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

Fix handling of SV `" and `\`" escape sequences in macros (GitHub issue #366). 

`" overrides the normal behaviour of disabling macro expansion within
a string.
This commit is contained in:
Martin Whitaker 2020-08-24 09:11:10 +01:00
parent bd0a1c75ed
commit dc2aa6efa0
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ivlpp/lexor.lex
View File

@ -153,28 +153,15 @@ static void ifdef_leave(void)
size_t rc = fread(buf, 1, max_size, istack->file); \ size_t rc = fread(buf, 1, max_size, istack->file); \
result = (rc == 0) ? YY_NULL : rc; \ result = (rc == 0) ? YY_NULL : rc; \
} else { \ } else { \
/* We are expanding a macro. Handle the SV macro escape \ /* We are expanding a macro. Handle the SV `` delimiter. \
sequences. There doesn't seem to be any good reason \ There doesn't seem to be any good reason not to allow \
not to allow them in traditional Verilog as well. */ \ it in traditional Verilog as well. */ \
while ((istack->str[0] == '`') && \ while ((istack->str[0] == '`') && \
(istack->str[1] == '`')) { \ (istack->str[1] == '`')) { \
istack->str += 2; \ istack->str += 2; \
} \ } \
if (*istack->str == 0) { \ if (*istack->str == 0) { \
result = YY_NULL; \ result = YY_NULL; \
} else if ((istack->str[0] == '`') && \
(istack->str[1] == '"')) { \
istack->str += 2; \
buf[0] = '"'; \
result = 1; \
} else if ((istack->str[0] == '`') && \
(istack->str[1] == '\\')&& \
(istack->str[2] == '`') && \
(istack->str[3] == '"')) { \
istack->str += 4; \
buf[0] = '\\'; \
buf[1] = '"'; \
result = 2; \
} else { \ } else { \
buf[0] = *istack->str++; \ buf[0] = *istack->str++; \
result = 1; \ result = 1; \
@ -262,9 +249,7 @@ keywords (include|define|undef|ifdef|ifndef|else|elseif|endif)
if (macro_needs_args(yytext+1)) yy_push_state(MA_START); else do_expand(0); if (macro_needs_args(yytext+1)) yy_push_state(MA_START); else do_expand(0);
} }
/* Strings do not contain preprocessor directives, but can expand /* Strings do not contain preprocessor directives or macro expansions.
* macros. If that happens, they get expanded in the context of the
* string.
*/ */
\" { string_enter = YY_START; BEGIN(CSTRING); ECHO; } \" { string_enter = YY_START; BEGIN(CSTRING); ECHO; }
<CSTRING>\\\\ | <CSTRING>\\\\ |
@ -541,6 +526,15 @@ keywords (include|define|undef|ifdef|ifndef|else|elseif|endif)
do_expand(0); do_expand(0);
} }
/* If we are expanding a macro, handle the SV `" override. This avoids
* entering CSTRING state, thus allowing nested macro expansions.
*/
`\" { if (!istack->file) fputc('"', yyout); else REJECT; }
/* If we are expanding a macro, handle the SV `\`" escape sequence.
*/
`\\`\" { if (!istack->file) fputs("\\\"", yyout); else REJECT; }
<MA_START>\( { BEGIN(MA_ADD); macro_start_args(); } <MA_START>\( { BEGIN(MA_ADD); macro_start_args(); }
<MA_START>{W} {} <MA_START>{W} {}