X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7254f6a84048d56da7b004c2934613f7f9de391a..95aed8db15a0bb0f7819bf77586d0cf6812ffdfd:/tests/local.at?ds=sidebyside
diff --git a/tests/local.at b/tests/local.at
index bfd573a4..d3b245c2 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -1,8 +1,9 @@
# Process this -*- Autotest -*- file with autom4te.
# Macros for the GNU Bison Test suite.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -41,6 +42,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])
# -----------------------------------------
@@ -71,13 +91,15 @@ 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])],
+ [m4_bmatch([$3], [%define *api\.pure *"?false"?], [$2], [$1])],
[$2])])
m4_pushdef([AT_PURE_AND_LOC_IF],
[m4_bmatch([$3], [%locations], [AT_PURE_IF($@)], [$2])])
@@ -88,8 +110,8 @@ m4_pushdef([AT_NAME_PREFIX],
[m4_bregexp([$3], [name-prefix "\([^"]*\)"], [\1])],
[yy])])
m4_pushdef([AT_TOKEN_PREFIX],
-[m4_bmatch([$3], [%define token.prefix ".*"],
- [m4_bregexp([$3], [%define token.prefix "\(.*\)"], [\1])])])
+[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])],
@@ -130,6 +152,16 @@ 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_GLR_IF([AT_KEYWORDS([glr])])
])# _AT_BISON_OPTION_PUSHDEFS
@@ -150,6 +182,7 @@ 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])
@@ -159,6 +192,7 @@ m4_popdef([AT_SKEL_CC_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
@@ -223,11 +257,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
@@ -235,7 +275,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])
# -----------------------------------------------------
@@ -409,12 +506,9 @@ m4_define([AT_PARSER_CHECK],
# [[syntax error, unexpected 'b', expecting $end
# ]])])
m4_define([AT_TEST_TABLES_AND_PARSE],
-[_AT_TEST_TABLES_AND_PARSE($[1], $[@], $@)])
-
-m4_define([_AT_TEST_TABLES_AND_PARSE],
-[m4_pushdef([AT_COND_CASE], [m4_case([$4], $][@)])
+[m4_pushdef([AT_COND_CASE], [m4_case([$2], $][@)])
-AT_SETUP([$3])
+AT_SETUP([$1])
AT_DATA_GRAMMAR([[input.y]],
[[%code {
@@ -423,11 +517,11 @@ AT_DATA_GRAMMAR([[input.y]],
static int yylex (void);
}
-]$6[
+]$4[
%%
-]$7[
+]$5[
%%
@@ -441,7 +535,7 @@ static int
yylex (void)
{
static int const input[] = {
- ]m4_if([$8], [], [], [$8], [[]], [], [$8[, ]])[0
+ ]m4_if([$6], [], [], [$6], [[]], [], [$6[, ]])[0
};
static int const *inputp = input;
return *inputp++;
@@ -454,40 +548,32 @@ main (void)
}
]])
-# 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 9 thru 14 expand to
-# properly quoted strings.
+# 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
+# strings.
-# Pass plenty of options, to exercise plenty of code, even if we
-# don't actually check the output. But SEGV is watching us, and
-# so might do dmalloc.
-m4_if(m4_index(m4_quote($5), [no-xml]), -1,
+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]],
- [0], [], m4_dquote($9))
+ [0], [], m4_dquote($7))
-# Sigh. Some M4's can't reference arg 10 directly.
-m4_pushdef([arg10], m4_car(m4_shiftn(9, $@)))
-m4_if(m4_index(m4_quote($5), [last-state]), -1,
+m4_if(m4_index(m4_quote($3), [last-state]), -1,
[AT_CHECK([[sed -n '/^state 0$/,$p' input.output]], [[0]],
- m4_dquote(arg10))],
+ m4_dquote($8))],
[AT_CHECK([[sed -n 's/^state //p' input.output | tail -1]], [[0]],
- m4_dquote(arg10)[[
+ m4_dquote($8)[[
]])])
-m4_popdef([arg10])
-m4_if($#, 10, [], m4_car(m4_shiftn(10, $@)))
+$9
AT_COMPILE([[input]])
-m4_pushdef([AT_EXPAND_ARGS], [$][*])
-m4_pushdef([AT_DQUOTE_EACH], [[[$1]]m4_if($][#, 1, [], [, AT_DQUOTE_EACH(m4_shift($2))])])
-
-AT_PARSER_CHECK([[./input]]m4_if($#, 10, [], $#, 11, [], [, AT_DQUOTE_EACH(AT_EXPAND_ARGS(m4_shiftn(11, $@)))]))
-
-m4_popdef([AT_DQUOTE_EACH])
-m4_popdef([AT_EXPAND_ARGS])
+AT_PARSER_CHECK([[./input]],
+ m4_ifval([$10], [m4_dquote($10)]),
+ m4_ifval([$11], [m4_dquote($11)]),
+ m4_ifval([$12], [m4_dquote($12)]))
AT_CLEANUP