diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2016-02-23 15:59:42 +0100 |
---|---|---|
committer | Will Estes <westes575@gmail.com> | 2016-02-24 16:19:49 -0500 |
commit | 647a92b9f4cda774fa9a088701e63bde59f5f684 (patch) | |
tree | ae13d6f585896464da6c1f25ebe1e8c587c59045 /src | |
parent | 64f27743785e30855b486e4575429192fddaa9eb (diff) |
Emit no #line directives if gen_line_dirs is false, resolves igh#55.
There are two instances in the code which will print a #line directive
to the resulting lexer, regardless of the value of gen_line_dirs. Fix
them, so they also respect gen_line_dirs.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'src')
-rw-r--r-- | src/buf.c | 3 | ||||
-rw-r--r-- | src/main.c | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -95,6 +95,9 @@ struct Buf *buf_linedir (struct Buf *buf, const char* filename, int lineno) const char *src; size_t tsz; + if (gen_line_dirs) + return buf; + tsz = strlen("#line \"\"\n") + /* constant parts */ 2 * strlen (filename) + /* filename with possibly all backslashes escaped */ (int) (1 + log10 (abs (lineno))) + /* line number */ @@ -496,7 +496,8 @@ void check_options (void) m4defs_buf.nelts = 0; /* memory leak here. */ /* Place a bogus line directive, it will be fixed in the filter. */ - outn("#line 0 \"M4_YY_OUTFILE_NAME\"\n"); + if (gen_line_dirs) + outn("#line 0 \"M4_YY_OUTFILE_NAME\"\n"); /* Dump the user defined preproc directives. */ if (userdef_buf.elts) |