Fix minor problems encountered by a fresh bootstrap.

* data/glr.c, data/yacc.c: Do not use apostrophes in '#' comments,
as they confuse xgettext, which tries to parse them as C character
constants in a preprocessor directive.
* data/yacc.c (yy_lac): Don't use printf %d format on *yyesp, as
that expression might not promote to int on some platforms.
* src/parse-gram.c, src/parse-gram.h: Regenerate.
(cherry picked from commit 3c9b20ff5acd1ad1a888a05717bf45b77b623f55)

Conflicts:

	data/yacc.c
	src/parse-gram.c
	src/parse-gram.h

diff --git a/ChangeLog b/ChangeLog
index 1ff0f09dce5fc44061447d1702a747f98e157340..75e7fcde1214948623d19b0a2ffa51dc893eafc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix minor problems encountered by a fresh bootstrap.
+       * data/glr.c, data/yacc.c: Do not use apostrophes in '#' comments,
+       as they confuse xgettext, which tries to parse them as C character
+       constants in a preprocessor directive.
+       * data/yacc.c (yy_lac): Don't use printf %d format on *yyesp, as
+       that expression might not promote to int on some platforms.
+       * src/parse-gram.c, src/parse-gram.h: Regenerate.
+
 2011-01-09  Joel E. Denny  <joeldenny@joeldenny.org>
 
        Improve error messages for `$' or `@' followed by `.' or `-'.

diff --git a/data/glr.c b/data/glr.c
index 8240d390045b19646cf8c824a10df12c2ef81f79..6829ca374b92187612088a8ced9d94cc63bc5045 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -35,8 +35,8 @@ m4_define_default([b4_stack_depth_init],  [200])
 ## ------------------------ ##
 
 b4_define_flag_if([pure])
-# If glr.cc is including this file and thus has already set b4_pure_flag, don't
-# change the value of b4_pure_flag, and don't record a use of api.pure.
+# If glr.cc is including this file and thus has already set b4_pure_flag,
+# do not change the value of b4_pure_flag, and do not record a use of api.pure.
 m4_ifndef([b4_pure_flag],
 [b4_percent_define_default([[api.pure]], [[false]])
  m4_define([b4_pure_flag],

diff --git a/data/yacc.c b/data/yacc.c
index a408b304a733a491784216f9eacd49aa1a2bf4a6..ca1059b02ebeadd6cb49d7111a760872f6e82132 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -29,8 +29,8 @@ m4_case(b4_percent_define_get([[api.push-pull]]),
         [push], [m4_define([b4_pull_flag], [[0]])])
 
 # Handle BISON_USE_PUSH_FOR_PULL for the test suite.  So that push parsing
-# tests function as written, don't let BISON_USE_PUSH_FOR_PULL modify Bison's
-# behavior at all when push parsing is already requested.
+# tests function as written, do not let BISON_USE_PUSH_FOR_PULL modify the
+# behavior of Bison at all when push parsing is already requested.
 b4_define_flag_if([use_push_for_pull])
 b4_use_push_for_pull_if([
   b4_push_if([m4_define([b4_use_push_for_pull_flag], [[0]])],
@@ -1134,7 +1134,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
               }
             *++yyesp = yystate;
           }
-        YYDPRINTF ((stderr, " G%d", *yyesp));
+        YYDPRINTF ((stderr, " G%d", yystate));
       }
     }
 }]])[
@@ -2067,7 +2067,7 @@ yypushreturn:]])[
 ]b4_epilogue
 b4_defines_if(
 [@output(b4_spec_defines_file@)@
-b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],
+b4_copyright([Bison interface for Yacc-like parsers in C],
              [1984, 1989-1990, 2000-2011])
 
 b4_percent_code_get([[requires]])[]dnl

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 84501d534da73ed45ef9d5ef65b3c80e1258b8af..d553b02877af015f12f8fe0b7d804cf479bcef48 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.4.1.259-f52e1.  */
+/* A Bison parser, made by GNU Bison 2.4.1.265-8cbbf.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1.259-f52e1"
+#define YYBISON_VERSION "2.4.1.265-8cbbf"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -1548,7 +1548,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
               }
             *++yyesp = yystate;
           }
-        YYDPRINTF ((stderr, " G%d", *yyesp));
+        YYDPRINTF ((stderr, " G%d", yystate));
       }
     }
 }

diff --git a/src/parse-gram.h b/src/parse-gram.h
index f2eb45d10f9a57fbf6aeaf1b7f7c4da429476c70..29dd067d83940d81d005d299c234f5f182972e9c 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,6 +1,6 @@
-/* A Bison parser, made by GNU Bison 2.4.1.259-f52e1.  */
+/* A Bison parser, made by GNU Bison 2.4.1.265-8cbbf.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
    
       Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.