Rename lr.default_reductions to lr.default-reductions.

* NEWS (2.5): Here.
* doc/bison.texinfo: Here.
* src/lalr.c (initialize_LA): Here.
* src/print.c (print_reductions): Here.
* src/reader.c (reader): Here.
* src/tables.c (action_row): Here.
* tests/input.at (%define enum variables): Here.
* tests/reduce.at (AT_TEST_LR_DEFAULT_REDUCTIONS): Here.

diff --git a/ChangeLog b/ChangeLog
index be1c8a343119fcb32ececdadd1d5a7e86b29d72c..af426e5cd04229a7cb438d251f22e46286ab862f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-29  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Rename lr.default_reductions to lr.default-reductions.
+       * NEWS (2.5): Here.
+       * doc/bison.texinfo: Here.
+       * src/lalr.c (initialize_LA): Here.
+       * src/print.c (print_reductions): Here.
+       * src/reader.c (reader): Here.
+       * src/tables.c (action_row): Here.
+       * tests/input.at (%define enum variables): Here.
+       * tests/reduce.at (AT_TEST_LR_DEFAULT_REDUCTIONS): Here.
+
 2009-04-29  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Pacify ./configure --enable-gcc-warnings.

diff --git a/NEWS b/NEWS
index 92a935fb98e5f77293330791cb9307061188769f..80b49da63f04ac75272ee20207cedea7d9be3fec 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,8 +25,8 @@ Bison News
     %define lr.type "canonical LR"
 
   The default reduction optimization in the parser tables can also be
-  adjusted using `%define lr.default_reductions'.  See the documentation
-  for `%define lr.type' and `%define lr.default_reductions' in the
+  adjusted using `%define lr.default-reductions'.  See the documentation
+  for `%define lr.type' and `%define lr.default-reductions' in the
   section `Bison Declaration Summary' in the Bison manual for the
   details.
 

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 46c95f01c1ac1b9e792f0b767b343901af4f7e6a..a81f9cf8023b9e03b8ed71b14f8ef3436b34fa38 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -4903,9 +4903,9 @@ More user feedback will help to stabilize it.)
 @item Default Value: @code{"pull"}
 @end itemize
 
-@item lr.default_reductions
+@item lr.default-reductions
 @cindex default reductions
-@findex %define lr.default_reductions
+@findex %define lr.default-reductions
 @cindex delayed syntax errors
 @cindex syntax errors delayed
 
@@ -5080,7 +5080,7 @@ syntactically acceptable in that left context.
 Thus, the only difference in parsing behavior is that the canonical
 @acronym{LR} parser can report a syntax error as soon as possible
 without performing any unnecessary reductions.
-@xref{Decl Summary,,lr.default_reductions}, for further details.
+@xref{Decl Summary,,lr.default-reductions}, for further details.
 Even when canonical @acronym{LR} behavior is ultimately desired,
 @acronym{IELR}'s elimination of duplicate conflicts should still
 facilitate the development of a grammar.
@@ -10346,7 +10346,7 @@ committee document contributing to what became the Algol 60 report.
 
 @item Consistent State
 A state containing only one possible action.
-@xref{Decl Summary,,lr.default_reductions}.
+@xref{Decl Summary,,lr.default-reductions}.
 
 @item Context-free grammars
 Grammars specified as rules that can be applied regardless of context.
@@ -10361,7 +10361,7 @@ contains no other action for the lookahead token.
 In permitted parser states, Bison declares the reduction with the
 largest lookahead set to be the default reduction and removes that
 lookahead set.
-@xref{Decl Summary,,lr.default_reductions}.
+@xref{Decl Summary,,lr.default-reductions}.
 
 @item Dynamic allocation
 Allocation of memory that occurs during execution, rather than at

diff --git a/src/lalr.c b/src/lalr.c
index a3a31b23ebd1bebc0cb9537811717f2012ee0794..4aa05b9ee6dfe22334d1547a445fde6a11d91023 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -372,7 +372,7 @@ initialize_LA (void)
   bool default_reduction_only_for_accept;
   {
     char *default_reductions =
-      muscle_percent_define_get ("lr.default_reductions");
+      muscle_percent_define_get ("lr.default-reductions");
     default_reduction_only_for_accept =
       0 == strcmp (default_reductions, "accepting");
     free (default_reductions);

diff --git a/src/print.c b/src/print.c
index e307329ddea26e5fb39ec65d0e5e27d093057cba..b4256576407f938a643b6b81e27e3283dc0b1877 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -335,7 +335,7 @@ print_reductions (FILE *out, state *s)
   if (default_reduction)
     {
       char *default_reductions =
-        muscle_percent_define_get ("lr.default_reductions");
+        muscle_percent_define_get ("lr.default-reductions");
       print_reduction (out, width, _("$default"), default_reduction, true);
       aver (0 == strcmp (default_reductions, "all")
             || (0 == strcmp (default_reductions, "consistent")

diff --git a/src/reader.c b/src/reader.c
index 17ff0f78de358533f063494d80f4a1f4bc637bce..76e379fad452b1522f82d1cbdac3f39b15b436dd 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -561,9 +561,9 @@ reader (void)
     muscle_percent_define_default ("lr.type", "LALR");
     lr_type = muscle_percent_define_get ("lr.type");
     if (0 != strcmp (lr_type, "canonical LR"))
-      muscle_percent_define_default ("lr.default_reductions", "all");
+      muscle_percent_define_default ("lr.default-reductions", "all");
     else
-      muscle_percent_define_default ("lr.default_reductions", "accepting");
+      muscle_percent_define_default ("lr.default-reductions", "accepting");
     free (lr_type);
   }
 
@@ -571,7 +571,7 @@ reader (void)
   {
     static char const * const values[] = {
       "lr.type", "LALR", "IELR", "canonical LR", NULL,
-      "lr.default_reductions", "all", "consistent", "accepting", NULL,
+      "lr.default-reductions", "all", "consistent", "accepting", NULL,
       NULL
     };
     muscle_percent_define_check_values (values);

diff --git a/src/tables.c b/src/tables.c
index 186c1fec86b57af38a682d11bb5a81b458fe16fd..8704f1055fa678dc21be11816cb6c4b992bf3398 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -309,7 +309,7 @@ action_row (state *s)
      labeled as consistent.  */
   {
     char *default_reductions =
-      muscle_percent_define_get ("lr.default_reductions");
+      muscle_percent_define_get ("lr.default-reductions");
     if (0 != strcmp (default_reductions, "all") && !s->consistent)
       nodefault = true;
     free (default_reductions);

diff --git a/tests/input.at b/tests/input.at
index 96ba0fc02115b30ce0a4410ad7aeea10121f7ea8..b1f5f0a39d43829e916460c482c6410b1f1beb57 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -938,12 +938,12 @@ AT_SETUP([[%define enum variables]])
 
 # Front-end.
 AT_DATA([[input.y]],
-[[%define lr.default_reductions "bogus"
+[[%define lr.default-reductions "bogus"
 %%
 start: ;
 ]])
 AT_BISON_CHECK([[input.y]], [[1]], [[]],
-[[input.y:1.9-29: invalid value for %define variable `lr.default_reductions': `bogus'
+[[input.y:1.9-29: invalid value for %define variable `lr.default-reductions': `bogus'
 input.y:1.9-29: accepted value: `all'
 input.y:1.9-29: accepted value: `consistent'
 input.y:1.9-29: accepted value: `accepting'

diff --git a/tests/reduce.at b/tests/reduce.at
index a3d1e27cabb3e36f85634b33784077d0e6407db3..af13e16f9df50964c860d601db99512182af8dd8 100644 (file)
--- a/tests/reduce.at
+++ b/tests/reduce.at
@@ -1443,28 +1443,28 @@ dnl PARSER-EXIT-VALUE, PARSER-STDOUT, PARSER-STDERR
 
 
 ## ------------------------------- ##
-## %define lr.default_reductions.  ##
+## %define lr.default-reductions.  ##
 ## ------------------------------- ##
 
 # AT_TEST_LR_DEFAULT_REDUCTIONS(GRAMMAR, INPUT, TABLES)
 # -----------------------------------------------------
 m4_define([AT_TEST_LR_DEFAULT_REDUCTIONS],
 [
-AT_TEST_TABLES_AND_PARSE([[no %define lr.default_reductions]],
+AT_TEST_TABLES_AND_PARSE([[no %define lr.default-reductions]],
                          [[all]], [[]],
                          [[]],
                          [$1], [$2], [[]], [$3])
-AT_TEST_TABLES_AND_PARSE([[%define lr.default_reductions "all"]],
+AT_TEST_TABLES_AND_PARSE([[%define lr.default-reductions "all"]],
                          [[all]], [[]],
-                         [[%define lr.default_reductions "all"]],
+                         [[%define lr.default-reductions "all"]],
                          [$1], [$2], [[]], [$3])
-AT_TEST_TABLES_AND_PARSE([[%define lr.default_reductions "consistent"]],
+AT_TEST_TABLES_AND_PARSE([[%define lr.default-reductions "consistent"]],
                          [[consistent]], [[]],
-                         [[%define lr.default_reductions "consistent"]],
+                         [[%define lr.default-reductions "consistent"]],
                          [$1], [$2], [[]], [$3])
-AT_TEST_TABLES_AND_PARSE([[%define lr.default_reductions "accepting"]],
+AT_TEST_TABLES_AND_PARSE([[%define lr.default-reductions "accepting"]],
                          [[accepting]], [[]],
-                         [[%define lr.default_reductions "accepting"]],
+                         [[%define lr.default-reductions "accepting"]],
                          [$1], [$2], [[]], [$3])
 ])