[PATCH 5/6] scan-skel.l: recognize the @directives directly in scanner

[Theophile Ranquet]

* src/scan-skel.l (at_ptr): New, function pointer used to call the
right at_directive function (at_basename, etc.).
(at_init): New, factor code from the scanner.
---
 src/scan-skel.l | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/scan-skel.l b/src/scan-skel.l
index e505373..840ba30 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -41,8 +41,10 @@
 #define YY_DECL static int skel_lex (void)
 YY_DECL;
 
-static void at_basename (int argc, char *argv[]);
-static void at_complain (int argc, char *argv[]);
+typedef void (*at_ptr_t)(int, char**, char **, int*);
+static void at_init (int *argc, char *argv[], at_ptr_t *at_ptr, at_ptr_t fun);
+static void at_basename (int argc, char *argv[], char**, int*);
+static void at_complain (int argc, char *argv[], char**, int*);
 static void at_output (int argc, char *argv[], char **name, int *lineno);
 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);
@@ -64,6 +66,7 @@ static void fail_for_invalid_at (char const *at);
 #define ARGC_MAX 9
   int argc = 0;
   char *argv[ARGC_MAX];
+  at_ptr_t at_ptr = NULL;
 %}
 
 "@@" fputc ('@', yyout);
@@ -75,12 +78,10 @@ static void fail_for_invalid_at (char const *at);
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);
 "@ofile@"  fputs (quotearg_style (c_quoting_style, outname), yyout);
 
address@hidden"(" {
-  yytext[yyleng-1] = '\0';
-  obstack_grow (&obstack_for_string, yytext, yyleng);
-  argv[argc++] = obstack_finish (&obstack_for_string);
-  BEGIN SC_AT_DIRECTIVE_ARGS;
-}
address@hidden"("    at_init (&argc, argv, &at_ptr, &at_basename);
address@hidden"("    at_init (&argc, argv, &at_ptr, &at_complain);
address@hidden"("      at_init (&argc, argv, &at_ptr, &at_output);
address@hidden"("     at_init (&argc, argv, &at_ptr, NULL);
 
   /* This pattern must not match more than the previous @ patterns. */
 @address@hidden(\n]* fail_for_invalid_at (yytext);
@@ -117,14 +118,10 @@ static void fail_for_invalid_at (char const *at);
       BEGIN SC_AT_DIRECTIVE_SKIP_WS;
     else
       {
-        if (STREQ (argv[0], "@basename"))
-          at_basename (argc, argv);
-        else if (STREQ (argv[0], "@complain"))
-          at_complain (argc, argv);
-        else if (STREQ (argv[0], "@output"))
-          at_output (argc, argv, &outname, &out_lineno);
-        else
+        if (at_ptr == NULL)
           fail_for_invalid_at (argv[0]);
+        else
+          at_ptr (argc, argv, &outname, &out_lineno);
 
         obstack_free (&obstack_for_string, argv[0]);
         argc = 0;
@@ -148,6 +145,16 @@ static void fail_for_invalid_at (char const *at);
 
 %%
 
+static void
+at_init (int *argc, char *argv[], at_ptr_t *at_ptr, at_ptr_t fun)
+{
+  *at_ptr = fun;
+  yytext[yyleng-1] = '\0';
+  obstack_grow (&obstack_for_string, yytext, yyleng);
+  argv[(*argc)++] = obstack_finish (&obstack_for_string);
+  BEGIN SC_AT_DIRECTIVE_ARGS;
+}
+
 /*------------------------.
 | Scan a Bison skeleton.  |
 `------------------------*/
@@ -191,7 +198,7 @@ flag (const char *arg)
 }
 
 static void
-at_basename (int argc, char *argv[])
+at_basename (int argc, char *argv[], char **unused1, int *unused2)
 {
   if (argc > 2)
     fail_for_at_directive_too_many_args (argv[0]);
@@ -199,11 +206,11 @@ at_basename (int argc, char *argv[])
 }
 
 static void
-at_complain (int argc, char *argv[])
+at_complain (int argc, char *argv[], char **unused1, int *unused2)
 {
   static unsigned indent;
   if (argc < 4)
-    fail_for_at_directive_too_few_args (argv[1]);
+    fail_for_at_directive_too_few_args (argv[0]);
   warnings w = flag (argv[1]);
   if ((w & silent) != silent)
     indent = 0;
-- 
1.7.11.4