[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scan-skel.l cleanup
From: |
Joel E. Denny |
Subject: |
scan-skel.l cleanup |
Date: |
Sun, 28 Jan 2007 09:31:55 -0500 (EST) |
I committed this.
Index: ChangeLog
===================================================================
RCS file: /sources/bison/bison/ChangeLog,v
retrieving revision 1.1673
diff -p -u -r1.1673 ChangeLog
--- ChangeLog 27 Jan 2007 23:34:15 -0000 1.1673
+++ ChangeLog 28 Jan 2007 14:28:49 -0000
@@ -1,3 +1,26 @@
+2007-01-28 Joel E. Denny <address@hidden>
+
+ 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 <address@hidden>
* ChangeLog: For changes in doc/bison.texinfo, consistently reference
Index: src/scan-skel.l
===================================================================
RCS file: /sources/bison/bison/src/scan-skel.l,v
retrieving revision 1.49
diff -p -u -r1.49 scan-skel.l
--- src/scan-skel.l 18 Jan 2007 08:32:33 -0000 1.49
+++ src/scan-skel.l 28 Jan 2007 14:28:49 -0000
@@ -47,23 +47,15 @@ YY_DECL;
#define QPUTS(String) \
fputs (quotearg_style (c_quoting_style, String), yyout)
-static void at_directive_perform (char **outnamep, int *out_linenop);
-static void fail_for_at_directive_too_many_args (void);
-static void fail_for_at_directive_too_few_args (void);
+static void at_directive_perform (int at_directive_argc,
+ char *at_directive_argv[],
+ 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);
-
-/* 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
%%
@@ -71,6 +63,13 @@ static char *at_directive_argv[AT_DIRECT
%{
int out_lineno IF_LINT (= 0);
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);
@@ -83,8 +82,10 @@ static char *at_directive_argv[AT_DIRECT
@[a-z_]+"(" {
yytext[yyleng-1] = '\0';
- at_directive_name = xstrdup (yytext);
- BEGIN SC_AT_DIRECTIVE_ARG;
+ obstack_grow (&obstack_for_string, yytext, yyleng);
+ 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. */
@@ -101,7 +102,7 @@ static char *at_directive_argv[AT_DIRECT
return EOF;
}
-<SC_AT_DIRECTIVE_ARG>{
+<SC_AT_DIRECTIVE_ARGS>{
address@hidden { STRING_GROW; }
"@@" { obstack_1grow (&obstack_for_string, '@'); }
@@ -112,7 +113,7 @@ static char *at_directive_argv[AT_DIRECT
@[,)] {
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');
at_directive_argv[at_directive_argc++] =
@@ -123,10 +124,10 @@ static char *at_directive_argv[AT_DIRECT
BEGIN SC_AT_DIRECTIVE_SKIP_WS;
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]);
at_directive_argc = 0;
- free (at_directive_name);
BEGIN INITIAL;
}
}
@@ -136,12 +137,12 @@ static char *at_directive_argv[AT_DIRECT
<SC_AT_DIRECTIVE_SKIP_WS>{
[ \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>> {
- 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__flex_debug = trace_flag & trace_skeleton;
skel_lex ();
- /* Reclaim Flex's buffers. */
- yylex_destroy ();
}
void
skel_scanner_free (void)
{
obstack_free (&obstack_for_string, 0);
+ /* Reclaim Flex's buffers. */
+ yylex_destroy ();
}
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)
- fail_for_at_directive_too_many_args ();
- fputs (last_component (at_directive_argv[0]), yyout);
+ if (at_directive_argc > 2)
+ fail_for_at_directive_too_many_args (at_directive_argv[0]);
+ fputs (last_component (at_directive_argv[1]), yyout);
}
- else if (0 == strcmp (at_directive_name, "@warn")
- || 0 == strcmp (at_directive_name, "@complain")
- || 0 == strcmp (at_directive_name, "@fatal"))
+ else if (0 == strcmp (at_directive_argv[0], "@warn")
+ || 0 == strcmp (at_directive_argv[0], "@complain")
+ || 0 == strcmp (at_directive_argv[0], "@fatal"))
{
void (*func)(char const *, ...);
- switch (at_directive_name[1])
+ switch (at_directive_argv[0][1])
{
case 'w': func = warn; break;
case 'c': func = complain; break;
case 'f': func = fatal; break;
- default: aver (false); func = NULL; break;
+ default: aver (false); break;
}
switch (at_directive_argc)
{
case 1:
- func (_(at_directive_argv[0]));
+ func (_(at_directive_argv[1]));
break;
case 2:
- func (_(at_directive_argv[0]), at_directive_argv[1]);
+ func (_(at_directive_argv[1]), at_directive_argv[2]);
break;
case 3:
- func (_(at_directive_argv[0]), at_directive_argv[1],
- at_directive_argv[2]);
+ func (_(at_directive_argv[1]), at_directive_argv[2],
+ at_directive_argv[3]);
break;
case 4:
- func (_(at_directive_argv[0]), at_directive_argv[1],
- at_directive_argv[2], at_directive_argv[3]);
+ func (_(at_directive_argv[1]), at_directive_argv[2],
+ at_directive_argv[3], at_directive_argv[4]);
break;
case 5:
- func (_(at_directive_argv[0]), at_directive_argv[1],
- at_directive_argv[2], at_directive_argv[3],
- at_directive_argv[4]);
+ func (_(at_directive_argv[1]), at_directive_argv[2],
+ at_directive_argv[3], at_directive_argv[4],
+ at_directive_argv[5]);
break;
default:
- fail_for_at_directive_too_many_args ();
+ fail_for_at_directive_too_many_args (at_directive_argv[0]);
break;
}
}
- else if (0 == strcmp (at_directive_name, "@warn_at")
- || 0 == strcmp (at_directive_name, "@complain_at")
- || 0 == strcmp (at_directive_name, "@fatal_at"))
+ else if (0 == strcmp (at_directive_argv[0], "@warn_at")
+ || 0 == strcmp (at_directive_argv[0], "@complain_at")
+ || 0 == strcmp (at_directive_argv[0], "@fatal_at"))
{
void (*func)(location, char const *, ...);
location loc;
- if (at_directive_argc < 3)
- fail_for_at_directive_too_few_args ();
- switch (at_directive_name[1])
+ if (at_directive_argc < 4)
+ fail_for_at_directive_too_few_args (at_directive_argv[0]);
+ switch (at_directive_argv[0][1])
{
case 'w': func = warn_at; break;
case 'c': func = complain_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.end, at_directive_argv[1]);
+ boundary_set_from_string (&loc.start, at_directive_argv[1]);
+ boundary_set_from_string (&loc.end, at_directive_argv[2]);
switch (at_directive_argc)
{
case 3:
- func (loc, _(at_directive_argv[2]));
+ func (loc, _(at_directive_argv[3]));
break;
case 4:
- func (loc, _(at_directive_argv[2]), at_directive_argv[3]);
+ func (loc, _(at_directive_argv[3]), at_directive_argv[4]);
break;
case 5:
- func (loc, _(at_directive_argv[2]), at_directive_argv[3],
- at_directive_argv[4]);
+ func (loc, _(at_directive_argv[3]), at_directive_argv[4],
+ at_directive_argv[5]);
break;
case 6:
- func (loc, _(at_directive_argv[2]), at_directive_argv[3],
- at_directive_argv[4], at_directive_argv[5]);
+ func (loc, _(at_directive_argv[3]), at_directive_argv[4],
+ at_directive_argv[5], at_directive_argv[6]);
break;
case 7:
- func (loc, _(at_directive_argv[2]), at_directive_argv[3],
- at_directive_argv[4], at_directive_argv[5],
- at_directive_argv[6]);
+ func (loc, _(at_directive_argv[3]), at_directive_argv[4],
+ at_directive_argv[5], at_directive_argv[6],
+ at_directive_argv[7]);
break;
default:
- fail_for_at_directive_too_many_args ();
+ fail_for_at_directive_too_many_args (at_directive_argv[0]);
break;
}
}
- else if (0 == strcmp (at_directive_name, "@output"))
+ else if (0 == strcmp (at_directive_argv[0], "@output"))
{
- if (at_directive_argc > 1)
- fail_for_at_directive_too_many_args ();
+ if (at_directive_argc > 2)
+ fail_for_at_directive_too_many_args (at_directive_argv[0]);
if (*outnamep)
{
free (*outnamep);
xfclose (yyout);
}
- *outnamep = xstrdup (at_directive_argv[0]);
+ *outnamep = xstrdup (at_directive_argv[1]);
output_file_name_check (*outnamep);
yyout = xfopen (*outnamep, "w");
*out_linenop = 1;
}
else
- fail_for_invalid_at (at_directive_name);
+ fail_for_invalid_at (at_directive_argv[0]);
}
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"),
at_directive_name);
}
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"),
at_directive_name);
Index: tests/skeletons.at
===================================================================
RCS file: /sources/bison/bison/tests/skeletons.at,v
retrieving revision 1.3
diff -p -u -r1.3 skeletons.at
--- tests/skeletons.at 18 Jan 2007 08:32:33 -0000 1.3
+++ tests/skeletons.at 28 Jan 2007 14:28:49 -0000
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
-AT_BANNER([[Skeletons Support.]])
+AT_BANNER([[Skeleton Support.]])
## ------------------------------ ##
## relative skeleton file names. ##
@@ -78,11 +78,11 @@ AT_CHECK([[cat input-cmd-line.tab.c]], [
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],
[[%{
- scan-skel.l cleanup,
Joel E. Denny <=