Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Fix parsing #1_2 delays

Browse Source
This commit is contained in:
Wilson Snyder 2023-03-15 21:22:28 -04:00
parent 45690faea7
commit 36da6a3563
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/verilog.l
View File

@ -913,7 +913,10 @@ vnum {vnum1}|{vnum2}|{vnum3}|{vnum4}|{vnum5}
/* "# 1'b0" is a delay value so must lex as "#" "1" "'b0" */ /* "# 1'b0" is a delay value so must lex as "#" "1" "'b0" */
if (PARSEP->lexPrevToken()=='#') { if (PARSEP->lexPrevToken()=='#') {
int shortlen = 0; int shortlen = 0;
while (std::isdigit(yytext[shortlen])) ++shortlen; if (std::isdigit(yytext[shortlen])) {
while (std::isdigit(yytext[shortlen])
|| yytext[shortlen]=='_') ++shortlen;
}
if (shortlen) { if (shortlen) {
// Push rest past numbers for later parse // Push rest past numbers for later parse
PARSEP->lexUnputString(yytext + shortlen, yyleng - shortlen); PARSEP->lexUnputString(yytext + shortlen, yyleng - shortlen);

7
test_regress/t/t_timing_events.v
View File

@ -28,6 +28,13 @@ module t;
$finish; $finish;
end end
int x;
initial begin
x = # 1_1 'd 12_34; // Checks we parse _ correctly
if (x != 1234) $stop;
if ($time != 11) $stop;
end
initial #21 $stop; // timeout initial #21 $stop; // timeout
endmodule endmodule