X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c932d6135ca3e508f7136810b9b0bf79725290b9..dfe292c695e1b6dcc7bc7257b59b98be960faff8:/tests/local.at diff --git a/tests/local.at b/tests/local.at index a2aa5687..f43ffde8 100644 --- a/tests/local.at +++ b/tests/local.at @@ -37,6 +37,33 @@ printf "$count\n";' $1], [0], [$3 ])]) +# AT_SAVE_SPECIAL_FILES / AT_RESTORE_SPECIAL_FILES +# ------------------------------------------------ +# Don't interfere with caller's files. +m4_divert_text([PREPARE_TESTS], +[at_save_special_files () +{ + for at_save_file in stderr experr expout + do + test ! -f $at_save_file || mv $at_save_file at-bison-check-$at_save_file.bak + done +} + +at_restore_special_files () +{ + for at_save_file in stderr experr expout + do + test ! -f at-bison-check-$at_save_file.bak || + mv at-bison-check-$at_save_file.bak $at_save_file + done +} +]) + +m4_define([AT_SAVE_SPECIAL_FILES], [at_save_special_files]) +m4_define([AT_RESTORE_SPECIAL_FILES], [at_restore_special_files]) + + + ## ------------------------------- ## ## Macros decoding Bison options. ## ## ------------------------------- ## @@ -71,7 +98,7 @@ m4_define([AT_BISON_OPTION_PUSHDEFS], # -------------------------------------------------- # This macro works around the impossibility to define macros # inside macros, because issuing `[$1]' is not possible in M4 :(. -# This sucks hard, GNU M4 should really provide M5 like $$1. +# 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 @@ -82,7 +109,7 @@ m4_pushdef([AT_SKEL_CC_IF], m4_pushdef([AT_SKEL_JAVA_IF], [m4_bmatch([$3], [%language "[Jj][Aa][Vv][Aa]"\|%skeleton "[a-z0-9]+\.java"], [$1], [$2])]) m4_pushdef([AT_GLR_IF], -[m4_bmatch([$3], [%glr-parser\|%skeleton "glr\.], [$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], @@ -108,39 +135,46 @@ 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])], + [m4_bregexp([$3], [name-prefix "\([^""]*\)"], [\1])], [yy])]) +m4_pushdef([AT_API_PREFIX], +[m4_bmatch([$3], [%define api\.prefix ".*"], + [m4_bregexp([$3], [%define api\.prefix "\([^""]*\)"], [\1])], + [yy])]) +m4_pushdef([AT_TOKEN_PREFIX], +[m4_bmatch([$3], [%define api.tokens.prefix ".*"], + [m4_bregexp([$3], [%define api.tokens.prefix "\(.*\)"], [\1])])]) # 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). 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 %define api.pure, or because we # are using the C++ parsers. m4_pushdef([AT_PURE_LEX_IF], [AT_PURE_IF([$1], - [AT_SKEL_CC_IF([$1], [$2])])]) + [AT_SKEL_CC_IF([$1], [$2])])]) AT_PURE_LEX_IF( [m4_pushdef([AT_LOC], [(*llocp)]) m4_pushdef([AT_VAL], [(*lvalp)]) m4_pushdef([AT_LEX_FORMALS], - [YYSTYPE *lvalp[]AT_LOCATION_IF([, YYLTYPE *llocp])]) + [YYSTYPE *lvalp[]AT_LOCATION_IF([, YYLTYPE *llocp])]) m4_pushdef([AT_LEX_ARGS], - [lvalp[]AT_LOCATION_IF([, llocp])]) + [lvalp[]AT_LOCATION_IF([, llocp])]) m4_pushdef([AT_USE_LEX_ARGS], - [(void) lvalp;AT_LOCATION_IF([(void) llocp])]) + [(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], [[(]AT_NAME_PREFIX[lloc)]]) m4_pushdef([AT_VAL], [[(]AT_NAME_PREFIX[lval)]]) @@ -159,6 +193,8 @@ AT_SKEL_CC_IF( [AT_LOC_PUSHDEF([begin.line], [begin.column], [end.line], [end.column])])], [AT_LOC_PUSHDEF([first_line], [first_column], [last_line], [last_column])]) + +AT_GLR_IF([AT_KEYWORDS([glr])]) ])# _AT_BISON_OPTION_PUSHDEFS @@ -175,6 +211,7 @@ 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_API_PREFIX]) m4_popdef([AT_NAME_PREFIX]) m4_popdef([AT_GLR_OR_PARAM_IF]) m4_popdef([AT_PURE_AND_LOC_IF]) @@ -240,6 +277,70 @@ m4_define([AT_DATA_GRAMMAR], $2]) ]) +# AT_YYLEX_DECLARE_EXTERN +# AT_YYLEX_DECLARE +# AT_YYLEX_DEFINE(INPUT-STRING, [ACTION]) +# --------------------------------------- +m4_define([AT_YYLEX_DECLARE_EXTERN], +[int AT_API_PREFIX[]lex (void);dnl +]) + +m4_define([AT_YYLEX_DECLARE], +[static AT_YYLEX_DECLARE_EXTERN[]dnl +]) + +m4_define([AT_YYLEX_DEFINE], +[[#include /* abort */ +static int +]AT_API_PREFIX[lex (void) +{ + static char const input[] = "$1"; + static size_t toknum = 0; + int res; + if (! (toknum < sizeof input)) + abort (); + res = input[toknum++]; + ]$2;[]AT_LOCATION_IF([[ + ]AT_API_PREFIX[lloc.first_line = ]AT_API_PREFIX[lloc.last_line = 1; + ]AT_API_PREFIX[lloc.first_column = ]AT_API_PREFIX[lloc.last_column = toknum;]])[ + return res; +}]dnl +]) + +# AT_YYERROR_DECLARE_EXTERN +# AT_YYERROR_DECLARE +# AT_YYERROR_DEFINE +# ------------------------- +# Beware that must be called inside a AT_BISON_OPTION_PUSHDEFS/POPDEFS +# pair. +m4_define([AT_YYERROR_DECLARE_EXTERN], +[void AT_API_PREFIX[]error (const char *msg);dnl +]) + +m4_define([AT_YYERROR_DECLARE], +[static AT_YYERROR_DECLARE_EXTERN[]dnl +]) + +m4_define([AT_YYERROR_DEFINE], +[AT_SKEL_JAVA_IF([[public void yyerror (String msg) +{ + System.err.println (msg); +}]], [AT_SKEL_CC_IF([[void +yy::parser::error (]AT_LOCATION_IF([[const yy::location &, ]])[std::string const &msg) +{ + std::cerr << msg << std::endl; +}]], [[#include +static void +]AT_API_PREFIX[error (char const *msg) +{ + fprintf (stderr, "%s\n", msg); +}]])])dnl +]) + +## --------------- ## +## Running Bison. ## +## --------------- ## + # AT_BISON_CHECK(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # ------------------------------------------------- # Check Bison by invoking `bison BISON_ARGS'. BISON_ARGS should not contain @@ -279,13 +380,11 @@ m4_define([AT_BISON_CHECK_NO_XML], [AT_QUELL_VALGRIND ])[[bison ]]$@) m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], m4_quote(m4_if(m4_quote($2), [], [0], [$2])), [0], [[ - # POSIXLY_CORRECT=1 causes bison to complain if options are added - # after the grammar file name, so skip these checks in that case. - if test x"$POSIXLY_CORRECT" != x1; then - # Don't interfere with caller's files. - if test -f stderr; then mv stderr at-bison-check-stderr.bak; fi - if test -f experr; then mv experr at-bison-check-experr.bak; fi - if test -f expout; then mv expout at-bison-check-expout.bak; fi + # Defining POSIXLY_CORRECT causes bison to complain if options + # are added after the grammar file name, so skip these checks + # in that case. + if test -z "${POSIXLY_CORRECT+set}"; then + ]AT_SAVE_SPECIAL_FILES[ # To avoid expanding it repeatedly, store specified stdout. ]AT_DATA([expout], [$3])[ @@ -297,14 +396,12 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], # Build expected stderr up to and including the "warnings being # treated as errors" message. ]AT_DATA([[at-bison-check-warnings]], [$4])[ - at_bison_check_first="` \ - sed -n '/: warning: /=' at-bison-check-warnings \ - | sed -n 1p \ - `" - at_bison_check_first_tmp="` \ - sed -n '/conflicts: [0-9].*reduce$/=' at-bison-check-warnings \ - | sed -n 1p \ - `" + at_bison_check_first=`sed -n \ + '/: warning: /{=;q;}' at-bison-check-warnings` + : ${at_bison_check_first:=1} + at_bison_check_first_tmp=`sed -n \ + '/conflicts: [0-9].*reduce$/{=;q;}' at-bison-check-warnings` + : ${at_bison_check_first_tmp:=1} if test $at_bison_check_first_tmp -lt $at_bison_check_first; then at_bison_check_first=$at_bison_check_first_tmp fi @@ -318,11 +415,9 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], # complaints cause bison to exit early. Thus, with -Werror, bison # does not necessarily report all warnings that it does without # -Werror, but it at least reports one. - at_bison_check_last="`sed -n '$=' stderr`" - if test x"$at_bison_check_last" = x; then - at_bison_check_last=1 - fi - at_bison_check_last="`expr $at_bison_check_last - 1`" + at_bison_check_last=`sed -n '$=' stderr` + : ${at_bison_check_last:=1} + at_bison_check_last=`expr $at_bison_check_last - 1` sed -n "$at_bison_check_first,$at_bison_check_last"p \ at-bison-check-warnings >> experr ]AT_CHECK([[sed 's,.*/\(]AT_BISON_WERROR_MSG[\)$,\1,' \ @@ -341,16 +436,7 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=none \ -Werror]], [[0]], [expout])[ - # Restore caller's files. - if test -f at-bison-check-expout.bak; then - mv at-bison-check-expout.bak expout - fi - if test -f at-bison-check-experr.bak; then - mv at-bison-check-experr.bak experr - fi - if test -f at-bison-check-stderr.bak; then - mv at-bison-check-stderr.bak stderr - fi + ]AT_RESTORE_SPECIAL_FILES[ fi ]]) ]) @@ -361,8 +447,9 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], # defined. It doesn't make sense to invoke this macro if Bison is expected to # have a non-zero exit status. m4_define([AT_BISON_CHECK_XML], -[[if test x"$BISON_TEST_XML" = x1 && test x"$XSLTPROC" != x""; then - mkdir xml-tests] +[[if test x"$BISON_TEST_XML" = x1 && test x"$XSLTPROC" != x""; then] + AT_SAVE_SPECIAL_FILES + [mkdir xml-tests] m4_pushdef([AT_BISON_ARGS], [m4_bpatsubsts([[$1]], [--report(-file)?=[^][ ]*], [], @@ -384,8 +471,9 @@ m4_define([AT_BISON_CHECK_XML], AT_CHECK([[$XSLTPROC \ `]]AT_QUELL_VALGRIND[[ bison --print-datadir`/xslt/xml2dot.xsl \ xml-tests/test.xml]], [[0]], [expout]) - [rm -rf xml-tests expout -fi]]) + [rm -rf xml-tests expout] + AT_RESTORE_SPECIAL_FILES +[fi]]) # AT_QUELL_VALGRIND # ----------------- @@ -412,7 +500,7 @@ m4_define([AT_QUELL_VALGRIND], # assume that we are linking too; this is a hack. m4_define([AT_COMPILE], [AT_CHECK([$CC $CFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.c])[]m4_bmatch([$1], [[.]], [], [ $LIBS])], - 0, [ignore], [ignore])]) + 0, [ignore], [ignore])]) # AT_COMPILE_CXX(OUTPUT, [SOURCES = OUTPUT.cc]) # -------------------------------------------- @@ -423,7 +511,7 @@ m4_define([AT_COMPILE_CXX], [AT_KEYWORDS(c++) AT_CHECK([$BISON_CXX_WORKS], 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])]) + 0, [ignore], [ignore])]) # AT_JAVA_COMPILE(SOURCES) # ------------------------ @@ -436,8 +524,8 @@ AT_CHECK([[test -n "$CONF_JAVA" || exit 77 AT_CHECK([[$SHELL ../../../javacomp.sh ]$1], [[0]], [ignore], [ignore])]) -# AT_FULL_COMPILE(OUTPUT, [OTHER]) -# -------------------------------- +# AT_FULL_COMPILE(OUTPUT, [OTHER1], [OTHER2]) +# ------------------------------------------- # Compile OUTPUT.y to OUTPUT.c, OUTPUT.cc, or OUTPUT.java, and then # compile it to OUTPUT or OUTPUT.class. If OTHER is specified, compile # OUTPUT-OTHER.c, OUTPUT-OTHER.cc, or OUTPUT-OTHER.java to OUTPUT or @@ -445,16 +533,27 @@ AT_CHECK([[$SHELL ../../../javacomp.sh ]$1], # AT_SKEL_JAVA_IF. m4_define([AT_FULL_COMPILE], [ AT_SKEL_JAVA_IF([ - AT_BISON_CHECK([[-o ]$1[.java ]$1[.y]]) - AT_JAVA_COMPILE([$1[.java]]m4_ifval($2, - [[$1[.java ]$1[-]$2[.java]]])) + AT_BISON_CHECK([-o $1.java $1.y]) + AT_JAVA_COMPILE([$1.java], + m4_join([ ], + [$1.java], + m4_ifval($2, [[$1-$2.java]]), + m4_ifval($3, [[$1-$3.java]]))) ], [ AT_SKEL_CC_IF([ - AT_BISON_CHECK([[-o ]$1[.cc ]$1[.y]]) - AT_COMPILE_CXX([$1]m4_ifval($2, [, [$1[.cc ]$1[-]$2[.cc]]])) + AT_BISON_CHECK([-o $1.cc $1.y]) + AT_COMPILE_CXX([$1], + m4_join([ ], + [$1.cc], + m4_ifval($2, [[$1-$2.cc]]), + m4_ifval($3, [[$1-$3.cc]]))) ], [ - AT_BISON_CHECK([[-o ]$1[.c ]$1[.y]]) - AT_COMPILE([$1]m4_ifval($2, [, [$1[.c ]$1[-]$2[.c]]])) + AT_BISON_CHECK([-o $1.c $1.y]) + AT_COMPILE([$1], + m4_join([ ], + [$1.c], + m4_ifval($2, [[$1-$2.c]]), + m4_ifval($3, [[$1-$3.c]]))) ]) ]) ]) @@ -464,17 +563,26 @@ m4_define([AT_FULL_COMPILE], [ ## Running a generated parser. ## ## ---------------------------- ## + # AT_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE]) # ------------------------------------------------------------ # 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 m4_define([AT_PARSER_CHECK], -[AT_CHECK([$5 $PREPARSER $1], [$2], [$3], [$4])]) +[AT_CHECK([$5 $PREPARSER $1], [$2], [$3], [stderr]) +AT_CHECK([sed >&2 -e '/^profiling:.*:Merge mismatch for summaries/d' stderr], + [0], [], [$4]) +]) + # AT_JAVA_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE]) # ----------------------------------------------------------------- m4_define([AT_JAVA_PARSER_CHECK], [AT_CHECK([$5[ $SHELL ../../../javaexec.sh ]$1], [$2], [$3], [$4])]) + # AT_TEST_TABLES_AND_PARSE(TITLE, COND-VALUE, TEST-SPEC, # DECLS, GRAMMAR, INPUT, # BISON-STDERR, TABLES-OR-LAST-STATE, @@ -554,12 +662,12 @@ m4_define([AT_TEST_TABLES_AND_PARSE], [m4_pushdef([AT_COND_CASE], [m4_case([$2], $][@)]) AT_SETUP([$1]) - +AT_BISON_OPTION_PUSHDEFS([$4]) AT_DATA_GRAMMAR([[input.y]], [[%code { #include - static void yyerror (char const *msg); - static int yylex (void); + ]AT_YYERROR_DECLARE[ + ]AT_YYLEX_DECLARE[ } ]$4[ @@ -569,13 +677,7 @@ AT_DATA_GRAMMAR([[input.y]], ]$5[ %% - -static void -yyerror (char const *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ static int yylex (void) { @@ -596,7 +698,7 @@ main (void) # In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before # expanding macros, so it corrupts some special characters in the # macros. To avoid this, expand now and pass it the result with proper -# string quotation. Assume args 7 thru 12 expand to properly quoted +# string quotation. Assume args 7 through 12 expand to properly quoted # strings. m4_if(m4_index(m4_quote($3), [no-xml]), -1, @@ -613,6 +715,17 @@ m4_if(m4_index(m4_quote($3), [last-state]), -1, $9 +# Canonical LR generates very large tables, resulting in very long +# files with #line directives that may overflow what the standards +# (C90 and C++98) guarantee: 32767. In that case, GCC's -pedantic +# will issue an error. +# +# 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 //'` +fi]) AT_COMPILE([[input]]) AT_PARSER_CHECK([[./input]], @@ -620,6 +733,7 @@ AT_PARSER_CHECK([[./input]], m4_ifval([$11], [m4_dquote($11)]), m4_ifval([$12], [m4_dquote($12)])) +AT_BISON_OPTION_POPDEFS AT_CLEANUP m4_popdef([AT_COND_CASE])]) @@ -632,4 +746,15 @@ m4_popdef([AT_COND_CASE])]) AT_INIT +# 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. +# +# Note that it also means that command line values for CXX and +# CXXFLAGS will not be propagated to CC and CFLAGS. +AT_ARG_OPTION([compile-c-with-cxx], + [compile C parsers with the C++ compiler]) + +AT_COLOR_TESTS + AT_TESTED([bison])