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

tests: simplify useless obfuscation

Browse Source 
* tests/c++.at: $$ is not special for M4, there is no need to "escape"
it.
This commit is contained in:
Akim Demaille
2013-11-14 16:58:42 +01:00
parent edb2e90531
commit 16bb9f1647
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/c++.at
View File

@@ -243,7 +243,7 @@ typedef std::list<std::string> strings_type;
// digraph for the left square bracket. // digraph for the left square bracket.
%type <::std::list<std::string>> list result; %type <::std::list<std::string>> list result;
%printer { yyo << $][$; } %printer { yyo << $$; }
<int> <::std::string> <::std::list<std::string>>; <int> <::std::string> <::std::list<std::string>>;
%% %%
@@ -253,13 +253,13 @@ result:
list: list:
/* nothing */ { /* Generates an empty string list */ } /* nothing */ { /* Generates an empty string list */ }
| list item { std::swap ($][$,$][1); $$.push_back ($][2); } | list item { std::swap ($$,$][1); $$.push_back ($][2); }
| list error { std::swap ($][$,$][1); } | list error { std::swap ($$,$][1); }
; ;
item: item:
TEXT { std::swap ($][$,$][1); } TEXT { std::swap ($$,$][1); }
| NUMBER { if ($][1 == 3) YYERROR; else $][$ = string_cast ($][1); } | NUMBER { if ($][1 == 3) YYERROR; else $$ = string_cast ($][1); }
; ;
%% %%
]AT_TOKEN_CTOR_IF([], ]AT_TOKEN_CTOR_IF([],
@@ -785,21 +785,21 @@ $1
start: list {]AT_VARIANT_IF([], [ delete $][1]; )[}; start: list {]AT_VARIANT_IF([], [ delete $][1]; )[};
list: list:
item { $][$ = $][1; } item { $$ = $][1; }
// Right recursion to load the stack. // Right recursion to load the stack.
| item list { $][$ = $][1; ]AT_VARIANT_IF([], [delete $][2]; )[} | item list { $$ = $][1; ]AT_VARIANT_IF([], [delete $][2]; )[}
; ;
item: item:
'a' { $$][ = $][1; } 'a' { $$ = $][1; }
| 'e' { YYUSE ($][$); YYUSE($][1); error ("syntax error"); } | 'e' { YYUSE ($$); YYUSE($][1); error ("syntax error"); }
// Not just 'E', otherwise we reduce when 'E' is the lookahead, and // Not just 'E', otherwise we reduce when 'E' is the lookahead, and
// then the stack is emptied, defeating the point of the test. // then the stack is emptied, defeating the point of the test.
| 'E' 'a' { YYUSE($][1); $][$ = $][2; } | 'E' 'a' { YYUSE($][1); $$ = $][2; }
| 'R' { ]AT_VARIANT_IF([], [$][$ = YY_NULLPTR; delete $][1]; )[YYERROR; } | 'R' { ]AT_VARIANT_IF([], [$$ = YY_NULLPTR; delete $][1]; )[YYERROR; }
| 'p' { $][$ = $][1; } | 'p' { $$ = $][1; }
| 's' { $][$ = $][1; throw std::runtime_error ("reduction"); } | 's' { $$ = $][1; throw std::runtime_error ("reduction"); }
| 'T' { ]AT_VARIANT_IF([], [$][$ = YY_NULLPTR; delete $][1]; )[YYABORT; } | 'T' { ]AT_VARIANT_IF([], [$$ = YY_NULLPTR; delete $][1]; )[YYABORT; }
| error { ]AT_VARIANT_IF([], [$][$ = YY_NULLPTR; ])[yyerrok; } | error { ]AT_VARIANT_IF([], [$][$ = YY_NULLPTR; ])[yyerrok; }
; ;
%% %%