Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-23 03:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/conflicts.c (conflicts_print): Correct format string typo:

Browse Source 
use `%%' to produce literal `%'.  (trivial change)
This commit is contained in:
Paul Eggert
2004-04-13 17:42:59 +00:00
parent 584bbcd839
commit 4f16766c00
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@@ -1,3 +1,8 @@
2004-04-13 Jim Meyering <jim@meyering.net>
* src/conflicts.c (conflicts_print): Correct format string typo:
use `%%' to produce literal `%'. (trivial change)
2004-03-30 Paul Eggert <eggert@twinsun.com> 2004-03-30 Paul Eggert <eggert@twinsun.com>
* src/getargs.c (version): Update copyright year to 2004. * src/getargs.c (version): Update copyright year to 2004.
@@ -44,12 +49,12 @@
* src/parse-gram.y: Define PERCENT_EXPECT_RR. * src/parse-gram.y: Define PERCENT_EXPECT_RR.
(declaration): Replace expected_conflicts with expected_sr_conflicts. (declaration): Replace expected_conflicts with expected_sr_conflicts.
Add %expect-rr rule. Add %expect-rr rule.
* src/scan-gram.l: Recognize %expect-rr. * src/scan-gram.l: Recognize %expect-rr.
* src/conflicts.h (expected_sr_conflicts): Rename from * src/conflicts.h (expected_sr_conflicts): Rename from
expected_conflicts. expected_conflicts.
(expected_rr_conflicts): Declare. (expected_rr_conflicts): Declare.
* src/conflicts.c (expected_sr_conflicts): Rename from * src/conflicts.c (expected_sr_conflicts): Rename from
expected_conflicts. expected_conflicts.
@@ -58,9 +63,9 @@
for GLR parsers. for GLR parsers.
Use expected_sr_conflicts in place of expected_conflicts. Use expected_sr_conflicts in place of expected_conflicts.
Warn if expected_rr_conflicts used in non-GLR parser. Warn if expected_rr_conflicts used in non-GLR parser.
* doc/bison.texinfo: Add documentation for %expect-rr. * doc/bison.texinfo: Add documentation for %expect-rr.
2004-03-08 Paul Eggert <eggert@gnu.org> 2004-03-08 Paul Eggert <eggert@gnu.org>
Add support for hex token numbers. Suggested by Odd Arild Olsen in Add support for hex token numbers. Suggested by Odd Arild Olsen in

4
src/conflicts.c
View File

@@ -1,6 +1,6 @@
/* Find and resolve or report look-ahead conflicts for bison, /* Find and resolve or report look-ahead conflicts for bison,
Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003 Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler. This file is part of Bison, the GNU Compiler Compiler.
@@ -484,7 +484,7 @@ conflicts_print (void)
if (! glr_parser && rrc_total > 0 && expected_rr_conflicts != -1) if (! glr_parser && rrc_total > 0 && expected_rr_conflicts != -1)
{ {
warn (_("%expect-rr applies only to GLR parsers")); warn (_("%%expect-rr applies only to GLR parsers"));
expected_rr_conflicts = -1; expected_rr_conflicts = -1;
} }