diff --git a/VERSION b/VERSION index b05db56..194f066 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.257 +1.5.258 diff --git a/base/netfile.c b/base/netfile.c index 9fcc41e..41bbad5 100644 --- a/base/netfile.c +++ b/base/netfile.c @@ -611,7 +611,8 @@ void SpiceTokNoNewline(void) } /*----------------------------------------------------------------------*/ -/* Skip to the next token, ignoring any C-style comments. */ +/* Skip to the next token, ignoring any C-style comments and verilog */ +/* "(* ... *)"-style comments. */ /*----------------------------------------------------------------------*/ void SkipTokComments(char *delimiter) @@ -627,6 +628,11 @@ void SkipTokComments(char *delimiter) SkipTok(delimiter); if (nexttok) SkipTok(delimiter); } + else if (match(nexttok, "(*")) { + while (nexttok && !match(nexttok, "*)")) + SkipTok(delimiter); + if (nexttok) SkipTok(delimiter); + } else break; } } @@ -731,7 +737,7 @@ char *strdtok(char *pstring, char *delim1, char *delim2) if (*s == '\\') { s++; while (*s != '\0') { - if ((*s == ' ') || (*s == '\\')) { + if ((*s == ' ') || ((*s == '\\') && (*(s + 1) == '\0'))) { s++; break; }