* src/reader.c (readgram): Bind the initial rule's lineno to that

of the first rule.
* tests/regression.at (Rule Line Numbers, Unresolved SR Conflicts):
(Solved SR Conflicts): Adjust rule 0's line number.

diff --git a/ChangeLog b/ChangeLog
index df65ef2ff4e4b47671e6925ab6dd8397f66a181d..be33f46766c1b6e2fd2c6a54eba3bcb54570a44e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-29  Akim Demaille  <akim@epita.fr>
+
+       * src/reader.c (readgram): Bind the initial rule's lineno to that
+       of the first rule.
+       * tests/regression.at (Rule Line Numbers, Unresolved SR Conflicts):
+       (Solved SR Conflicts): Adjust rule 0's line number.
+
+       

 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        Fix the `GAWK Grammar' failure.
 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        Fix the `GAWK Grammar' failure.

diff --git a/src/reader.c b/src/reader.c
index 5ee5093d175cefe5b352e7baf049d880f3d4731b..fcfb2c9460e0c625e41df03b23a32c153d378630 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1451,10 +1451,12 @@ readgram (void)
        t = lex ();
       }
 
        t = lex ();
       }
 

-  /* Insert the initial rule:
+  /* Insert the initial rule, which line is that of the first rule
+     (not that of the start symbol):

 
      axiom: %start EOF.  */
   p = symbol_list_new (axiom);
 
      axiom: %start EOF.  */
   p = symbol_list_new (axiom);

+  p->line = grammar->line;

   p->next = symbol_list_new (startval);
   p->next->next = symbol_list_new (eoftoken);
   p->next->next->next = symbol_list_new (NULL);
   p->next = symbol_list_new (startval);
   p->next->next = symbol_list_new (eoftoken);
   p->next->next->next = symbol_list_new (NULL);

diff --git a/tests/regression.at b/tests/regression.at
index f6d8f10231dbad4ce6035ca91911b4969cc5e009..78e607b6d92522e9b8b0fea8f511b864d9348658 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -67,7 +67,7 @@ AT_CHECK([cat input.output], [],
 Grammar
 
   Number, Line, Rule
 Grammar
 
   Number, Line, Rule

-    0   4 $axiom -> exp $
+    0   3 $axiom -> exp $

     1   3 exp -> exp OP exp
     2   3 exp -> NUM
 
     1   3 exp -> exp OP exp
     2   3 exp -> NUM
 


@@ -171,7 +171,7 @@ AT_CHECK([cat input.output], [],
 Grammar
 
   Number, Line, Rule
 Grammar
 
   Number, Line, Rule

-    0   5 $axiom -> exp $
+    0   4 $axiom -> exp $

     1   4 exp -> exp OP exp
     2   4 exp -> NUM
 
     1   4 exp -> exp OP exp
     2   4 exp -> NUM
 


@@ -296,7 +296,7 @@ AT_CHECK([cat input.output], [],
 [[Grammar
 
   Number, Line, Rule
 [[Grammar
 
   Number, Line, Rule

-    0  28 $axiom -> expr $
+    0   2 $axiom -> expr $

     1   2 @1 -> /* empty */
     2   2 expr -> 'a' @1 'b'
     3  15 @2 -> /* empty */
     1   2 @1 -> /* empty */
     2   2 expr -> 'a' @1 'b'
     3  15 @2 -> /* empty */