mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-13 06:13:02 +00:00
* NEWS: Bison-generated C parsers no longer quote literal strings
associated with tokens. * src/output.c (prepare_symbols): Don't escape strings, since users don't want to see C escapes. * tests/calc.at (AT_CHECK_CALC): Adjust to lack of quotes in diagnostics. * tests/regression.at (Token definitions, Web2c Actions): Likewise.
This commit is contained in:
@@ -467,9 +467,9 @@ _AT_CHECK_CALC([$1],
|
||||
|
||||
# Some syntax errors.
|
||||
_AT_CHECK_CALC_ERROR([$1], [1], [0 0], [13],
|
||||
[1.2: syntax error, unexpected "number"])
|
||||
[1.2: syntax error, unexpected number])
|
||||
_AT_CHECK_CALC_ERROR([$1], [1], [1//2], [18],
|
||||
[1.2: syntax error, unexpected '/', expecting "number" or '-' or '(' or '!'])
|
||||
[1.2: syntax error, unexpected '/', expecting number or '-' or '(' or '!'])
|
||||
_AT_CHECK_CALC_ERROR([$1], [1], [error], [5],
|
||||
[1.0: syntax error, unexpected $undefined])
|
||||
_AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [26],
|
||||
@@ -481,7 +481,7 @@ _AT_CHECK_CALC_ERROR([$1], [1],
|
||||
[2.0: syntax error, unexpected '+'])
|
||||
# Exercise error messages with EOF: work on an empty file.
|
||||
_AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [5],
|
||||
[1.0: syntax error, unexpected "end of input"])
|
||||
[1.0: syntax error, unexpected end of input])
|
||||
|
||||
# Exercise the error token: without it, we die at the first error,
|
||||
# hence be sure to
|
||||
@@ -502,20 +502,20 @@ _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [5],
|
||||
_AT_CHECK_CALC_ERROR([$1], [0],
|
||||
[() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
|
||||
[188],
|
||||
[1.1: syntax error, unexpected ')', expecting "number" or '-' or '(' or '!'
|
||||
1.17: syntax error, unexpected ')', expecting "number" or '-' or '(' or '!'
|
||||
1.22: syntax error, unexpected '*', expecting "number" or '-' or '(' or '!'
|
||||
1.40: syntax error, unexpected '*', expecting "number" or '-' or '(' or '!'
|
||||
[1.1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
|
||||
1.17: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
|
||||
1.22: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
|
||||
1.40: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
|
||||
calc: error: 4444 != 1])
|
||||
|
||||
# The same, but this time exercising explicitly triggered syntax errors.
|
||||
# POSIX says the look-ahead causing the error should not be discarded.
|
||||
_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [75],
|
||||
[1.9: syntax error, unexpected "number"
|
||||
[1.9: syntax error, unexpected number
|
||||
calc: error: 2222 != 1])
|
||||
_AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (0 0) = 1], [85],
|
||||
[1.3: syntax error, unexpected '*', expecting "number" or '-' or '(' or '!'
|
||||
1.11: syntax error, unexpected "number"
|
||||
[1.3: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
|
||||
1.11: syntax error, unexpected number
|
||||
calc: error: 2222 != 1])
|
||||
AT_BISON_OPTION_POPDEFS
|
||||
|
||||
|
||||
@@ -324,9 +324,9 @@ int yylex (void);
|
||||
%token B_TOKEN "b"
|
||||
%token C_TOKEN 'c'
|
||||
%token 'd' D_TOKEN
|
||||
%token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\377\x001\x0000ff"
|
||||
%token SPECIAL "\\\'\?\"\n\t??!"
|
||||
%%
|
||||
exp: "a" "\\\'\?\"\a\b\f\n\r\t\v\001\377\x001\x0000ff";
|
||||
exp: "a" "\\\'\?\"\n\t??!";
|
||||
%%
|
||||
void
|
||||
yyerror (char const *s)
|
||||
@@ -350,7 +350,8 @@ main (void)
|
||||
AT_CHECK([bison -o input.c input.y])
|
||||
AT_COMPILE([input])
|
||||
AT_PARSER_CHECK([./input], 1, [],
|
||||
[syntax error, unexpected "\\'?\"\a\b\f\n\r\t\v\001\377\001\377", expecting "a"
|
||||
[syntax error, unexpected \'?"
|
||||
??!, expecting a
|
||||
])
|
||||
AT_CLEANUP
|
||||
|
||||
@@ -634,8 +635,8 @@ static const unsigned char yyrline[] =
|
||||
};
|
||||
static const char *const yytname[] =
|
||||
{
|
||||
"$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",
|
||||
"\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0
|
||||
"$end", "error", "$undefined", "if", "const", "then", "else", "$accept",
|
||||
"statement", "struct_stat", "if", "else", 0
|
||||
};
|
||||
static const unsigned short int yytoknum[] =
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user