Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some M4 cleanup in the testsuite.

Browse Source 
Suggested by Eric Blake at
<http://lists.gnu.org/archive/html/bison-patches/2009-04/msg00083.html>.
* tests/existing.at (_AT_TEST_EXISTING_GRAMMAR): Do not
complicate the code by distinguishing between a missing value
and an empty string value for an optional argument.  This fix is
allowed by the similar fix in AT_TEST_TABLES_AND_PARSE below.
* tests/local.at (_AT_TEST_TABLES_AND_PARSE): Merge into...
(AT_TEST_TABLES_AND_PARSE): ... this now that the special
arguments are not needed because of the following changes.
Fix stale comments.
Bison developers should use GNU M4 and should not use
POSIXLY_CORRECT when building the test suite, so do not
complicate the code by avoiding $10 and above.
Do not quote an empty string value for an optional argument, and
do not distinguish between a missing value and an empty string
value.
(cherry picked from commit cba975069a)
This commit is contained in:
Joel E. Denny
2009-07-22 15:06:49 -04:00
parent feeb56cd36
commit c4be551734
3 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@@ -1,3 +1,23 @@
2009-07-22 Joel E. Denny <jdenny@ces.clemson.edu>
Some M4 cleanup in the testsuite.
Suggested by Eric Blake at
<http://lists.gnu.org/archive/html/bison-patches/2009-04/msg00083.html>.
* tests/existing.at (_AT_TEST_EXISTING_GRAMMAR): Do not
complicate the code by distinguishing between a missing value
and an empty string value for an optional argument. This fix is
allowed by the similar fix in AT_TEST_TABLES_AND_PARSE below.
* tests/local.at (_AT_TEST_TABLES_AND_PARSE): Merge into...
(AT_TEST_TABLES_AND_PARSE): ... this now that the special
arguments are not needed because of the following changes.
Fix stale comments.
Bison developers should use GNU M4 and should not use
POSIXLY_CORRECT when building the test suite, so do not
complicate the code by avoiding $10 and above.
Do not quote an empty string value for an optional argument, and
do not distinguish between a missing value and an empty string
value.
2009-07-15 Joel E. Denny <jdenny@ces.clemson.edu> 2009-07-15 Joel E. Denny <jdenny@ces.clemson.edu>
Revert unnecessary column realignment in --help output. Revert unnecessary column realignment in --help output.

12
tests/existing.at
View File

@@ -45,24 +45,18 @@ AT_TEST_TABLES_AND_PARSE([$2[: LALR(1)]], [[LALR]], [[last-state]],
[[%define lr.type "LALR" [[%define lr.type "LALR"
]$3], ]$3],
[$4], [$5], [$6], [$7], [$4], [$5], [$6], [$7],
[AT_LALR1_DIFF_CHECK([$8])$9]m4_if($#, 8, [], [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12])
$#, 9, [],
[, m4_shiftn(9,
$@)]))
AT_TEST_TABLES_AND_PARSE([$2[: IELR(1)]], [[IELR]], [[last-state]], AT_TEST_TABLES_AND_PARSE([$2[: IELR(1)]], [[IELR]], [[last-state]],
[[%define lr.type "IELR" [[%define lr.type "IELR"
]$3], ]$3],
[$4], [$5], [$6], [$7], [$4], [$5], [$6], [$7],
[AT_LALR1_DIFF_CHECK([$8])$9]m4_if($#, 8, [], [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12])
$#, 9, [],
[, m4_shiftn(9,
$@)]))
AT_TEST_TABLES_AND_PARSE([$2[: Canonical LR(1)]], [[canonical LR]], AT_TEST_TABLES_AND_PARSE([$2[: Canonical LR(1)]], [[canonical LR]],
[[last-state,no-xml]], [[last-state,no-xml]],
[[%define lr.type "canonical LR" [[%define lr.type "canonical LR"
]$3], ]$3],
[$4], [$5], [$6], [$7], [$4], [$5], [$6], [$7],
[$9]m4_if($#, 8, [], $#, 9, [], [, m4_shiftn(9, $@)])) [$9], [$10], [$11], [$12])
m4_popdef([AT_LALR1_DIFF_CHECK]) m4_popdef([AT_LALR1_DIFF_CHECK])
]) ])

51
tests/local.at
View File

@@ -409,12 +409,9 @@ m4_define([AT_PARSER_CHECK],
# [[syntax error, unexpected 'b', expecting $end # [[syntax error, unexpected 'b', expecting $end
# ]])]) # ]])])
m4_define([AT_TEST_TABLES_AND_PARSE], m4_define([AT_TEST_TABLES_AND_PARSE],
[_AT_TEST_TABLES_AND_PARSE($[1], $[@], $@)]) [m4_pushdef([AT_COND_CASE], [m4_case([$2], $][@)])
m4_define([_AT_TEST_TABLES_AND_PARSE], AT_SETUP([$1])
[m4_pushdef([AT_COND_CASE], [m4_case([$4], $][@)])
AT_SETUP([$3])
AT_DATA_GRAMMAR([[input.y]], AT_DATA_GRAMMAR([[input.y]],
[[%code { [[%code {
@@ -423,11 +420,11 @@ AT_DATA_GRAMMAR([[input.y]],
static int yylex (void); static int yylex (void);
} }
]$6[ ]$4[
%% %%
]$7[ ]$5[
%% %%
@@ -441,7 +438,7 @@ static int
yylex (void) yylex (void)
{ {
static int const input[] = { static int const input[] = {
]m4_if([$8], [], [], [$8], [[]], [], [$8[, ]])[0 ]m4_if([$6], [], [], [$6], [[]], [], [$6[, ]])[0
}; };
static int const *inputp = input; static int const *inputp = input;
return *inputp++; return *inputp++;
@@ -454,40 +451,32 @@ main (void)
} }
]]) ]])
# AT_CHECK invokes AS_ESCAPE before expanding macros, so it corrupts some # In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before
# special characters in the macros. To avoid this, expand now and pass it # expanding macros, so it corrupts some special characters in the
# the result with proper string quotation. Assume args 9 thru 14 expand to # macros. To avoid this, expand now and pass it the result with proper
# properly quoted strings. # string quotation. Assume args 7 thru 12 expand to properly quoted
# strings.
# Pass plenty of options, to exercise plenty of code, even if we m4_if(m4_index(m4_quote($3), [no-xml]), -1,
# 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,
[AT_BISON_CHECK], [AT_BISON_CHECK],
[AT_BISON_CHECK_NO_XML])([[--report=all --defines -o input.c input.y]], [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_if(m4_index(m4_quote($3), [last-state]), -1,
m4_pushdef([arg10], m4_car(m4_shiftn(9, $@)))
m4_if(m4_index(m4_quote($5), [last-state]), -1,
[AT_CHECK([[sed -n '/^state 0$/,$p' input.output]], [[0]], [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]], [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]]) AT_COMPILE([[input]])
m4_pushdef([AT_EXPAND_ARGS], [$][*]) AT_PARSER_CHECK([[./input]],
m4_pushdef([AT_DQUOTE_EACH], [[[$1]]m4_if($][#, 1, [], [, AT_DQUOTE_EACH(m4_shift($2))])]) m4_ifval([$10], [m4_dquote($10)]),
m4_ifval([$11], [m4_dquote($11)]),
AT_PARSER_CHECK([[./input]]m4_if($#, 10, [], $#, 11, [], [, AT_DQUOTE_EACH(AT_EXPAND_ARGS(m4_shiftn(11, $@)))])) m4_ifval([$12], [m4_dquote($12)]))
m4_popdef([AT_DQUOTE_EACH])
m4_popdef([AT_EXPAND_ARGS])
AT_CLEANUP AT_CLEANUP