FYI [trunk]: lines-bug1.patch

[Marc Autret]

> Index: ChangeLog
> ===================================================================
> RCS file: /cvsroot/bison/bison/ChangeLog,v
> retrieving revision 1.397
> diff -u -r1.397 ChangeLog
> --- ChangeLog 10 Dec 2001 22:55:06 -0000      1.397
> +++ ChangeLog 10 Dec 2001 23:09:04 -0000
> @@ -1,5 +1,12 @@
>  2001-12-10  Marc Autret  <address@hidden>
>  
> +     * src/reader.c (copy_definition): Re-use CPP-outed code which 
> +     replace precedent remove.
> +     * src/bison.simple: Remove #line before %%prologue because
> +     %%input-line is wrong at this time.
> +
> +2001-12-10  Marc Autret  <address@hidden>
> +
>       * src/reader.c (symbols_output): Clean up.
>       * src/output.c (output_gram, output): Clean up. 
>  
> Index: src/bison.simple
> ===================================================================
> RCS file: /cvsroot/bison/bison/src/bison.simple,v
> retrieving revision 1.85
> diff -u -r1.85 bison.simple
> --- src/bison.simple  4 Dec 2001 14:10:07 -0000       1.85
> +++ src/bison.simple  10 Dec 2001 23:09:09 -0000
> @@ -76,7 +76,6 @@
>  #endif
>  
>  /* Copy the user declarations.  */
> -#line %%input-line "%%filename"
>  %%prologue
>  
>  #line %%line "%%skeleton"
> Index: src/output.c
> ===================================================================
> RCS file: /cvsroot/bison/bison/src/output.c,v
> retrieving revision 1.85
> diff -u -r1.85 output.c
> --- src/output.c      10 Dec 2001 22:55:06 -0000      1.85
> +++ src/output.c      10 Dec 2001 23:09:13 -0000
> @@ -959,6 +959,8 @@
>           obstack_sgrow (oout, muscle_value);
>         else if (!strcmp (muscle_key, "line"))
>           obstack_fgrow1 (oout, "%d", line + 1);
> +       /* How can lineno be correct after having finished reading
> +          input file ? --Marc.  */
>         else if (!strcmp (muscle_key, "input-line"))
>           obstack_fgrow1 (oout, "%d", lineno);
>         else
> Index: src/reader.c
> ===================================================================
> RCS file: /cvsroot/bison/bison/src/reader.c,v
> retrieving revision 1.113
> diff -u -r1.113 reader.c
> --- src/reader.c      10 Dec 2001 22:55:06 -0000      1.113
> +++ src/reader.c      10 Dec 2001 23:09:17 -0000
> @@ -437,14 +437,12 @@
>    /* -1 while reading a character if prev char was %. */
>    int after_percent;
>  
> -#if 0
>    if (!no_lines_flag)
>      {
>        obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"),
>                     lineno, quotearg_style (c_quoting_style,
>                                             muscle_find("filename")));
>      }
> -#endif
>  
>    after_percent = 0;
>  
> 
> 
> -- 
> Marc Autret