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

Clean up.

Browse Source 
* src/scan-skel.l (at_directive_perform): Add at_directive_argc and
at_directive_argv arguments so these no longer have to be global
variables.  Also, update the implementation for the following changes.
(fail_for_at_directive_too_many_args,
fail_for_at_directive_too_few_args): Add at_directive_name argument.
(at_directive_name): Remove as at_directive_argv[0] will be used for
this now.
(AT_DIRECTIVE_ARGC_MAX): Increment to make space in at_directive_argv
for the directive name.
(at_directive_argc, at_directive_argv): Make these local within
skel_lex instead of global.
(INITIAL): Update directive start action for above changes.
(SC_AT_DIRECTIVE_ARG): Rename to...
(SC_AT_DIRECTIVE_ARGS): ... this, and update for above changes.
(SC_AT_DIRECTIVE_SKIP_WS): Update.
(scan_skel): Move yylex_destroy to...
(skel_scanner_free): ... here.
* tests/skeletons.at (installed skeleton file name): Rename to...
(installed skeleton file names): ... this.
This commit is contained in:
Joel E. Denny
2007-01-28 14:31:56 +00:00
parent 148d66d861
commit 3eb82471fa
3 changed files with 102 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@@ -1,3 +1,26 @@
2007-01-28 Joel E. Denny <jdenny@ces.clemson.edu>
Clean up.
* src/scan-skel.l (at_directive_perform): Add at_directive_argc and
at_directive_argv arguments so these no longer have to be global
variables. Also, update the implementation for the following changes.
(fail_for_at_directive_too_many_args,
fail_for_at_directive_too_few_args): Add at_directive_name argument.
(at_directive_name): Remove as at_directive_argv[0] will be used for
this now.
(AT_DIRECTIVE_ARGC_MAX): Increment to make space in at_directive_argv
for the directive name.
(at_directive_argc, at_directive_argv): Make these local within
skel_lex instead of global.
(INITIAL): Update directive start action for above changes.
(SC_AT_DIRECTIVE_ARG): Rename to...
(SC_AT_DIRECTIVE_ARGS): ... this, and update for above changes.
(SC_AT_DIRECTIVE_SKIP_WS): Update.
(scan_skel): Move yylex_destroy to...
(skel_scanner_free): ... here.
* tests/skeletons.at (installed skeleton file name): Rename to...
(installed skeleton file names): ... this.
2007-01-27 Joel E. Denny <jdenny@ces.clemson.edu> 2007-01-27 Joel E. Denny <jdenny@ces.clemson.edu>
* ChangeLog: For changes in doc/bison.texinfo, consistently reference * ChangeLog: For changes in doc/bison.texinfo, consistently reference

145
src/scan-skel.l
View File

@@ -47,23 +47,15 @@ YY_DECL;
#define QPUTS(String) \ #define QPUTS(String) \
fputs (quotearg_style (c_quoting_style, String), yyout) fputs (quotearg_style (c_quoting_style, String), yyout)
static void at_directive_perform (char **outnamep, int *out_linenop); static void at_directive_perform (int at_directive_argc,
static void fail_for_at_directive_too_many_args (void); char *at_directive_argv[],
static void fail_for_at_directive_too_few_args (void); char **outnamep, int *out_linenop);
static void fail_for_at_directive_too_many_args (char const *at_directive_name);
static void fail_for_at_directive_too_few_args (char const *at_directive_name);
static void fail_for_invalid_at (char const *at); static void fail_for_invalid_at (char const *at);
/* In SC_AT_DIRECTIVE_ARG context, the name of the directive. */
static char *at_directive_name;
/* Currently, only the @warn, @complain, @fatal, @warn_at, @complain_at, and
@fatal_at directives take multiple arguments, and the last three already
can't take more than 7. */
#define AT_DIRECTIVE_ARGC_MAX 7
static int at_directive_argc = 0;
static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
%} %}
%x SC_AT_DIRECTIVE_ARG %x SC_AT_DIRECTIVE_ARGS
%x SC_AT_DIRECTIVE_SKIP_WS %x SC_AT_DIRECTIVE_SKIP_WS
%% %%
@@ -71,6 +63,13 @@ static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
%{ %{
int out_lineno IF_LINT (= 0); int out_lineno IF_LINT (= 0);
char *outname = NULL; char *outname = NULL;
/* Currently, only the @warn, @complain, @fatal, @warn_at, @complain_at, and
@fatal_at directives take multiple arguments, and the last three already
can't take more than 7. at_directive_argv[0] is the directive name. */
#define AT_DIRECTIVE_ARGC_MAX 8
int at_directive_argc = 0;
char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
%} %}
"@@" fputc ('@', yyout); "@@" fputc ('@', yyout);
@@ -83,8 +82,10 @@ static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
@[a-z_]+"(" { @[a-z_]+"(" {
yytext[yyleng-1] = '\0'; yytext[yyleng-1] = '\0';
at_directive_name = xstrdup (yytext); obstack_grow (&obstack_for_string, yytext, yyleng);
BEGIN SC_AT_DIRECTIVE_ARG; at_directive_argv[at_directive_argc++] =
obstack_finish (&obstack_for_string);
BEGIN SC_AT_DIRECTIVE_ARGS;
} }
/* This pattern must not match more than the previous @ patterns. */ /* This pattern must not match more than the previous @ patterns. */
@@ -101,7 +102,7 @@ static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
return EOF; return EOF;
} }
<SC_AT_DIRECTIVE_ARG>{ <SC_AT_DIRECTIVE_ARGS>{
[^@]+ { STRING_GROW; } [^@]+ { STRING_GROW; }
"@@" { obstack_1grow (&obstack_for_string, '@'); } "@@" { obstack_1grow (&obstack_for_string, '@'); }
@@ -112,7 +113,7 @@ static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
@[,)] { @[,)] {
if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX) if (at_directive_argc >= AT_DIRECTIVE_ARGC_MAX)
fail_for_at_directive_too_many_args (); fail_for_at_directive_too_many_args (at_directive_argv[0]);
obstack_1grow (&obstack_for_string, '\0'); obstack_1grow (&obstack_for_string, '\0');
at_directive_argv[at_directive_argc++] = at_directive_argv[at_directive_argc++] =
@@ -123,10 +124,10 @@ static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
BEGIN SC_AT_DIRECTIVE_SKIP_WS; BEGIN SC_AT_DIRECTIVE_SKIP_WS;
else else
{ {
at_directive_perform (&outname, &out_lineno); at_directive_perform (at_directive_argc, at_directive_argv,
&outname, &out_lineno);
obstack_free (&obstack_for_string, at_directive_argv[0]); obstack_free (&obstack_for_string, at_directive_argv[0]);
at_directive_argc = 0; at_directive_argc = 0;
free (at_directive_name);
BEGIN INITIAL; BEGIN INITIAL;
} }
} }
@@ -136,12 +137,12 @@ static char *at_directive_argv[AT_DIRECTIVE_ARGC_MAX];
<SC_AT_DIRECTIVE_SKIP_WS>{ <SC_AT_DIRECTIVE_SKIP_WS>{
[ \t\r\n] [ \t\r\n]
. { yyless (0); BEGIN SC_AT_DIRECTIVE_ARG; } . { yyless (0); BEGIN SC_AT_DIRECTIVE_ARGS; }
} }
<SC_AT_DIRECTIVE_ARG,SC_AT_DIRECTIVE_SKIP_WS>{ <SC_AT_DIRECTIVE_ARGS,SC_AT_DIRECTIVE_SKIP_WS>{
<<EOF>> { <<EOF>> {
fatal (_("unclosed %s directive in skeleton"), at_directive_name); fatal (_("unclosed %s directive in skeleton"), at_directive_argv[0]);
} }
} }
@@ -163,133 +164,135 @@ scan_skel (FILE *in)
skel_in = in; skel_in = in;
skel__flex_debug = trace_flag & trace_skeleton; skel__flex_debug = trace_flag & trace_skeleton;
skel_lex (); skel_lex ();
/* Reclaim Flex's buffers. */
yylex_destroy ();
} }
void void
skel_scanner_free (void) skel_scanner_free (void)
{ {
obstack_free (&obstack_for_string, 0); obstack_free (&obstack_for_string, 0);
/* Reclaim Flex's buffers. */
yylex_destroy ();
} }
static static
void at_directive_perform (char **outnamep, int *out_linenop) void at_directive_perform (int at_directive_argc,
char *at_directive_argv[],
char **outnamep, int *out_linenop)
{ {
if (0 == strcmp (at_directive_name, "@basename")) if (0 == strcmp (at_directive_argv[0], "@basename"))
{ {
if (at_directive_argc > 1) if (at_directive_argc > 2)
fail_for_at_directive_too_many_args (); fail_for_at_directive_too_many_args (at_directive_argv[0]);
fputs (last_component (at_directive_argv[0]), yyout); fputs (last_component (at_directive_argv[1]), yyout);
} }
else if (0 == strcmp (at_directive_name, "@warn") else if (0 == strcmp (at_directive_argv[0], "@warn")
|| 0 == strcmp (at_directive_name, "@complain") || 0 == strcmp (at_directive_argv[0], "@complain")
|| 0 == strcmp (at_directive_name, "@fatal")) || 0 == strcmp (at_directive_argv[0], "@fatal"))
{ {
void (*func)(char const *, ...); void (*func)(char const *, ...);
switch (at_directive_name[1]) switch (at_directive_argv[0][1])
{ {
case 'w': func = warn; break; case 'w': func = warn; break;
case 'c': func = complain; break; case 'c': func = complain; break;
case 'f': func = fatal; break; case 'f': func = fatal; break;
default: aver (false); func = NULL; break; default: aver (false); break;
} }
switch (at_directive_argc) switch (at_directive_argc)
{ {
case 1: case 1:
func (_(at_directive_argv[0])); func (_(at_directive_argv[1]));
break; break;
case 2: case 2:
func (_(at_directive_argv[0]), at_directive_argv[1]); func (_(at_directive_argv[1]), at_directive_argv[2]);
break; break;
case 3: case 3:
func (_(at_directive_argv[0]), at_directive_argv[1], func (_(at_directive_argv[1]), at_directive_argv[2],
at_directive_argv[2]); at_directive_argv[3]);
break; break;
case 4: case 4:
func (_(at_directive_argv[0]), at_directive_argv[1], func (_(at_directive_argv[1]), at_directive_argv[2],
at_directive_argv[2], at_directive_argv[3]); at_directive_argv[3], at_directive_argv[4]);
break; break;
case 5: case 5:
func (_(at_directive_argv[0]), at_directive_argv[1], func (_(at_directive_argv[1]), at_directive_argv[2],
at_directive_argv[2], at_directive_argv[3], at_directive_argv[3], at_directive_argv[4],
at_directive_argv[4]); at_directive_argv[5]);
break; break;
default: default:
fail_for_at_directive_too_many_args (); fail_for_at_directive_too_many_args (at_directive_argv[0]);
break; break;
} }
} }
else if (0 == strcmp (at_directive_name, "@warn_at") else if (0 == strcmp (at_directive_argv[0], "@warn_at")
|| 0 == strcmp (at_directive_name, "@complain_at") || 0 == strcmp (at_directive_argv[0], "@complain_at")
|| 0 == strcmp (at_directive_name, "@fatal_at")) || 0 == strcmp (at_directive_argv[0], "@fatal_at"))
{ {
void (*func)(location, char const *, ...); void (*func)(location, char const *, ...);
location loc; location loc;
if (at_directive_argc < 3) if (at_directive_argc < 4)
fail_for_at_directive_too_few_args (); fail_for_at_directive_too_few_args (at_directive_argv[0]);
switch (at_directive_name[1]) switch (at_directive_argv[0][1])
{ {
case 'w': func = warn_at; break; case 'w': func = warn_at; break;
case 'c': func = complain_at; break; case 'c': func = complain_at; break;
case 'f': func = fatal_at; break; case 'f': func = fatal_at; break;
default: aver (false); func = NULL; break; default: aver (false); break;
} }
boundary_set_from_string (&loc.start, at_directive_argv[0]); boundary_set_from_string (&loc.start, at_directive_argv[1]);
boundary_set_from_string (&loc.end, at_directive_argv[1]); boundary_set_from_string (&loc.end, at_directive_argv[2]);
switch (at_directive_argc) switch (at_directive_argc)
{ {
case 3: case 3:
func (loc, _(at_directive_argv[2])); func (loc, _(at_directive_argv[3]));
break; break;
case 4: case 4:
func (loc, _(at_directive_argv[2]), at_directive_argv[3]); func (loc, _(at_directive_argv[3]), at_directive_argv[4]);
break; break;
case 5: case 5:
func (loc, _(at_directive_argv[2]), at_directive_argv[3], func (loc, _(at_directive_argv[3]), at_directive_argv[4],
at_directive_argv[4]); at_directive_argv[5]);
break; break;
case 6: case 6:
func (loc, _(at_directive_argv[2]), at_directive_argv[3], func (loc, _(at_directive_argv[3]), at_directive_argv[4],
at_directive_argv[4], at_directive_argv[5]); at_directive_argv[5], at_directive_argv[6]);
break; break;
case 7: case 7:
func (loc, _(at_directive_argv[2]), at_directive_argv[3], func (loc, _(at_directive_argv[3]), at_directive_argv[4],
at_directive_argv[4], at_directive_argv[5], at_directive_argv[5], at_directive_argv[6],
at_directive_argv[6]); at_directive_argv[7]);
break; break;
default: default:
fail_for_at_directive_too_many_args (); fail_for_at_directive_too_many_args (at_directive_argv[0]);
break; break;
} }
} }
else if (0 == strcmp (at_directive_name, "@output")) else if (0 == strcmp (at_directive_argv[0], "@output"))
{ {
if (at_directive_argc > 1) if (at_directive_argc > 2)
fail_for_at_directive_too_many_args (); fail_for_at_directive_too_many_args (at_directive_argv[0]);
if (*outnamep) if (*outnamep)
{ {
free (*outnamep); free (*outnamep);
xfclose (yyout); xfclose (yyout);
} }
*outnamep = xstrdup (at_directive_argv[0]); *outnamep = xstrdup (at_directive_argv[1]);
output_file_name_check (*outnamep); output_file_name_check (*outnamep);
yyout = xfopen (*outnamep, "w"); yyout = xfopen (*outnamep, "w");
*out_linenop = 1; *out_linenop = 1;
} }
else else
fail_for_invalid_at (at_directive_name); fail_for_invalid_at (at_directive_argv[0]);
} }
static void static void
fail_for_at_directive_too_few_args (void) fail_for_at_directive_too_few_args (char const *at_directive_name)
{ {
fatal (_("too few arguments for %s directive in skeleton"), fatal (_("too few arguments for %s directive in skeleton"),
at_directive_name); at_directive_name);
} }
static void static void
fail_for_at_directive_too_many_args (void) fail_for_at_directive_too_many_args (char const *at_directive_name)
{ {
fatal (_("too many arguments for %s directive in skeleton"), fatal (_("too many arguments for %s directive in skeleton"),
at_directive_name); at_directive_name);

10
tests/skeletons.at
View File

@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA. # 02110-1301, USA.
AT_BANNER([[Skeletons Support.]]) AT_BANNER([[Skeleton Support.]])
## ------------------------------ ## ## ------------------------------ ##
## relative skeleton file names. ## ## relative skeleton file names. ##
@@ -78,11 +78,11 @@ AT_CHECK([[cat input-cmd-line.tab.c]], [[0]],
AT_CLEANUP AT_CLEANUP
## ------------------------------ ## ## ------------------------------- ##
## installed skeleton file name. ## ## installed skeleton file names. ##
## ------------------------------ ## ## ------------------------------- ##
AT_SETUP([[installed skeleton file name]]) AT_SETUP([[installed skeleton file names]])
m4_pushdef([AT_GRAM], m4_pushdef([AT_GRAM],
[[%{ [[%{