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.

diff --git a/ChangeLog b/ChangeLog
index 1f500fdf65b942822143f62aab40c6166d2aea19..9255aab55cc563bf40c9f2b597a0c288549c29b0 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 `-'.
 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 0a4ed469d063db8068802419e67ee986e900f8b7..807d67d77c39bbae598a22b088b9ceee81b5f2f1 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])
 ## ------------------------ ##
 
 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],
 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 3357e60fd43c370db208a3ffb2c0290180a937a8..e4a4fb05a5199c82d9c4392b27489c6574e27142 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -31,8 +31,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
         [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]])],
 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]])],


@@ -1068,7 +1068,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
               }
             *++yyesp = yystate;
           }
               }
             *++yyesp = yystate;
           }

-        YYDPRINTF ((stderr, " G%d", *yyesp));
+        YYDPRINTF ((stderr, " G%d", yystate));

       }
     }
 }]])[
       }
     }
 }]])[


@@ -2000,7 +2000,7 @@ yypushreturn:]])[
 ]b4_epilogue[]dnl
 b4_defines_if(
 [@output(b4_spec_defines_file@)@
 ]b4_epilogue[]dnl
 b4_defines_if(
 [@output(b4_spec_defines_file@)@

-b4_copyright([Interface for Bison's Yacc-like parsers in C])dnl
+b4_copyright([Bison interface for Yacc-like parsers in C])dnl

 
 b4_percent_code_get([[requires]])[]dnl
 
 
 b4_percent_code_get([[requires]])[]dnl
 

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 64e26cf4249bcf1b35fcda8f5673bce52e489294..643b20901eb65cc070bd57dbe0fdd9c3a78c9d58 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.547-d397.  */
+/* A Bison parser, made by GNU Bison 2.4.555-5c9e.  */

 
 /* Implementation for Bison's Yacc-like parsers in C
 
 
 /* Implementation for Bison's Yacc-like parsers in C
 


@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
 #define YYBISON 1
 
 /* Bison version.  */

-#define YYBISON_VERSION "2.4.547-d397"
+#define YYBISON_VERSION "2.4.555-5c9e"

 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"


@@ -1563,7 +1563,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
               }
             *++yyesp = yystate;
           }
               }
             *++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 e3246691a1e4dd5f77b03d3173f57f42f953d85b..b44a8ec32a798b44b04376fd9de84ba311d8366b 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.547-d397.  */
+/* A Bison parser, made by GNU Bison 2.4.555-5c9e.  */

 
 

-/* 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.
 
 
    Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.