variants: document move and swap

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

diff --git a/src/scan-code.l b/src/scan-code.l
index 62444840e1b7f3dbf1a74b12198ceb0e7d876f78..c16515dddba35aae53a11a1ff1d3e58d10c974ba 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;
   }
   [$@]  {
     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;
   }
     obstack_escape (&obstack_for_string, yytext);
     need_semicolon = true;
   }


@@ -221,14 +221,16 @@ ref      -?[0-9]+|{id}|"["{id}"]"|"$"
     /* As an undocumented Bison extension, append ';' before the last
        brace in braced code, so that the user code can omit trailing
        ';'.  But do not append ';' if emulating Yacc, since Yacc does
     /* As an undocumented Bison extension, append ';' before the last
        brace in braced code, so that the user code can omit trailing
        ';'.  But do not append ';' if emulating Yacc, since Yacc does

-       not append one.  */
+       not append one.  This is deprecated since release 2.4.1.  */

     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, Wdeprecated,
-                     _("a ';' might be needed at the end of action code"));
-        complain_at (*loc, Wdeprecated,
-                     _("future versions of Bison will not add the ';'"));
+        unsigned int indent = 0;
+        complain_indent (loc, Wdeprecated, &indent,
+                         _("a ';' might be needed at the end of action code"));
+        indent += SUB_INDENT;
+        complain_indent (loc, Wdeprecated | silent, &indent,
+                         _("future versions of Bison will not add the ';'"));

         obstack_1grow (&obstack_for_string, ';');
       }
 
         obstack_1grow (&obstack_for_string, ';');
       }
 


@@ -400,16 +402,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;


@@ -444,21 +447,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]);
 }


@@ -471,9 +476,6 @@ show_sub_messages (const char* cp, bool explicit_bracketing,
    points to LHS ($$) of the current rule or midrule. */
 #define LHS_REF (INT_MIN + 1)
 
    points to LHS ($$) of the current rule or midrule. */
 #define LHS_REF (INT_MIN + 1)
 

-/* Sub-messages indent. */
-#define SUB_INDENT (4)
-

 /* Parse named or positional reference. In case of positional
    references, can return negative values for $-n "deep" stack
    accesses. */
 /* Parse named or positional reference. In case of positional
    references, can return negative values for $-n "deep" stack
    accesses. */


@@ -499,8 +501,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
         return num;
       else
         {
         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;
         }
     }
           return INVALID_REF;
         }
     }


@@ -588,31 +590,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;
       }


@@ -621,9 +624,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);
           }
         {


@@ -636,9 +640,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;
       }


@@ -673,8 +678,8 @@ fetch_type_name (char *cp, char const **type_name,
          'text' is needed for error messages. */
       ++cp;
       if (untyped_var_seen)
          '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;
       tag_seen = true;
     }
   return cp;


@@ -732,15 +737,15 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
           if (union_seen | tag_seen)
             {
               if (rule->midrule_parent_rule)
           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
                              _("$$ 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;
             }
           else
             untyped_var_seen = true;


@@ -761,9 +766,9 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
       if (!type_name)
         {
           if (union_seen | tag_seen)
       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;
         }
           else
             untyped_var_seen = true;
         }