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

d: tests: use fewer global variables

Browse Source 
* tests/calc.at: Move 'input' into the scanner.
This commit is contained in:
Akim Demaille
2019-02-26 18:40:37 +01:00
parent d57751d2fb
commit 8eac78f8ef
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/calc.at
View File

@@ -50,12 +50,8 @@ AT_D_IF([m4_pushdef([AT_CALC_MAIN],
semantic_value result = 0; semantic_value result = 0;
int count = 0; int count = 0;
if (args.length == 2) File input = args.length == 2 ? File (args[1], "r") : stdin;
input = File (args[1], "r"); CalcLexer l = new CalcLexer (input);
else
input = stdin;
CalcLexer l = new CalcLexer ();
YYParser p = new YYParser (l); YYParser p = new YYParser (l);
int status = !p.parse (); int status = !p.parse ();
return status; return status;
@@ -121,9 +117,15 @@ main (int argc, const char **argv)
]])]) ]])])
AT_D_IF([m4_pushdef([AT_CALC_LEX], AT_D_IF([m4_pushdef([AT_CALC_LEX],
[[File input; [[class CalcLexer : Lexer
{
class CalcLexer : Lexer { this (File i)
{
input = i;
}
File input;
int prev_char = -1; int prev_char = -1;
@@ -871,4 +873,4 @@ AT_CHECK_CALC([%skeleton "lalr1.d"])
m4_define([AT_CHECK_CALC_LALR1_D], m4_define([AT_CHECK_CALC_LALR1_D],
[AT_CHECK_CALC([%language "D" $1], [$2])]) [AT_CHECK_CALC([%language "D" $1], [$2])])
AT_CHECK_CALC_LALR1_D([]) AT_CHECK_CALC_LALR1_D([])