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

scan-skel: use the scanner to reject all invalid directives

Browse Source 
* src/scan-skel.l: Use a simpler and more consistent pattern escaping
scheme.
Catch all the invalid directives here by just removing the previous
catch-all-but-alphabetical rule.
This commit is contained in:
Akim Demaille
2012-10-04 15:36:00 +02:00
parent 92f39ba6dc
commit fc5618b338
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/scan-skel.l
View File

@@ -78,15 +78,14 @@ static void fail_for_invalid_at (char const *at);
"@oline@" fprintf (yyout, "%d", out_lineno + 1); "@oline@" fprintf (yyout, "%d", out_lineno + 1);
"@ofile@" fputs (quotearg_style (c_quoting_style, out_name), yyout); "@ofile@" fputs (quotearg_style (c_quoting_style, out_name), yyout);
@basename"(" at_init (&argc, argv, &at_ptr, &at_basename); "@basename(" at_init (&argc, argv, &at_ptr, &at_basename);
@complain"(" at_init (&argc, argv, &at_ptr, &at_complain); "@complain(" at_init (&argc, argv, &at_ptr, &at_complain);
@output"(" at_init (&argc, argv, &at_ptr, &at_output); "@output(" at_init (&argc, argv, &at_ptr, &at_output);
@[a-z_]+"(" at_init (&argc, argv, &at_ptr, NULL);
/* This pattern must not match more than the previous @ patterns. */ /* This pattern must not match more than the previous @ patterns. */
@[^@{}`(\n]* fail_for_invalid_at (yytext); @[^@{}`(\n]* fail_for_invalid_at (yytext);
\n out_lineno++; ECHO; \n out_lineno++; ECHO;
[^@\n]+ ECHO; [^@\n]+ ECHO;
<INITIAL><<EOF>> { <INITIAL><<EOF>> {
if (out_name) if (out_name)
@@ -118,11 +117,8 @@ static void fail_for_invalid_at (char const *at);
BEGIN SC_AT_DIRECTIVE_SKIP_WS; BEGIN SC_AT_DIRECTIVE_SKIP_WS;
else else
{ {
if (at_ptr) aver (at_ptr);
at_ptr (argc, argv, &out_name, &out_lineno); at_ptr (argc, argv, &out_name, &out_lineno);
else
fail_for_invalid_at (argv[0]);
obstack_free (&obstack_for_string, argv[0]); obstack_free (&obstack_for_string, argv[0]);
argc = 0; argc = 0;
BEGIN INITIAL; BEGIN INITIAL;