Add copyright updates missed during previous cherry pick.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index d5cd629fde13025cbb55b3114b237c8e15ad9bae..17ff0f78de358533f063494d80f4a1f4bc637bce 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,24 +1,22 @@
 /* Input parser for Bison
 
    Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002, 2003,
 /* Input parser for Bison
 
    Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002, 2003,

-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2009 Free Software Foundation, Inc.

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

-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"


@@ -69,27 +67,6 @@ grammar_start_symbol_set (symbol *sym, location loc)
     }
 }
 
     }
 }
 

-
-/*---------------------------------------------------------------------.
-| There are two prologues: one before the first %union and one after.  |
-| Augment the one specified by POST.                                   |
-`---------------------------------------------------------------------*/
-
-void
-prologue_augment (const char *prologue, location loc, bool post)
-{
-  struct obstack *oout =
-    !post ? &pre_prologue_obstack : &post_prologue_obstack;
-
-  obstack_fgrow1 (oout, "]b4_syncline(%d, [[", loc.start.line);
-  /* FIXME: Protection of M4 characters missing here.  See
-     output.c:escaped_output.  */
-  MUSCLE_OBSTACK_SGROW (oout,
-                       quotearg_style (c_quoting_style, loc.start.file));
-  obstack_sgrow (oout, "]])[\n");
-  obstack_sgrow (oout, prologue);
-}
-

 \f
 
 /*------------------------------------------------------------------------.
 \f
 
 /*------------------------------------------------------------------------.


@@ -253,13 +230,14 @@ grammar_current_rule_begin (symbol *lhs, location loc)
 static bool
 symbol_should_be_used (symbol_list const *s)
 {
 static bool
 symbol_should_be_used (symbol_list const *s)
 {

-  if (symbol_destructor_get (s->content.sym))
+  if (symbol_destructor_get (s->content.sym)->code)

     return true;
   if (warnings_flag & warnings_midrule_values)
     return true;
   if (warnings_flag & warnings_midrule_values)

-    return ((s->midrule && s->midrule->used)
+    return ((s->midrule && s->midrule->action_props.is_value_used)

            || (s->midrule_parent_rule
                && symbol_list_n_get (s->midrule_parent_rule,
            || (s->midrule_parent_rule
                && symbol_list_n_get (s->midrule_parent_rule,

-                                     s->midrule_parent_rhs_index)->used));
+                                     s->midrule_parent_rhs_index)
+                     ->action_props.is_value_used));

   return false;
 }
 
   return false;
 }
 


@@ -278,7 +256,7 @@ grammar_rule_check (const symbol_list *r)
 
      Don't worry about the default action if $$ is untyped, since $$'s
      value can't be used.  */
 
      Don't worry about the default action if $$ is untyped, since $$'s
      value can't be used.  */

-  if (!r->action && r->content.sym->type_name)
+  if (!r->action_props.code && r->content.sym->type_name)

     {
       symbol *first_rhs = r->next->content.sym;
       /* If $$ is being set in default way, report if any type mismatch.  */
     {
       symbol *first_rhs = r->next->content.sym;
       /* If $$ is being set in default way, report if any type mismatch.  */


@@ -303,10 +281,10 @@ grammar_rule_check (const symbol_list *r)
     symbol_list const *l = r;
     int n = 0;
     for (; l && l->content.sym; l = l->next, ++n)
     symbol_list const *l = r;
     int n = 0;
     for (; l && l->content.sym; l = l->next, ++n)

-      if (! (l->used
+      if (! (l->action_props.is_value_used

             || !symbol_should_be_used (l)
             /* The default action, $$ = $1, `uses' both.  */
             || !symbol_should_be_used (l)
             /* The default action, $$ = $1, `uses' both.  */

-            || (!r->action && (n == 0 || n == 1))))
+            || (!r->action_props.code && (n == 0 || n == 1))))

        {
          if (n)
            warn_at (r->location, _("unused value: $%d"), n);
        {
          if (n)
            warn_at (r->location, _("unused value: $%d"), n);


@@ -346,7 +324,7 @@ grammar_midrule_action (void)
 
   /* Make a DUMMY nonterminal, whose location is that of the midrule
      action.  Create the MIDRULE.  */
 
   /* Make a DUMMY nonterminal, whose location is that of the midrule
      action.  Create the MIDRULE.  */

-  location dummy_location = current_rule->action_location;
+  location dummy_location = current_rule->action_props.location;

   symbol *dummy = dummy_symbol_get (dummy_location);
   symbol_list *midrule = symbol_list_sym_new (dummy, dummy_location);
 
   symbol *dummy = dummy_symbol_get (dummy_location);
   symbol_list *midrule = symbol_list_sym_new (dummy, dummy_location);
 


@@ -356,12 +334,11 @@ grammar_midrule_action (void)
   ++nritems;
   /* Attach its location and actions to that of the DUMMY.  */
   midrule->location = dummy_location;
   ++nritems;
   /* Attach its location and actions to that of the DUMMY.  */
   midrule->location = dummy_location;

-  midrule->action = current_rule->action;
-  midrule->action_location = dummy_location;
-  current_rule->action = NULL;
-  /* The action has not been translated yet, so $$ use hasn't been
-     detected yet.  */
-  midrule->used = false;
+  code_props_rule_action_init (&midrule->action_props,
+                               current_rule->action_props.code,
+                               current_rule->action_props.location,
+                               midrule);
+  code_props_none_init (&current_rule->action_props);

 
   if (previous_rule_end)
     previous_rule_end->next = midrule;
 
   if (previous_rule_end)
     previous_rule_end->next = midrule;


@@ -387,6 +364,7 @@ grammar_midrule_action (void)
 void
 grammar_current_rule_prec_set (symbol *precsym, location loc)
 {
 void
 grammar_current_rule_prec_set (symbol *precsym, location loc)
 {

+  symbol_class_set (precsym, token_sym, loc, false);

   if (current_rule->ruleprec)
     complain_at (loc, _("only one %s allowed per rule"), "%prec");
   current_rule->ruleprec = precsym;
   if (current_rule->ruleprec)
     complain_at (loc, _("only one %s allowed per rule"), "%prec");
   current_rule->ruleprec = precsym;


@@ -426,7 +404,7 @@ grammar_current_rule_merge_set (uniqstr name, location loc)
 void
 grammar_current_rule_symbol_append (symbol *sym, location loc)
 {
 void
 grammar_current_rule_symbol_append (symbol *sym, location loc)
 {

-  if (current_rule->action)
+  if (current_rule->action_props.code)

     grammar_midrule_action ();
   grammar_symbol_append (sym, loc);
 }
     grammar_midrule_action ();
   grammar_symbol_append (sym, loc);
 }


@@ -436,12 +414,12 @@ grammar_current_rule_symbol_append (symbol *sym, location loc)
 void
 grammar_current_rule_action_append (const char *action, location loc)
 {
 void
 grammar_current_rule_action_append (const char *action, location loc)
 {

-  if (current_rule->action)
+  if (current_rule->action_props.code)

     grammar_midrule_action ();
   /* After all symbol declarations have been parsed, packgram invokes
     grammar_midrule_action ();
   /* After all symbol declarations have been parsed, packgram invokes

-     translate_rule_action.  */
-  current_rule->action = action;
-  current_rule->action_location = loc;
+     code_props_translate_code.  */
+  code_props_rule_action_init (&current_rule->action_props, action, loc,
+                               current_rule);

 }
 
 \f
 }
 
 \f


@@ -464,21 +442,6 @@ packgram (void)
 
   rules = xnmalloc (nrules, sizeof *rules);
 
 
   rules = xnmalloc (nrules, sizeof *rules);
 

-  /* Before invoking grammar_rule_check on any rule, make sure all actions have
-     already been scanned in order to set `used' flags.  Otherwise, checking
-     that a midrule's $$ should be set will not always work properly because
-     the check must forward-reference the midrule's parent rule.  For the same
-     reason, all the `used' flags must be set before checking whether to remove
-     `$' from any midrule symbol name.  */
-  while (p)
-    {
-      if (p->action)
-        p->action = translate_rule_action (p);
-      if (p)
-       p = p->next;
-    }
-
-  p = grammar;

   while (p)
     {
       int rule_length = 0;
   while (p)
     {
       int rule_length = 0;


@@ -495,16 +458,17 @@ packgram (void)
       rules[ruleno].precsym = NULL;
       rules[ruleno].location = p->location;
       rules[ruleno].useful = true;
       rules[ruleno].precsym = NULL;
       rules[ruleno].location = p->location;
       rules[ruleno].useful = true;

-      rules[ruleno].action = p->action;
-      rules[ruleno].action_location = p->action_location;
+      rules[ruleno].action = p->action_props.code;
+      rules[ruleno].action_location = p->action_props.location;

 
       /* If the midrule's $$ is set or its $n is used, remove the `$' from the
         symbol name so that it's a user-defined symbol so that the default
         %destructor and %printer apply.  */
       if (p->midrule_parent_rule
 
       /* If the midrule's $$ is set or its $n is used, remove the `$' from the
         symbol name so that it's a user-defined symbol so that the default
         %destructor and %printer apply.  */
       if (p->midrule_parent_rule

-          && (p->used
+          && (p->action_props.is_value_used

              || symbol_list_n_get (p->midrule_parent_rule,
              || symbol_list_n_get (p->midrule_parent_rule,

-                                   p->midrule_parent_rhs_index)->used))
+                                   p->midrule_parent_rhs_index)
+                   ->action_props.is_value_used))

        p->content.sym->tag += 1;
 
       /* Don't check the generated rule 0.  It has no action, so some rhs
        p->content.sym->tag += 1;
 
       /* Don't check the generated rule 0.  It has no action, so some rhs


@@ -584,10 +548,6 @@ reader (void)
   undeftoken->class = token_sym;
   undeftoken->number = ntokens++;
 
   undeftoken->class = token_sym;
   undeftoken->number = ntokens++;
 

-  /* Initialize the obstacks. */
-  obstack_init (&pre_prologue_obstack);
-  obstack_init (&post_prologue_obstack);
-

   gram_in = xfopen (grammar_file, "r");
 
   gram__flex_debug = trace_flag & trace_scan;
   gram_in = xfopen (grammar_file, "r");
 
   gram__flex_debug = trace_flag & trace_scan;


@@ -595,6 +555,28 @@ reader (void)
   gram_scanner_initialize ();
   gram_parse ();
 
   gram_scanner_initialize ();
   gram_parse ();
 

+  /* IELR would be a better default, but LALR is historically the default.  */
+  {
+    char *lr_type;
+    muscle_percent_define_default ("lr.type", "LALR");
+    lr_type = muscle_percent_define_get ("lr.type");
+    if (0 != strcmp (lr_type, "canonical LR"))
+      muscle_percent_define_default ("lr.default_reductions", "all");
+    else
+      muscle_percent_define_default ("lr.default_reductions", "accepting");
+    free (lr_type);
+  }
+
+  /* Check front-end %define variable values.  */
+  {
+    static char const * const values[] = {
+      "lr.type", "LALR", "IELR", "canonical LR", NULL,
+      "lr.default_reductions", "all", "consistent", "accepting", NULL,
+      NULL
+    };
+    muscle_percent_define_check_values (values);
+  }
+

   if (! complaint_issued)
     check_and_convert_grammar ();
 
   if (! complaint_issued)
     check_and_convert_grammar ();
 


@@ -667,6 +649,23 @@ check_and_convert_grammar (void)
      token symbols into FDEFINES if requested.  */
   symbols_pack ();
 
      token symbols into FDEFINES if requested.  */
   symbols_pack ();
 

+  /* Scan rule actions after invoking symbol_check_alias_consistency (in
+     symbols_pack above) so that token types are set correctly before the rule
+     action type checking.
+
+     Before invoking grammar_rule_check (in packgram below) on any rule, make
+     sure all actions have already been scanned in order to set `used' flags.
+     Otherwise, checking that a midrule's $$ should be set will not always work
+     properly because the check must forward-reference the midrule's parent
+     rule.  For the same reason, all the `used' flags must be set before
+     checking whether to remove `$' from any midrule symbol name (also in
+     packgram).  */
+  {
+    symbol_list *sym;
+    for (sym = grammar; sym; sym = sym->next)
+      code_props_translate_code (&sym->action_props);
+  }
+

   /* Convert the grammar into the format described in gram.h.  */
   packgram ();
 
   /* Convert the grammar into the format described in gram.h.  */
   packgram ();