named references: fix double free.

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

diff --git a/src/scan-code.l b/src/scan-code.l
index fc35513a10f93cd5b4a6ba92c2903f54f19ec2ec..c13f8805642f8fdb717f290faafd1f86d71aa7d6 100644 (file)
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -1,6 +1,6 @@
 /* Bison Action Scanner                             -*- C -*-
 
 /* Bison Action Scanner                             -*- C -*-
 

-   Copyright (C) 2006, 2007, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2011 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -84,8 +84,8 @@ splice         (\\[ \f\t\v]*\n)*
 /* C style identifier. Must start with letter. Will be used for
    named symbol references. Shall be kept synchronized with
    scan-gram.l "letter" and "id". */
 /* C style identifier. Must start with letter. Will be used for
    named symbol references. Shall be kept synchronized with
    scan-gram.l "letter" and "id". */

-letter   [-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]
-id       {letter}({letter}|[0-9])*
+letter   [.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]
+id       {letter}({letter}|[-0-9])*

 ref      -?[0-9]+|{id}|"["{id}"]"|"$"
 
 %%
 ref      -?[0-9]+|{id}|"["{id}"]"|"$"
 
 %%


@@ -245,7 +245,20 @@ ref      -?[0-9]+|{id}|"["{id}"]"|"$"
   {splice}  STRING_GROW;
   [\n\r]    STRING_GROW; if (in_cpp) in_cpp = need_semicolon = false; 
   [ \t\f]   STRING_GROW;
   {splice}  STRING_GROW;
   [\n\r]    STRING_GROW; if (in_cpp) in_cpp = need_semicolon = false; 
   [ \t\f]   STRING_GROW;

-  .         STRING_GROW; need_semicolon = true;
+
+  /* YYFAIL is undocumented and was formally deprecated in Bison
+     2.4.2.  */
+  YYFAIL {
+    STRING_GROW; need_semicolon = true;
+    warn_at (*loc, _("use of YYFAIL, which is deprecated and will be"
+                     " removed"));
+  }
+
+  /* The sole purpose of this is to make sure identifiers that merely
+     contain YYFAIL don't produce the above warning.  */
+  [A-Za-z_][0-9A-Za-z_]* STRING_GROW; need_semicolon = true;
+
+  . STRING_GROW; need_semicolon = true;

 }
 
 <SC_SYMBOL_ACTION>
 }
 
 <SC_SYMBOL_ACTION>


@@ -375,14 +388,14 @@ find_prefix_end (const char *prefix, char *begin, char *end)
 
 static variant *
 variant_add (uniqstr id, location id_loc, unsigned symbol_index,
 
 static variant *
 variant_add (uniqstr id, location id_loc, unsigned symbol_index,

-            char *cp, char *cp_end, bool exact_mode)
+            char *cp, char *cp_end, bool explicit_bracketing)

 {
   char *prefix_end;
 
   prefix_end = find_prefix_end (id, cp, cp_end);
   if (prefix_end &&
       (prefix_end == cp_end ||
 {
   char *prefix_end;
 
   prefix_end = find_prefix_end (id, cp, cp_end);
   if (prefix_end &&
       (prefix_end == cp_end ||

-       (!exact_mode && is_dot_or_dash (*prefix_end))))
+       (!explicit_bracketing && is_dot_or_dash (*prefix_end))))

     {
       variant *r = variant_table_grow ();
       r->symbol_index = symbol_index;
     {
       variant *r = variant_table_grow ();
       r->symbol_index = symbol_index;


@@ -408,8 +421,9 @@ get_at_spec(unsigned symbol_index)
 }
 
 static void
 }
 
 static void

-show_sub_messages (const char* cp, bool exact_mode, int midrule_rhs_index,
-                   char dollar_or_at, bool is_warning)
+show_sub_messages (const char* cp, bool explicit_bracketing,
+                   int midrule_rhs_index, char dollar_or_at,
+                   bool is_warning, unsigned indent)

 {
   unsigned i;
 
 {
   unsigned i;
 


@@ -421,16 +435,16 @@ show_sub_messages (const char* cp, bool exact_mode, int midrule_rhs_index,
       if (var->err == 0)
         {
           if (is_warning)
       if (var->err == 0)
         {
           if (is_warning)

-            warn_at (var->loc, _("  refers to: %c%s at %s"),
-                     dollar_or_at, var->id, at_spec);
+            warn_at_indent (var->loc, &indent, _("refers to: %c%s at %s"),
+                            dollar_or_at, var->id, at_spec);

           else
           else

-            complain_at (var->loc, _("  refers to: %c%s at %s"),
-                         dollar_or_at, var->id, at_spec);
+            complain_at_indent (var->loc, &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;

-         const char *tail = exact_mode ? "" :
+         const char *tail = explicit_bracketing ? "" :

            cp + strlen (var->id);
          const char *id = var->hidden_by ? var->hidden_by->id :
            var->id;
            cp + strlen (var->id);
          const char *id = var->hidden_by ? var->hidden_by->id :
            var->id;


@@ -440,7 +454,7 @@ show_sub_messages (const char* cp, bool exact_mode, int midrule_rhs_index,
          /* Create the explanation message. */
          obstack_init (&msg_buf);
 
          /* Create the explanation message. */
          obstack_init (&msg_buf);
 

-         obstack_fgrow1 (&msg_buf, "  possibly meant: %c", dollar_or_at);
+         obstack_fgrow1 (&msg_buf, _("possibly meant: %c"), dollar_or_at);

          if (contains_dot_or_dash (id))
            obstack_fgrow1 (&msg_buf, "[%s]", id);
          else
          if (contains_dot_or_dash (id))
            obstack_fgrow1 (&msg_buf, "[%s]", id);
          else


@@ -449,7 +463,7 @@ show_sub_messages (const char* cp, bool exact_mode, int midrule_rhs_index,
 
          if (var->err & VARIANT_HIDDEN)
            {
 
          if (var->err & VARIANT_HIDDEN)
            {

-             obstack_fgrow1 (&msg_buf, ", hiding %c", dollar_or_at);
+             obstack_fgrow1 (&msg_buf, _(", hiding %c"), dollar_or_at);

              if (contains_dot_or_dash (var->id))
                obstack_fgrow1 (&msg_buf, "[%s]", var->id);
              else
              if (contains_dot_or_dash (var->id))
                obstack_fgrow1 (&msg_buf, "[%s]", var->id);
              else


@@ -457,17 +471,22 @@ show_sub_messages (const char* cp, bool exact_mode, int midrule_rhs_index,
              obstack_sgrow (&msg_buf, tail);
            }
 
              obstack_sgrow (&msg_buf, tail);
            }
 

-         obstack_fgrow1 (&msg_buf, " at %s", at_spec);
+         obstack_fgrow1 (&msg_buf, _(" at %s"), at_spec);

 
          if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
 
          if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)

-           obstack_fgrow1 (&msg_buf, ", cannot be accessed from "
-                           "mid-rule action at $%d", midrule_rhs_index);
+            {
+              const char *format =
+                _(", cannot be accessed from mid-rule action at $%d");
+              obstack_fgrow1 (&msg_buf, format, midrule_rhs_index);
+            }

 
          obstack_1grow (&msg_buf, '\0');
           if (is_warning)
 
          obstack_1grow (&msg_buf, '\0');
           if (is_warning)

-            warn_at (id_loc, _("%s"), (char *) obstack_finish (&msg_buf));
+            warn_at_indent (id_loc, &indent, "%s",
+                            (char *) obstack_finish (&msg_buf));

           else
           else

-            complain_at (id_loc, _("%s"), (char *) obstack_finish (&msg_buf));
+            complain_at_indent (id_loc, &indent, "%s",
+                                (char *) obstack_finish (&msg_buf));

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


@@ -481,6 +500,9 @@ show_sub_messages (const char* cp, bool exact_mode, int midrule_rhs_index,
    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. */


@@ -491,7 +513,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
 {
   symbol_list *l;
   char *cp_end;
 {
   symbol_list *l;
   char *cp_end;

-  bool exact_mode;
+  bool explicit_bracketing;

   unsigned i;
   unsigned valid_variants = 0;
   unsigned valid_variant_index = 0;
   unsigned i;
   unsigned valid_variants = 0;
   unsigned valid_variant_index = 0;


@@ -520,7 +542,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
        continue;
       cp_end = p;
 
        continue;
       cp_end = p;
 

-      exact_mode = true;
+      explicit_bracketing = true;

     }
   else
     {
     }
   else
     {


@@ -536,7 +558,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
        continue;
       cp_end = p;
 
        continue;
       cp_end = p;
 

-      exact_mode = false;
+      explicit_bracketing = false;

     }
 
   /* Add all relevant variants. */
     }
 
   /* Add all relevant variants. */


@@ -551,13 +573,13 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
          continue;
 
        var = variant_add (l->content.sym->tag, l->sym_loc,
          continue;
 
        var = variant_add (l->content.sym->tag, l->sym_loc,

-                           symbol_index, cp, cp_end, exact_mode);
+                           symbol_index, cp, cp_end, explicit_bracketing);

        if (var && l->named_ref)
          var->hidden_by = l->named_ref;
 
        if (l->named_ref)
          variant_add (l->named_ref->id, l->named_ref->loc,
        if (var && l->named_ref)
          var->hidden_by = l->named_ref;
 
        if (l->named_ref)
          variant_add (l->named_ref->id, l->named_ref->loc,

-                       symbol_index, cp, cp_end, exact_mode);
+                       symbol_index, cp, cp_end, explicit_bracketing);

       }
   }
 
       }
   }
 


@@ -573,7 +595,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
         var->err |= VARIANT_NOT_VISIBLE_FROM_MIDRULE;
 
       /* Check correct bracketing. */
         var->err |= VARIANT_NOT_VISIBLE_FROM_MIDRULE;
 
       /* Check correct bracketing. */

-      if (!exact_mode && contains_dot_or_dash (var->id))
+      if (!explicit_bracketing && contains_dot_or_dash (var->id))

         var->err |= VARIANT_BAD_BRACKETING;
 
       /* Check using of hidden symbols. */
         var->err |= VARIANT_BAD_BRACKETING;
 
       /* Check using of hidden symbols. */


@@ -590,25 +612,53 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
   switch (valid_variants)
     {
     case 0:
   switch (valid_variants)
     {
     case 0:

-      if (variant_count == 0)
-        complain_at (text_loc, _("invalid reference: %s, symbol not found"),
-                     quote (text));
-      else
-        {
-          complain_at (text_loc, _("invalid reference: %s"),
-                       quote (text));
-          show_sub_messages (cp, exact_mode, midrule_rhs_index,
-                             dollar_or_at, false);
-        }
-      return INVALID_REF;
+      {
+        unsigned len = (explicit_bracketing || !ref_tail_fields) ?
+          cp_end - cp : ref_tail_fields - cp;
+        unsigned indent = 0;
+
+        complain_at_indent (text_loc, &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;
+            const char *format =
+              _("syntax error after `%c', expecting integer, letter,"
+                " `_', `[', or `$'");
+            complain_at_indent (sym_loc, &indent, format, dollar_or_at);
+          }
+        else if (midrule_rhs_index)
+          {
+            const char *format =
+              _("symbol not found in production before $%d: %.*s");
+            complain_at_indent (rule->location, &indent, format,
+                                midrule_rhs_index, len, cp);
+          }
+        else
+          {
+            const char *format =
+              _("symbol not found in production: %.*s");
+            complain_at_indent (rule->location, &indent, format,
+                                len, cp);
+          }
+
+        if (variant_count > 0)
+          show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
+                             dollar_or_at, false, indent);
+        return INVALID_REF;
+      }

     case 1:
       {
     case 1:
       {

+        unsigned indent = 0;

         if (variant_count > 1)
           {
         if (variant_count > 1)
           {

-            warn_at (text_loc, _("misleading reference: %s"),
-                     quote (text));
-            show_sub_messages (cp, exact_mode, midrule_rhs_index,
-                               dollar_or_at, true);
+            warn_at_indent (text_loc, &indent, _("misleading reference: %s"),
+                            quote (text));
+            show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
+                               dollar_or_at, true, indent + SUB_INDENT);

           }
         {
           unsigned symbol_index =
           }
         {
           unsigned symbol_index =


@@ -618,11 +668,14 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
       }
     case 2:
     default:
       }
     case 2:
     default:

-      complain_at (text_loc, _("ambiguous reference: %s"),
-                   quote (text));
-      show_sub_messages (cp, exact_mode, midrule_rhs_index,
-                         dollar_or_at, false);
-      return INVALID_REF;
+      {
+        unsigned indent = 0;
+        complain_at_indent (text_loc, &indent, _("ambiguous reference: %s"),
+                            quote (text));
+        show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
+                           dollar_or_at, false, indent + SUB_INDENT);
+        return INVALID_REF;
+      }

     }
 
   /* Not reachable. */
     }
 
   /* Not reachable. */