# Macros for the GNU Bison Test suite.
-# Copyright (C) 2003-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 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
# 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)]])
# AT_BISON_CHECK(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
# -------------------------------------------------
-# Check Bison by invoking `bison BISON_ARGS'. OTHER_AT_CHECK_ARGS are the
-# usual remaining arguments to AT_CHECK: STATUS, STDOUT, etc.
+# 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.
#
# This macro or AT_BISON_CHECK_NO_XML should always be used whenever invoking
# Bison in the test suite. For now it ensures that:
#
# 3. If stderr contains a warning, -Werror and --warnings=error
# convert the warning to an error.
+#
+# 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($@)])
[AT_CHECK(m4_if(m4_quote($2), [0], [], m4_quote($2), [], [],
[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
- ]])
- ])
+ 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
+
+ # 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: /=' 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 \
+ `"
+ 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`"
+ 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 ]$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])[
+
+ # 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
+ fi
+ ]])
])
# AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
# 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])
# --------------------------------------------
[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)
# ------------------------
projects / bison.git / blobdiff