%expect-rr is for GLR only

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

diff --git a/src/scan-code.l b/src/scan-code.l
index 2fe880ed6a371d03215cc19af83d16320a6759e7..522c5b9ce3c758286268216f52274f541e79f05d 100644 (file)
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -225,9 +225,9 @@ ref      -?[0-9]+|{id}|"["{id}"]"|"$"
     if (outer_brace && !yacc_flag && language_prio == default_prio
         && skeleton_prio == default_prio && need_semicolon && ! in_cpp)
       {
     if (outer_brace && !yacc_flag && language_prio == default_prio
         && skeleton_prio == default_prio && need_semicolon && ! in_cpp)
       {

-        complain_at (*loc, Wother,
+        complain_at (*loc, Wdeprecated,

                      _("a ';' might be needed at the end of action code"));
                      _("a ';' might be needed at the end of action code"));

-        complain_at (*loc, Wother,
+        complain_at (*loc, Wdeprecated,

                      _("future versions of Bison will not add the ';'"));
         obstack_1grow (&obstack_for_string, ';');
       }
                      _("future versions of Bison will not add the ';'"));
         obstack_1grow (&obstack_for_string, ';');
       }


@@ -400,79 +400,70 @@ get_at_spec(unsigned symbol_index)
 }
 
 static void
 }
 
 static void

-show_sub_messages (const char* cp, bool explicit_bracketing,
-                   int midrule_rhs_index, char dollar_or_at,
-                   bool is_warning, unsigned indent)
+show_sub_message (const char* cp, bool explicit_bracketing,
+                  int midrule_rhs_index, char dollar_or_at,
+                  warnings wflags, unsigned indent,
+                  const variant *var)

 {
 {

-  unsigned i;
+  const char *at_spec = get_at_spec (var->symbol_index);

 
 

-  for (i = 0; i < variant_count; ++i)
+  if (var->err == 0)
+    complain_at_indent (var->loc, wflags, &indent,
+                        _("refers to: %c%s at %s"), dollar_or_at,
+                        var->id, at_spec);
+  else

     {
     {

-      const variant *var = &variant_table[i];
-      const char *at_spec = get_at_spec (var->symbol_index);
+      static struct obstack msg_buf;
+      const char *tail = explicit_bracketing ? "" : cp + strlen (var->id);
+      const char *id = var->hidden_by ? var->hidden_by->id : var->id;
+      location id_loc = var->hidden_by ? var->hidden_by->loc : var->loc;

 
 

-      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);
-        }
+      /* Create the explanation message. */
+      obstack_init (&msg_buf);
+
+      obstack_printf (&msg_buf, _("possibly meant: %c"), dollar_or_at);
+      if (contains_dot_or_dash (id))
+        obstack_printf (&msg_buf, "[%s]", id);

       else
       else

+        obstack_sgrow (&msg_buf, id);
+      obstack_sgrow (&msg_buf, tail);
+
+      if (var->err & VARIANT_HIDDEN)

         {
         {

-          static struct obstack msg_buf;
-          const char *tail = explicit_bracketing ? "" :
-            cp + strlen (var->id);
-          const char *id = var->hidden_by ? var->hidden_by->id :
-            var->id;
-          location id_loc = var->hidden_by ? var->hidden_by->loc :
-            var->loc;
-
-          /* Create the explanation message. */
-          obstack_init (&msg_buf);
-
-          obstack_fgrow1 (&msg_buf, _("possibly meant: %c"), dollar_or_at);
-          if (contains_dot_or_dash (id))
-            obstack_fgrow1 (&msg_buf, "[%s]", id);
+          obstack_printf (&msg_buf, _(", hiding %c"), dollar_or_at);
+          if (contains_dot_or_dash (var->id))
+            obstack_printf (&msg_buf, "[%s]", var->id);

           else
           else

-            obstack_sgrow (&msg_buf, id);
+            obstack_sgrow (&msg_buf, var->id);

           obstack_sgrow (&msg_buf, tail);
           obstack_sgrow (&msg_buf, tail);

+        }

 
 

-          if (var->err & VARIANT_HIDDEN)
-            {
-              obstack_fgrow1 (&msg_buf, _(", hiding %c"), dollar_or_at);
-              if (contains_dot_or_dash (var->id))
-                obstack_fgrow1 (&msg_buf, "[%s]", var->id);
-              else
-                obstack_sgrow (&msg_buf, var->id);
-              obstack_sgrow (&msg_buf, tail);
-            }
-
-          obstack_fgrow1 (&msg_buf, _(" at %s"), at_spec);
+      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_fgrow1 (&msg_buf, format, midrule_rhs_index);
-            }
+      if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
+        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));
-          obstack_free (&msg_buf, 0);
-        }
+      complain_at_indent (id_loc, wflags, &indent, "%s",
+                          obstack_finish0 (&msg_buf));
+      obstack_free (&msg_buf, 0);

     }
 }
 
     }
 }
 

+static void
+show_sub_messages (const char* cp, bool explicit_bracketing,
+                   int midrule_rhs_index, char dollar_or_at,
+                   warnings wflags, unsigned indent)
+{
+  unsigned i;
+
+  for (i = 0; i < variant_count; ++i)
+    show_sub_message (cp, explicit_bracketing,
+                      midrule_rhs_index, dollar_or_at,
+                      wflags, indent, &variant_table[i]);
+}
+

 /* Returned from "parse_ref" when the reference
    is inappropriate. */
 #define INVALID_REF (INT_MIN)
 /* Returned from "parse_ref" when the reference
    is inappropriate. */
 #define INVALID_REF (INT_MIN)


@@ -606,30 +597,24 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
             location sym_loc = text_loc;
             sym_loc.start.column += 1;
             sym_loc.end = sym_loc.start;
             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,
+            complain_at_indent (sym_loc, complaint, &indent,
+                                _("syntax error after '%c', expecting integer, "
+                                  "letter, '_', '[', or '$'"),

                                 dollar_or_at);
           }
         else if (midrule_rhs_index)
                                 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_at_indent (rule->location, complaint, &indent,
+                              _("symbol not found in production before $%d: "
+                                "%.*s"),
+                              midrule_rhs_index, len, cp);

         else
         else

-          {
-            const char *format =
-              _("symbol not found in production: %.*s");
-            complain_at_indent (rule->location, complaint, &indent, format,
-                                len, cp);
-          }
+          complain_at_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,
 
         if (variant_count > 0)
           show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,

-                             dollar_or_at, false, indent);
+                             dollar_or_at, complaint, indent);

         return INVALID_REF;
       }
     case 1:
         return INVALID_REF;
       }
     case 1:


@@ -640,7 +625,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
             complain_at_indent (text_loc, Wother, &indent,
                                 _("misleading reference: %s"), quote (text));
             show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
             complain_at_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, Wother, indent + SUB_INDENT);

           }
         {
           unsigned symbol_index =
           }
         {
           unsigned symbol_index =


@@ -655,7 +640,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
         complain_at_indent (text_loc, complaint, &indent,
                             _("ambiguous reference: %s"), quote (text));
         show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
         complain_at_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, complaint, indent + SUB_INDENT);

         return INVALID_REF;
       }
     }
         return INVALID_REF;
       }
     }


@@ -784,7 +769,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
             untyped_var_seen = true;
         }
 
             untyped_var_seen = true;
         }
 

-      obstack_fgrow2 (&obstack_for_string,
+      obstack_printf (&obstack_for_string,

                       "]b4_rhs_value(%d, %d, ", effective_rule_length, n);
       obstack_quote (&obstack_for_string, type_name);
       obstack_sgrow (&obstack_for_string, ")[");
                       "]b4_rhs_value(%d, %d, ", effective_rule_length, n);
       obstack_quote (&obstack_for_string, type_name);
       obstack_sgrow (&obstack_for_string, ")[");


@@ -834,7 +819,7 @@ handle_action_at (symbol_list *rule, char *text, location at_loc)
       break;
 
     default:
       break;
 
     default:

-      obstack_fgrow2 (&obstack_for_string, "]b4_rhs_location(%d, %d)[",
+      obstack_printf (&obstack_for_string, "]b4_rhs_location(%d, %d)[",

                       effective_rule_length, n);
       break;
     }
                       effective_rule_length, n);
       break;
     }