X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b9cecb91a08fa4baa73a5e12a83611b41507a022..b931235eb9e55277e0147443f916c0f73ad697c4:/tests/headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 5e2facb4..a348d65b 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,5 +1,5 @@
 # Bison Parser Headers.                               -*- Autotest -*-
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006 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
@@ -13,8 +13,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 AT_BANNER([[Parser Headers.]])
 
@@ -55,15 +55,21 @@ m4_define([AT_TEST_CPP_GUARD_H],
 dirname=`AS_DIRNAME([$1])`
 AS_MKDIR_P([$dirname])
 
-AT_DATA([$1.y],
-[%%
-dummy:
+AT_DATA_GRAMMAR([$1.y],
+[%{
+#include <$1.h>
+void yyerror (const char *);
+int yylex (void);
+%}
+%%
+dummy:;
+%%
+#include <$1.h>
 ])
 
-AT_CHECK([bison --defines=$1.h $1.y])
+AT_CHECK([bison --defines=$1.h --output=y.tab.c $1.y])
 
-# CPP should be happy with it.
-AT_CHECK([$CC -E $1.h], 0, [ignore])
+AT_COMPILE([y.tab.o], [-I. -c y.tab.c])
 
 AT_CLEANUP
 ])
@@ -80,20 +86,22 @@ AT_TEST_CPP_GUARD_H([9foo])
 
 AT_SETUP([export YYLTYPE])
 
-AT_DATA([input.y],
+AT_DATA_GRAMMAR([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 +111,27 @@ 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.o], [-c caller.c])
+AT_COMPILE([input.o], [-c input.c])
+AT_COMPILE([caller], [caller.o input.o])
+AT_PARSER_CHECK([./caller])
 
 AT_CLEANUP