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

* src/files.c, src/files.h (strsuffix): Not static.

Browse Source 
* src/conflicts.c (conflicts_print): Don't consider it is an error
to have a %expectation violation on a file ending by `plural.y'.
Eek.
This commit is contained in:
Akim Demaille
2002-01-03 13:39:20 +00:00
parent dd3c3f3006
commit ffc03584ad
5 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2002-01-03 Akim Demaille <akim@epita.fr>
* src/files.c, src/files.h (strsuffix): Not static.
* src/conflicts.c (conflicts_print): Don't consider it is an error
to have a %expectation violation on a file ending by `plural.y'.
Eek.
2002-01-03 Akim Demaille <akim@epita.fr> 2002-01-03 Akim Demaille <akim@epita.fr>
* tests/bison.in: Adjust to CVS Autoconf. * tests/bison.in: Adjust to CVS Autoconf.

6
NEWS
View File

@@ -3,6 +3,12 @@ Bison News
Changes in version 1.30j: Changes in version 1.30j:
* GNU Gettext and %expect
GNU Gettext asserts 10 s/r conflicts, but there are 7. Now that
Bison dies on incorrect %expectations, we fear there will be
too many bug reports for Gettext, so _for the time being_, %expect
does not trigger an error when the input file is named `plural.y'.
Changes in version 1.30i: Changes in version 1.30i:
* Use of alloca in parsers * Use of alloca in parsers

9
src/conflicts.c
View File

@@ -401,7 +401,14 @@ conflicts_print (void)
if (expected_conflicts != -1 && !src_ok) if (expected_conflicts != -1 && !src_ok)
{ {
complain_message_count++; /* FIXME: BIG ATTROCIOUS HACK. For flames, complaints and so
on, see Bruno Haible. GNU Gettext's plural.y's %expect is
wrong, and newer Bison reject it. But then, Bruno will be
overwhelmed by bug reports, until a fixed Gettext is
released. So for the 1.3x generation only, we leave a puke
puke hack. */
if (!strsuffix (infile, "plural.y"))
complain_message_count++;
fprintf (stderr, ngettext ("expected %d shift/reduce conflict\n", fprintf (stderr, ngettext ("expected %d shift/reduce conflict\n",
"expected %d shift/reduce conflicts\n", "expected %d shift/reduce conflicts\n",
expected_conflicts), expected_conflicts),

5
src/files.c
View File

@@ -1,5 +1,6 @@
/* Open and close files for bison, /* Open and close files for bison,
Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc. Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002
Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler. This file is part of Bison, the GNU Compiler Compiler.
@@ -58,7 +59,7 @@ const char *header_extension = NULL;
| Is SUFFIX ending STRING? | | Is SUFFIX ending STRING? |
`--------------------------*/ `--------------------------*/
static int int
strsuffix (const char *string, const char *suffix) strsuffix (const char *string, const char *suffix)
{ {
size_t string_len = strlen (string); size_t string_len = strlen (string);

7
src/files.h
View File

@@ -1,7 +1,5 @@
#ifndef FILES_H_
# define FILES_H_
/* File names and variables for bison, /* File names and variables for bison,
Copyright 1984, 1989, 2000 Free Software Foundation, Inc. Copyright 1984, 1989, 2000, 2002 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler. This file is part of Bison, the GNU Compiler Compiler.
@@ -20,6 +18,9 @@
the Free Software Foundation, Inc., 59 Temple Place - Suite 330, the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#ifndef FILES_H_
# define FILES_H_
/* These two should be pathnames for opening the sample parser files. /* These two should be pathnames for opening the sample parser files.
When bison is installed, they should be absolute pathnames. When bison is installed, they should be absolute pathnames.
XPFILE1 and XPFILE2 normally come from config.h. */ XPFILE1 and XPFILE2 normally come from config.h. */