[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Fix minor problems encountered by a fresh bootstrap.
From: |
Joel E. Denny |
Subject: |
Re: [PATCH] Fix minor problems encountered by a fresh bootstrap. |
Date: |
Mon, 24 Jan 2011 21:52:33 -0500 (EST) |
User-agent: |
Alpine 2.00 (DEB 1167 2008-08-23) |
On Sun, 9 Jan 2011, Paul Eggert wrote:
> * 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.
I cherry-picked that to branch-2.5. There's no reason to let the branches
fall out of sync here, and the yy_lac fix should be in 2.5.
I also pushed the following patch to branch-2.5 and then cherry-picked to
master.
>From 448dc38bc4a5396809f0987fd4e93488498122a4 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Mon, 24 Jan 2011 21:10:41 -0500
Subject: [PATCH] * data/yacc.c: Fix last apostrophe warning from xgettext.
---
ChangeLog | 4 ++++
data/yacc.c | 2 +-
src/parse-gram.c | 6 +++---
src/parse-gram.h | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 75e7fcd..f987a06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-24 Joel E. Denny <address@hidden>
+
+ * data/yacc.c: Fix last apostrophe warning from xgettext.
+
2011-01-09 Paul Eggert <address@hidden>
Fix minor problems encountered by a fresh bootstrap.
diff --git a/data/yacc.c b/data/yacc.c
index ca1059b..7ff163a 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -233,7 +233,7 @@ m4_define([b4_declare_parser_state_variables],
[b4_pure_if([[
m4_changecom()
m4_divert_push(0)dnl
@output(b4_parser_file_name@)@
-b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],
+b4_copyright([Bison implementation for Yacc-like parsers in C],
[1984, 1989-1990, 2000-2011])[
/* C LALR(1) parser skeleton written by Richard Stallman, by
diff --git a/src/parse-gram.c b/src/parse-gram.c
index d553b02..ad5a6fc 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,6 +1,6 @@
-/* A Bison parser, made by GNU Bison 2.4.1.265-8cbbf. */
+/* A Bison parser, made by GNU Bison 2.4.1.266-7e5e. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1.265-8cbbf"
+#define YYBISON_VERSION "2.4.1.266-7e5e"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
diff --git a/src/parse-gram.h b/src/parse-gram.h
index 29dd067..a30d5f8 100644
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.4.1.265-8cbbf. */
+/* A Bison parser, made by GNU Bison 2.4.1.266-7e5e. */
/* Bison interface for Yacc-like parsers in C
--
1.7.0.4