X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/896517cdf0bac6da7fabc52509205724eb1a9e28..5cf79ede6143aa56ff6e41d8d39ad2142f20f01c:/src/scan-skel.l

diff --git a/src/scan-skel.l b/src/scan-skel.l
index c0df0ed0..c7e7190f 100644
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
-   Copyright (C) 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -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_directive)(int, char**, char **, int*);
+static void at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive 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);
@@ -56,7 +58,7 @@ static void fail_for_invalid_at (char const *at);
 
 %{
   int out_lineno PACIFY_CC (= 0);
-  char *outname = NULL;
+  char *out_name = NULL;
 
   /* Currently, only the @complain directive takes multiple arguments, and
      never more than 7, with argv[0] being the directive name and argv[1]
@@ -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_directive at_ptr = NULL;
 %}
 
 "@@" fputc ('@', yyout);
@@ -73,24 +76,21 @@ static void fail_for_invalid_at (char const *at);
 @\n  continue;
 
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);
-"@ofile@"  fputs (quotearg_style (c_quoting_style, outname), yyout);
+"@ofile@"  fputs (quotearg_style (c_quoting_style, out_name), yyout);
 
-@[a-z_]+"(" {
-  yytext[yyleng-1] = '\0';
-  obstack_grow (&obstack_for_string, yytext, yyleng);
-  argv[argc++] = obstack_finish (&obstack_for_string);
-  BEGIN SC_AT_DIRECTIVE_ARGS;
-}
+"@basename("    at_init (&argc, argv, &at_ptr, &at_basename);
+"@complain("    at_init (&argc, argv, &at_ptr, &at_complain);
+"@output("      at_init (&argc, argv, &at_ptr, &at_output);
 
   /* This pattern must not match more than the previous @ patterns. */
-@[^@{}`(\n]* fail_for_invalid_at (yytext);
-\n         out_lineno++; ECHO;
-[^@\n]+    ECHO;
+@[^@{}`(\n]*    fail_for_invalid_at (yytext);
+\n              out_lineno++; ECHO;
+[^@\n]+         ECHO;
 
 <INITIAL><<EOF>> {
-  if (outname)
+  if (out_name)
     {
-      free (outname);
+      free (out_name);
       xfclose (yyout);
     }
   return EOF;
@@ -117,15 +117,8 @@ 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
-          fail_for_invalid_at (argv[0]);
-
+        aver (at_ptr);
+        at_ptr (argc, argv, &out_name, &out_lineno);
         obstack_free (&obstack_for_string, argv[0]);
         argc = 0;
         BEGIN INITIAL;
@@ -148,6 +141,16 @@ static void fail_for_invalid_at (char const *at);
 
 %%
 
+static void
+at_init (int *argc, char *argv[], at_directive *at_ptr, at_directive 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.  |
 `------------------------*/
@@ -183,7 +186,7 @@ flag (const char *arg)
   else if (STREQ (arg, "fatal"))
     return fatal;
   else if (STREQ (arg, "note"))
-    return silent;
+    return silent | complaint | no_caret;
   else if (STREQ (arg, "warn"))
     return Wother;
   else
@@ -191,23 +194,28 @@ flag (const char *arg)
 }
 
 static void
-at_basename (int argc, char *argv[])
+at_basename (int argc, char *argv[], char **out_namep, int *out_linenop)
 {
+  (void) out_namep;
+  (void) out_linenop;
   if (2 < argc)
     fail_for_at_directive_too_many_args (argv[0]);
   fputs (last_component (argv[1]), yyout);
 }
 
 static void
-at_complain (int argc, char *argv[])
+at_complain (int argc, char *argv[], char **out_namep, int *out_linenop)
 {
   static unsigned indent;
   warnings w = flag (argv[1]);
   location loc;
   location *locp = NULL;
 
+  (void) out_namep;
+  (void) out_linenop;
+
   if (argc < 4)
-    fail_for_at_directive_too_few_args (argv[1]);
+    fail_for_at_directive_too_few_args (argv[0]);
   if (argv[2] && argv[2][0])
     {
       boundary_set_from_string (&loc.start, argv[2]);
@@ -218,28 +226,28 @@ at_complain (int argc, char *argv[])
     indent += SUB_INDENT;
   else
     indent = 0;
-  complain_args (locp, w, &indent, argc - 3, argv + 3);
+  complain_args (locp, w, &indent, argc - 4, argv + 4);
   if (w & silent)
     indent -= SUB_INDENT;
 }
 
 static void
-at_output (int argc, char *argv[], char **outnamep, int *out_linenop)
+at_output (int argc, char *argv[], char **out_namep, int *out_linenop)
 {
   if (2 < argc)
     fail_for_at_directive_too_many_args (argv[0]);
-  if (*outnamep)
+  if (*out_namep)
     {
-      free (*outnamep);
+      free (*out_namep);
       xfclose (yyout);
     }
-  *outnamep = xstrdup (argv[1]);
-  output_file_name_check (outnamep);
-  yyout = xfopen (*outnamep, "w");
+  *out_namep = xstrdup (argv[1]);
+  output_file_name_check (out_namep);
+  yyout = xfopen (*out_namep, "w");
   *out_linenop = 1;
 }
 
-  static void
+static void
 fail_for_at_directive_too_few_args (char const *at_directive_name)
 {
   complain (NULL, fatal, _("too few arguments for %s directive in skeleton"),