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

`line directive line number must be > 0 and can have arbitrary space

This commit is contained in:
Cary R 2023-07-19 01:48:55 -07:00
parent 3aafa1333b
commit 9e4c4d5460
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ivlpp/lexor.lex
View File

@ -1,7 +1,7 @@
%option prefix="yy"
%{
/*
* Copyright (c) 1999-2022 Stephen Williams (steve@icarus.com)
* Copyright (c) 1999-2023 Stephen Williams (steve@icarus.com)
*
* This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU
@ -225,7 +225,7 @@ keywords (line|include|define|undef|ifdef|ifndef|else|elsif|endif)
/* Recognize and handle the `line directive. Also pass it through to
* the output so the main compiler is aware of the change.
*/
^[ \t]?"`line"[ \t]+.+ { handle_line_directive(); ECHO; }
^[ \t]*"`line"[ \t]+.+ { handle_line_directive(); ECHO; }
/* Detect single line comments, passing them directly to the output.
*/

12
lexor.lex
View File

@ -4,7 +4,7 @@
%{
/*
* Copyright (c) 1998-2022 Stephen Williams (steve@icarus.com)
* Copyright (c) 1998-2023 Stephen Williams (steve@icarus.com)
*
* This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU
@ -168,7 +168,7 @@ TU [munpf]
/* Recognize the various line directives. */
^"#line"[ \t]+.+ { line_directive(); }
^[ \t]?"`line"[ \t]+.+ { line_directive2(); }
^[ \t]*"`line"[ \t]+.+ { line_directive2(); }
[ \t\b\f\r] { ; }
\n { yylloc.first_line += 1; }
@ -1520,12 +1520,16 @@ static void line_directive2()
assert(strncmp(cp, "`line", 5) == 0);
cp += 5;
/* strtoul skips leading space. */
unsigned long lineno = strtoul(cp, &cpr, 10);
/* strtol skips leading space. */
long lineno = strtol(cp, &cpr, 10);
if (cp == cpr) {
VLerror(yylloc, "error: Invalid line number for `line directive.");
return;
}
if (lineno < 1) {
VLerror(yylloc, "error: Line number for `line directive most be greater than zero.");
return;
}
lineno -= 1;
cp = cpr;