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

Support escaped identifiers as macro names.

This commit is contained in:
Martin Whitaker 2020-10-09 11:38:16 +01:00
parent 6566072741
commit 359b2b65c2
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ivlpp/lexor.lex
View File

@ -186,9 +186,11 @@ static int ma_parenthesis_level = 0;
%x PPINCLUDE %x PPINCLUDE
%x DEF_NAME %x DEF_NAME
%x DEF_ESC
%x DEF_ARG %x DEF_ARG
%x DEF_SEP %x DEF_SEP
%x DEF_TXT %x DEF_TXT
%x MN_ESC
%x MA_START %x MA_START
%x MA_ADD %x MA_ADD
%x CCOMMENT %x CCOMMENT
@ -338,6 +340,11 @@ keywords (include|define|undef|ifdef|ifndef|else|elseif|endif)
<DEF_NAME>[a-zA-Z_][a-zA-Z0-9_$]*"("{W}? { BEGIN(DEF_ARG); def_start(); } <DEF_NAME>[a-zA-Z_][a-zA-Z0-9_$]*"("{W}? { BEGIN(DEF_ARG); def_start(); }
<DEF_NAME>[a-zA-Z_][a-zA-Z0-9_$]*{W}? { BEGIN(DEF_TXT); def_start(); } <DEF_NAME>[a-zA-Z_][a-zA-Z0-9_$]*{W}? { BEGIN(DEF_TXT); def_start(); }
<DEF_NAME>\\ { BEGIN(DEF_ESC); }
<DEF_ESC>[^ \t\b\f\n\r]+{W}"("{W}? { BEGIN(DEF_ARG); def_start(); }
<DEF_ESC>[^ \t\b\f\n\r]+{W} { BEGIN(DEF_TXT); def_start(); }
/* define arg: <name> = <text> */ /* define arg: <name> = <text> */
<DEF_ARG>[a-zA-Z_][a-zA-Z0-9_$]*{W}*"="[^,\)]*{W}? { BEGIN(DEF_SEP); def_add_arg(); } <DEF_ARG>[a-zA-Z_][a-zA-Z0-9_$]*{W}*"="[^,\)]*{W}? { BEGIN(DEF_SEP); def_add_arg(); }
/* define arg: <name> */ /* define arg: <name> */
@ -352,7 +359,7 @@ keywords (include|define|undef|ifdef|ifndef|else|elseif|endif)
<DEF_ARG,DEF_SEP>(\n|"\r\n"|"\n\r"|\r){W}? { istack->lineno += 1; fputc('\n', yyout); } <DEF_ARG,DEF_SEP>(\n|"\r\n"|"\n\r"|\r){W}? { istack->lineno += 1; fputc('\n', yyout); }
<DEF_NAME,DEF_ARG,DEF_SEP>. { <DEF_NAME,DEF_ESC,DEF_ARG,DEF_SEP>. {
emit_pathline(istack); emit_pathline(istack);
fprintf(stderr, "error: malformed `define directive.\n"); fprintf(stderr, "error: malformed `define directive.\n");
error_count += 1; error_count += 1;
@ -535,6 +542,24 @@ keywords (include|define|undef|ifdef|ifndef|else|elseif|endif)
do_expand(0); do_expand(0);
} }
`\\ { yy_push_state(MN_ESC); }
<MN_ESC>[^ \t\b\f\n\r]+ {
yy_pop_state();
if (macro_needs_args(yytext))
yy_push_state(MA_START);
else
do_expand(0);
}
<MN_ESC>. {
yy_pop_state();
unput(yytext[0]);
emit_pathline(istack);
fprintf(stderr, "error: malformed macro name.\n");
error_count += 1;
}
/* Stringified version of macro expansion. This is an Icarus extension. /* Stringified version of macro expansion. This is an Icarus extension.
When expanding macro text, the SV usage of `` takes precedence. */ When expanding macro text, the SV usage of `` takes precedence. */
``[a-zA-Z_][a-zA-Z0-9_$]* { ``[a-zA-Z_][a-zA-Z0-9_$]* {
@ -825,8 +850,13 @@ static void def_add_arg(void)
/* This can happen because we are also processing "argv[0]", the /* This can happen because we are also processing "argv[0]", the
macro name, as a pseudo-argument. The lexor will match that macro name, as a pseudo-argument. The lexor will match that
as name(, so chop off the ( here. */ as name(, so chop off the ( here. If we have an escaped name,
if (yytext[length - 1] == '(') length--; we also need to strip off the white space that terminates the
name. */
if (yytext[length - 1] == '(') {
length--;
while (isspace((int)yytext[length - 1])) length--;
}
yytext[length] = 0; yytext[length] = 0;