Update.

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 5e2facb492c65e2d44bf98a652a7431e28317599..c7f35c43ba584d300fb8856fa1bd8ccfe54df7e3 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -57,7 +57,7 @@ AS_MKDIR_P([$dirname])
 
 AT_DATA([$1.y],
 [%%
-dummy:
+dummy:;
 ])
 
 AT_CHECK([bison --defines=$1.h $1.y])
@@ -82,18 +82,20 @@ AT_SETUP([export YYLTYPE])
 
 AT_DATA([input.y],
 [%locations
+
+%name-prefix="my_"
 %{
 #include <stdio.h>
 #include <stdlib.h>
 
 static int
-yylex (void)
+my_lex (void)
 {
   return EOF;
 }
 
 static void
-yyerror (const char *msg)
+my_error (const char *msg)
 {
   fprintf (stderr, "%s\n", msg);
 }
@@ -103,25 +105,25 @@ yyerror (const char *msg)
 exp:;
 ])
 
-AT_CHECK([bison --defines input.y -o input.c])
+AT_CHECK([bison --defines -o input.c input.y])
 
-# YYLTYPE should be defined, and YYLLOC declared.
+# YYLTYPE should be defined, and MY_LLOC declared.
 AT_DATA([caller.c],
 [[#include "input.h"
-YYLTYPE *yyllocp = &yylloc;
+YYLTYPE *my_llocp = &my_lloc;
 
-int yyparse (void);
+int my_parse (void);
 
 int
 main (void)
 {
-  return yyparse ();
+  return my_parse ();
 }
 ]])
 
 # Link and execute, just to make sure everything is fine (and in
-# particular, that YYLLOC is indeed defined somewhere).
-AT_CHECK([$CC $CFLAGS $CPPFLAGS caller.c input.c -o caller], 0, [], [ignore])
-AT_CHECK([caller])
+# particular, that MY_LLOC is indeed defined somewhere).
+AT_COMPILE([caller], [caller.c input.c])
+AT_PARSER_CHECK([./caller])
 
 AT_CLEANUP