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.
This commit is contained in:
Paul Eggert
2011-01-09 17:08:33 -08:00
parent 5c9efc755e
commit 3c9b20ff5a
5 changed files with 21 additions and 11 deletions

View File

@@ -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> 2011-01-09 Joel E. Denny <joeldenny@joeldenny.org>
Improve error messages for `$' or `@' followed by `.' or `-'. Improve error messages for `$' or `@' followed by `.' or `-'.

View File

@@ -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 # If glr.cc is including this file and thus has already set b4_pure_flag,
# change the value of b4_pure_flag, and don't record a use of api.pure. # do not change the value of b4_pure_flag, and do not record a use of api.pure.
m4_ifndef([b4_pure_flag], m4_ifndef([b4_pure_flag],
[b4_percent_define_default([[api.pure]], [[false]]) [b4_percent_define_default([[api.pure]], [[false]])
m4_define([b4_pure_flag], m4_define([b4_pure_flag],

View File

@@ -31,8 +31,8 @@ m4_case(b4_percent_define_get([[api.push-pull]]),
[push], [m4_define([b4_pull_flag], [[0]])]) [push], [m4_define([b4_pull_flag], [[0]])])
# Handle BISON_USE_PUSH_FOR_PULL for the test suite. So that push parsing # 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 # tests function as written, do not let BISON_USE_PUSH_FOR_PULL modify the
# behavior at all when push parsing is already requested. # behavior of Bison at all when push parsing is already requested.
b4_define_flag_if([use_push_for_pull]) b4_define_flag_if([use_push_for_pull])
b4_use_push_for_pull_if([ b4_use_push_for_pull_if([
b4_push_if([m4_define([b4_use_push_for_pull_flag], [[0]])], 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_epilogue[]dnl
b4_defines_if( b4_defines_if(
[@output(b4_spec_defines_file@)@ [@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

View File

@@ -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 #define YYBISON 1
/* Bison version. */ /* Bison version. */
#define YYBISON_VERSION "2.4.547-d397" #define YYBISON_VERSION "2.4.555-5c9e"
/* Skeleton name. */ /* Skeleton name. */
#define YYSKELETON_NAME "yacc.c" #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));
} }
} }
} }

View File

@@ -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.