X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/064e42b0aca1db0ca84b06b01cac5a40f3016591..5202b6ac1d3662fe283240aab1b29f35607995cd:/tests/local.at diff --git a/tests/local.at b/tests/local.at index 121dedf2..d5ef8084 100644 --- a/tests/local.at +++ b/tests/local.at @@ -2,7 +2,7 @@ # Macros for the GNU Bison Test suite. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 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 @@ -29,6 +29,23 @@ m4_define([m4_null_if], [], [$2], [$3])]) +# AT_SETUP_STRIP(TITLE) +# --------------------- +# Abbreviate the TITLE to be passed to AT_SETUP. Remove new-lines +# that completely break AT_SETUP. +m4_define([AT_SETUP_STRIP], +[m4_bpatsubsts([$1], + [%\(language\|skeleton\) "?\([^\" ]*\)"?], + [\2], + [%define "?\([-A-Za-z0-9_.]+\)"? \("[^\"]+"\|[-A-Za-z0-9_.]+\)], + [\1=\2], + [%define "?\([-A-Za-z0-9_.]+\)"?], + [\1], + [ * ++ *], [ ])dnl +]) + + ## ------------- ## ## Basic tests. ## ## ------------- ## @@ -80,21 +97,30 @@ m4_define([AT_RESTORE_SPECIAL_FILES], [at_restore_special_files]) # AT_LOC_PUSHDEF(FIRST-LINE, FIRST-COLUMN, LAST-LINE, LAST-COLUMN) # ---------------------------------------------------------------- -# Pushdef AT_LOC_(FIRST|LAST)_(LINE|COLUMN). +# Pushdef AT(_LOC)?_(FIRST|LAST)_(LINE|COLUMN). m4_define([AT_LOC_PUSHDEF], -[m4_pushdef([AT_LOC_FIRST_LINE], [AT_LOC.$1]) -m4_pushdef([AT_LOC_FIRST_COLUMN], [AT_LOC.$2]) -m4_pushdef([AT_LOC_LAST_LINE], [AT_LOC.$3]) -m4_pushdef([AT_LOC_LAST_COLUMN], [AT_LOC.$4])]) +[m4_pushdef([AT_FIRST_LINE], [$1]) +m4_pushdef([AT_FIRST_COLUMN], [$2]) +m4_pushdef([AT_LAST_LINE], [$3]) +m4_pushdef([AT_LAST_COLUMN], [$4]) +m4_pushdef([AT_LOC_FIRST_LINE], [AT_LOC.AT_FIRST_LINE]) +m4_pushdef([AT_LOC_FIRST_COLUMN], [AT_LOC.AT_FIRST_COLUMN]) +m4_pushdef([AT_LOC_LAST_LINE], [AT_LOC.AT_LAST_LINE]) +m4_pushdef([AT_LOC_LAST_COLUMN], [AT_LOC.AT_LAST_COLUMN])]) # AT_LOC_POPDEF # ------------- -# Popdef AT_LOC_(FIRST|LAST)_(LINE|COL). +# Popdef AT(_LOC)?_(FIRST|LAST)_(LINE|COLUMN). m4_define([AT_LOC_POPDEF], [m4_popdef([AT_LOC_FIRST_LINE]) m4_popdef([AT_LOC_FIRST_COLUMN]) m4_popdef([AT_LOC_LAST_LINE]) -m4_popdef([AT_LOC_LAST_COLUMN])]) +m4_popdef([AT_LOC_LAST_COLUMN]) +m4_popdef([AT_FIRST_LINE]) +m4_popdef([AT_FIRST_COLUMN]) +m4_popdef([AT_LAST_LINE]) +m4_popdef([AT_LAST_COLUMN]) +]) @@ -108,13 +134,15 @@ m4_define([AT_BISON_OPTION_PUSHDEFS], # _AT_BISON_OPTION_PUSHDEFS($1, $2, [BISON-OPTIONS]) # -------------------------------------------------- # This macro works around the impossibility to define macros -# inside macros, because issuing `[$1]' is not possible in M4 :(. +# inside macros, because issuing '[$1]' is not possible in M4 :(. # This sucks hard, GNU M4 should really provide M5-like $$1. m4_define([_AT_BISON_OPTION_PUSHDEFS], [m4_if([$1$2], $[1]$[2], [], [m4_fatal([$0: Invalid arguments: $@])])dnl m4_pushdef([AT_DEFINES_IF], [m4_bmatch([$3], [%defines], [$1], [$2])]) +m4_pushdef([AT_DEBUG_IF], +[m4_bmatch([$3], [%debug\|%define parse.trace], [$1], [$2])]) m4_pushdef([AT_SKEL_CC_IF], [m4_bmatch([$3], [%language "[Cc]\+\+"\|%skeleton "[a-z0-9]+\.cc"], [$1], [$2])]) m4_pushdef([AT_SKEL_JAVA_IF], @@ -152,15 +180,18 @@ m4_pushdef([AT_PURE_IF], [m4_bmatch([$3], [%define *api\.pure\|%pure-parser], [m4_bmatch([$3], [%define *api\.pure *"?false"?], [$2], [$1])], [$2])]) +# AT_NAME_PREFIX: also consider api.namespace. m4_pushdef([AT_NAME_PREFIX], -[m4_bmatch([$3], [\(%define api\.prefix\|%name-prefix\) ".*"], - [m4_bregexp([$3], [\(%define api\.prefix\|%name-prefix\) "\([^""]*\)"], [\2])], +[m4_bmatch([$3], [\(%define api\.\(namespace\|prefix\)\|%name-prefix\) ".*"], + [m4_bregexp([$3], [\(%define api\.\(namespace\|prefix\)\|%name-prefix\) "\([^""]*\)"], [\3])], [yy])]) m4_pushdef([AT_TOKEN_CTOR_IF], -[m4_bmatch([$3], [%define api.token.constructor], [$1], [$2])]) +[m4_bmatch([$3], [%define api\.token\.constructor], [$1], [$2])]) m4_pushdef([AT_TOKEN_PREFIX], -[m4_bmatch([$3], [%define api.token.prefix ".*"], - [m4_bregexp([$3], [%define api.token.prefix "\(.*\)"], [\1])])]) +[m4_bmatch([$3], [%define api\.token\.prefix ".*"], + [m4_bregexp([$3], [%define api\.token\.prefix "\(.*\)"], [\1])])]) +m4_pushdef([AT_VARIANT_IF], +[m4_bmatch([$3], [%define api\.value\.type "?variant"?], [$1], [$2])]) m4_pushdef([AT_API_prefix], [m4_bmatch([$3], [%define api\.prefix ".*"], [m4_bregexp([$3], [%define api\.prefix "\([^""]*\)"], [\1])], @@ -174,7 +205,7 @@ m4_pushdef([AT_API_PREFIX], m4_pushdef([AT_YYERROR_ARG_LOC_IF], [AT_LOCATION_IF([AT_PURE_IF([m4_bmatch([$3], m4_quote(m4_join([\|], - [%define api.pure "?full"?], + [%define api\.pure "?full"?], [%glr-parser], [%parse-param], [%skeleton "?glr.c"?])), @@ -259,6 +290,7 @@ m4_popdef([AT_YYERROR_SEES_LOC_IF]) m4_popdef([AT_YYERROR_ARG_LOC_IF]) m4_popdef([AT_API_PREFIX]) m4_popdef([AT_API_prefix]) +m4_popdef([AT_VARIANT_IF]) m4_popdef([AT_TOKEN_PREFIX]) m4_popdef([AT_TOKEN_CTOR_IF]) m4_popdef([AT_NAME_PREFIX]) @@ -275,6 +307,7 @@ m4_popdef([AT_SKEL_JAVA_IF]) m4_popdef([AT_GLR_CC_IF]) m4_popdef([AT_LALR1_CC_IF]) m4_popdef([AT_DEFINES_IF]) +m4_popdef([AT_DEBUG_IF]) AT_LOC_POPDEF])dnl ])# AT_BISON_OPTION_POPDEFS @@ -284,6 +317,25 @@ AT_LOC_POPDEF])dnl ## Generating Grammar Files. ## ## -------------------------- ## +# _AT_LANG_DISPATCH(LANG, MACRO, ARGS) +# ------------------------------------ +# Call the specialization of MACRO for LANG with ARGS. Complain if +# unavailable. +m4_define([_AT_LANG_DISPATCH], +[m4_ifdef([$2($1)], + [m4_indir([$2($1)], m4_shift2($@))], + [m4_fatal([$2: unknown language: $1])])]) + + +# AT_LANG_DISPATCH(MACRO, ARGS) +# ----------------------------- +# Call the specialization of MACRO for AT_LANG with ARGS. Complain if +# unavailable. +m4_define([AT_LANG_DISPATCH], +[_AT_LANG_DISPATCH(AT_LANG, $@)]) + + + # AT_DATA_SOURCE_PROLOGUE # ------------------------ # The prologue that should be included in any source code that is @@ -373,29 +425,76 @@ static # AT_YYERROR_DEFINE # ------------------------- # Must be called inside a AT_BISON_OPTION_PUSHDEFS/POPDEFS pair. -m4_define([AT_YYERROR_FORMALS], -[m4_case(AT_LANG, -[c], [AT_YYERROR_ARG_LOC_IF([AT_YYLTYPE const * const llocp, ])AT_PARSE_PARAMS [const char *msg]])[]dnl -]) +m4_define([AT_YYERROR_FORMALS], [AT_LANG_DISPATCH([$0], $@)]) +m4_define([AT_YYERROR_PROTOTYPE],[AT_LANG_DISPATCH([$0], $@)]) +m4_define([AT_YYERROR_DECLARE_EXTERN], [AT_LANG_DISPATCH([$0], $@)]) +m4_define([AT_YYERROR_DECLARE], [AT_LANG_DISPATCH([$0], $@)]) +m4_define([AT_YYERROR_DEFINE], [AT_LANG_DISPATCH([$0], $@)]) -m4_define([AT_YYERROR_PROTOTYPE], -[m4_case(AT_LANG, -[c], [[void ]AT_NAME_PREFIX[error (]AT_YYERROR_FORMALS[)]])[]dnl -]) +# AT_MAIN_DEFINE +# -------------- +m4_define([AT_MAIN_DEFINE], [AT_LANG_DISPATCH([$0], $@)]) -m4_define([AT_YYERROR_DECLARE_EXTERN], -[m4_case(AT_LANG, -[c], [AT_YYERROR_PROTOTYPE;])[]dnl -]) -m4_define([AT_YYERROR_DECLARE], -[m4_case(AT_LANG, -[c], [static AT_YYERROR_DECLARE_EXTERN])[]dnl -]) -m4_define([AT_YYERROR_DEFINE], -[m4_case(AT_LANG, -[c], [[#include +## --- ## +## C. ## +## --- ## + +m4_define([AT_YYERROR_FORMALS(c)], +[AT_YYERROR_ARG_LOC_IF([AT_YYLTYPE const * const llocp, ])AT_PARSE_PARAMS[const char *msg]]) + +m4_define([AT_YYERROR_PROTOTYPE(c)], +[[void ]AT_NAME_PREFIX[error (]AT_YYERROR_FORMALS[)]]) + +m4_define([AT_YYERROR_DECLARE_EXTERN(c)], +[AT_YYERROR_PROTOTYPE;]) + +m4_define([AT_YYERROR_DECLARE(c)], +[#include +]AT_LOCATION_IF([[ +#if defined ]AT_YYLTYPE[_IS_TRIVIAL && ]AT_YYLTYPE[_IS_TRIVIAL +static unsigned location_print (FILE *yyo, ]AT_YYLTYPE[ const * const yylocp); +# ifndef LOCATION_PRINT +# define LOCATION_PRINT(File, Loc) location_print (File, &(Loc)) +# endif +#endif +]])[ +static AT_YYERROR_DECLARE_EXTERN]) + + +m4_define([AT_YYERROR_DEFINE(c)], +[[ +]AT_LOCATION_IF([[ +# if defined ]AT_YYLTYPE[_IS_TRIVIAL && ]AT_YYLTYPE[_IS_TRIVIAL +/* Print *YYLOCP on YYO. */ +__attribute__((__unused__)) +static unsigned +location_print (FILE *yyo, ]AT_YYLTYPE[ const * const yylocp) +{ + unsigned res = 0; + int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; + if (0 <= yylocp->first_line) + { + res += fprintf (yyo, "%d", yylocp->first_line); + if (0 <= yylocp->first_column) + res += fprintf (yyo, ".%d", yylocp->first_column); + } + if (0 <= yylocp->last_line) + { + if (yylocp->first_line < yylocp->last_line) + { + res += fprintf (yyo, "-%d", yylocp->last_line); + if (0 <= end_col) + res += fprintf (yyo, ".%d", end_col); + } + else if (0 <= end_col && yylocp->first_column < end_col) + res += fprintf (yyo, "-%d", end_col); + } + return res; +} +#endif +]])[ /* A C error reporting function. */ static ]AT_YYERROR_PROTOTYPE[ @@ -403,16 +502,69 @@ static [[^,]+[^A-Za-z_0-9]\([A-Za-z_][A-Za-z_0-9]*\), *], [ YYUSE(\1);])dnl AT_YYERROR_SEES_LOC_IF([[ - YY_LOCATION_PRINT (stderr, ]AT_LOC[); + LOCATION_PRINT (stderr, ]AT_LOC[); fprintf (stderr, ": ");]])[ fprintf (stderr, "%s\n", msg); -}]], -[c++], [[/* A C++ error reporting function. */ +}]]) + + +m4_define([AT_MAIN_DEFINE(c)], +[[#include /* getenv. */ +#include /* strcmp. */ +int +main (int argc, char const* argv[]) +{]AT_DEBUG_IF([[ + if (getenv("YYDEBUG") + || (argc == 2 + && (!strcmp (argv[1], "-d") || !strcmp (argv[1], "--debug")))) + yydebug |= 1;]], [[ + (void) argc; + (void) argv;]])[ + return ]AT_NAME_PREFIX[parse (); +}]]) + + +## ----- ## +## C++. ## +## ----- ## + +# No need to declare, it's part of the class interface. +m4_define([AT_YYERROR_DECLARE(c++)], []) +m4_define([AT_YYERROR_DECLARE_EXTERN(c++)], []) + +m4_define([AT_YYERROR_DEFINE(c++)], +[[/* A C++ error reporting function. */ void ]AT_NAME_PREFIX[::parser::error (]AT_LOCATION_IF([[const location_type& l, ]])[const std::string& m) -{ std::cerr << ]AT_LOCATION_IF([l << ": " << ])[m << std::endl; -}]], -[java], [AT_LOCATION_IF([[public void yyerror (Calc.Location l, String s) +{ + std::cerr << ]AT_LOCATION_IF([l << ": " << ])[m << std::endl; +}]]) + + +m4_define([AT_MAIN_DEFINE(c++)], +[[#include // getenv. +#include // strcmp. +int +main (int argc, char const* argv[]) +{ + ]AT_NAME_PREFIX[::parser p;]AT_DEBUG_IF([[ + if (getenv("YYDEBUG") + || (argc == 2 + && (!strcmp (argv[1], "-d") || !strcmp (argv[1], "--debug")))) + p.set_debug_level (true);]], [[ + (void) argc; + (void) argv;]])[ + return p.parse (); +}]]) + + + +## ------ ## +## Java. ## +## ------ ## + +m4_define([AT_YYERROR_DEFINE(java)], +[AT_LOCATION_IF([[public void yyerror (Calc.Location l, String s) { if (l == null) System.err.println (s); @@ -423,9 +575,19 @@ void public void yyerror (String s) { System.err.println (s); - }]])], -[m4_fatal([$0: invalid language: ]AT_LANG)])dnl -]) + } +]])]) + +m4_define([AT_MAIN_DEFINE(java)], +[[class input +{ + public static void main (String args[]) throws IOException + { + YYParser p = new YYParser (); + p.parse (); + } +}]]) + ## --------------- ## @@ -437,7 +599,7 @@ void # High-level routine that may call bison several times, under different # conditions. # -# Check Bison by invoking `bison BISON_ARGS'. BISON_ARGS should not contain +# Check Bison by invoking 'bison BISON_ARGS'. BISON_ARGS should not contain # shell constructs (such as redirection or pipes) that would prevent # appending additional command-line arguments for bison. OTHER_AT_CHECK_ARGS # are the usual remaining arguments to AT_CHECK: STATUS, STDOUT, etc. @@ -464,7 +626,7 @@ AT_BISON_CHECK_NO_XML($@)]) # -------------------------------------------------- # Low-level macro to run bison once. m4_define([AT_BISON_CHECK_], -[AT_CHECK(AT_QUELL_VALGRIND[[ bison ]]$@)]) +[AT_CHECK(AT_QUELL_VALGRIND[[ bison -fno-caret ]]$@)]) # AT_BISON_CHECK_WARNINGS(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) @@ -515,7 +677,7 @@ fi]dnl # when a tortured grammar's XML is known to be too large for xsltproc to # handle. m4_define([AT_BISON_CHECK_NO_XML], -[AT_CHECK(m4_null_if([$2], [], [AT_QUELL_VALGRIND ])[[bison ]]$@) +[AT_CHECK(m4_null_if([$2], [], [AT_QUELL_VALGRIND ])[[bison -fno-caret ]]$@) AT_BISON_CHECK_WARNINGS($@)]) # AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) @@ -581,9 +743,7 @@ m4_define([AT_QUELL_VALGRIND], # otherwise pass "-c"; this is a hack. The default SOURCES is OUTPUT # with trailing .o removed, and ".c" appended. m4_define([AT_COMPILE], -[AT_CHECK([case $POSIXLY_CORRECT_IS_EXPORTED:$C_COMPILER_POSIXLY_CORRECT in - true:false) echo 'cannot compile properly with POSIXLY_CORRECT' && exit 77;; -esac]) +[AT_CHECK([$BISON_C_WORKS], 0, ignore, ignore) AT_CHECK(m4_join([ ], [$CC $CFLAGS $CPPFLAGS], [m4_bmatch([$1], [[.]], [-c], [$LDFLAGS])], @@ -611,6 +771,7 @@ AT_CHECK(m4_join([ ], [m4_bmatch([$1], [[.]], [], [$LIBS])]), 0, [ignore], [ignore])]) + # AT_JAVA_COMPILE(SOURCES) # ------------------------ # Compile SOURCES into Java class files. Skip the test if java or javac @@ -622,6 +783,7 @@ AT_SKIP_IF([[test -z "$CONF_JAVA"]]) AT_CHECK([[$SHELL ../../../javacomp.sh ]$1], [[0]], [ignore], [ignore])]) + # AT_LANG_COMPILE(OUTPUT, [SOURCES = OUTPUT.c] # -------------------------------------------- # Compile SOURCES into OUTPUT. Skip if compiler does not work. @@ -629,13 +791,11 @@ AT_CHECK([[$SHELL ../../../javacomp.sh ]$1], # If OUTPUT does not contain '.', assume that we are linking too, # otherwise pass "-c"; this is a hack. The default SOURCES is OUTPUT # with trailing .o removed, and ".c"/".cc" appended. -m4_define([AT_LANG_COMPILE], -[m4_case(AT_LANG, -[c], [AT_COMPILE([$1], [$2])], -[c++], [AT_COMPILE_CXX([$1], [$2])], -[java], [AT_JAVA_COMPILE([$1.java], [$2])], - [m4_fatal([unknown language: ]m4_defn([AT_LANG]))])[]dnl -]) +m4_define([AT_LANG_COMPILE], [AT_LANG_DISPATCH([$0], $@)]) +m4_define([AT_LANG_COMPILE(c)], [AT_COMPILE([$1], [$2])]) +m4_define([AT_LANG_COMPILE(c++)], [AT_COMPILE_CXX([$1], [$2])]) +m4_define([AT_LANG_COMPILE(java)], [AT_JAVA_COMPILE([$1.java], [$2])]) + # AT_FULL_COMPILE(OUTPUT, [OTHER1], [OTHER2]) # ------------------------------------------- @@ -644,30 +804,31 @@ m4_define([AT_LANG_COMPILE], # OUTPUT-OTHER.c, OUTPUT-OTHER.cc, or OUTPUT-OTHER.java to OUTPUT or # OUTPUT.java along with it. Relies on AT_SKEL_CC_IF and # AT_SKEL_JAVA_IF. -m4_define([AT_FULL_COMPILE], -[m4_case(AT_LANG, -[java], - [AT_BISON_CHECK([-o $1.java $1.y]) - AT_LANG_COMPILE([$1], - m4_join([ ], - [$1.java], - m4_ifval($2, [[$1-$2.java]]), - m4_ifval($3, [[$1-$3.java]])))], -[c++], - [AT_BISON_CHECK([-o $1.cc $1.y]) - AT_LANG_COMPILE([$1], - m4_join([ ], - [$1.cc], - m4_ifval($2, [[$1-$2.cc]]), - m4_ifval($3, [[$1-$3.cc]])))], -[c], - [AT_BISON_CHECK([-o $1.c $1.y]) - AT_LANG_COMPILE([$1], - m4_join([ ], - [$1.c], - m4_ifval($2, [[$1-$2.c]]), - m4_ifval($3, [[$1-$3.c]])))]) -]) +m4_define([AT_FULL_COMPILE], [AT_LANG_DISPATCH([$0], $@)]) +m4_define([AT_FULL_COMPILE(c)], +[AT_BISON_CHECK([-o $1.c $1.y]) + AT_LANG_COMPILE([$1], + m4_join([ ], + [$1.c], + m4_ifval($2, [[$1-$2.c]]), + m4_ifval($3, [[$1-$3.c]])))]) + +m4_define([AT_FULL_COMPILE(c++)], +[AT_BISON_CHECK([-o $1.cc $1.y]) + AT_LANG_COMPILE([$1], + m4_join([ ], + [$1.cc], + m4_ifval($2, [[$1-$2.cc]]), + m4_ifval($3, [[$1-$3.cc]])))]) + +m4_define([AT_FULL_COMPILE(java)], +[AT_BISON_CHECK([-o $1.java $1.y]) + AT_LANG_COMPILE([$1], + m4_join([ ], + [$1.java], + m4_ifval($2, [[$1-$2.java]]), + m4_ifval($3, [[$1-$3.java]])))]) + @@ -715,7 +876,7 @@ AT_PARSER_CHECK([./c-and-cxx]) # AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE]) # ------------------------------------------------------------ -# So that we can run `./testsuite PREPARSER='valgrind -q' for instance. +# So that we can run './testsuite PREPARSER='valgrind -q' for instance. # # Get rid of spurious messages when compiled with --coverage: # +profiling:/[...]/lib/fprintf.gcda:Merge mismatch for summaries @@ -757,16 +918,16 @@ m4_define([AT_JAVA_PARSER_CHECK], # that Bison exits with value 0, has no stdout, and has stderr # BISON-STDERR. # -# If TEST-SPEC contains the attribute `last-state', check that the value +# If TEST-SPEC contains the attribute 'last-state', check that the value # of TABLES-OR-LAST-STATE is the index of the last state generated for # the grammar; in other words, check the number of states (minus one). -# Otherwise, check that everything in the `.output' file starting with +# Otherwise, check that everything in the '.output' file starting with # the definition of state 0 is the same as the entire value of # TABLES-OR-LAST-STATE. # # Expand the M4 in OTHER-CHECKS to perform additional checks of the -# `.output' file, which is named `input.output', and/or grammar file, -# which is named `input.y'. +# '.output' file, which is named 'input.output', and/or grammar file, +# which is named 'input.y'. # # Finally, compile the generated parser and then run it using # AT_PARSER_CHECK with PARSER-EXIT-VALUE, PARSER-STDOUT, and @@ -814,7 +975,6 @@ AT_SETUP([$1]) AT_BISON_OPTION_PUSHDEFS([$4]) AT_DATA_GRAMMAR([[input.y]], [[%code { - #include ]AT_YYERROR_DECLARE[ ]AT_YYLEX_DECLARE[ } @@ -837,11 +997,7 @@ yylex (void) return *inputp++; } -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) # In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before @@ -852,7 +1008,7 @@ main (void) m4_if(m4_index(m4_quote($3), [no-xml]), -1, [AT_BISON_CHECK], - [AT_BISON_CHECK_NO_XML])([[--report=all --defines -o input.c input.y]], + [AT_BISON_CHECK_NO_XML])([[-Wall --report=all --defines -o input.c input.y]], [0], [], m4_dquote($7)) m4_if(m4_index(m4_quote($3), [last-state]), -1, @@ -872,8 +1028,8 @@ $9 # There is no "" around `wc` since some indent the result. m4_bmatch([$4], [%define lr.type canonical-lr], [if test 32767 -lt `wc -l < input.c`; then - CFLAGS=`echo " $CFLAGS " | sed -e 's/ -pedantic //'` - CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -pedantic //'` + CFLAGS=`echo " $CFLAGS " | sed -e 's/ -pedantic / /'` + CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -pedantic / /'` fi]) AT_COMPILE([[input]]) @@ -889,12 +1045,20 @@ m4_popdef([AT_COND_CASE])]) + ## ----------------------- ## ## Launch the test suite. ## ## ----------------------- ## AT_INIT +# AT_SETUP([TITLE]) +# ----------------- +# Redefine AT_SETUP to be more concise. Must be done after AT_INIT. +m4_copy_force([AT_SETUP], [B4_SETUP]) +m4_define([AT_SETUP], +[B4_SETUP(m4_expand([AT_SETUP_STRIP([[$1]])]))]) + # Cannot assign CC and CFLAGS here, since atlocal is loaded after # options are processed, so we don't know the value of CXX and # CXXFLAGS yet.