X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2b42986e7508b80e3f0fdd25bfa0429d7a9bb4d3..6bbb2ed5efc60128f52a542f0b8fb8337aa694fe:/tests/headers.at
diff --git a/tests/headers.at b/tests/headers.at
index 90652514..8d70b35e 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,20 +1,18 @@
# Bison Parser Headers. -*- Autotest -*-
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006, 2007 Free Software Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-
+#
# 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.
+# along with this program. If not, see .
AT_BANNER([[Parser Headers.]])
@@ -36,7 +34,7 @@ AT_DATA([input.y],
exp: {};
])
-AT_CHECK([bison --defines input.y])
+AT_BISON_CHECK([--defines input.y])
AT_CLEANUP
@@ -55,15 +53,21 @@ m4_define([AT_TEST_CPP_GUARD_H],
dirname=`AS_DIRNAME([$1])`
AS_MKDIR_P([$dirname])
-AT_DATA([$1.y],
-[%%
+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_BISON_CHECK([--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,10 +84,10 @@ AT_TEST_CPP_GUARD_H([9foo])
AT_SETUP([export YYLTYPE])
-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],
[%locations
-%name-prefix="my_"
+%name-prefix "my_"
%{
#include
#include
@@ -105,7 +109,7 @@ my_error (const char *msg)
exp:;
])
-AT_CHECK([bison --defines -o input.c input.y])
+AT_BISON_CHECK([--defines -o input.c input.y])
# YYLTYPE should be defined, and MY_LLOC declared.
AT_DATA([caller.c],