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 3c9b20ff5a)

Conflicts:

	data/yacc.c
	src/parse-gram.c
	src/parse-gram.h
This commit is contained in:
Paul Eggert
2011-01-09 17:08:33 -08:00
committed by Joel E. Denny
parent 8cbbf1786f
commit 7e5ef70679
5 changed files with 21 additions and 11 deletions

View File

@@ -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));
}
}
}

View File

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