From: Joel E. Denny Date: Wed, 22 Jul 2009 19:06:49 +0000 (-0400) Subject: Some M4 cleanup in the testsuite. X-Git-Tag: v2.5_rc1~212 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cba975069a746bccdd2f2a954954ac7e43a47ac2;p=platform%2Fupstream%2Fbison.git Some M4 cleanup in the testsuite. Suggested by Eric Blake at . * 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. --- diff --git a/ChangeLog b/ChangeLog index 892e1e8..db0c415 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2009-07-22 Joel E. Denny + + Some M4 cleanup in the testsuite. + Suggested by Eric Blake at + . + * 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-21 Joel E. Denny * m4/m4.m4: Make it a sym link to submodules/autoconf/m4/m4.m4. diff --git a/tests/existing.at b/tests/existing.at index b754f3c..976ab0c 100644 --- a/tests/existing.at +++ b/tests/existing.at @@ -45,24 +45,18 @@ AT_TEST_TABLES_AND_PARSE([$2[: LALR(1)]], [[LALR]], [[last-state]], [[%define lr.type "LALR" ]$3], [$4], [$5], [$6], [$7], - [AT_LALR1_DIFF_CHECK([$8])$9]m4_if($#, 8, [], - $#, 9, [], - [, m4_shiftn(9, - $@)])) + [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12]) AT_TEST_TABLES_AND_PARSE([$2[: IELR(1)]], [[IELR]], [[last-state]], [[%define lr.type "IELR" ]$3], [$4], [$5], [$6], [$7], - [AT_LALR1_DIFF_CHECK([$8])$9]m4_if($#, 8, [], - $#, 9, [], - [, m4_shiftn(9, - $@)])) + [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12]) AT_TEST_TABLES_AND_PARSE([$2[: Canonical LR(1)]], [[canonical LR]], [[last-state,no-xml]], [[%define lr.type "canonical LR" ]$3], [$4], [$5], [$6], [$7], - [$9]m4_if($#, 8, [], $#, 9, [], [, m4_shiftn(9, $@)])) + [$9], [$10], [$11], [$12]) m4_popdef([AT_LALR1_DIFF_CHECK]) ]) diff --git a/tests/local.at b/tests/local.at index 91e0f20..38cd295 100644 --- a/tests/local.at +++ b/tests/local.at @@ -405,12 +405,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_pushdef([AT_COND_CASE], [m4_case([$2], $][@)]) -m4_define([_AT_TEST_TABLES_AND_PARSE], -[m4_pushdef([AT_COND_CASE], [m4_case([$4], $][@)]) - -AT_SETUP([$3]) +AT_SETUP([$1]) AT_DATA_GRAMMAR([[input.y]], [[%code { @@ -419,11 +416,11 @@ AT_DATA_GRAMMAR([[input.y]], static int yylex (void); } -]$6[ +]$4[ %% -]$7[ +]$5[ %% @@ -437,7 +434,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++; @@ -450,40 +447,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