tests: use %empty

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 92e4ae8708fc08bb59266836f4383e6e29e4f973..9f7d59f93b262552ea753dad9728953683afdb9c 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -17,42 +17,9 @@
 
 AT_BANNER([[Conflicts.]])
 
-## ------------------------------ ##
-## Useless associativity warning. ##
-## ------------------------------ ##
-
-AT_SETUP([Useless associativity warning])
-
-AT_DATA([[input.y]],
-[[%token T
-%left A B
-%right C
-%nonassoc D
-%precedence E
-
-%%
-e: T A T
- | T B T
- | T C T
- | T D T
- | T E T
-;
-]])
-
-AT_BISON_CHECK([input.y], 0, [],
-[[input.y:5.13: warning: useless precedence for E [-Wother]
-input.y:2.7: warning: useless associativity for A [-Wother]
-input.y:2.9: warning: useless associativity for B [-Wother]
-input.y:3.8: warning: useless associativity for C [-Wother]
-input.y:4.11: warning: useless associativity for D [-Wother]
-]])
-
-AT_CLEANUP
-
-
-## ------------------------ ##
-## Token declaration order. ##
-## ------------------------ ##
+## ------------------------- ##
+## Token declaration order.  ##
+## ------------------------- ##
 
 # This test checks that token are declared left to right when in a precedence
 # statement.
@@ -110,27 +77,7 @@ int main (void)
 }
 ]])
 
-AT_BISON_CHECK([-o input.c input.y], [], [],
-[[input.y:24.13: warning: useless precedence for R [-Wother]
-input.y:24.15: warning: useless precedence for S [-Wother]
-input.y:24.17: warning: useless precedence for T [-Wother]
-input.y:24.19: warning: useless precedence for U [-Wother]
-input.y:25.13: warning: useless precedence for V [-Wother]
-input.y:25.15: warning: useless precedence for W [-Wother]
-input.y:18.8: warning: useless associativity for E [-Wother]
-input.y:18.10: warning: useless associativity for F [-Wother]
-input.y:18.12: warning: useless associativity for G [-Wother]
-input.y:19.8: warning: useless associativity for H [-Wother]
-input.y:19.10: warning: useless associativity for I [-Wother]
-input.y:20.8: warning: useless associativity for J [-Wother]
-input.y:21.8: warning: useless associativity for K [-Wother]
-input.y:22.8: warning: useless associativity for L [-Wother]
-input.y:22.10: warning: useless associativity for M [-Wother]
-input.y:22.12: warning: useless associativity for N [-Wother]
-input.y:23.11: warning: useless associativity for O [-Wother]
-input.y:23.13: warning: useless associativity for P [-Wother]
-input.y:23.15: warning: useless associativity for Q [-Wother]
-]])
+AT_BISON_CHECK([-o input.c input.y])
 AT_COMPILE([input])
 
 AT_PARSER_CHECK([./input])
@@ -140,6 +87,40 @@ AT_BISON_OPTION_POPDEFS
 AT_CLEANUP
 
 
+## ------------------------------- ##
+## Useless associativity warning.  ##
+## ------------------------------- ##
+
+AT_SETUP([Useless associativity warning])
+
+AT_DATA([[input.y]],
+[[%nonassoc "="
+%left "+"
+%left "*"
+%precedence "("
+%%
+stmt:
+  exp
+| "var" "=" exp
+;
+
+exp:
+  exp "+" exp
+| exp "*" "num"
+| "(" exp ")"
+| "num"
+;
+]])
+
+AT_BISON_CHECK([-Wprecedence input.y], 0, [],
+[[input.y:1.11-13: warning: useless precedence and associativity for "=" [-Wprecedence]
+input.y:3.7-9: warning: useless associativity for "*", use %precedence [-Wprecedence]
+input.y:4.13-15: warning: useless precedence for "(" [-Wprecedence]
+]])
+
+AT_CLEANUP
+
+
 ## ---------------------------- ##
 ## Useless precedence warning.  ##
 ## ---------------------------- ##
@@ -174,17 +155,17 @@ f: B
 ;
 ]])
 
-AT_BISON_CHECK([-fcaret -o input.c input.y], 0, [],
-[[input.y:2.13: warning: useless precedence for Z [-Wother]
+AT_BISON_CHECK([-Wprecedence -fcaret -o input.c input.y], 0, [],
+[[input.y:2.13: warning: useless precedence for Z [-Wprecedence]
  %precedence Z
              ^
-input.y:5.7: warning: useless associativity for W [-Wother]
+input.y:5.7: warning: useless precedence and associativity for W [-Wprecedence]
  %left W
        ^
-input.y:6.8: warning: useless associativity for V [-Wother]
+input.y:6.8: warning: useless precedence and associativity for V [-Wprecedence]
  %right V
         ^
-input.y:7.11: warning: useless associativity for U [-Wother]
+input.y:7.11: warning: useless precedence and associativity for U [-Wprecedence]
  %nonassoc U
            ^
 ]])
@@ -211,7 +192,7 @@ e: 'e' | /* Nothing. */;
 ]])
 
 AT_BISON_CHECK([-o input.c input.y], 0, [],
-[[input.y:4.9: warning: rule useless in parser due to conflicts: e: /* empty */ [-Wother]
+[[input.y:4.9: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
 AT_BISON_CHECK([-fcaret -o input.c input.y], 0, [],
@@ -939,7 +920,7 @@ cond:
 
 AT_BISON_CHECK([-o input.c input.y], 0, [],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
-input.y:12.3-18: warning: rule useless in parser due to conflicts: cond: cond "then" cond [-Wother]
+input.y:12.3-18: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
 AT_CLEANUP
@@ -983,7 +964,7 @@ id : '0';
 
 AT_BISON_CHECK([-o input.c --report=all input.y], 0, [],
 [[input.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
-input.y:4.6-8: warning: rule useless in parser due to conflicts: id: '0' [-Wother]
+input.y:4.6-8: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
 # Check the contents of the report.
@@ -1196,10 +1177,10 @@ e:   e '+' e
    ;
 ]])
 
-AT_BISON_CHECK([-o input.c input.y], 0, [],
+AT_BISON_CHECK([-Wall -o input.c input.y], 0, [],
 [[input.y: warning: 4 shift/reduce conflicts [-Wconflicts-sr]
-input.y:1.7-9: warning: useless associativity for '+' [-Wother]
-input.y:2.7-9: warning: useless associativity for '*' [-Wother]
+input.y:1.7-9: warning: useless precedence and associativity for '+' [-Wprecedence]
+input.y:2.7-9: warning: useless precedence and associativity for '*' [-Wprecedence]
 ]])
 AT_CLEANUP
 
@@ -1303,13 +1284,13 @@ reported_conflicts:
 AT_BISON_CHECK([[--report=all input.y]], 0, [],
 [[input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
 input.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
-input.y:12.5-20: warning: rule useless in parser due to conflicts: resolved_conflict: 'a' unreachable1 [-Wother]
-input.y:20.5-20: warning: rule useless in parser due to conflicts: unreachable1: 'a' unreachable2 [-Wother]
-input.y:21.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */ [-Wother]
-input.y:25.13: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ [-Wother]
-input.y:25.16: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ [-Wother]
-input.y:31.5-7: warning: rule useless in parser due to conflicts: reported_conflicts: 'a' [-Wother]
-input.y:32.4: warning: rule useless in parser due to conflicts: reported_conflicts: /* empty */ [-Wother]
+input.y:12.5-20: warning: rule useless in parser due to conflicts [-Wother]
+input.y:20.5-20: warning: rule useless in parser due to conflicts [-Wother]
+input.y:21.4: warning: rule useless in parser due to conflicts [-Wother]
+input.y:25.13: warning: rule useless in parser due to conflicts [-Wother]
+input.y:25.16: warning: rule useless in parser due to conflicts [-Wother]
+input.y:31.5-7: warning: rule useless in parser due to conflicts [-Wother]
+input.y:32.4: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
 AT_CHECK([[cat input.output]], 0,
@@ -1456,10 +1437,10 @@ AT_CHECK([[cat input.y >> input-keep.y]])
 AT_BISON_CHECK([[input-keep.y]], 0, [],
 [[input-keep.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
 input-keep.y: warning: 2 reduce/reduce conflicts [-Wconflicts-rr]
-input-keep.y:22.4: warning: rule useless in parser due to conflicts: unreachable1: /* empty */ [-Wother]
-input-keep.y:26.16: warning: rule useless in parser due to conflicts: unreachable2: /* empty */ [-Wother]
-input-keep.y:32.5-7: warning: rule useless in parser due to conflicts: reported_conflicts: 'a' [-Wother]
-input-keep.y:33.4: warning: rule useless in parser due to conflicts: reported_conflicts: /* empty */ [-Wother]
+input-keep.y:22.4: warning: rule useless in parser due to conflicts [-Wother]
+input-keep.y:26.16: warning: rule useless in parser due to conflicts [-Wother]
+input-keep.y:32.5-7: warning: rule useless in parser due to conflicts [-Wother]
+input-keep.y:33.4: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
 AT_CLEANUP
@@ -1639,7 +1620,7 @@ exp: 'a' | 'a';
 AT_BISON_CHECK([[2.y]], [[0]], [],
 [[2.y: warning: %expect-rr applies only to GLR parsers [-Wother]
 2.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
-2.y:3.12-14: warning: rule useless in parser due to conflicts: exp: 'a' [-Wother]
+2.y:3.12-14: warning: rule useless in parser due to conflicts [-Wother]
 ]])
 
 AT_CLEANUP