From 16bb9f1647c4666d8f4e55c672e0ee5010df9e51 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 14 Nov 2013 16:58:42 +0100 Subject: tests: simplify useless obfuscation * tests/c++.at: $$ is not special for M4, there is no need to "escape" it. --- tests/c++.at | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/c++.at b/tests/c++.at index e403c554..14a001a4 100644 --- a/tests/c++.at +++ b/tests/c++.at @@ -243,7 +243,7 @@ typedef std::list strings_type; // digraph for the left square bracket. %type <::std::list> list result; -%printer { yyo << $][$; } +%printer { yyo << $$; } <::std::string> <::std::list>; %% @@ -253,13 +253,13 @@ result: list: /* nothing */ { /* Generates an empty string list */ } -| list item { std::swap ($][$,$][1); $$.push_back ($][2); } -| list error { std::swap ($][$,$][1); } +| list item { std::swap ($$,$][1); $$.push_back ($][2); } +| list error { std::swap ($$,$][1); } ; item: - TEXT { std::swap ($][$,$][1); } -| NUMBER { if ($][1 == 3) YYERROR; else $][$ = string_cast ($][1); } + TEXT { std::swap ($$,$][1); } +| NUMBER { if ($][1 == 3) YYERROR; else $$ = string_cast ($][1); } ; %% ]AT_TOKEN_CTOR_IF([], @@ -785,21 +785,21 @@ $1 start: list {]AT_VARIANT_IF([], [ delete $][1]; )[}; list: - item { $][$ = $][1; } + item { $$ = $][1; } // Right recursion to load the stack. -| item list { $][$ = $][1; ]AT_VARIANT_IF([], [delete $][2]; )[} +| item list { $$ = $][1; ]AT_VARIANT_IF([], [delete $][2]; )[} ; item: - 'a' { $$][ = $][1; } -| 'e' { YYUSE ($][$); YYUSE($][1); error ("syntax error"); } + 'a' { $$ = $][1; } +| 'e' { YYUSE ($$); YYUSE($][1); error ("syntax error"); } // Not just 'E', otherwise we reduce when 'E' is the lookahead, and // then the stack is emptied, defeating the point of the test. -| 'E' 'a' { YYUSE($][1); $][$ = $][2; } -| 'R' { ]AT_VARIANT_IF([], [$][$ = YY_NULLPTR; delete $][1]; )[YYERROR; } -| 'p' { $][$ = $][1; } -| 's' { $][$ = $][1; throw std::runtime_error ("reduction"); } -| 'T' { ]AT_VARIANT_IF([], [$][$ = YY_NULLPTR; delete $][1]; )[YYABORT; } +| 'E' 'a' { YYUSE($][1); $$ = $][2; } +| 'R' { ]AT_VARIANT_IF([], [$$ = YY_NULLPTR; delete $][1]; )[YYERROR; } +| 'p' { $$ = $][1; } +| 's' { $$ = $][1; throw std::runtime_error ("reduction"); } +| 'T' { ]AT_VARIANT_IF([], [$$ = YY_NULLPTR; delete $][1]; )[YYABORT; } | error { ]AT_VARIANT_IF([], [$][$ = YY_NULLPTR; ])[yyerrok; } ; %% -- cgit v1.2.1