lalr1.cc: rename lex_symbol as api.token.constructor

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

diff --git a/src/scan-code.l b/src/scan-code.l
index 138d2d91db594c89a9b3fdf4cad545213ac56738..1024913a999f929b794e1ed4a6e5590645cb423a 100644 (file)
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -398,14 +398,15 @@ get_at_spec(unsigned symbol_index)
 }
 
 static void
 }
 
 static void

-show_sub_message (const char* cp, bool explicit_bracketing,
+show_sub_message (warnings warning,
+                  const char* cp, bool explicit_bracketing,

                   int midrule_rhs_index, char dollar_or_at,
                   unsigned indent, const variant *var)
 {
   const char *at_spec = get_at_spec (var->symbol_index);
 
   if (var->err == 0)
                   int midrule_rhs_index, char dollar_or_at,
                   unsigned indent, const variant *var)
 {
   const char *at_spec = get_at_spec (var->symbol_index);
 
   if (var->err == 0)

-    complain_indent (&var->loc, silent, &indent,
+    complain_indent (&var->loc, warning, &indent,

                      _("refers to: %c%s at %s"), dollar_or_at,
                      var->id, at_spec);
   else
                      _("refers to: %c%s at %s"), dollar_or_at,
                      var->id, at_spec);
   else


@@ -442,21 +443,23 @@ show_sub_message (const char* cp, bool explicit_bracketing,
                         _(", cannot be accessed from mid-rule action at $%d"),
                         midrule_rhs_index);
 
                         _(", cannot be accessed from mid-rule action at $%d"),
                         midrule_rhs_index);
 

-      complain_indent (&id_loc, silent, &indent, "%s",
-                       obstack_finish0 (&msg_buf));
+      complain_indent (&id_loc, warning, &indent, "%s",
+                        obstack_finish0 (&msg_buf));

       obstack_free (&msg_buf, 0);
     }
 }
 
 static void
       obstack_free (&msg_buf, 0);
     }
 }
 
 static void

-show_sub_messages (const char* cp, bool explicit_bracketing,
+show_sub_messages (warnings warning,
+                   const char* cp, bool explicit_bracketing,

                    int midrule_rhs_index, char dollar_or_at,
                    unsigned indent)
 {
   unsigned i;
 
   for (i = 0; i < variant_count; ++i)
                    int midrule_rhs_index, char dollar_or_at,
                    unsigned indent)
 {
   unsigned i;
 
   for (i = 0; i < variant_count; ++i)

-    show_sub_message (cp, explicit_bracketing,
+    show_sub_message (warning | silent,
+                      cp, explicit_bracketing,

                       midrule_rhs_index, dollar_or_at,
                       indent, &variant_table[i]);
 }
                       midrule_rhs_index, dollar_or_at,
                       indent, &variant_table[i]);
 }


@@ -610,7 +613,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
                            len, cp);
 
         if (variant_count > 0)
                            len, cp);
 
         if (variant_count > 0)

-          show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
+          show_sub_messages (complaint,
+                             cp, explicit_bracketing, midrule_rhs_index,

                              dollar_or_at, indent);
         return INVALID_REF;
       }
                              dollar_or_at, indent);
         return INVALID_REF;
       }


@@ -621,7 +625,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
           {
             complain_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,
+            show_sub_messages (Wother,
+                               cp, explicit_bracketing, midrule_rhs_index,

                                dollar_or_at, indent + SUB_INDENT);
           }
         {
                                dollar_or_at, indent + SUB_INDENT);
           }
         {


@@ -636,7 +641,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
         unsigned indent = 0;
         complain_indent (&text_loc, complaint, &indent,
                          _("ambiguous reference: %s"), quote (text));
         unsigned indent = 0;
         complain_indent (&text_loc, complaint, &indent,
                          _("ambiguous reference: %s"), quote (text));

-        show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
+        show_sub_messages (complaint,
+                           cp, explicit_bracketing, midrule_rhs_index,

                            dollar_or_at, indent + SUB_INDENT);
         return INVALID_REF;
       }
                            dollar_or_at, indent + SUB_INDENT);
         return INVALID_REF;
       }