regen

[bison.git] / tests / reduce.at

diff --git a/tests/reduce.at b/tests/reduce.at
index a3d1e27cabb3e36f85634b33784077d0e6407db3..c528eed809495bebed100a69795daba3553835a8 100644 (file)
--- a/tests/reduce.at
+++ b/tests/reduce.at
@@ -1,6 +1,6 @@
 # Exercising Bison Grammar Reduction.                      -*- Autotest -*-
 # Exercising Bison Grammar Reduction.                      -*- Autotest -*-

-# Copyright (C) 2001, 2002, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+
+# Copyright (C) 2001-2002, 2007-2012 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -375,19 +375,19 @@ m4_define([AT_TEST_LR_TYPE],
 AT_TEST_TABLES_AND_PARSE([[no %define lr.type: ]$1],
                          [[LALR]], [[]],
                          [$2], m4_shiftn(2, $@))
 AT_TEST_TABLES_AND_PARSE([[no %define lr.type: ]$1],
                          [[LALR]], [[]],
                          [$2], m4_shiftn(2, $@))

-AT_TEST_TABLES_AND_PARSE([[%define lr.type "LALR": ]$1],
+AT_TEST_TABLES_AND_PARSE([[%define lr.type lalr: ]$1],

                          [[LALR]], [[]],
                          [[LALR]], [[]],

-                         [[%define lr.type "LALR"
+                         [[%define lr.type lalr

 ]$2],
                          m4_shiftn(2, $@))
 ]$2],
                          m4_shiftn(2, $@))

-AT_TEST_TABLES_AND_PARSE([[%define lr.type "IELR": ]$1],
+AT_TEST_TABLES_AND_PARSE([[%define lr.type ielr: ]$1],

                          [[IELR]], [[]],
                          [[IELR]], [[]],

-                         [[%define lr.type "IELR"
+                         [[%define lr.type ielr

 ]$2],
                          m4_shiftn(2, $@))
 ]$2],
                          m4_shiftn(2, $@))

-AT_TEST_TABLES_AND_PARSE([[%define lr.type "canonical LR": ]$1],
+AT_TEST_TABLES_AND_PARSE([[%define lr.type canonical-lr: ]$1],

                          [[canonical LR]], [[]],
                          [[canonical LR]], [[]],

-                         [[%define lr.type "canonical LR"
+                         [[%define lr.type canonical-lr

 ]$2],
                          m4_shiftn(2, $@))
 ])
 ]$2],
                          m4_shiftn(2, $@))
 ])


@@ -396,7 +396,7 @@ AT_TEST_LR_TYPE([[Single State Split]],
 [[%left 'a'
 // Conflict resolution renders state 12 unreachable for canonical LR(1).  We
 // keep it so that the paser table diff is easier to code.
 [[%left 'a'
 // Conflict resolution renders state 12 unreachable for canonical LR(1).  We
 // keep it so that the paser table diff is easier to code.

-%define lr.keep_unreachable_states]],
+%define lr.keep-unreachable-states]],

 [[
 S: 'a' A 'a' /* rule 1 */
  | 'b' A 'b' /* rule 2 */
 [[
 S: 'a' A 'a' /* rule 1 */
  | 'b' A 'b' /* rule 2 */


@@ -629,7 +629,7 @@ AT_TEST_LR_TYPE([[Lane Split]],
 [[%left 'a'
 // Conflict resolution renders state 16 unreachable for canonical LR(1).  We
 // keep it so that the paser table diff is easier to code.
 [[%left 'a'
 // Conflict resolution renders state 16 unreachable for canonical LR(1).  We
 // keep it so that the paser table diff is easier to code.

-%define lr.keep_unreachable_states]],
+%define lr.keep-unreachable-states]],

 [[
 /* Similar to the last test case set but two states must be split.  */
 S: 'a' A 'a' /* rule 1 */
 [[
 /* Similar to the last test case set but two states must be split.  */
 S: 'a' A 'a' /* rule 1 */


@@ -873,7 +873,7 @@ AT_TEST_LR_TYPE([[Complex Lane Split]],
 [[%left 'a'
 // Conflict resolution renders state 16 unreachable for canonical LR(1).  We
 // keep it so that the paser table diff is easier to code.
 [[%left 'a'
 // Conflict resolution renders state 16 unreachable for canonical LR(1).  We
 // keep it so that the paser table diff is easier to code.

-%define lr.keep_unreachable_states]],
+%define lr.keep-unreachable-states]],

 [[
 /* Similar to the last test case set but forseeing the S/R conflict from the
    first state that must be split is becoming difficult.  Imagine if B were
 [[
 /* Similar to the last test case set but forseeing the S/R conflict from the
    first state that must be split is becoming difficult.  Imagine if B were


@@ -1139,7 +1139,7 @@ dnl PARSER-EXIT-VALUE, PARSER-STDOUT, PARSER-STDERR
 ]])])
 
 AT_TEST_LR_TYPE([[Split During Added Lookahead Propagation]],
 ]])])
 
 AT_TEST_LR_TYPE([[Split During Added Lookahead Propagation]],

-[[%define lr.keep_unreachable_states]],
+[[%define lr.keep-unreachable-states]],

 [[
 /* The partial state chart diagram below is for LALR(1).  State 0 is the start
    state.  States are iterated for successor construction in numerical order.
 [[
 /* The partial state chart diagram below is for LALR(1).  State 0 is the start
    state.  States are iterated for successor construction in numerical order.


@@ -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_LR_DEFAULT_REDUCTIONS(GRAMMAR, INPUT, TABLES)
 # -----------------------------------------------------
 m4_define([AT_TEST_LR_DEFAULT_REDUCTIONS],
 [

-AT_TEST_TABLES_AND_PARSE([[no %define lr.default_reductions]],
-                         [[all]], [[]],
+AT_TEST_TABLES_AND_PARSE([[no %define lr.default-reductions]],
+                         [[most]], [[]],

                          [[]],
                          [$1], [$2], [[]], [$3])
                          [[]],
                          [$1], [$2], [[]], [$3])

-AT_TEST_TABLES_AND_PARSE([[%define lr.default_reductions "all"]],
-                         [[all]], [[]],
-                         [[%define lr.default_reductions "all"]],
+AT_TEST_TABLES_AND_PARSE([[%define lr.default-reductions most]],
+                         [[most]], [[]],
+                         [[%define lr.default-reductions most]],

                          [$1], [$2], [[]], [$3])
                          [$1], [$2], [[]], [$3])

-AT_TEST_TABLES_AND_PARSE([[%define lr.default_reductions "consistent"]],
+AT_TEST_TABLES_AND_PARSE([[%define lr.default-reductions consistent]],

                          [[consistent]], [[]],
                          [[consistent]], [[]],

-                         [[%define lr.default_reductions "consistent"]],
+                         [[%define lr.default-reductions consistent]],

                          [$1], [$2], [[]], [$3])
                          [$1], [$2], [[]], [$3])

-AT_TEST_TABLES_AND_PARSE([[%define lr.default_reductions "accepting"]],
+AT_TEST_TABLES_AND_PARSE([[%define lr.default-reductions accepting]],

                          [[accepting]], [[]],
                          [[accepting]], [[]],

-                         [[%define lr.default_reductions "accepting"]],
+                         [[%define lr.default-reductions accepting]],

                          [$1], [$2], [[]], [$3])
 ])
 
                          [$1], [$2], [[]], [$3])
 ])
 


@@ -1529,7 +1529,7 @@ state 3
     2      | a . b 'a'
     3      | a . c 'b'
     5 b: .  [$end, 'a']
     2      | a . b 'a'
     3      | a . c 'b'
     5 b: .  [$end, 'a']

-    6 c: .  ['b']]AT_COND_CASE([[all]], [[
+    6 c: .  ['b']]AT_COND_CASE([[most]], [[

 
     'b'       reduce using rule 6 (c)
     $default  reduce using rule 5 (b)]], [[
 
     'b'       reduce using rule 6 (c)
     $default  reduce using rule 5 (b)]], [[


@@ -1556,7 +1556,8 @@ state 5
 
     'a'  shift, and go to state 7
 
 
     'a'  shift, and go to state 7
 

-    ]AT_COND_CASE([[all]], [[$default]], [[$end]])[  reduce using rule 1 (start)
+    ]AT_COND_CASE([[most]], [[$default]],
+                  [[$end]])[  reduce using rule 1 (start)

 
 
 state 6
 
 
 state 6