Remove more K&R C support.

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 3147365623d8e35bd3bba31ae3ed4bc89fff0391..381b49ef99659214d1ef9ceb37661946b75d966e 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,5 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 # Exercising Bison on conflicts.                         -*- Autotest -*-

-# Copyright (C) 2002 Free Software Foundation, Inc.
+
+# Copyright (C) 2002, 2003, 2004 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


@@ -38,7 +39,7 @@ e: 'e' | /* Nothing. */;
 ]])
 
 AT_CHECK([bison -o input.c input.y], 0, [],
 ]])
 
 AT_CHECK([bison -o input.c input.y], 0, [],

-[[input.y:4.8: warning: rule never reduced because of conflicts: e: /* empty */
+[[input.y:4.9: warning: rule never reduced because of conflicts: e: /* empty */

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -50,17 +51,11 @@ AT_CLEANUP
 
 AT_SETUP([%nonassoc and eof])
 
 
 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>
 #include <stdio.h>

-
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>

 
 #define YYERROR_VERBOSE 1
 static void
 
 #define YYERROR_VERBOSE 1
 static void


@@ -111,16 +106,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], [],
 # 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], [],
 ])
 
 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], [],
 ])
 
 AT_PARSER_CHECK([./input '0<0>0'], [1], [],

-         [parse error, unexpected '>', expecting '<' or '>'
+         [syntax error, unexpected '>', expecting '<' or '>'

 ])
 
 AT_CLEANUP
 ])
 
 AT_CLEANUP


@@ -142,12 +137,12 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_CHECK([bison -o input.c --report=all input.y], 0, [],
 ]])
 
 AT_CHECK([bison -o input.c --report=all input.y], 0, [],

-[input.y: warning: 1 shift/reduce conflict
+[input.y: conflicts: 1 shift/reduce

 ])
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
 ])
 
 # 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
 
 
 Grammar


@@ -372,8 +367,8 @@ id : '0';
 ]])
 
 AT_CHECK([bison -o input.c --report=all input.y], 0, [],
 ]])
 
 AT_CHECK([bison -o input.c --report=all input.y], 0, [],

-[[input.y: warning: 1 reduce/reduce conflict
-input.y:4.4-8: warning: rule never reduced because of conflicts: id: '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.
 ]])
 
 # Check the contents of the report.


@@ -383,7 +378,7 @@ AT_CHECK([cat input.output], [],
     4 id: '0'
 
 
     4 id: '0'
 
 

-State 1 contains 1 reduce/reduce conflict.
+State 1 conflicts: 1 reduce/reduce

 
 
 Grammar
 
 
 Grammar


@@ -488,9 +483,9 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
 exp: exp OP exp | NUM;
 ]])
 

-AT_CHECK([bison -o input.c input.y], 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
 
 ])
 AT_CLEANUP
 


@@ -525,8 +520,102 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
 exp: exp OP exp | NUM;
 ]])
 

-AT_CHECK([bison -o input.c input.y], 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
 ])
 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
+
+
+## ------------------------------- ##
+## %no-default-prec without %prec  ##
+## ------------------------------- ##
+
+AT_SETUP([%no-default-prec without %prec])
+
+AT_DATA([[input.y]],
+[[%left '+'
+%left '*'
+
+%%
+
+%no-default-prec;
+
+e:   e '+' e
+   | e '*' e
+   | '0'
+   ;
+]])
+
+AT_CHECK([bison -o input.c input.y], 0, [],
+[[input.y: conflicts: 4 shift/reduce
+]])
+AT_CLEANUP
+
+
+## ---------------------------- ##
+## %no-default-prec with %prec  ##
+## ---------------------------- ##
+
+AT_SETUP([%no-default-prec with %prec])
+
+AT_DATA([[input.y]],
+[[%left '+'
+%left '*'
+
+%%
+
+%no-default-prec;
+
+e:   e '+' e %prec '+'
+   | e '*' e %prec '*'
+   | '0'
+   ;
+]])
+
+AT_CHECK([bison -o input.c input.y])
+AT_CLEANUP
+
+
+## ---------------- ##
+## %default-prec    ##
+## ---------------- ##
+
+AT_SETUP([%default-prec])
+
+AT_DATA([[input.y]],
+[[%left '+'
+%left '*'
+
+%%
+
+%default-prec;
+
+e:   e '+' e
+   | e '*' e
+   | '0'
+   ;
+]])
+
+AT_CHECK([bison -o input.c input.y])
+AT_CLEANUP