* src/bison.simple (YYLLOC_DEFAULT): Update.

(yyparse): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 5360599b9fbdeb39c9596818da7ed5f69649cfbf..d266f411ed65b02137c9670fc5b2ceb17e1558dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-09  Robert Anisko  <anisko_r@epita.fr>
+
+       * src/bison.simple (YYLLOC_DEFAULT): Update.
+       (yyparse): Adjust.
+

 2001-08-08  Marc Autret  <autret_m@epita.fr>
 
        * doc/bison.texinfo: Change @samp{$<@dots{}>} to 
 2001-08-08  Marc Autret  <autret_m@epita.fr>
 
        * doc/bison.texinfo: Change @samp{$<@dots{}>} to 

diff --git a/src/bison.simple b/src/bison.simple
index e2b5d6fb377e456113697f17e86c19506ebf2597..7a374ee53efd24413f6166216ac36990658c7ecc 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -119,9 +119,9 @@ while (0)
    its range to the last symbol.  */
 
 #ifndef YYLLOC_DEFAULT
    its range to the last symbol.  */
 
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Last)         \
-   Current.last_line   = Last.last_line;       \
-   Current.last_column = Last.last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)               \
+   Current.last_line   = Rhs[N].last_line;     \
+   Current.last_column = Rhs[N].last_column;

 #endif
 
 
 #endif
 
 


@@ -592,7 +592,7 @@ yyreduce:
   /* Similarly for the default location.  Let the user run additional
      commands if for instance locations are ranges.  */
   yyloc = yylsp[1-yylen];
   /* Similarly for the default location.  Let the user run additional
      commands if for instance locations are ranges.  */
   yyloc = yylsp[1-yylen];

-  YYLLOC_DEFAULT (yyloc, yylsp[0]);
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);

 #endif
 
 #if YYDEBUG
 #endif
 
 #if YYDEBUG