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

Match Verilog-Perl: Fix parse error on min:typ:max delay pairs 

git-svn-id: file://localhost/svn/verilator/trunk/verilator@1018 77ca24e4-aefa-0310-84f0-b9a241c72d87
This commit is contained in:
Wilson Snyder 2008-03-31 21:03:56 +00:00
parent 61fbab1910
commit bd60cf12f8
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/V3PreProc.cpp
View File

@ -562,7 +562,7 @@ int V3PreProcImp::getRawToken() {
if (m_lineAdd) { if (m_lineAdd) {
m_lineAdd--; m_lineAdd--;
m_rawAtBol = true; m_rawAtBol = true;
yytext="\n"; yyleng=1; yytext=(char*)"\n"; yyleng=1;
return (VP_TEXT); return (VP_TEXT);
} }
if (m_lineCmt!="") { if (m_lineCmt!="") {

12
src/verilog.y
View File

@ -382,7 +382,7 @@ class AstSenTree;
%type<nodep> modItem modItemList modItemListE modOrGenItem %type<nodep> modItem modItemList modItemListE modOrGenItem
%type<nodep> generateRegion %type<nodep> generateRegion
%type<nodep> genItem genItemList genItemBegin genItemBlock genTopBlock genCaseListE genCaseList %type<nodep> genItem genItemList genItemBegin genItemBlock genTopBlock genCaseListE genCaseList
%type<nodep> dlyTerm %type<nodep> dlyTerm minTypMax
%type<fileline> delay %type<fileline> delay
%type<varp> sigAndAttr sigId sigIdRange sigList regsig regsigList regSigId %type<varp> sigAndAttr sigId sigIdRange sigList regsig regsigList regSigId
%type<varp> netSig netSigList %type<varp> netSig netSigList
@ -696,9 +696,9 @@ delayE: /* empty */ { }
; ;
delay: '#' dlyTerm { $$ = $1; } /* ignored */ delay: '#' dlyTerm { $$ = $1; } /* ignored */
| '#' '(' dlyInParen ')' { $$ = $1; } /* ignored */ | '#' '(' minTypMax ')' { $$ = $1; } /* ignored */
| '#' '(' dlyInParen ',' dlyInParen ')' { $$ = $1; } /* ignored */ | '#' '(' minTypMax ',' minTypMax ')' { $$ = $1; } /* ignored */
| '#' '(' dlyInParen ',' dlyInParen ',' dlyInParen ')' { $$ = $1; } /* ignored */ | '#' '(' minTypMax ',' minTypMax ',' minTypMax ')' { $$ = $1; } /* ignored */
; ;
dlyTerm: yaID { $$ = NULL; } dlyTerm: yaID { $$ = NULL; }
@ -706,7 +706,9 @@ dlyTerm: yaID { $$ = NULL; }
| yaFLOATNUM { $$ = NULL; } | yaFLOATNUM { $$ = NULL; }
; ;
dlyInParen: dlyTerm { } /* ignored */ // IEEE: mintypmax_expression and constant_mintypmax_expression
minTypMax: expr { $$ = $1; } /* ignored */
| expr ':' expr ':' expr { $$ = $1; } /* ignored */
; ;
sigAndAttr: sigId sigAttrListE { $$ = $1; } sigAndAttr: sigId sigAttrListE { $$ = $1; }