X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1462fcee1ed295b24f47758b370068aa6304bb41..d815ec4a6290e18fac9220438622f6dd27b3227f:/tests/local.at diff --git a/tests/local.at b/tests/local.at index 8cd21cee..9ccc2c53 100644 --- a/tests/local.at +++ b/tests/local.at @@ -1,7 +1,8 @@ # Process this -*- Autotest -*- file with autom4te. # Macros for the GNU Bison Test suite. -# Copyright (C) 2003-2010 Free Software Foundation, Inc. + +# Copyright (C) 2003-2011 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 @@ -40,6 +41,25 @@ printf "$count\n";' $1], [0], [$3 ## Macros decoding Bison options. ## ## ------------------------------- ## +# AT_LOC_PUSHDEF(FIRST-LINE, FIRST-COLUMN, LAST-LINE, LAST-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])]) + +# AT_LOC_POPDEF +# ------------- +# Popdef AT_LOC_(FIRST|LAST)_(LINE|COL). +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])]) + + # AT_BISON_OPTION_PUSHDEFS([BISON-OPTIONS]) # ----------------------------------------- @@ -59,6 +79,8 @@ m4_pushdef([AT_DEFINES_IF], [m4_bmatch([$3], [%defines], [$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], +[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_pushdef([AT_LALR1_CC_IF], @@ -70,10 +92,12 @@ m4_pushdef([AT_YACC_IF], [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], [m4_bmatch([$3], [%locations], [$1], [$2])]) +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])]) m4_pushdef([AT_PURE_IF], [m4_bmatch([$3], [%define *api\.pure\|%pure-parser], [m4_bmatch([$3], [%define *api\.pure *"?false"?], [$2], [$1])], @@ -126,6 +150,15 @@ AT_PURE_LEX_IF( m4_pushdef([AT_LEX_PRE_FORMALS], []) m4_pushdef([AT_LEX_PRE_ARGS], []) ]) + +# Handle the different types of location components. + +AT_SKEL_CC_IF( + [AT_LOCATION_TYPE_IF( + [AT_LOC_PUSHDEF([first.l], [first.c], [last.l], [last.c])], + [AT_LOC_PUSHDEF([begin.line], [begin.column], [end.line], [end.column])])], + [AT_LOC_PUSHDEF([first_line], [first_column], [last_line], [last_column])]) + ])# _AT_BISON_OPTION_PUSHDEFS @@ -145,15 +178,18 @@ 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_TYPE_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_SKEL_JAVA_IF]) m4_popdef([AT_GLR_CC_IF]) m4_popdef([AT_LALR1_CC_IF]) m4_popdef([AT_DEFINES_IF]) +AT_LOC_POPDEF ])# AT_BISON_OPTION_POPDEFS @@ -218,11 +254,17 @@ $2]) # # 2. In the case of maintainer-xml-check, XML/XSLT output is compared with # --graph and --report=all output for every working grammar. +# +# 3. If stderr contains a warning, -Werror and --warnings=error +# convert the warning to an error. m4_define([AT_BISON_CHECK], [m4_if(m4_quote($2), [0], [AT_BISON_CHECK_XML($@)], m4_quote($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_NO_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # -------------------------------------------------------- # Same as AT_BISON_CHECK except don't perform XML/XSLT checks. This is useful @@ -230,7 +272,64 @@ AT_BISON_CHECK_NO_XML($@)]) # handle. m4_define([AT_BISON_CHECK_NO_XML], [AT_CHECK(m4_if(m4_quote($2), [0], [], m4_quote($2), [], [], - [AT_QUELL_VALGRIND ])[[bison ]]$@)]) + [AT_QUELL_VALGRIND ])[[bison ]]$@) +m4_if(m4_bregexp([$4], [: warning: ]), [-1], [], + [m4_if(m4_quote(m4_if(m4_quote($2), [], [0], [$2])), [0], + [[# 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 + + # Run with -Werror. + ]AT_CHECK(AT_QUELL_VALGRIND[[ bison -Werror ]$1], + [[1]], [$3], [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: /=' at-bison-check-warnings \ + | sed -n 1p \ + `" + 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`" + 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`" + 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 --warnings=error ]$1], + [[1]], [$3], [experr])[ + + # Restore caller's files. + 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_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS]) # ----------------------------------------------------- @@ -302,19 +401,38 @@ 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])]) +# AT_JAVA_COMPILE(SOURCES) +# ------------------------ +# Compile SOURCES into Java class files. Skip the test if java or javac +# is not installed. +m4_define([AT_JAVA_COMPILE], +[AT_KEYWORDS(java) +AT_CHECK([[test -n "$CONF_JAVA" || exit 77 + test -n "$CONF_JAVAC" || exit 77]]) +AT_CHECK([[$SHELL ../../../javacomp.sh ]$1], + [[0]], [ignore], [ignore])]) # AT_FULL_COMPILE(OUTPUT, [OTHER]) # -------------------------------- -# Compile OUTPUT.y to OUTPUT.c or OUTPUT.cc, and compile it to OUTPUT. -# If OTHER is specified, compile OUTPUT-OTHER.c or OUTPUT-OTHER.cc to OUTPUT -# along with it. -# Relies on AT_SKEL_CC_IF. -m4_define([AT_FULL_COMPILE], -[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.c $1.y]) - AT_COMPILE([$1]m4_ifval($2, [, [$1.c $1-$2.c]]))]) +# 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 +# OUTPUT.java along with it. Relies on AT_SKEL_CC_IF and +# 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_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[.c ]$1[.y]]) + AT_COMPILE([$1]m4_ifval($2, [, [$1[.c ]$1[-]$2[.c]]])) + ]) + ]) ]) @@ -328,6 +446,11 @@ m4_define([AT_FULL_COMPILE], m4_define([AT_PARSER_CHECK], [AT_CHECK([$5 $PREPARSER $1], [$2], [$3], [$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,