X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a32a2d57a5d931ad1e30d180f9d40b482b674593..a1d1ab50a00a4d28d6ba7b227ddc6628d5734ce3:/tests/local.at?ds=inline diff --git a/tests/local.at b/tests/local.at index 5a5bbdd0..73680c73 100644 --- a/tests/local.at +++ b/tests/local.at @@ -20,6 +20,15 @@ m4_version_prereq([2.58]) +# m4_null_if(VAL, IF-TRUE, IF-FALSE) +# ---------------------------------- +# If VAL evaluates to empty or 0, run IF-TRUE, otherwise IF-FALSE. +m4_define([m4_null_if], +[m4_case(m4_quote($1), + [0], [$2], + [], [$2], + [$3])]) + ## ------------- ## ## Basic tests. ## ## ------------- ## @@ -29,7 +38,7 @@ m4_version_prereq([2.58]) # Expect COUNT matches of the PERL-REGEXP in FILE. The file is # taken in "slurp" mode, i.e., one can match end-of-lines. m4_define([AT_MATCHES_CHECK], -[AT_CHECK([perl -0777 -ne ' +[AT_CHECK([$PERL -0777 -ne ' my $count = 0; s{$2}{ ++$count; "" }gem; printf "$count\n";' $1], [0], [$3 @@ -44,6 +53,8 @@ m4_divert_text([PREPARE_TESTS], { for at_save_file in stderr experr expout do + test ! -f at-bison-check-$at_save_file.bak || + as_fn_error 1 "fatal error: back-up on top of a back-up" test ! -f $at_save_file || mv $at_save_file at-bison-check-$at_save_file.bak done } @@ -108,6 +119,7 @@ m4_pushdef([AT_SKEL_CC_IF], [m4_bmatch([$3], [%language "[Cc]\+\+"\|%skeleton "[a-z0-9]+\.cc"], [$1], [$2])]) m4_pushdef([AT_SKEL_JAVA_IF], [m4_bmatch([$3], [%language "[Jj][Aa][Vv][Aa]"\|%skeleton "[a-z0-9]+\.java"], [$1], [$2])]) +# The target language: "c", "c++", or "java". m4_pushdef([AT_LANG], [AT_SKEL_JAVA_IF([java], [AT_SKEL_CC_IF([c++], @@ -129,6 +141,12 @@ m4_pushdef([AT_LOCATION_TYPE_IF], [m4_bmatch([$3], [%define location_type], [$1], [$2])]) m4_pushdef([AT_PARAM_IF], [m4_bmatch([$3], [%parse-param], [$1], [$2])]) +# Comma-terminated list of formals parse-parameters. +# E.g., %parse-param { int x } {int y} -> "int x, int y, ". +m4_pushdef([AT_PARSE_PARAMS]) +m4_bpatsubst([$3], [%parse-param { *\([^{}]*[^{} ]\) *}], + [m4_append([AT_PARSE_PARAMS], [\1, ])]) + m4_pushdef([AT_PURE_IF], [m4_bmatch([$3], [%define *api\.pure\|%pure-parser], [m4_bmatch([$3], [%define *api\.pure *"?false"?], [$2], [$1])], @@ -145,6 +163,8 @@ m4_pushdef([AT_API_prefix], [m4_bmatch([$3], [%define api\.prefix ".*"], [m4_bregexp([$3], [%define api\.prefix "\([^""]*\)"], [\1])], [yy])]) +m4_pushdef([AT_API_PREFIX], +[m4_toupper(AT_API_prefix)]) # 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])], @@ -165,10 +185,10 @@ m4_pushdef([AT_PURE_LEX_IF], m4_pushdef([AT_YYSTYPE], [AT_SKEL_CC_IF([AT_NAME_PREFIX[::parser::semantic_type]], - [[YYSTYPE]])]) + [AT_API_PREFIX[STYPE]])]) m4_pushdef([AT_YYLTYPE], [AT_SKEL_CC_IF([AT_NAME_PREFIX[::parser::location_type]], - [[YYLTYPE]])]) + [AT_API_PREFIX[LTYPE]])]) AT_PURE_LEX_IF( @@ -221,12 +241,14 @@ 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_API_prefix]) m4_popdef([AT_NAME_PREFIX]) m4_popdef([AT_GLR_OR_PARAM_IF]) m4_popdef([AT_PURE_AND_LOC_IF]) m4_popdef([AT_LOCATION_TYPE_IF]) m4_popdef([AT_LOCATION_IF]) +m4_popdef([AT_PARSE_PARAMS]) m4_popdef([AT_PARAM_IF]) m4_popdef([AT_LEXPARAM_IF]) m4_popdef([AT_YACC_IF]) @@ -291,8 +313,11 @@ $2]) # AT_YYLEX_PROTOTYPE # AT_YYLEX_DECLARE_EXTERN # AT_YYLEX_DECLARE -# AT_YYLEX_DEFINE(INPUT-STRING, [ACTION]) -# --------------------------------------- +# AT_YYLEX_DEFINE([INPUT], [ACTION]) +# ---------------------------------- +# INPUT can be empty, or in double quotes, or a list (in braces). +# ACTION may compute yylval for instance, using "res" as token type, +# and "toknum" as the number of calls to yylex (starting at 0). m4_define([AT_YYLEX_PROTOTYPE], [int AT_NAME_PREFIX[]lex (]AT_YYLEX_FORMALS[)[]dnl ]) @@ -310,11 +335,13 @@ m4_define([AT_YYLEX_DEFINE], static ]AT_YYLEX_PROTOTYPE[ { - static char const input[] = "$1"; + ]m4_bmatch([$1], [^\(".*"\)?$], + [[static char const input[] = ]m4_default([$1], [""])], + [[static int const input[] = ]$1])[; static size_t toknum = 0; int res; ]AT_USE_LEX_ARGS[; - assert (toknum < sizeof input); + assert (toknum < sizeof input / sizeof input[0]); res = input[toknum++]; ]$2[;]AT_LOCATION_IF([[ ]AT_LOC_FIRST_LINE[ = ]AT_LOC_LAST_LINE[ = 1; @@ -331,7 +358,7 @@ static # 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([YYLTYPE *llocp, ])[const char *msg]])[]dnl +[c], [AT_YYERROR_ARG_LOC_IF([AT_YYLTYPE *llocp, ])AT_PARSE_PARAMS [const char *msg]])[]dnl ]) m4_define([AT_YYERROR_PROTOTYPE], @@ -355,16 +382,11 @@ m4_define([AT_YYERROR_DEFINE], /* A C error reporting function. */ static ]AT_YYERROR_PROTOTYPE[ -{ -]AT_YYERROR_SEES_LOC_IF([[ - fprintf (stderr, "%d.%d", - ]AT_LOC_FIRST_LINE[, ]AT_LOC_FIRST_COLUMN[); - if (]AT_LOC_FIRST_LINE[ != ]AT_LOC_LAST_LINE[) - fprintf (stderr, "-%d.%d", - ]AT_LOC_LAST_LINE[, ]AT_LOC_LAST_COLUMN[ - 1); - else if (]AT_LOC_FIRST_COLUMN[ != ]AT_LOC_LAST_COLUMN[ - 1) - fprintf (stderr, "-%d", - ]AT_LOC_LAST_COLUMN[ - 1); +{]m4_bpatsubst(m4_defn([AT_PARSE_PARAMS]), + [[^,]+[^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[); fprintf (stderr, ": ");]])[ fprintf (stderr, "%s\n", msg); }]], @@ -386,7 +408,8 @@ void public void yyerror (String s) { System.err.println (s); - }]])])dnl + }]])], +[m4_fatal([$0: invalid language: ]AT_LANG)])dnl ]) @@ -396,6 +419,9 @@ void # AT_BISON_CHECK(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # ------------------------------------------------- +# High-level routine that may call bison several times, under different +# conditions. +# # 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 @@ -416,83 +442,97 @@ void # # 4. If stderr contains a warning, -Wnone and --warnings=none suppress it. m4_define([AT_BISON_CHECK], -[m4_if(m4_quote($2), [0], [AT_BISON_CHECK_XML($@)], - m4_quote($2), [], [AT_BISON_CHECK_XML($@)]) +[m4_null_if([$2], [AT_BISON_CHECK_XML($@)]) AT_BISON_CHECK_NO_XML($@)]) m4_define([AT_BISON_WERROR_MSG], [[bison: warnings being treated as errors]]) + +# AT_BISON_CHECK_(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) +# -------------------------------------------------- +# Low-level macro to run bison once. +m4_define([AT_BISON_CHECK_], +[AT_CHECK(AT_QUELL_VALGRIND[[ bison ]]$@)]) + + +# AT_BISON_CHECK_WARNINGS(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) +# ---------------------------------------------------------- +# Check that warnings (if some are expected) are correctly +# turned into errors with -Werror, etc. +m4_define([AT_BISON_CHECK_WARNINGS], +[m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], + [m4_null_if([$2], [AT_BISON_CHECK_WARNINGS_($@)])])]) + +m4_define([AT_BISON_CHECK_WARNINGS_], +[[# Defining POSIXLY_CORRECT causes bison to complain if options are +# added after the grammar file name, so skip these checks in that +# case. +# +# Don't just check if $POSIXLY_CORRECT is set, as Bash, when launched +# as /bin/sh, sets the shell variable POSIXLY_CORRECT to y, but not +# the environment variable. +if env | grep '^POSIXLY_CORRECT=' >/dev/null; then :; else + ]AT_SAVE_SPECIAL_FILES[ + + # To avoid expanding it repeatedly, store specified stdout. + ]AT_DATA([expout], [$3])[ + + # Run with -Werror. + ]AT_BISON_CHECK_([$1[ -Werror]], [[1]], [expout], [stderr])[ + + # 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: /{=;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 + if test $at_bison_check_first -gt 1; then + sed -n "1,`expr $at_bison_check_first - 1`"p \ + at-bison-check-warnings > experr + fi + echo ']AT_BISON_WERROR_MSG[' >> experr + + # Finish building expected stderr and check. Unlike warnings, + # 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` + : ${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,' \ + stderr 1>&2]], [[0]], [[]], [experr])[ + + # Now check --warnings=error. + cp stderr experr + ]AT_BISON_CHECK_([$1[ --warnings=error]], [[1]], [expout], [experr])[ + + # Now check -Wnone and --warnings=none by making sure that + # -Werror doesn't change the exit status when -Wnone or + # --warnings=none is specified. + ]AT_BISON_CHECK_([$1[ -Wnone -Werror]], [[0]], [expout])[ + ]AT_BISON_CHECK_([$1[ --warnings=none -Werror]], [[0]], [expout])[ + + ]AT_RESTORE_SPECIAL_FILES[ +fi]dnl +]) + # AT_BISON_CHECK_NO_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # -------------------------------------------------------- # Same as AT_BISON_CHECK except don't perform XML/XSLT checks. This is useful # 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_if(m4_quote($2), [0], [], m4_quote($2), [], [], - [AT_QUELL_VALGRIND ])[[bison ]]$@) -m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], - m4_quote(m4_if(m4_quote($2), [], [0], [$2])), [0], [[ - # 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])[ - - # Run with -Werror. - ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Werror]], - [[1]], [expout], [stderr])[ - - # 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: /{=;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 - if test $at_bison_check_first -gt 1; then - sed -n "1,`expr $at_bison_check_first - 1`"p \ - at-bison-check-warnings > experr - fi - echo ']AT_BISON_WERROR_MSG[' >> experr - - # Finish building expected stderr and check. Unlike warnings, - # 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` - : ${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,' \ - stderr 1>&2]], [[0]], [[]], [experr])[ - - # Now check --warnings=error. - cp stderr experr - ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=error]], - [[1]], [expout], [experr])[ - - # Now check -Wnone and --warnings=none by making sure that - # -Werror doesn't change the exit status when -Wnone or - # --warnings=none is specified. - ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ -Wnone -Werror]], - [[0]], [expout])[ - ]AT_CHECK(AT_QUELL_VALGRIND[[ bison ]$1[ --warnings=none \ - -Werror]], [[0]], [expout])[ - - ]AT_RESTORE_SPECIAL_FILES[ - fi - ]]) -]) +[AT_CHECK(m4_null_if([$2], [], [AT_QUELL_VALGRIND ])[[bison ]]$@) +AT_BISON_CHECK_WARNINGS($@)]) # AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # ----------------------------------------------------- @@ -510,11 +550,11 @@ m4_define([AT_BISON_CHECK_XML], [--xml=[^][ ]*], [])])dnl # Don't combine these Bison invocations since we want to be sure that # --report=all isn't required to get the full XML file. - AT_CHECK([[bison --report=all --report-file=xml-tests/test.output \ - --graph=xml-tests/test.dot ]]AT_BISON_ARGS, - [[0]], [ignore], [ignore]) - AT_CHECK([[bison --xml=xml-tests/test.xml ]]AT_BISON_ARGS, - [[0]], [ignore], [ignore]) + AT_BISON_CHECK_([[--report=all --report-file=xml-tests/test.output \ + --graph=xml-tests/test.dot ]]AT_BISON_ARGS, + [[0]], [ignore], [ignore]) + AT_BISON_CHECK_([[--xml=xml-tests/test.xml ]]AT_BISON_ARGS, + [[0]], [ignore], [ignore]) m4_popdef([AT_BISON_ARGS])dnl [cp xml-tests/test.output expout] AT_CHECK([[$XSLTPROC \ @@ -542,6 +582,8 @@ m4_define([AT_BISON_CHECK_XML], m4_define([AT_QUELL_VALGRIND], [[[VALGRIND_OPTS="$VALGRIND_OPTS --leak-check=summary --show-reachable=no"; export VALGRIND_OPTS;]]]) + + ## ------------------------ ## ## Compiling C, C++ Files. ## ## ------------------------ ## @@ -588,7 +630,8 @@ AT_CHECK(m4_join([ ], # is not installed. m4_define([AT_JAVA_COMPILE], [AT_KEYWORDS(java) -AT_SKIP_IF([[test -z "$CONF_JAVA$CONF_JAVAC"]]) +AT_SKIP_IF([[test -z "$CONF_JAVAC"]]) +AT_SKIP_IF([[test -z "$CONF_JAVA"]]) AT_CHECK([[$SHELL ../../../javacomp.sh ]$1], [[0]], [ignore], [ignore])])