Regenerate.

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 0527917f85adc4b76ecb80879f472b768dfca7e0..3361a5e055af47e06a4388ed58b0b665b14fafff 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,7 +1,7 @@
 /* A Bison parser, made by GNU Bison 2.0a.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
 /* A Bison parser, made by GNU Bison 2.0a.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,

-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -1990,9 +1990,6 @@ yyacceptlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:

-  yydestruct (_("Error: discarding lookahead"),
-              yytoken, &yylval, &yylloc);
-  yychar = YYEMPTY;

   yyresult = 1;
   goto yyreturn;
 
   yyresult = 1;
   goto yyreturn;
 


@@ -2002,13 +1999,14 @@ yyabortlab:
 `----------------------------------------------*/
 yyoverflowlab:
   yyerror (_("parser stack overflow"));
 `----------------------------------------------*/
 yyoverflowlab:
   yyerror (_("parser stack overflow"));

-  yydestruct (_("Error: discarding lookahead"),
-             yytoken, &yylval, &yylloc);

   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:

+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct (_("Error: discarding lookahead"),
+                yytoken, &yylval, &yylloc);

   if (yyssp != yyss)
     for (;;)
       {
   if (yyssp != yyss)
     for (;;)
       {

diff --git a/src/parse-gram.h b/src/parse-gram.h
index 3a5be6749f1c08893a815f85caf4ff987fec2a90..fa69e024afa81cb9c83c7ef98d84701e23ac3e71 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,7 +1,7 @@
 /* A Bison parser, made by GNU Bison 2.0a.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
 /* A Bison parser, made by GNU Bison 2.0a.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,

-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


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

-/* Line 1381 of yacc.c.  */
+/* Line 1379 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