X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9501dc6e69988cd8cf7623278a3894af9479e198..9bcffa0c13d1abee13433f14cdb785cbb960425c:/tests/headers.at
diff --git a/tests/headers.at b/tests/headers.at
index 81d5c7dc..549d62dc 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -1,75 +1,63 @@
# Bison Parser Headers. -*- Autotest -*-
-# Copyright 2001 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Copyright (C) 2001-2002, 2006-2007, 2009-2012 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
+# 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.]])
-## ---------------------- ##
-## %union and --defines. ##
-## ---------------------- ##
-
-
-AT_SETUP([%union and --defines])
-
-AT_DATA([input.y],
-[%union
-{
- int integer;
- char *string ;
-}
-%%
-exp: {};
-])
-
-AT_CHECK([bison --defines input.y])
-
-AT_CLEANUP
-
-
-
## --------------------- ##
## Invalid CPP headers. ##
## --------------------- ##
-# AT_TEST_CPP_GUARD_H([INPUT-FILE-BASE)
-# -------------------------------------
+# AT_TEST_CPP_GUARD_H(BASE-NAME, [DIRECTIVES])
+# --------------------------------------------
+# FIXME: Much of this can be covered by calc.at.
m4_define([AT_TEST_CPP_GUARD_H],
-[AT_SETUP([Invalid CPP guards: $1])
-
+[AT_SETUP([Invalid CPP guards: $2 --defines=$1.h])
+AT_BISON_OPTION_PUSHDEFS([$2])
# Possibly create inner directories.
dirname=`AS_DIRNAME([$1])`
AS_MKDIR_P([$dirname])
AT_DATA_GRAMMAR([$1.y],
-[%%
+[$2
+%{
+#include <$1.h>
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[
+%}
+%%
dummy:;
+%%
+#include <$1.h>
])
-AT_CHECK([bison --defines=$1.h $1.y])
+AT_BISON_CHECK([--defines=$1.h --output=$1.c $1.y])
-# CPP should be happy with it.
-AT_CHECK([$CC -E $1.h], 0, [ignore])
+AT_COMPILE([$1.o], [-I. -c $1.c])
+AT_BISON_OPTION_POPDEFS
AT_CLEANUP
])
AT_TEST_CPP_GUARD_H([input/input])
AT_TEST_CPP_GUARD_H([9foo])
+AT_TEST_CPP_GUARD_H([input/input], [%glr-parser])
+AT_TEST_CPP_GUARD_H([9foo], [%glr-parser])
@@ -83,7 +71,7 @@ AT_SETUP([export YYLTYPE])
AT_DATA_GRAMMAR([input.y],
[%locations
-%name-prefix="my_"
+%name-prefix "my_"
%{
#include
#include
@@ -105,7 +93,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],
@@ -123,8 +111,8 @@ main (void)
# Link and execute, just to make sure everything is fine (and in
# 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.o])
+AT_COMPILE([input.o])
AT_COMPILE([caller], [caller.o input.o])
AT_PARSER_CHECK([./caller])