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

ivlpp: Handle multi-line comments in macros 

Make sure that comments spanning multiple lines are supported in multi-line
macros. Since the lexer parses line by line we need a flag to track whether
a multi-line comment is currently active.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Lars-Peter Clausen 2022-12-17 10:30:18 -08:00
parent d12a74beec
commit c4daf11fac
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ivlpp/lexor.lex
View File

@ -1130,12 +1130,14 @@ void free_macros(void)
* variables. When the define is over, the def_finish() function
* executes the define and clears this text. The define_continue_flag
* is set if do_define detects that the definition is to be continued
* on the next line.
* on the next line. The define_comment_flag is set when a multi-line comment is
* active in a define.
*/
static char* define_text = 0;
static size_t define_cnt = 0;
static int define_continue_flag = 0;
static int define_comment_flag = 0;
/*
* The do_magic function puts the expansions of magic macros into
@ -1189,6 +1191,33 @@ static char *find_arg(char*ptr, char*head, char*arg)
return cp;
}
/*
* Returns 1 if the comment continues on the next line
*/
static int do_define_multiline_comment(char *replace_start,
const char *search_start)
{
char *tail = strstr(search_start, "*/");
if (!tail) {
if (search_start[strlen(search_start) - 1] == '\\') {
define_continue_flag = 1;
define_comment_flag = 1;
*replace_start++ = '\\';
} else {
define_comment_flag = 0;
fprintf(stderr, "%s:%u: Unterminated comment in define\n",
istack->path, istack->lineno+1);
}
*replace_start = '\0';
return 1;
}
define_comment_flag = 0;
tail += 2;
memmove(replace_start, tail, strlen(tail) + 1);
return 0;
}
/*
* Collect the definition. Normally, this returns 0. If there is a
* continuation, then return 1 and this function may be called again
@ -1204,6 +1233,12 @@ static void do_define(void)
define_continue_flag = 0;
/* Are we in an multi-line comment? Look for the end */
if (define_comment_flag) {
if (do_define_multiline_comment(yytext, yytext))
return;
}
/* Look for comments in the definition, and remove them. */
cp = strchr(yytext, '/');
@ -1216,17 +1251,8 @@ static void do_define(void)
*cp = 0;
break;
} else if (cp[1] == '*') {
tail = strstr(cp+2, "*/");
if (tail == 0) {
*cp = 0;
fprintf(stderr, "%s:%u: Unterminated comment in define\n",
istack->path, istack->lineno+1
);
if (do_define_multiline_comment(cp, cp + 2))
break;
}
memmove(cp, tail+2, strlen(tail+2)+1);
} else {
cp++;
}