X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c8f002c7d3407d5c91a5882466916160a72aa8c4..603f1cfdc56691b331b6ef337a8c3633e7a125b3:/tests/conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 6f0a971f..3b51d6f0 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,5 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
-# Copyright (C) 2002 Free Software Foundation, Inc.
+
+# Copyright (C) 2002, 2003 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
@@ -37,8 +38,8 @@ exp: e 'e';
 e: 'e' | /* Nothing. */;
 ]])
 
-AT_CHECK([bison input.y -o input.c], 0, [],
-[[input.y:4.8: warning: rule never reduced because of conflicts: e: /* empty */
+AT_CHECK([bison -o input.c input.y], 0, [],
+[[input.y:4.9: warning: rule never reduced because of conflicts: e: /* empty */
 ]])
 
 AT_CLEANUP
@@ -50,12 +51,9 @@ AT_CLEANUP
 
 AT_SETUP([%nonassoc and eof])
 
-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],
 [[
 %{
-#include <config.h>
-/* We don't need a perfect malloc for these tests. */
-#undef malloc
 #include <stdio.h>
 
 #if STDC_HEADERS
@@ -103,7 +101,7 @@ main (int argc, const char *argv[])
 ]])
 
 # Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison input.y -o input.c])
+AT_CHECK([bison -o input.c input.y])
 AT_COMPILE([input])
 
 AT_PARSER_CHECK([./input '0<0'])
@@ -111,16 +109,16 @@ AT_PARSER_CHECK([./input '0<0'])
 # no one has ever spotted it!  The messages are *wrong*: there should
 # be nothing there, it should be expected eof.
 AT_PARSER_CHECK([./input '0<0<0'], [1], [],
-         [parse error, unexpected '<', expecting '<' or '>'
+         [syntax error, unexpected '<', expecting '<' or '>'
 ])
 
 AT_PARSER_CHECK([./input '0>0'])
 AT_PARSER_CHECK([./input '0>0>0'], [1], [],
-         [parse error, unexpected '>', expecting '<' or '>'
+         [syntax error, unexpected '>', expecting '<' or '>'
 ])
 
 AT_PARSER_CHECK([./input '0<0>0'], [1], [],
-         [parse error, unexpected '>', expecting '<' or '>'
+         [syntax error, unexpected '>', expecting '<' or '>'
 ])
 
 AT_CLEANUP
@@ -141,13 +139,13 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c --report=all], 0, [],
-[input.y: warning: 1 shift/reduce conflict
+AT_CHECK([bison -o input.c --report=all input.y], 0, [],
+[input.y: conflicts: 1 shift/reduce
 ])
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
-[[State 5 contains 1 shift/reduce conflict.
+[[State 5 conflicts: 1 shift/reduce
 
 
 Grammar
@@ -249,7 +247,7 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c --report=all])
+AT_CHECK([bison -o input.c --report=all input.y])
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
@@ -328,6 +326,7 @@ state 5
     1    | exp OP exp .  [$end, OP]
 
     $default  reduce using rule 1 (exp)
+
     Conflict between rule 1 and token OP resolved as reduce (%left OP).
 ]])
 
@@ -370,9 +369,9 @@ id : '0';
 %%
 ]])
 
-AT_CHECK([bison input.y -o input.c --report=all], 0, [],
-[[input.y: warning: 1 reduce/reduce conflict
-input.y:4.4-8: warning: rule never reduced because of conflicts: id: '0'
+AT_CHECK([bison -o input.c --report=all input.y], 0, [],
+[[input.y: conflicts: 1 reduce/reduce
+input.y:4.6-8: warning: rule never reduced because of conflicts: id: '0'
 ]])
 
 # Check the contents of the report.
@@ -382,7 +381,7 @@ AT_CHECK([cat input.output], [],
     4 id: '0'
 
 
-State 1 contains 1 reduce/reduce conflict.
+State 1 conflicts: 1 reduce/reduce
 
 
 Grammar
@@ -487,9 +486,9 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c], 1, [],
-[input.y: warning: 1 shift/reduce conflict
-input.y: expected 0 shift/reduce conflicts
+AT_CHECK([bison -o input.c input.y], 0, [],
+[input.y: conflicts: 1 shift/reduce
+input.y: warning: expected 0 shift/reduce conflicts
 ])
 AT_CLEANUP
 
@@ -507,7 +506,7 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c])
+AT_CHECK([bison -o input.c input.y])
 AT_CLEANUP
 
 
@@ -524,8 +523,28 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c], 1, [],
-[input.y: warning: 1 shift/reduce conflict
-input.y: expected 2 shift/reduce conflicts
+AT_CHECK([bison -o input.c input.y], 0, [],
+[input.y: conflicts: 1 shift/reduce
+input.y: warning: expected 2 shift/reduce conflicts
+])
+AT_CLEANUP
+
+
+## ------------------------------ ##
+## %expect with reduce conflicts  ##
+## ------------------------------ ##
+
+AT_SETUP([%expect with reduce conflicts])
+
+AT_DATA([input.y],
+[[%expect 0
+%%
+program: a 'a' | a a;
+a: 'a';
+]])
+
+AT_CHECK([bison -o input.c input.y], 0, [],
+[input.y: conflicts: 1 reduce/reduce
+input.y: warning: expected 0 reduce/reduce conflicts
 ])
 AT_CLEANUP