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

scanner: issue a single error for groups of invalid characters

Browse Source 
* src/scan-gram.l: Scan groups of invalid characters together.
* tests/input.at, tests/named-refs.at: Adjust.
This commit is contained in:
Akim Demaille
2012-11-23 11:21:47 +01:00
parent ac7f308c8e
commit 68ac70bc7b
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/scan-gram.l
View File

@@ -103,9 +103,9 @@ static void unexpected_newline (boundary, char const *);
/* Bracketed identifiers support. */ /* Bracketed identifiers support. */
%x SC_BRACKETED_ID SC_RETURN_BRACKETED_ID %x SC_BRACKETED_ID SC_RETURN_BRACKETED_ID
letter [.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_] letter [.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]
notletter [^.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]{-}[%\{]
id {letter}({letter}|[-0-9])* id {letter}({letter}|[-0-9])*
directive %{id}
int [0-9]+ int [0-9]+
/* POSIX says that a tag must be both an id and a C union member, but /* POSIX says that a tag must be both an id and a C union member, but
@@ -218,7 +218,7 @@ splice (\\[ \f\t\v]*\n)*
"%verbose" return PERCENT_VERBOSE; "%verbose" return PERCENT_VERBOSE;
"%yacc" return PERCENT_YACC; "%yacc" return PERCENT_YACC;
{directive} { "%"{id}|"%"{notletter}([[:graph:]])+ {
complain_at (*loc, _("invalid directive: %s"), quote (yytext)); complain_at (*loc, _("invalid directive: %s"), quote (yytext));
} }
@@ -290,8 +290,10 @@ splice (\\[ \f\t\v]*\n)*
BEGIN SC_BRACKETED_ID; BEGIN SC_BRACKETED_ID;
} }
. { [^\[%A-Za-z0-9_<>{}\"\'*;|=/, \f\n\t\v]+|. {
complain_at (*loc, _("invalid character: %s"), quote_mem (yytext, yyleng)); complain_at (*loc, "%s: %s",
ngettext ("invalid character", "invalid characters", yyleng),
quote_mem (yytext, yyleng));
} }
<<EOF>> { <<EOF>> {
@@ -373,10 +375,14 @@ splice (\\[ \f\t\v]*\n)*
else else
complain_at (*loc, _("an identifier expected")); complain_at (*loc, _("an identifier expected"));
} }
. {
complain_at (*loc, _("invalid character in bracketed name: %s"), [^\].A-Za-z0-9_/ \f\n\t\v]+|. {
quote_mem (yytext, yyleng)); complain_at (*loc, "%s: %s",
ngettext ("invalid character in bracketed name",
"invalid characters in bracketed name", yyleng),
quote_mem (yytext, yyleng));
} }
<<EOF>> { <<EOF>> {
BEGIN bracketed_id_context_state; BEGIN bracketed_id_context_state;
unexpected_eof (bracketed_id_start, "]"); unexpected_eof (bracketed_id_start, "]");

6
tests/input.at
View File

@@ -39,11 +39,7 @@ default: 'a' }
AT_CHECK([[$PERL -pi -e 's/\\(\d{3})/chr(oct($1))/ge' input.y || exit 77]]) AT_CHECK([[$PERL -pi -e 's/\\(\d{3})/chr(oct($1))/ge' input.y || exit 77]])
AT_BISON_CHECK([input.y], [1], [], AT_BISON_CHECK([input.y], [1], [],
[[input.y:1.1: error: invalid character: '\0' [[input.y:1.1-2: error: invalid characters: '\0\001\002\377?'
input.y:1.1: error: invalid character: '\001'
input.y:1.1: error: invalid character: '\002'
input.y:1.1: error: invalid character: '\377'
input.y:1.2: error: invalid character: '?'
input.y:3.1: error: invalid character: '?' input.y:3.1: error: invalid character: '?'
input.y:4.14: error: invalid character: '}' input.y:4.14: error: invalid character: '}'
input.y:5.1: error: invalid character: '%' input.y:5.1: error: invalid character: '%'

13
tests/named-refs.at
View File

@@ -443,19 +443,14 @@ AT_SETUP([Stray symbols in brackets])
AT_DATA_GRAMMAR([test.y], AT_DATA_GRAMMAR([test.y],
[[ [[
%% %%
start: foo[ /* aaa */ *&-.+\000\001\002\377 ] bar start: foo[ % /* aaa */ *&-.+\000\001\002\377 ] bar
{ s = $foo; } { s = $foo; }
]]) ]])
AT_CHECK([[$PERL -pi -e 's/\\(\d{3})/chr(oct($1))/ge' test.y || exit 77]]) AT_CHECK([[$PERL -pi -e 's/\\(\d{3})/chr(oct($1))/ge' test.y || exit 77]])
AT_BISON_CHECK([-o test.c test.y], 1, [], AT_BISON_CHECK([-o test.c test.y], 1, [],
[[test.y:11.23: error: invalid character in bracketed name: '*' [[test.y:11.13: error: invalid character in bracketed name: '%'
test.y:11.24: error: invalid character in bracketed name: '&' test.y:11.25-27: error: invalid characters in bracketed name: '*&-'
test.y:11.25: error: invalid character in bracketed name: '-' test.y:11.29-30: error: invalid characters in bracketed name: '+\0\001\002\377'
test.y:11.27: error: invalid character in bracketed name: '+'
test.y:11.28: error: invalid character in bracketed name: '\0'
test.y:11.28: error: invalid character in bracketed name: '\001'
test.y:11.28: error: invalid character in bracketed name: '\002'
test.y:11.28: error: invalid character in bracketed name: '\377'
]]) ]])
AT_CLEANUP AT_CLEANUP