luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support free-form `begin_keywords and `end_keywords directives.

This commit is contained in:
Martin Whitaker 2022-12-20 17:14:49 +00:00
parent 52f269649a
commit 79a3d08d69
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ivtest/ivltests/br_gh782e.v Normal file
View File

@ -0,0 +1,22 @@
// This is just a syntax test.
/* comment */ `begin_keywords /* comment */ // comment
/* comment */ "1364-2005" /* comment */ // comment
module m1;
endmodule
/* comment */ `end_keywords /* comment */ // comment
/* comment */`begin_keywords/*
comment */
/* comment */"1364-2005"/*
comment */
module m2;
endmodule
/* comment */`end_keywords/*
comment */
module test;
initial $display("PASSED");
endmodule

1
ivtest/regress-vlg.list
View File

@ -351,6 +351,7 @@ br_gh674 normal ivltests
br_gh732 normal ivltests gold=br_gh732.gold br_gh732 normal ivltests gold=br_gh732.gold
br_gh782c normal ivltests br_gh782c normal ivltests
br_gh782d normal ivltests br_gh782d normal ivltests
br_gh782e normal ivltests
br_gh788 normal,-gno-io-range-error,-Wno-anachronisms ivltests gold=br_gh788.gold br_gh788 normal,-gno-io-range-error,-Wno-anachronisms ivltests gold=br_gh788.gold
br_gh793 normal ivltests br_gh793 normal ivltests
br_ml20150315 normal ivltests gold=br_ml_20150315.gold br_ml20150315 normal ivltests gold=br_ml_20150315.gold

25
lexor.lex
View File

@ -153,6 +153,7 @@ void lex_in_package_scope(PPackage*pkg)
%x PPUCDRIVE_ERROR %x PPUCDRIVE_ERROR
%x PPDEFAULT_NETTYPE %x PPDEFAULT_NETTYPE
%x PPBEGIN_KEYWORDS %x PPBEGIN_KEYWORDS
%x PPBEGIN_KEYWORDS_ERROR
%s EDGES %s EDGES
%x REAL_SCALE %x REAL_SCALE
@ -708,9 +709,9 @@ TU [munpf]
^{W}?`suppress_faults{W}?.* { } ^{W}?`suppress_faults{W}?.* { }
^{W}?`uselib{W}?.* { } ^{W}?`uselib{W}?.* { }
^{W}?`begin_keywords{W}? { BEGIN(PPBEGIN_KEYWORDS); } `begin_keywords { BEGIN(PPBEGIN_KEYWORDS); }
<PPBEGIN_KEYWORDS>\"[a-zA-Z0-9 -\.]*\".* { <PPBEGIN_KEYWORDS>\"[a-zA-Z0-9 -\.]*\" {
keyword_mask_stack.push_front(lexor_keyword_mask); keyword_mask_stack.push_front(lexor_keyword_mask);
char*word = yytext+1; char*word = yytext+1;
@ -764,19 +765,23 @@ TU [munpf]
BEGIN(0); BEGIN(0);
} }
<PPBEGIN_KEYWORDS>.* { <PPBEGIN_KEYWORDS>"//" { comment_enter = PPBEGIN_KEYWORDS; BEGIN(LCOMMENT); }
fprintf(stderr, "%s:%d: Malformed keywords specification: %s\n", <PPBEGIN_KEYWORDS>"/*" { comment_enter = PPBEGIN_KEYWORDS; BEGIN(CCOMMENT); }
yylloc.text, yylloc.first_line, yytext); <PPBEGIN_KEYWORDS>"\n" { yylloc.first_line += 1; }
BEGIN(0); <PPBEGIN_KEYWORDS>{W} { ; }
} <PPBEGIN_KEYWORDS>. { BEGIN(PPBEGIN_KEYWORDS_ERROR); }
^{W}?`end_keywords{W}?.* { /* On error, try to recover by skipping to the end of the line. */
<PPBEGIN_KEYWORDS_ERROR>[^\n]+ {
VLerror(yylloc, "error: Invalid `begin_keywords directive.");
BEGIN(0); }
`end_keywords {
if (!keyword_mask_stack.empty()) { if (!keyword_mask_stack.empty()) {
lexor_keyword_mask = keyword_mask_stack.front(); lexor_keyword_mask = keyword_mask_stack.front();
keyword_mask_stack.pop_front(); keyword_mask_stack.pop_front();
} else { } else {
fprintf(stderr, "%s:%d: Mismatched end_keywords directive\n", VLwarn(yylloc, "warning: Mismatched `end_keywords directive");
yylloc.text, yylloc.first_line);
} }
} }