lalr1.cc: check (and fix) %initial-action exception safety

[bison.git] / src / state.c

diff --git a/src/state.c b/src/state.c
index 8fb769aa827190aeb9d5a4af5645537e1f7ee963..666e0cc7a246219e264a57c22978479d1004d148 100644 (file)
--- a/src/state.c
+++ b/src/state.c
@@ -1,7 +1,6 @@
-/* Type definitions for nondeterministic finite state machine for Bison.
+/* Type definitions for the finite state machine for Bison.

 
 

-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2012 Free Software Foundation, Inc.

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


@@ -142,6 +141,7 @@ state_new (symbol_number accessing_symbol,
   res->transitions = NULL;
   res->reductions = NULL;
   res->errs = NULL;
   res->transitions = NULL;
   res->reductions = NULL;
   res->errs = NULL;

+  res->state_list = NULL;

   res->consistent = 0;
   res->solved_conflicts = NULL;
   res->solved_conflicts_xml = NULL;
   res->consistent = 0;
   res->solved_conflicts = NULL;
   res->solved_conflicts_xml = NULL;


@@ -154,6 +154,32 @@ state_new (symbol_number accessing_symbol,
   return res;
 }
 
   return res;
 }
 

+state *
+state_new_isocore (state const *s)
+{
+  state *res;
+  size_t items_size = s->nitems * sizeof *s->items;
+
+  aver (nstates < STATE_NUMBER_MAXIMUM);
+
+  res = xmalloc (offsetof (state, items) + items_size);
+  res->number = nstates++;
+  res->accessing_symbol = s->accessing_symbol;
+  res->transitions =
+    transitions_new (s->transitions->num, s->transitions->states);
+  res->reductions = reductions_new (s->reductions->num, s->reductions->rules);
+  res->errs = NULL;
+  res->state_list = NULL;
+  res->consistent = s->consistent;
+  res->solved_conflicts = NULL;
+  res->solved_conflicts_xml = NULL;
+
+  res->nitems = s->nitems;
+  memcpy (res->items, s->items, items_size);
+
+  return res;
+}
+

 
 /*---------.
 | Free S.  |
 
 /*---------.
 | Free S.  |


@@ -259,12 +285,10 @@ state_rule_lookahead_tokens_print_xml (state *s, rule *r,
     {
       bitset_iterator biter;
       int k;
     {
       bitset_iterator biter;
       int k;

-      char const *sep = "";

       xml_puts (out, level, "<lookaheads>");
       BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
        {
       xml_puts (out, level, "<lookaheads>");
       BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
        {

-         xml_printf (out, level + 1, "<symbol class=\"%s\">%s</symbol>",
-                     symbol_class_get_string (symbols[k]),
+         xml_printf (out, level + 1, "<symbol>%s</symbol>",

                      xml_escape (symbols[k]->tag));
        }
       xml_puts (out, level, "</lookaheads>");
                      xml_escape (symbols[k]->tag));
        }
       xml_puts (out, level, "</lookaheads>");


@@ -354,7 +378,8 @@ state_hash_free (void)
 void
 state_hash_insert (state *s)
 {
 void
 state_hash_insert (state *s)
 {

-  hash_insert (state_table, s);
+  if (!hash_insert (state_table, s))
+    xalloc_die ();

 }
 
 
 }