From 81602d18c49bd47787a168cd9d08d4dc94651609 Mon Sep 17 00:00:00 2001 From: Neal Wood Date: Fri, 14 Jan 2022 21:50:38 +0000 Subject: [PATCH 1/2] Allow any whitespace to end escaped identifiers Escaped identifiers are allowed to end in a space, tab, newline or formfeed. Currently, ADMS only recognises a space. This commit also accommodates the remaining whitespace options. --- admsXml/verilogaLex.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admsXml/verilogaLex.l b/admsXml/verilogaLex.l index 443658e..ea03938 100644 --- a/admsXml/verilogaLex.l +++ b/admsXml/verilogaLex.l @@ -274,7 +274,7 @@ INF {TKRETURN(yytext,yyleng); return tk_inf;} \|\| {TKRETURN(yytext,yyleng); return tk_or;} \^\~ {TKRETURN(yytext,yyleng); return tk_bitwise_equr;} -\\{ident}" " {TKSTRIPPEDRETURN(yytext,yyleng); return tk_ident;} +\\{ident}{wn} {TKSTRIPPEDRETURN(yytext,yyleng); return tk_ident;} // FIXME \${ident} {TKRETURN(yytext,yyleng); return tk_dollar_ident;} {char} {TKSTRIPPEDRETURN(yytext,yyleng); return tk_char;} {b8_int} {TKRETURN(yytext,yyleng); return tk_integer;} From 7da6e8d9c1deadf38ba65f57866934147b053fb9 Mon Sep 17 00:00:00 2001 From: Neal Wood Date: Sat, 22 Jan 2022 18:36:22 +0000 Subject: [PATCH 2/2] Remove redundant comment --- admsXml/verilogaLex.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admsXml/verilogaLex.l b/admsXml/verilogaLex.l index ea03938..e4cf053 100644 --- a/admsXml/verilogaLex.l +++ b/admsXml/verilogaLex.l @@ -274,7 +274,7 @@ INF {TKRETURN(yytext,yyleng); return tk_inf;} \|\| {TKRETURN(yytext,yyleng); return tk_or;} \^\~ {TKRETURN(yytext,yyleng); return tk_bitwise_equr;} -\\{ident}{wn} {TKSTRIPPEDRETURN(yytext,yyleng); return tk_ident;} // FIXME +\\{ident}{wn} {TKSTRIPPEDRETURN(yytext,yyleng); return tk_ident;} \${ident} {TKRETURN(yytext,yyleng); return tk_dollar_ident;} {char} {TKSTRIPPEDRETURN(yytext,yyleng); return tk_char;} {b8_int} {TKRETURN(yytext,yyleng); return tk_integer;}