Fix newlines in radix values, bug507.

jeras · May 7, 2012 · 0c1e184 · 0c1e184
1 parent e97541d
commit 0c1e184
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/Changes b/Changes
@@ -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]

diff --git a/src/verilog.l b/src/verilog.l
@@ -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,25 +895,25 @@ word	[a-zA-Z0-9_]+
 			}
   \" 			{ yy_push_state(STRING); yymore(); }
 
-  [0-9]*?['']s?[bcodhBCODH][ \t]*[A-Fa-f0-9xXzZ_?]*	{
+  [0-9]*?['']s?[bcodhBCODH][ \t\n]*[A-Fa-f0-9xXzZ_?]*	{
-			  FL; yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
+			  FL; LINECHECK(); yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
                           return yaINTNUM;
 			}
   [0-9]*?['']s?[01xXzZ]	{	/* SystemVerilog */
 			  FL; yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
                           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_?]+	{
+  [0-9][_0-9]*[ \t\n]*['']s?[bcodhBCODH]?[ \t]*[A-Fa-f0-9xXzZ_?]+	{
-			  FL; yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
+			  FL; LINECHECK(); yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
                           return yaINTNUM;
 			}
-  [0-9][_0-9]*[ \t]*['']s?[bcodhBCODH]	{
+  [0-9][_0-9]*[ \t\n]*['']s?[bcodhBCODH]	{
-			  FL; yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
+			  FL; LINECHECK(); yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
                           return yaINTNUM;
 			}
-  [0-9][_0-9]*[ \t]*['']s	{
+  [0-9][_0-9]*[ \t\n]*['']s	{
-			  FL; yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
+			  FL; LINECHECK(); yylval.nump = PARSEP->newNumber(yylval.fl,(char*)yytext);
                           return yaINTNUM;
 			}
   [0-9][_0-9]*		{