doc: specify documentation encoding

[bison.git] / src / scan-skel.l

diff --git a/src/scan-skel.l b/src/scan-skel.l
index 5126d5f2f87c924547ad48ba21765120a790186d..129b8899a5d92117a2381641cc95aeb18d9e8164 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.                                       -*- C -*-
 
 /* 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -41,8 +41,11 @@
 #define YY_DECL static int skel_lex (void)
 YY_DECL;
 
 #define YY_DECL static int skel_lex (void)
 YY_DECL;
 

-static void at_directive_perform (int argc, char *argv[],
-                                  char **outnamep, int *out_linenop);
+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);
 static void fail_for_invalid_at (char const *at);
 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);


@@ -55,41 +58,39 @@ static void fail_for_invalid_at (char const *at);
 
 %{
   int out_lineno PACIFY_CC (= 0);
 
 %{
   int out_lineno PACIFY_CC (= 0);

-  char *outname = NULL;
+  char *out_name = 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.  argv[0] is the directive name.  */
-  #define ARGC_MAX 8
+  /* Currently, only the @complain directive takes multiple arguments, and
+     never more than 7, with argv[0] being the directive name and argv[1]
+     being the type of complaint to dispatch. */
+#define ARGC_MAX 9

   int argc = 0;
   char *argv[ARGC_MAX];
   int argc = 0;
   char *argv[ARGC_MAX];

+  at_directive at_ptr = NULL;

 %}
 
 "@@" fputc ('@', yyout);
 "@{" fputc ('[', yyout);
 "@}" fputc (']', yyout);
 %}
 
 "@@" fputc ('@', yyout);
 "@{" fputc ('[', yyout);
 "@}" fputc (']', yyout);

-"@`" continue;  /* Used by b4_cat in ../data/bison.m4.  */
+"@'" continue;  /* Used by b4_cat in ../data/bison.m4.  */

 @\n  continue;
 
 "@oline@"  fprintf (yyout, "%d", out_lineno + 1);
 @\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. */
 
   /* 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>> {
 
 <INITIAL><<EOF>> {

-  if (outname)
+  if (out_name)

     {
     {

-      free (outname);
+      free (out_name);

       xfclose (yyout);
     }
   return EOF;
       xfclose (yyout);
     }
   return EOF;


@@ -102,7 +103,7 @@ static void fail_for_invalid_at (char const *at);
   "@@"   obstack_1grow (&obstack_for_string, '@');
   "@{"   obstack_1grow (&obstack_for_string, '[');
   "@}"   obstack_1grow (&obstack_for_string, ']');
   "@@"   obstack_1grow (&obstack_for_string, '@');
   "@{"   obstack_1grow (&obstack_for_string, '[');
   "@}"   obstack_1grow (&obstack_for_string, ']');

-  "@`"   continue; /* For starting an argument that begins with whitespace. */
+  "@'"   continue; /* For starting an argument that begins with whitespace. */

   @\n    continue;
 
   @[,)] {
   @\n    continue;
 
   @[,)] {


@@ -116,7 +117,8 @@ static void fail_for_invalid_at (char const *at);
       BEGIN SC_AT_DIRECTIVE_SKIP_WS;
     else
       {
       BEGIN SC_AT_DIRECTIVE_SKIP_WS;
     else
       {

-        at_directive_perform (argc, argv, &outname, &out_lineno);
+        aver (at_ptr);
+        at_ptr (argc, argv, &out_name, &out_lineno);

         obstack_free (&obstack_for_string, argv[0]);
         argc = 0;
         BEGIN INITIAL;
         obstack_free (&obstack_for_string, argv[0]);
         argc = 0;
         BEGIN INITIAL;


@@ -134,11 +136,21 @@ static void fail_for_invalid_at (char const *at);
 
 <SC_AT_DIRECTIVE_ARGS,SC_AT_DIRECTIVE_SKIP_WS>
 {
 
 <SC_AT_DIRECTIVE_ARGS,SC_AT_DIRECTIVE_SKIP_WS>
 {

-  <<EOF>>  complain (fatal, _("unclosed %s directive in skeleton"), argv[0]);
+  <<EOF>>  complain (NULL, fatal, _("unclosed %s directive in skeleton"), argv[0]);

 }
 
 %%
 
 }
 
 %%
 

+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.  |
 `------------------------*/
 /*------------------------.
 | Scan a Bison skeleton.  |
 `------------------------*/


@@ -168,118 +180,92 @@ skel_scanner_free (void)
 static inline warnings
 flag (const char *arg)
 {
 static inline warnings
 flag (const char *arg)
 {

-  switch (arg[1])
-    {
-    case 'w': return Wother;
-    case 'c': return complaint;
-    case 'f': return fatal;
-    default: aver (false); break;
-    }
+  /* compare with values issued from b4_error */
+  if (STREQ (arg, "complain"))
+    return complaint;
+  else if (STREQ (arg, "deprecated"))
+    return Wdeprecated;
+  else if (STREQ (arg, "fatal"))
+    return fatal;
+  else if (STREQ (arg, "note"))
+    return silent | complaint | no_caret;
+  else if (STREQ (arg, "warn"))
+    return Wother;
+  else
+    aver (false);

 }
 
 static void
 }
 
 static void

-at_directive_perform (int argc, char *argv[], char **outnamep, int *out_linenop)
+at_basename (int argc, char *argv[], char **out_namep, int *out_linenop)

 {
 {

-  if (STREQ (argv[0], "@basename"))
-    {
-      if (argc > 2)
-        fail_for_at_directive_too_many_args (argv[0]);
-      fputs (last_component (argv[1]), yyout);
-    }
-  else if (STREQ (argv[0], "@warn")
-           || STREQ (argv[0], "@complain")
-           || STREQ (argv[0], "@fatal"))
-    {
-      warnings w = flag (argv[0]);
-      switch (argc)
-        {
-          case 2:
-            complain (w, "%s", _(argv[1]));
-            break;
-          case 3:
-            complain (w, _(argv[1]), argv[2]);
-            break;
-          case 4:
-            complain (w, _(argv[1]), argv[2], argv[3]);
-            break;
-          case 5:
-            complain (w, _(argv[1]), argv[2], argv[3], argv[4]);
-            break;
-          case 6:
-            complain (w, _(argv[1]), argv[2], argv[3], argv[4], argv[5]);
-            break;
-          default:
-            fail_for_at_directive_too_many_args (argv[0]);
-            break;
-        }
-    }
-  else if (STREQ (argv[0], "@warn_at")
-           || STREQ (argv[0], "@complain_at")
-           || STREQ (argv[0], "@fatal_at"))
+  (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[], 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[0]);
+  if (argv[2] && argv[2][0])

     {
     {

-      warnings w = flag (argv[0]);
-      location loc;
-      if (argc < 4)
-        fail_for_at_directive_too_few_args (argv[0]);
-      boundary_set_from_string (&loc.start, argv[1]);
-      boundary_set_from_string (&loc.end, argv[2]);
-      switch (argc)
-        {
-          case 4:
-            complain_at (loc, w, "%s", _(argv[3]));
-            break;
-          case 5:
-            complain_at (loc, w, _(argv[3]), argv[4]);
-            break;
-          case 6:
-            complain_at (loc, w, _(argv[3]), argv[4], argv[5]);
-            break;
-          case 7:
-            complain_at (loc, w, _(argv[3]), argv[4], argv[5], argv[6]);
-            break;
-          case 8:
-            complain_at (loc, w, _(argv[3]), argv[4], argv[5], argv[6],
-                         argv[7]);
-            break;
-          default:
-            fail_for_at_directive_too_many_args (argv[0]);
-            break;
-        }
+      boundary_set_from_string (&loc.start, argv[2]);
+      boundary_set_from_string (&loc.end, argv[3]);
+      locp = &loc;

     }
     }

-  else if (STREQ (argv[0], "@output"))
+  if (w & silent)
+    indent += SUB_INDENT;
+  else
+    indent = 0;
+  complain_args (locp, w, &indent, argc - 4, argv + 4);
+  if (w & silent)
+    indent -= SUB_INDENT;
+}
+
+static void
+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 (*out_namep)

     {
     {

-      if (argc > 2)
-        fail_for_at_directive_too_many_args (argv[0]);
-      if (*outnamep)
-        {
-          free (*outnamep);
-          xfclose (yyout);
-        }
-      *outnamep = xstrdup (argv[1]);
-      output_file_name_check (outnamep);
-      yyout = xfopen (*outnamep, "w");
-      *out_linenop = 1;
+      free (*out_namep);
+      xfclose (yyout);

     }
     }

-  else
-    fail_for_invalid_at (argv[0]);
+  *out_namep = xstrdup (argv[1]);
+  output_file_name_check (out_namep, true);
+  /* If there were errors, do not generate the output.  */
+  yyout = xfopen (complaint_status ? "/dev/null" : *out_namep, "w");
+  *out_linenop = 1;

 }
 
 static void
 fail_for_at_directive_too_few_args (char const *at_directive_name)
 {
 }
 
 static void
 fail_for_at_directive_too_few_args (char const *at_directive_name)
 {

-  complain (fatal, _("too few arguments for %s directive in skeleton"),
+  complain (NULL, fatal, _("too few arguments for %s directive in skeleton"),

             at_directive_name);
 }
 
 static void
 fail_for_at_directive_too_many_args (char const *at_directive_name)
 {
             at_directive_name);
 }
 
 static void
 fail_for_at_directive_too_many_args (char const *at_directive_name)
 {

-  complain (fatal, _("too many arguments for %s directive in skeleton"),
+  complain (NULL, fatal, _("too many arguments for %s directive in skeleton"),

             at_directive_name);
 }
 
 static void
 fail_for_invalid_at (char const *at)
 {
             at_directive_name);
 }
 
 static void
 fail_for_invalid_at (char const *at)
 {

-  complain (fatal, "invalid @ in skeleton: %s", at);
+  complain (NULL, fatal, "invalid @ in skeleton: %s", at);

 }
 }