riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ignoring of simulation timings so that invalid module parameters cause syntax errors

This commit is contained in:
Clifford Wolf 2017-09-26 01:52:59 +02:00
parent 143c0abd33
commit 2cc09161ff
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontends/verilog/verilog_lexer.l
View File

@ -389,10 +389,6 @@ import[ \t\r\n]+\"(DPI|DPI-C)\"[ \t\r\n]+function[ \t\r\n]+ {
\\[\r\n] /* ignore continuation sequence */ \\[\r\n] /* ignore continuation sequence */
"//"[^\r\n]* /* ignore one-line comments */ "//"[^\r\n]* /* ignore one-line comments */
"#"\ *[0-9][0-9_]* /* ignore simulation timings */
"#"\ *[0-9][0-9_]*\.[0-9][0-9_]* /* ignore simulation timings */
"#"\ *[$a-zA-Z_\.][$a-zA-Z_0-9\.]* /* ignore simulation timings */
. { return *yytext; } . { return *yytext; }
%% %%

2
frontends/verilog/verilog_parser.y
View File

@ -355,6 +355,8 @@ package_body_stmt:
localparam_decl; localparam_decl;
non_opt_delay: non_opt_delay:
'#' TOK_ID { delete $2; } |
'#' TOK_CONSTVAL { delete $2; } |
'#' '(' expr ')' { delete $3; } | '#' '(' expr ')' { delete $3; } |
'#' '(' expr ':' expr ':' expr ')' { delete $3; delete $5; delete $7; }; '#' '(' expr ':' expr ':' expr ')' { delete $3; delete $5; delete $7; };