summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <akim@lrde.epita.fr>2013-11-14 16:58:42 +0100
committerAkim Demaille <akim@lrde.epita.fr>2013-11-15 09:38:15 +0100
commit16bb9f1647c4666d8f4e55c672e0ee5010df9e51 (patch)
tree25180c4419ed29bd99219daed5a2ac51c1d1352d
parentedb2e90531197dfd3250bd3ca2e5993376002182 (diff)
downloadbison-16bb9f1647c4666d8f4e55c672e0ee5010df9e51.tar.gz
tests: simplify useless obfuscation
* tests/c++.at: $$ is not special for M4, there is no need to "escape" it.
-rw-r--r--tests/c++.at28
1 files 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<std::string> strings_type;
// digraph for the left square bracket.
%type <::std::list<std::string>> list result;
-%printer { yyo << $][$; }
+%printer { yyo << $$; }
<int> <::std::string> <::std::list<std::string>>;
%%
@@ -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; }
;
%%