X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/72d848c21d85a531e965058d37787e646076b641..a2ea208d82fdd67257d16e11b93ab17a8c48d452:/tests/local.at?ds=sidebyside diff --git a/tests/local.at b/tests/local.at index 2544b2f6..ab68cca9 100644 --- a/tests/local.at +++ b/tests/local.at @@ -1,7 +1,7 @@ # Process this -*- Autotest -*- file with autom4te. # Macros for the GNU Bison Test suite. -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2007 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 @@ -15,8 +15,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. # We want a recent Autotest. m4_version_prereq([2.58]) @@ -41,13 +41,19 @@ m4_define([AT_BISON_OPTION_PUSHDEFS], m4_define([_AT_BISON_OPTION_PUSHDEFS], [m4_if([$1$2], $[1]$[2], [], [m4_fatal([$0: Invalid arguments: $@])])dnl -m4_pushdef([AT_LALR1_CC_IF], -[m4_bmatch([$3], ["lalr1.cc"], [$1], [$2])]) +m4_pushdef([AT_SKEL_CC_IF], +[m4_bmatch([$3], [%language "[Cc]\+\+"\|%skeleton "[a-z0-9]+\.cc"], [$1], [$2])]) m4_pushdef([AT_GLR_IF], -[m4_bmatch([$3], [%glr-parser], [$1], [$2])]) +[m4_bmatch([$3], [%glr-parser\|%skeleton "glr\.], [$1], [$2])]) +m4_pushdef([AT_LALR1_CC_IF], +[AT_SKEL_CC_IF([AT_GLR_IF([$2], [$1])], [$2])]) +m4_pushdef([AT_GLR_CC_IF], +[AT_SKEL_CC_IF([AT_GLR_IF([$1], [$2])], [$2])]) # Using yacc.c? m4_pushdef([AT_YACC_IF], -[m4_bmatch([$3], [%glr-parser\|%skeleton], [$2], [$1])]) +[m4_bmatch([$3], [%language\|%glr-parser\|%skeleton], [$2], [$1])]) +m4_pushdef([AT_LEXPARAM_IF], +[m4_bmatch([$3], [%lex-param], [$1], [$2])]) m4_pushdef([AT_PARAM_IF], [m4_bmatch([$3], [%parse-param], [$1], [$2])]) m4_pushdef([AT_LOCATION_IF], @@ -56,41 +62,44 @@ m4_pushdef([AT_PURE_IF], [m4_bmatch([$3], [%pure-parser], [$1], [$2])]) m4_pushdef([AT_PURE_AND_LOC_IF], [m4_bmatch([$3], [%locations.*%pure-parser\|%pure-parser.*%locations], - [$1], [$2])]) + [$1], [$2])]) m4_pushdef([AT_GLR_OR_PARAM_IF], [m4_bmatch([$3], [%glr-parser\|%parse-param], [$1], [$2])]) - +m4_pushdef([AT_NAME_PREFIX], +[m4_bmatch([$3], [%name-prefix ".*"], + [m4_bregexp([$3], [name-prefix "\([^"]*\)"], [\1])], + [yy])]) # yyerror receives the location if %location & %pure & (%glr or %parse-param). m4_pushdef([AT_YYERROR_ARG_LOC_IF], [AT_GLR_OR_PARAM_IF([AT_PURE_AND_LOC_IF([$1], [$2])], - [$2])]) + [$2])]) # yyerror always sees the locations (when activated), except if -# yacc & pure & !param. +# (yacc & pure & !param). FIXME: This is wrong. See the manual. m4_pushdef([AT_YYERROR_SEES_LOC_IF], [AT_LOCATION_IF([AT_YACC_IF([AT_PURE_IF([AT_PARAM_IF([$1], [$2])], - [$1])], - [$1])], - [$2])]) + [$1])], + [$1])], + [$2])]) # The interface is pure: either because %pure-parser, or because we # are using the C++ parsers. m4_pushdef([AT_PURE_LEX_IF], [AT_PURE_IF([$1], - [AT_LALR1_CC_IF([$1], [$2])])]) + [AT_SKEL_CC_IF([$1], [$2])])]) AT_PURE_LEX_IF( -[m4_pushdef([AT_LOC], [(*yylloc)]) - m4_pushdef([AT_VAL], [(*yylval)]) +[m4_pushdef([AT_LOC], [(*llocp)]) + m4_pushdef([AT_VAL], [(*lvalp)]) m4_pushdef([AT_LEX_FORMALS], - [YYSTYPE *yylval[]AT_LOCATION_IF([, YYLTYPE *yylloc])]) + [YYSTYPE *lvalp[]AT_LOCATION_IF([, YYLTYPE *llocp])]) m4_pushdef([AT_LEX_ARGS], - [yylval[]AT_LOCATION_IF([, yylloc])]) + [lvalp[]AT_LOCATION_IF([, llocp])]) m4_pushdef([AT_USE_LEX_ARGS], - [(void) yylval;AT_LOCATION_IF([(void) yylloc])]) + [(void) lvalp;AT_LOCATION_IF([(void) llocp])]) m4_pushdef([AT_LEX_PRE_FORMALS], - [AT_LEX_FORMALS, ]) + [AT_LEX_FORMALS, ]) m4_pushdef([AT_LEX_PRE_ARGS], - [AT_LEX_ARGS, ]) + [AT_LEX_ARGS, ]) ], [m4_pushdef([AT_LOC], [(yylloc)]) m4_pushdef([AT_VAL], [(yylval)]) @@ -116,12 +125,16 @@ m4_popdef([AT_LOC]) m4_popdef([AT_PURE_LEX_IF]) m4_popdef([AT_YYERROR_SEES_LOC_IF]) m4_popdef([AT_YYERROR_ARG_LOC_IF]) +m4_popdef([AT_NAME_PREFIX]) m4_popdef([AT_GLR_OR_PARAM_IF]) m4_popdef([AT_PURE_AND_LOC_IF]) m4_popdef([AT_LOCATION_IF]) m4_popdef([AT_PARAM_IF]) +m4_popdef([AT_LEXPARAM_IF]) m4_popdef([AT_YACC_IF]) m4_popdef([AT_GLR_IF]) +m4_popdef([AT_SKEL_CC_IF]) +m4_popdef([AT_GLR_CC_IF]) m4_popdef([AT_LALR1_CC_IF]) ])# AT_BISON_OPTION_POPDEFS @@ -138,13 +151,11 @@ m4_popdef([AT_LALR1_CC_IF]) # meant to be compiled. m4_define([AT_DATA_GRAMMAR_PROLOGUE], [[%{ -#if HAVE_CONFIG_H -# include - /* We don't need perfect functions for these tests. */ -# undef malloc -# undef memcmp -# undef realloc -#endif +#include +/* We don't need perfect functions for these tests. */ +#undef malloc +#undef memcmp +#undef realloc %}] ]) @@ -175,12 +186,14 @@ m4_define([AT_COMPILE], # AT_COMPILE_CXX(OUTPUT, [SOURCES = OUTPUT.cc]) # -------------------------------------------- +# Compile SOURCES into OUTPUT. If OUTPUT does not contain '.', +# assume that we are linking too; this is a hack. # If the C++ compiler does not work, ignore the test. m4_define([AT_COMPILE_CXX], [AT_KEYWORDS(c++) AT_CHECK([$BISON_CXX_WORKS], 0, ignore, ignore) -AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS -o $1 m4_default([$2], [$1.cc])], - 0, [ignore], [ignore])]) +AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.cc])[]m4_bmatch([$1], [[.]], [], [ $LIBS])], + 0, [ignore], [ignore])]) @@ -188,11 +201,11 @@ AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS -o $1 m4_default([$2], [$1.cc])], ## Running a generated parser. ## ## ---------------------------- ## -# AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR) -# ----------------------------------------------------- +# AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE]) +# ------------------------------------------------------------ # So that we can run `./testsuite PREPARSER='valgrind -q' for instance. m4_define([AT_PARSER_CHECK], -[AT_CHECK([$PREPARSER $1], [$2], [$3], [$4])]) +[AT_CHECK([$5 $PREPARSER $1], [$2], [$3], [$4])])