scan-skel.l: shift complain_args arguments

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

diff --git a/src/scan-code.l b/src/scan-code.l
index 0bf5dc7e9451e298233287d8eb23106981b32d3b..138d2d91db594c89a9b3fdf4cad545213ac56738 100644 (file)
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -186,7 +186,7 @@ ref      -?[0-9]+|{id}|"["{id}"]"|"$"
     BEGIN SC_LINE_COMMENT;
   }
   [$@]  {
-    complain_at (*loc, Wother, _("stray '%s'"), yytext);
+    complain (loc, Wother, _("stray '%s'"), yytext);
     obstack_escape (&obstack_for_string, yytext);
     need_semicolon = true;
   }
@@ -225,10 +225,8 @@ ref      -?[0-9]+|{id}|"["{id}"]"|"$"
     if (outer_brace && !yacc_flag && language_prio == default_prio
         && skeleton_prio == default_prio && need_semicolon && ! in_cpp)
       {
-        complain_at (*loc, Wother,
-                     _("a ';' might be needed at the end of action code"));
-        complain_at (*loc, Wother,
-                     _("future versions of Bison will not add the ';'"));
+        complain (loc, Wdeprecated, _("a ';' might be needed at the end of action code"));
+        complain (loc, Wdeprecated, _("future versions of Bison will not add the ';'"));
         obstack_1grow (&obstack_for_string, ';');
       }
 
@@ -402,22 +400,14 @@ get_at_spec(unsigned symbol_index)
 static void
 show_sub_message (const char* cp, bool explicit_bracketing,
                   int midrule_rhs_index, char dollar_or_at,
-                  bool is_warning, unsigned indent,
-                  const variant *var)
+                  unsigned indent, const variant *var)
 {
   const char *at_spec = get_at_spec (var->symbol_index);
 
   if (var->err == 0)
-    {
-      if (is_warning)
-        complain_at_indent (var->loc, Wother, &indent,
-                            _("refers to: %c%s at %s"), dollar_or_at,
-                            var->id, at_spec);
-      else
-        complain_at_indent (var->loc, complaint, &indent,
-                            _("refers to: %c%s at %s"), dollar_or_at,
-                            var->id, at_spec);
-    }
+    complain_indent (&var->loc, silent, &indent,
+                     _("refers to: %c%s at %s"), dollar_or_at,
+                     var->id, at_spec);
   else
     {
       static struct obstack msg_buf;
@@ -448,19 +438,12 @@ show_sub_message (const char* cp, bool explicit_bracketing,
       obstack_printf (&msg_buf, _(" at %s"), at_spec);
 
       if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
-        {
-          const char *format =
-            _(", cannot be accessed from mid-rule action at $%d");
-          obstack_printf (&msg_buf, format, midrule_rhs_index);
-        }
+        obstack_printf (&msg_buf,
+                        _(", cannot be accessed from mid-rule action at $%d"),
+                        midrule_rhs_index);
 
-      obstack_1grow (&msg_buf, '\0');
-      if (is_warning)
-        complain_at_indent (id_loc, Wother, &indent, "%s",
-                            (char *) obstack_finish (&msg_buf));
-      else
-        complain_at_indent (id_loc, complaint, &indent, "%s",
-                            (char *) obstack_finish (&msg_buf));
+      complain_indent (&id_loc, silent, &indent, "%s",
+                       obstack_finish0 (&msg_buf));
       obstack_free (&msg_buf, 0);
     }
 }
@@ -468,14 +451,14 @@ show_sub_message (const char* cp, bool explicit_bracketing,
 static void
 show_sub_messages (const char* cp, bool explicit_bracketing,
                    int midrule_rhs_index, char dollar_or_at,
-                   bool is_warning, unsigned indent)
+                   unsigned indent)
 {
   unsigned i;
 
   for (i = 0; i < variant_count; ++i)
     show_sub_message (cp, explicit_bracketing,
                       midrule_rhs_index, dollar_or_at,
-                      is_warning, indent, &variant_table[i]);
+                      indent, &variant_table[i]);
 }
 
 /* Returned from "parse_ref" when the reference
@@ -514,8 +497,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
         return num;
       else
         {
-          complain_at (text_loc, complaint, _("integer out of range: %s"),
-                       quote (text));
+          complain (&text_loc, complaint, _("integer out of range: %s"),
+                    quote (text));
           return INVALID_REF;
         }
     }
@@ -603,38 +586,32 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
           cp_end - cp : ref_tail_fields - cp;
         unsigned indent = 0;
 
-        complain_at_indent (text_loc, complaint, &indent,
-                            _("invalid reference: %s"), quote (text));
+        complain_indent (&text_loc, complaint, &indent,
+                         _("invalid reference: %s"), quote (text));
         indent += SUB_INDENT;
         if (len == 0)
           {
             location sym_loc = text_loc;
             sym_loc.start.column += 1;
             sym_loc.end = sym_loc.start;
-            const char *format =
-              _("syntax error after '%c', expecting integer, letter,"
-                " '_', '[', or '$'");
-            complain_at_indent (sym_loc, complaint, &indent, format,
-                                dollar_or_at);
+            complain_indent (&sym_loc, complaint, &indent,
+                             _("syntax error after '%c', expecting integer, "
+                               "letter, '_', '[', or '$'"),
+                             dollar_or_at);
           }
         else if (midrule_rhs_index)
-          {
-            const char *format =
-              _("symbol not found in production before $%d: %.*s");
-            complain_at_indent (rule->location, complaint, &indent, format,
-                                midrule_rhs_index, len, cp);
-          }
+          complain_indent (&rule->location, complaint, &indent,
+                           _("symbol not found in production before $%d: "
+                             "%.*s"),
+                           midrule_rhs_index, len, cp);
         else
-          {
-            const char *format =
-              _("symbol not found in production: %.*s");
-            complain_at_indent (rule->location, complaint, &indent, format,
-                                len, cp);
-          }
+          complain_indent (&rule->location, complaint, &indent,
+                           _("symbol not found in production: %.*s"),
+                           len, cp);
 
         if (variant_count > 0)
           show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
-                             dollar_or_at, false, indent);
+                             dollar_or_at, indent);
         return INVALID_REF;
       }
     case 1:
@@ -642,10 +619,10 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
         unsigned indent = 0;
         if (variant_count > 1)
           {
-            complain_at_indent (text_loc, Wother, &indent,
-                                _("misleading reference: %s"), quote (text));
+            complain_indent (&text_loc, Wother, &indent,
+                             _("misleading reference: %s"), quote (text));
             show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
-                               dollar_or_at, true, indent + SUB_INDENT);
+                               dollar_or_at, indent + SUB_INDENT);
           }
         {
           unsigned symbol_index =
@@ -657,10 +634,10 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
     default:
       {
         unsigned indent = 0;
-        complain_at_indent (text_loc, complaint, &indent,
-                            _("ambiguous reference: %s"), quote (text));
+        complain_indent (&text_loc, complaint, &indent,
+                         _("ambiguous reference: %s"), quote (text));
         show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
-                           dollar_or_at, false, indent + SUB_INDENT);
+                           dollar_or_at, indent + SUB_INDENT);
         return INVALID_REF;
       }
     }
@@ -694,8 +671,8 @@ fetch_type_name (char *cp, char const **type_name,
          'text' is needed for error messages. */
       ++cp;
       if (untyped_var_seen)
-        complain_at (dollar_loc, complaint,
-                     _("explicit type given in untyped grammar"));
+        complain (&dollar_loc, complaint,
+                  _("explicit type given in untyped grammar"));
       tag_seen = true;
     }
   return cp;
@@ -753,15 +730,15 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
           if (union_seen | tag_seen)
             {
               if (rule->midrule_parent_rule)
-                complain_at (dollar_loc, complaint,
+                complain (&dollar_loc, complaint,
                              _("$$ for the midrule at $%d of %s"
                                " has no declared type"),
                              rule->midrule_parent_rhs_index,
                              quote (effective_rule->content.sym->tag));
               else
-                complain_at (dollar_loc, complaint,
-                             _("$$ of %s has no declared type"),
-                             quote (rule->content.sym->tag));
+                complain (&dollar_loc, complaint,
+                          _("$$ of %s has no declared type"),
+                          quote (rule->content.sym->tag));
             }
           else
             untyped_var_seen = true;
@@ -782,9 +759,9 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
       if (!type_name)
         {
           if (union_seen | tag_seen)
-            complain_at (dollar_loc, complaint,
-                         _("$%s of %s has no declared type"), cp,
-                         quote (effective_rule->content.sym->tag));
+            complain (&dollar_loc, complaint,
+                      _("$%s of %s has no declared type"), cp,
+                      quote (effective_rule->content.sym->tag));
           else
             untyped_var_seen = true;
         }