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 6d7e13811dcc8738756747f0fc56616cc07db797..1024913a999f929b794e1ed4a6e5590645cb423a 100644 (file)
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -398,16 +398,17 @@ 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_at_indent (var->loc, silent, &indent,
-                        _("refers to: %c%s at %s"), dollar_or_at,
-                        var->id, at_spec);
+    complain_indent (&var->loc, warning, &indent,
+                     _("refers to: %c%s at %s"), dollar_or_at,
+                     var->id, at_spec);

   else
     {
       static struct obstack msg_buf;
   else
     {
       static struct obstack msg_buf;


@@ -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_at_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]);
 }


@@ -586,31 +589,32 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
           cp_end - cp : ref_tail_fields - cp;
         unsigned indent = 0;
 
           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;
         indent += SUB_INDENT;
         if (len == 0)
           {
             location sym_loc = text_loc;
             sym_loc.start.column += 1;
             sym_loc.end = sym_loc.start;

-            complain_at_indent (sym_loc, complaint, &indent,
-                                _("syntax error after '%c', expecting integer, "
-                                  "letter, '_', '[', or '$'"),
-                                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)
           }
         else if (midrule_rhs_index)

-          complain_at_indent (rule->location, complaint, &indent,
-                              _("symbol not found in production before $%d: "
-                                "%.*s"),
-                              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
         else

-          complain_at_indent (rule->location, complaint, &indent,
-                              _("symbol not found in production: %.*s"),
-                              len, cp);
+          complain_indent (&rule->location, complaint, &indent,
+                           _("symbol not found in production: %.*s"),
+                           len, cp);

 
         if (variant_count > 0)
 
         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;
       }


@@ -619,9 +623,10 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
         unsigned indent = 0;
         if (variant_count > 1)
           {
         unsigned indent = 0;
         if (variant_count > 1)
           {

-            complain_at_indent (text_loc, Wother, &indent,
-                                _("misleading reference: %s"), quote (text));
-            show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
+            complain_indent (&text_loc, Wother, &indent,
+                             _("misleading reference: %s"), quote (text));
+            show_sub_messages (Wother,
+                               cp, explicit_bracketing, midrule_rhs_index,

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


@@ -634,9 +639,10 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
     default:
       {
         unsigned indent = 0;
     default:
       {
         unsigned indent = 0;

-        complain_at_indent (text_loc, complaint, &indent,
-                            _("ambiguous reference: %s"), quote (text));
-        show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
+        complain_indent (&text_loc, complaint, &indent,
+                         _("ambiguous reference: %s"), quote (text));
+        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;
       }