* src/output.c (prepare): Delete the `filename' muscule insertion.

* src/reader.c (copy_action): Use `filename' muscule with `#line'.
(parse_union_decl): Likewise.
* src/macrotab.c (macro_init): Initialize filename by infile.
This commit is contained in:
Pascal Bart
2001-08-31 18:51:06 +00:00
parent 6b7d911c5d
commit dda680cb80
4 changed files with 12 additions and 5 deletions

View File

@@ -1,3 +1,10 @@
2001-08-31 Pascal Bart <pascal.bart@epita.fr>
* src/output.c (prepare): Delete the `filename' muscule insertion.
* src/reader.c (copy_action): Use `filename' muscule with `#line'.
(parse_union_decl): Likewise.
* src/macrotab.c (macro_init): Initialize filename by infile.
2001-08-31 Marc Autret <autret_m@epita.fr>
* src/bison.simple (YYLSP_NEEDED): New definition.

View File

@@ -53,7 +53,7 @@ macro_init (void)
/* Version and input file. */
macro_insert ("version", VERSION);
macro_insert ("filename", "a.y");
macro_insert ("filename", infile);
/* Types. */
macro_insert ("stype", "int");

View File

@@ -1067,8 +1067,6 @@ prepare (void)
MACRO_INSERT_INT ("ntbase", ntokens);
MACRO_INSERT_INT ("verbose", 0);
MACRO_INSERT_STRING ("filename", infile);
MACRO_INSERT_INT ("nnts", nvars);
MACRO_INSERT_INT ("nrules", nrules);
MACRO_INSERT_INT ("nstates", nstates);

View File

@@ -749,7 +749,8 @@ parse_union_decl (void)
if (!no_lines_flag)
obstack_fgrow2 (&attrs_obstack, "\n#line %d %s\n",
lineno, quotearg_style (c_quoting_style, infile));
lineno, quotearg_style (c_quoting_style,
macro_find("filename")));
else
obstack_1grow (&attrs_obstack, '\n');
@@ -1111,7 +1112,8 @@ copy_action (symbol_list *rule, int stack_offset)
if (!no_lines_flag)
{
sprintf (buf, "#line %d %s\n",
lineno, quotearg_style (c_quoting_style, infile));
lineno, quotearg_style (c_quoting_style,
macro_find ("filename")));
obstack_grow (&action_obstack, buf, strlen (buf));
}
obstack_1grow (&action_obstack, '{');