Regenerate.

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 14a70563a15995ea5c06fdc860efe1f7c2103857..67c54c817a8b28550b1976c4eb85a58e96c206c4 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 1.875e.  */
+/* A Bison parser, made by GNU Bison 1.875f.  */

 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.


@@ -734,22 +734,25 @@ while (0)
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 

+#define YYRHSLOC(Rhs, K) ((Rhs)[K])

 #ifndef YYLLOC_DEFAULT
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)                                    \
-do {                                                                        \
-  if (N)                                                                    \
-    {                                                                       \
-      (Current).first_line   = (Rhs)[1].first_line;                         \
-      (Current).first_column = (Rhs)[1].first_column;                       \
-      (Current).last_line    = (Rhs)[N].last_line;                          \
-      (Current).last_column  = (Rhs)[N].last_column;                        \
-    }                                                                       \
-  else                                                                      \
-    {                                                                       \
-      (Current).first_line   = (Current).last_line   = (Rhs)[0].last_line;   \
-      (Current).first_column = (Current).last_column = (Rhs)[0].last_column; \
-    }                                                                       \
-} while(0)
+# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                 \
+      if (N)                                                           \
+       {                                                               \
+         (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;         \
+         (Current).first_column = YYRHSLOC(Rhs, 1).first_column;       \
+         (Current).last_line    = YYRHSLOC(Rhs, N).last_line;          \
+         (Current).last_column  = YYRHSLOC(Rhs, N).last_column;        \
+       }                                                               \
+      else                                                             \
+       {                                                               \
+         (Current).first_line   = (Current).last_line   =              \
+           YYRHSLOC(Rhs, 0).last_line;                                 \
+         (Current).first_column = (Current).last_column =              \
+           YYRHSLOC(Rhs, 0).last_column;                               \
+       }                                                               \
+    while (0)

 #endif
 
 
 #endif
 
 


@@ -1153,8 +1156,8 @@ YYLTYPE yylloc;
   yylloc.start.line   = yylloc.end.line   = 1;
   yylloc.start.column = yylloc.end.column = 0;
 }
   yylloc.start.line   = yylloc.end.line   = 1;
   yylloc.start.column = yylloc.end.column = 0;
 }

-/* Line 848 of yacc.c.  */
-#line 1158 "parse-gram.c"
+/* Line 851 of yacc.c.  */
+#line 1161 "parse-gram.c"

   yyvsp[0] = yylval;
     yylsp[0] = yylloc;
 
   yyvsp[0] = yylval;
     yylsp[0] = yylloc;
 


@@ -1740,8 +1743,8 @@ yyreduce:
 
     }
 
 
     }
 

-/* Line 1043 of yacc.c.  */
-#line 1745 "parse-gram.c"
+/* Line 1046 of yacc.c.  */
+#line 1748 "parse-gram.c"

 \f
   yyvsp -= yylen;
   yyssp -= yylen;
 \f
   yyvsp -= yylen;
   yyssp -= yylen;

diff --git a/src/parse-gram.h b/src/parse-gram.h
index 295a39c3861a8177a011c0c1edc480a4cc017fdc..0edd35a34faf8c0f4f05795a1834bb6aa0abc986 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 1.875e.  */
+/* A Bison parser, made by GNU Bison 1.875f.  */

 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.


@@ -143,7 +143,7 @@ typedef union YYSTYPE {
   assoc assoc;
   uniqstr uniqstr;
 } YYSTYPE;
   assoc assoc;
   uniqstr uniqstr;
 } YYSTYPE;

-/* Line 1324 of yacc.c.  */
+/* Line 1327 of yacc.c.  */

 #line 148 "parse-gram.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #line 148 "parse-gram.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1