[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Fix minor problems encountered by a fresh bootstrap.
From: |
Paul Eggert |
Subject: |
[PATCH] Fix minor problems encountered by a fresh bootstrap. |
Date: |
Sun, 09 Jan 2011 17:10:19 -0800 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 |
* 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.
---
ChangeLog | 10 ++++++++++
data/glr.c | 4 ++--
data/yacc.c | 8 ++++----
src/parse-gram.c | 6 +++---
src/parse-gram.h | 4 ++--
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1f500fd..9255aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-09 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
Improve error messages for `$' or `@' followed by `.' or `-'.
diff --git a/data/glr.c b/data/glr.c
index 0a4ed46..807d67d 100644
--- 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 3357e60..e4a4fb0 100644
--- 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
-# 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]])],
@@ -1068,7 +1068,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
}
*++yyesp = yystate;
}
- YYDPRINTF ((stderr, " G%d", *yyesp));
+ YYDPRINTF ((stderr, " G%d", yystate));
}
}
}]])[
@@ -2000,7 +2000,7 @@ yypushreturn:]])[
]b4_epilogue[]dnl
b4_defines_if(
address@hidden(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
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 64e26cf..643b209 100644
--- 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
@@ -44,7 +44,7 @@
#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"
@@ -1563,7 +1563,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 e324669..b44a8ec 100644
--- 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.
--
1.7.3
- [PATCH] Fix minor problems encountered by a fresh bootstrap.,
Paul Eggert <=