For push mode, convert yyparse from a macro to a function, invoke yylex

[bison.git] / tests / headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 81d5c7dc90d6e76f178445f00e1f3bf71b7c4725..6b17017083296542be19427363e4542a6ce4fbbc 100644 (file)
--- 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.]])
 
@@ -56,14 +56,20 @@ dirname=`AS_DIRNAME([$1])`
 AS_MKDIR_P([$dirname])
 
 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
 ])
@@ -83,7 +89,7 @@ AT_SETUP([export YYLTYPE])
 AT_DATA_GRAMMAR([input.y],
 [%locations
 
-%name-prefix="my_"
+%name-prefix "my_"
 %{
 #include <stdio.h>
 #include <stdlib.h>
@@ -112,7 +118,9 @@ AT_DATA([caller.c],
 [[#include "input.h"
 YYLTYPE *my_llocp = &my_lloc;
 
+#ifndef YYPUSH_DECLS
 int my_parse (void);
+#endif
 
 int
 main (void)