(gram_error): Now static. Add static decl.

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 3147365623d8e35bd3bba31ae3ed4bc89fff0391..f3fe782135792d0af74282746cb627f609006d45 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -50,12 +50,9 @@ 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>
 
 #if STDC_HEADERS
 #include <stdio.h>
 
 #if STDC_HEADERS


@@ -111,16 +108,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