Re: mid rule action linenos

[Akim Demaille]

>>>>> "Hans" == Hans Aberg <address@hidden> writes:

Hans> Well, in view of that you have not announced 1.30e publicly and
Hans> the address above isn't GNU, it looked as though that you
Hans> preferred non-public discussions so that you could make some
Hans> last minute corrections before releasing it.

That's correct, sorry for the confusion.  I've not put it up there
because it means it is named then: no other snapshot shall be named
1.30e, which I didn't want to force.

Hans> Just let me know what you want.

:)

I'd like you to try the following patch, which is available too as a
tarball at

        http://www.lrde.epita.fr/~akim/download/bison-1.30e.tar.gz

I plan to make it a beta in a hour or so.

Thanks Hans!

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * src/reader.c (readgram): Make sure rules for mid-rule actions
        have a lineno equal to that of their host rule.
        Reported by Hans Aberg.
        * tests/regression.at (Rule Line Numbers): New.

Index: src/reader.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reader.c,v
retrieving revision 1.72.2.20
diff -u -u -r1.72.2.20 reader.c
--- src/reader.c 2001/11/26 09:49:58 1.72.2.20
+++ src/reader.c 2001/11/26 15:20:20
@@ -1438,12 +1438,14 @@
                  /* Make a dummy nonterminal, a gensym.  */
                  bucket *sdummy = gensym ();

-                 /* Make a new rule, whose body is empty,
-                    before the current one, so that the action
-                    just read can belong to it.  */
+                 /* Make a new rule, whose body is empty, before the
+                    current one, so that the action just read can
+                    belong to it.  */
                  nrules++;
                  nitems++;
                  p = symbol_list_new (sdummy);
+                 /* Attach its lineno to that of the host rule. */
+                 p->line = crule->line;
                  if (crule1)
                    crule1->next = p;
                  else
Index: tests/regression.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/regression.at,v
retrieving revision 1.1.2.17
diff -u -u -r1.1.2.17 regression.at
--- tests/regression.at 2001/11/26 09:49:58 1.1.2.17
+++ tests/regression.at 2001/11/26 15:20:20
@@ -242,6 +242,148 @@



+
+## ------------------- ##
+## Rule Line Numbers.  ##
+## ------------------- ##
+
+AT_SETUP([Rule Line Numbers])
+
+AT_DATA([input.y],
+[[%%
+expr:
+'a'
+
+{
+
+}
+
+'b'
+
+{
+
+}
+
+|
+
+
+{
+
+
+}
+
+'c'
+
+{
+
+}
+]])
+
+AT_CHECK([bison input.y input.c -v], 0, [], [])
+
+# Check the contents of the report.
+AT_CHECK([cat input.output], [],
+[[
+Grammar
+
+  Number, Line, Rule
+    1   2 @1 -> /* empty */
+    2   2 expr -> 'a' @1 'b'
+    3  15 @2 -> /* empty */
+    4  15 expr -> @2 'c'
+
+Terminals, with rules where they appear
+
+$ (-1)
+'a' (97) 2
+'b' (98) 2
+'c' (99) 4
+error (256)
+
+Nonterminals, with rules where they appear
+
+expr (6)
+    on left: 2 4
address@hidden (7)
+    on left: 1, on right: 2
address@hidden (8)
+    on left: 3, on right: 4
+
+
+state 0
+
+    'a'        shift, and go to state 1
+
+    $default   reduce using rule 3 (@2)
+
+    expr       go to state 6
+    @2         go to state 2
+
+
+
+state 1
+
+    expr  ->  'a' . @1 'b'   (rule 2)
+
+    $default   reduce using rule 1 (@1)
+
+    @1         go to state 3
+
+
+
+state 2
+
+    expr  ->  @2 . 'c'   (rule 4)
+
+    'c'        shift, and go to state 4
+
+
+
+state 3
+
+    expr  ->  'a' @1 . 'b'   (rule 2)
+
+    'b'        shift, and go to state 5
+
+
+
+state 4
+
+    expr  ->  @2 'c' .   (rule 4)
+
+    $default   reduce using rule 4 (expr)
+
+
+
+state 5
+
+    expr  ->  'a' @1 'b' .   (rule 2)
+
+    $default   reduce using rule 2 (expr)
+
+
+
+state 6
+
+    $          go to state 7
+
+
+
+state 7
+
+    $          go to state 8
+
+
+
+state 8
+
+    $default   accept
+]])
+
+AT_CLEANUP
+
+
+
 ## -------------------- ##
 ## %expect not enough.  ##
 ## -------------------- ##