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

Fix newlines in radix values, bug507.

This commit is contained in:
Wilson Snyder 2012-05-07 08:58:29 -04:00
parent e97541dcbc
commit 0c1e184cb7
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes
View File

@ -29,6 +29,9 @@ indicates the contributor was also the author of the fix; Thanks!
**** Fix imports causing symbol table error, bug490. [Alex Solomatnikov]
**** Fix newlines in radix values, bug507. [Walter Lavino]
* Verilator 3.833 2012/04/15
*** Support += and -= in standard for loops, bug463. [Alex Solomatnikov]

17
src/verilog.l
View File

@ -43,6 +43,7 @@ extern void yyerrorf(const char* format, ...);
//======================================================================
#define NEXTLINE() {PARSEP->linenoInc();}
#define LINECHECK() { const char* cp=yytext; for (int n=yyleng; n; --n) if (cp[n]=='\n') NEXTLINE(); }
#define CRELINE() (PARSEP->copyOrSameFileLine())
#define FL { yylval.fl = CRELINE(); }
@ -894,8 +895,8 @@ word [a-zA-Z0-9_]+
}
\" { yy_push_state(STRING); yymore(); }
[0-9]*?['']s?[bcodhBCODH][ \t]*[A-Fa-f0-9xXzZ_?]* {
FL; yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
[0-9]*?['']s?[bcodhBCODH][ \t\n]*[A-Fa-f0-9xXzZ_?]* {
FL; LINECHECK(); yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
return yaINTNUM;
}
[0-9]*?['']s?[01xXzZ] { /* SystemVerilog */
@ -903,16 +904,16 @@ word [a-zA-Z0-9_]+
return yaINTNUM;
}
/* Note below is constructed to not match the ' that begins a '( or '{ */
[0-9][_0-9]*[ \t]*['']s?[bcodhBCODH]?[ \t]*[A-Fa-f0-9xXzZ_?]+ {
FL; yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
[0-9][_0-9]*[ \t\n]*['']s?[bcodhBCODH]?[ \t]*[A-Fa-f0-9xXzZ_?]+ {
FL; LINECHECK(); yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
return yaINTNUM;
}
[0-9][_0-9]*[ \t]*['']s?[bcodhBCODH] {
FL; yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
[0-9][_0-9]*[ \t\n]*['']s?[bcodhBCODH] {
FL; LINECHECK(); yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
return yaINTNUM;
}
[0-9][_0-9]*[ \t]*['']s {
FL; yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
[0-9][_0-9]*[ \t\n]*['']s {
FL; LINECHECK(); yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
return yaINTNUM;
}
[0-9][_0-9]* {