mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 20:33:03 +00:00
(Actions after errors): Use an output format
more similar to that of the Printers and Destructors test. Test the position of the ';' token too. (Printers and Destructors): Likewise. (Printers and Destructors: %glr-parser): Remove for now, to avoid unnecessarily alarming people when the test fails.
This commit is contained in:
Paul Eggert
102
tests/actions.at
102
tests/actions.at
@@ -108,13 +108,13 @@ input:
|
||||
/* Nothing. */
|
||||
{
|
||||
$$ = 0;
|
||||
printf ("input(%d): /* Nothing */\n", $$);
|
||||
printf ("input (%d): /* Nothing */\n", $$);
|
||||
}
|
||||
| line input /* Right recursive to load the stack so that popping at
|
||||
EOF can be exercised. */
|
||||
{
|
||||
$$ = 2;
|
||||
printf ("input(%d): line(%d) input(%d)\n", $$, $1, $2);
|
||||
printf ("input (%d): line (%d) input (%d)\n", $$, $1, $2);
|
||||
}
|
||||
;
|
||||
|
||||
@@ -122,23 +122,23 @@ line:
|
||||
thing thing thing ';'
|
||||
{
|
||||
$$ = $1;
|
||||
printf ("line(%d): thing(%d) thing(%d) thing(%d) ';'(%d)\n",
|
||||
printf ("line (%d): thing (%d) thing (%d) thing (%d) ';' (%d)\n",
|
||||
$$, $1, $2, $3, $4);
|
||||
}
|
||||
| thing thing ';'
|
||||
{
|
||||
$$ = $1;
|
||||
printf ("line(%d): thing(%d) thing(%d) ';'(%d)\n", $$, $1, $2, $3);
|
||||
printf ("line (%d): thing (%d) thing (%d) ';' (%d)\n", $$, $1, $2, $3);
|
||||
}
|
||||
| thing ';'
|
||||
{
|
||||
$$ = $1;
|
||||
printf ("line(%d): thing(%d) ';'(%d)\n", $$, $1, $2);
|
||||
printf ("line (%d): thing (%d) ';' (%d)\n", $$, $1, $2);
|
||||
}
|
||||
| error ';'
|
||||
{
|
||||
$$ = -1;
|
||||
printf ("line(%d): error ';'(%d)\n", $$, $2);
|
||||
printf ("line (%d): error ';' (%d)\n", $$, $2);
|
||||
}
|
||||
;
|
||||
|
||||
@@ -146,7 +146,7 @@ thing:
|
||||
'x'
|
||||
{
|
||||
$$ = $1;
|
||||
printf ("thing(%d): 'x'(%d)\n", $$, $1);
|
||||
printf ("thing (%d): 'x' (%d)\n", $$, $1);
|
||||
}
|
||||
;
|
||||
%%
|
||||
@@ -171,7 +171,7 @@ yylex (void)
|
||||
if (counter < sizeof input)
|
||||
{
|
||||
yylval.ival = counter;
|
||||
printf ("sending: '%c' (value = %d)\n", input[counter], yylval.ival);
|
||||
printf ("sending: '%c' (%d)\n", input[counter], yylval.ival);
|
||||
return input[counter++];
|
||||
}
|
||||
else
|
||||
@@ -198,29 +198,29 @@ main (void)
|
||||
AT_CHECK([bison -o input.c input.y])
|
||||
AT_COMPILE([input])
|
||||
AT_PARSER_CHECK([./input], 1,
|
||||
[[sending: 'x' (value = 0)
|
||||
thing(0): 'x'(0)
|
||||
sending: 'x' (value = 1)
|
||||
thing(1): 'x'(1)
|
||||
sending: 'x' (value = 2)
|
||||
thing(2): 'x'(2)
|
||||
sending: 'x' (value = 3)
|
||||
[[sending: 'x' (0)
|
||||
thing (0): 'x' (0)
|
||||
sending: 'x' (1)
|
||||
thing (1): 'x' (1)
|
||||
sending: 'x' (2)
|
||||
thing (2): 'x' (2)
|
||||
sending: 'x' (3)
|
||||
4: syntax error
|
||||
sending: 'x' (value = 4)
|
||||
sending: 'x' (value = 5)
|
||||
sending: ';' (value = 6)
|
||||
line(-1): error ';'(6)
|
||||
sending: 'x' (value = 7)
|
||||
thing(7): 'x'(7)
|
||||
sending: 'x' (value = 8)
|
||||
thing(8): 'x'(8)
|
||||
sending: ';' (value = 9)
|
||||
line(7): thing(7) thing(8) ';'(9)
|
||||
sending: 'x' (value = 10)
|
||||
thing(10): 'x'(10)
|
||||
sending: ';' (value = 11)
|
||||
line(10): thing(10) ';'(11)
|
||||
sending: 'y' (value = 12)
|
||||
sending: 'x' (4)
|
||||
sending: 'x' (5)
|
||||
sending: ';' (6)
|
||||
line (-1): error ';' (6)
|
||||
sending: 'x' (7)
|
||||
thing (7): 'x' (7)
|
||||
sending: 'x' (8)
|
||||
thing (8): 'x' (8)
|
||||
sending: ';' (9)
|
||||
line (7): thing (7) thing (8) ';' (9)
|
||||
sending: 'x' (10)
|
||||
thing (10): 'x' (10)
|
||||
sending: ';' (11)
|
||||
line (10): thing (10) ';' (11)
|
||||
sending: 'y' (12)
|
||||
13: syntax error
|
||||
sending: EOF
|
||||
]])
|
||||
@@ -304,18 +304,18 @@ AT_CLEANUP
|
||||
## Printers and Destructors. ##
|
||||
## -------------------------- ##
|
||||
|
||||
# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, BISON-DIRECTIVE)
|
||||
# -------------------------------------------------------------
|
||||
# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4, BISON-DIRECTIVE)
|
||||
# -----------------------------------------------------------------
|
||||
m4_define([_AT_CHECK_PRINTER_AND_DESTRUCTOR],
|
||||
[m4_if([$1$2$3], $[1]$[2]$[3], [],
|
||||
[m4_fatal([$0: Invalid arguments: $@])])dnl
|
||||
|
||||
AT_SETUP([Printers and Destructors: $4])
|
||||
AT_SETUP([Printers and Destructors: $5])
|
||||
|
||||
# Make sure complex $n work.
|
||||
|
||||
AT_DATA_GRAMMAR([[input.y]],
|
||||
[[$4
|
||||
[[$5
|
||||
%{
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -331,7 +331,7 @@ static void yyerror (const char *msg);
|
||||
{
|
||||
int ival;
|
||||
}
|
||||
%type <ival> 'x' thing line input
|
||||
%type <ival> 'x' ';' thing line input
|
||||
|
||||
%printer { fprintf (yyout, "%d@%d-%d", $$, RANGE (@$)); }
|
||||
input line thing 'x'
|
||||
@@ -357,13 +357,13 @@ input:
|
||||
/* Nothing. */
|
||||
{
|
||||
$$ = 0;
|
||||
printf ("input (%d@%d-%d): /* Nothing */';'\n", $$, RANGE (@$));
|
||||
printf ("input (%d@%d-%d): /* Nothing */\n", $$, RANGE (@$));
|
||||
}
|
||||
| line input /* Right recursive to load the stack so that popping at
|
||||
EOF can be exercised. */
|
||||
{
|
||||
$$ = 2;
|
||||
printf ("input (%d@%d-%d): line (%d@%d-%d) input (%d@%d-%d)';'\n",
|
||||
printf ("input (%d@%d-%d): line (%d@%d-%d) input (%d@%d-%d)\n",
|
||||
$$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2));
|
||||
}
|
||||
;
|
||||
@@ -372,27 +372,27 @@ line:
|
||||
thing thing thing ';'
|
||||
{
|
||||
$$ = $1;
|
||||
printf ("line (%d@%d-%d): thing (%d@%d-%d) thing (%d@%d-%d) thing (%d@%d-%d) ';'\n",
|
||||
printf ("line (%d@%d-%d): thing (%d@%d-%d) thing (%d@%d-%d) thing (%d@%d-%d) ';' (%d@%d-%d)\n",
|
||||
$$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2),
|
||||
$3, RANGE (@3));
|
||||
$3, RANGE (@3), $4, RANGE (@4));
|
||||
}
|
||||
| thing thing ';'
|
||||
{
|
||||
$$ = $1;
|
||||
printf ("line (%d@%d-%d): thing (%d@%d-%d) thing (%d@%d-%d) ';'\n",
|
||||
$$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2));
|
||||
printf ("line (%d@%d-%d): thing (%d@%d-%d) thing (%d@%d-%d) ';' (%d@%d-%d)\n",
|
||||
$$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2), $3, RANGE (@3));
|
||||
}
|
||||
| thing ';'
|
||||
{
|
||||
$$ = $1;
|
||||
printf ("line (%d@%d-%d): thing (%d@%d-%d) ';'\n",
|
||||
$$, RANGE (@$), $1, RANGE (@1));
|
||||
printf ("line (%d@%d-%d): thing (%d@%d-%d) ';' (%d@%d-%d)\n",
|
||||
$$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2));
|
||||
}
|
||||
| error ';'
|
||||
{
|
||||
$$ = -1;
|
||||
printf ("line (%d@%d-%d): error (@%d-%d) ';'\n",
|
||||
$$, RANGE (@$), RANGE (@1));
|
||||
printf ("line (%d@%d-%d): error (@%d-%d) ';' (%d@%d-%d)\n",
|
||||
$$, RANGE (@$), RANGE (@1), $2, RANGE (@2));
|
||||
}
|
||||
;
|
||||
|
||||
@@ -479,17 +479,17 @@ Freeing token 'x' (4@40-49)
|
||||
sending: 'x' (5@50-59)
|
||||
Freeing token 'x' (5@50-59)
|
||||
sending: ';' (6@60-69)
|
||||
line (-1@50-69): error (@50-59) ';'
|
||||
line (-1@50-69): error (@50-59) ';' (6@60-69)
|
||||
sending: 'x' (7@70-79)
|
||||
thing (7@70-79): 'x' (7@70-79)
|
||||
sending: 'x' (8@80-89)
|
||||
thing (8@80-89): 'x' (8@80-89)
|
||||
sending: ';' (9@90-99)
|
||||
line (7@70-99): thing (7@70-79) thing (8@80-89) ';'
|
||||
line (7@70-99): thing (7@70-79) thing (8@80-89) ';' (9@90-99)
|
||||
sending: 'x' (10@100-109)
|
||||
thing (10@100-109): 'x' (10@100-109)
|
||||
sending: ';' (11@110-119)
|
||||
line (10@100-119): thing (10@100-109) ';'
|
||||
line (10@100-119): thing (10@100-109) ';' (11@110-119)
|
||||
sending: 'y' (12@120-129)
|
||||
120-129: syntax error, unexpected $undefined, expecting $end or 'x'
|
||||
sending: EOF
|
||||
@@ -507,9 +507,11 @@ AT_CLEANUP
|
||||
# ------------------------------------------------
|
||||
# Produce `calc.y'.
|
||||
m4_define([AT_CHECK_PRINTER_AND_DESTRUCTOR],
|
||||
[_AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], [$1])
|
||||
[_AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4], [$1])
|
||||
])
|
||||
|
||||
|
||||
AT_CHECK_PRINTER_AND_DESTRUCTOR()
|
||||
AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])
|
||||
|
||||
# This test fails, but the test case is questionable.
|
||||
#AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])
|
||||
|
||||
Reference in New Issue
Block a user