From b52e1d3ede214589fec75fb04a13f89cb4ac7bc7 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Tue, 25 Feb 2025 20:40:33 -0500 Subject: [PATCH] Fix wrong fileline on 1step --- src/verilog.l | 6 ++---- src/verilog.y | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/verilog.l b/src/verilog.l index 7e96bdf44..d96e9f808 100644 --- a/src/verilog.l +++ b/src/verilog.l @@ -653,7 +653,7 @@ vnum {vnum1}|{vnum2}|{vnum3}|{vnum4}|{vnum5} { /* Generic unsupported warnings */ - "1step" { FL; return ya1STEP; } + "1step" { FL; return y1STEP; } "above" { ERROR_RSVD_WORD("AMS"); } "abs" { ERROR_RSVD_WORD("AMS"); } "absdelay" { ERROR_RSVD_WORD("AMS"); } @@ -964,9 +964,7 @@ vnum {vnum1}|{vnum2}|{vnum3}|{vnum4}|{vnum5} FL; yylval.cdouble = V3ParseImp::lexParseTimenum(yytext); return yaTIMENUM; } - 1step { - return ya1STEP; - } + 1step { FL; return y1STEP; } } /************************************************************************/ diff --git a/src/verilog.y b/src/verilog.y index d41af1d6f..780a6343f 100644 --- a/src/verilog.y +++ b/src/verilog.y @@ -545,7 +545,7 @@ BISONPRE_VERSION(3.7,%define api.header.include {"V3ParseBison.h"}) // for example yP_ for punctuation based operators. // Double underscores "yX__Y" means token X followed by Y, // and "yX__ETC" means X folled by everything but Y(s). -%token ya1STEP "1step" +%token y1STEP "1step" %token yACCEPT_ON "accept_on" %token yALIAS "alias" %token yALWAYS "always" @@ -6077,7 +6077,7 @@ clocking_skewE: // IEEE: [clocking_skew] clocking_skew: // IEEE: clocking_skew delay_control { $$ = $1->lhsp()->unlinkFrBack(); $1->deleteTree(); } - | '#' ya1STEP { $$ = new AstConst{$1, AstConst::OneStep{}}; } + | '#' y1STEP { $$ = new AstConst{$1, AstConst::OneStep{}}; } | yPOSEDGE delay_controlE { $$ = nullptr; BBUNSUP($1, "Unsupported: clocking event edge override"); } | yNEGEDGE delay_controlE { $$ = nullptr;