Merge remote-tracking branch 'origin/maint'

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

diff --git a/src/scan-code.l b/src/scan-code.l
index 138d2d91db594c89a9b3fdf4cad545213ac56738..c16515dddba35aae53a11a1ff1d3e58d10c974ba 100644 (file)
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -221,12 +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
-       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)
       {
-        complain (loc, Wdeprecated, _("a ';' might be needed at the end of action code"));
-        complain (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, ';');
       }
 
@@ -398,14 +402,15 @@ get_at_spec(unsigned symbol_index)
 }
 
 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)
-    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
@@ -442,21 +447,23 @@ show_sub_message (const char* cp, bool explicit_bracketing,
                         _(", 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
-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)
-    show_sub_message (cp, explicit_bracketing,
+    show_sub_message (warning | silent,
+                      cp, explicit_bracketing,
                       midrule_rhs_index, dollar_or_at,
                       indent, &variant_table[i]);
 }
@@ -469,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)
 
-/* 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. */
@@ -610,7 +614,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
                            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;
       }
@@ -621,7 +626,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
           {
             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);
           }
         {
@@ -636,7 +642,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));
-        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;
       }