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

%define lr.type: make values lowercase IDs.

Browse Source 
That is, "LALR" => "lalr", "IELR" => "ielr", and
"canonical LR" => "canonical-lr".
* NEWS (2.5): Update documentation.
* doc/bison.texinfo (Decl Summary): Likewise.
* src/ielr.c (ielr): Use new values.
* src/ielr.h (ielr): Update documentation.
* src/reader.c (prepare_percent_define_front_end_variables): Use
and validate new values.
* tests/existing.at (AT_TEST_EXISTING_GRAMMAR): Update test
grammars.
* tests/reduce.at (AT_TEST_LR_TYPE): Likewise.
(cherry picked from commit 6ba9640406)
This commit is contained in:
Joel E. Denny
2009-08-28 00:57:06 -04:00
parent 4bb975e1ad
commit 3a414bbfa0
10 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ielr.c
View File

@@ -1095,11 +1095,11 @@ ielr (void)
/* Examine user options. */
{
char *type = muscle_percent_define_get ("lr.type");
if (0 == strcmp (type, "LALR"))
if (0 == strcmp (type, "lalr"))
lr_type = LR_TYPE__LALR;
else if (0 == strcmp (type, "IELR"))
else if (0 == strcmp (type, "ielr"))
lr_type = LR_TYPE__IELR;
else if (0 == strcmp (type, "canonical LR"))
else if (0 == strcmp (type, "canonical-lr"))
lr_type = LR_TYPE__CANONICAL_LR;
else
aver (false);

6
src/ielr.h
View File

@@ -33,9 +33,9 @@
* - \c ::states is of size \c ::nstates (which might be greater than
* <tt>::nstates \@pre</tt>) and defines the type of parser specified by
* the value of the \c \%define variable \c lr.type. Its value can be:
* - \c "LALR".
* - \c "IELR".
* - \c "canonical LR".
* - \c "lalr".
* - \c "ielr".
* - \c "canonical-lr".
*/
void ielr (void);

4
src/parse-gram.c
View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 2.4.1.124-faff. */
/* A Bison parser, made by GNU Bison 2.4.1.128-4bb9. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
@@ -45,7 +45,7 @@
#define YYBISON 1
/* Bison version. */
#define YYBISON_VERSION "2.4.1.124-faff"
#define YYBISON_VERSION "2.4.1.128-4bb9"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"

2
src/parse-gram.h
View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 2.4.1.124-faff. */
/* A Bison parser, made by GNU Bison 2.4.1.128-4bb9. */
/* Skeleton interface for Bison's Yacc-like parsers in C

6
src/reader.c
View File

@@ -608,9 +608,9 @@ prepare_percent_define_front_end_variables (void)
char *lr_type;
/* IELR would be a better default, but LALR is historically the
default. */
muscle_percent_define_default ("lr.type", "LALR");
muscle_percent_define_default ("lr.type", "lalr");
lr_type = muscle_percent_define_get ("lr.type");
if (0 != strcmp (lr_type, "canonical LR"))
if (0 != strcmp (lr_type, "canonical-lr"))
muscle_percent_define_default ("lr.default-reductions", "all");
else
muscle_percent_define_default ("lr.default-reductions", "accepting");
@@ -620,7 +620,7 @@ prepare_percent_define_front_end_variables (void)
/* Check %define front-end variables. */
{
static char const * const values[] = {
"lr.type", "LALR", "IELR", "canonical LR", NULL,
"lr.type", "lalr", "ielr", "canonical-lr", NULL,
"lr.default-reductions", "all", "consistent", "accepting", NULL,
NULL
};