X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/75ad86eebd3f49dff81976eb83036eb7b7793e68..041308d0c03783c51ef362f888c957cd2a0e129a:/src/state.c?ds=sidebyside
diff --git a/src/state.c b/src/state.c
index 9448da7d..666e0cc7 100644
--- a/src/state.c
+++ b/src/state.c
@@ -1,24 +1,21 @@
-/* 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.
- 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
- 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
- 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 . */
#include
#include "system.h"
@@ -28,6 +25,7 @@
#include "complain.h"
#include "gram.h"
#include "state.h"
+#include "print-xml.h"
/*-------------------.
@@ -143,9 +141,10 @@ state_new (symbol_number accessing_symbol,
res->transitions = NULL;
res->reductions = NULL;
res->errs = NULL;
+ res->state_list = NULL;
res->consistent = 0;
res->solved_conflicts = NULL;
- res->reachable = false;
+ res->solved_conflicts_xml = NULL;
res->nitems = nitems;
memcpy (res->items, core, items_size);
@@ -155,6 +154,32 @@ state_new (symbol_number accessing_symbol,
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. |
@@ -247,6 +272,29 @@ state_rule_lookahead_tokens_print (state *s, rule *r, FILE *out)
}
}
+void
+state_rule_lookahead_tokens_print_xml (state *s, rule *r,
+ FILE *out, int level)
+{
+ /* Find the reduction we are handling. */
+ reductions *reds = s->reductions;
+ int red = state_reduction_find (s, r);
+
+ /* Print them if there are. */
+ if (reds->lookahead_tokens && red != -1)
+ {
+ bitset_iterator biter;
+ int k;
+ xml_puts (out, level, "");
+ BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
+ {
+ xml_printf (out, level + 1, "%s",
+ xml_escape (symbols[k]->tag));
+ }
+ xml_puts (out, level, "");
+ }
+}
+
/*---------------------.
| A state hash table. |
@@ -330,7 +378,8 @@ state_hash_free (void)
void
state_hash_insert (state *s)
{
- hash_insert (state_table, s);
+ if (!hash_insert (state_table, s))
+ xalloc_die ();
}
@@ -354,41 +403,49 @@ state_hash_lookup (size_t nitems, item_number *core)
}
-/*------------------------------------------------------.
-| Mark S and all states reachable from S as reachable. |
-`------------------------------------------------------*/
+/*--------------------------------------------------------.
+| Record S and all states reachable from S in REACHABLE. |
+`--------------------------------------------------------*/
static void
-state_mark_reachable_states (state *s)
+state_record_reachable_states (state *s, bitset reachable)
{
- if (s->reachable)
+ if (bitset_test (reachable, s->number))
return;
- s->reachable = true;
- for (int i = 0; i < s->transitions->num; ++i)
- if (!TRANSITION_IS_DISABLED (s->transitions, i))
- state_mark_reachable_states (s->transitions->states[i]);
+ bitset_set (reachable, s->number);
+ {
+ int i;
+ for (i = 0; i < s->transitions->num; ++i)
+ if (!TRANSITION_IS_DISABLED (s->transitions, i))
+ state_record_reachable_states (s->transitions->states[i], reachable);
+ }
}
void
state_remove_unreachable_states (state_number old_to_new[])
{
state_number nstates_reachable = 0;
- state_mark_reachable_states (states[0]);
- for (state_number i = 0; i < nstates; ++i)
- {
- if (states[i]->reachable)
- {
- states[nstates_reachable] = states[i];
- states[nstates_reachable]->number = nstates_reachable;
- old_to_new[i] = nstates_reachable++;
- }
- else
- {
- state_free (states[i]);
- old_to_new[i] = nstates;
- }
- }
+ bitset reachable = bitset_create (nstates, BITSET_FIXED);
+ state_record_reachable_states (states[0], reachable);
+ {
+ state_number i;
+ for (i = 0; i < nstates; ++i)
+ {
+ if (bitset_test (reachable, states[i]->number))
+ {
+ states[nstates_reachable] = states[i];
+ states[nstates_reachable]->number = nstates_reachable;
+ old_to_new[i] = nstates_reachable++;
+ }
+ else
+ {
+ state_free (states[i]);
+ old_to_new[i] = nstates;
+ }
+ }
+ }
nstates = nstates_reachable;
+ bitset_free (reachable);
}
/* All the decorated states, indexed by the state number. */