projects
/
bison.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/maint'
[bison.git]
/
src
/
state.h
diff --git
a/src/state.h
b/src/state.h
index 1641106d66750917fe53ad4816b2cad0df634eaf..cfbef36d33eca8ae1b1ebb1dd7de273b5f8fc9cb 100644
(file)
--- a/
src/state.h
+++ b/
src/state.h
@@
-1,7
+1,7
@@
-/* Type definitions for
nondeterministic
finite state machine for Bison.
+/* Type definitions for
the
finite state machine for Bison.
- Copyright (C) 1984, 1989, 2000
, 2001, 2002, 2003, 2004, 2007 Fre
e
-
Software
Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000
-2004, 2007, 2009-2012 Free Softwar
e
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
This file is part of Bison, the GNU Compiler Compiler.
@@
-148,12
+148,12
@@
typedef struct
/* Iterate over each transition over a token (shifts). */
/* Iterate over each transition over a token (shifts). */
-#define FOR_EACH_SHIFT(Transitions, Iter) \
- for (Iter = 0; \
- Iter < Transitions->num \
- && (TRANSITION_IS_DISABLED (Transitions, Iter) \
- || TRANSITION_IS_SHIFT (Transitions, Iter)); \
- ++Iter) \
+#define FOR_EACH_SHIFT(Transitions, Iter)
\
+ for (Iter = 0;
\
+ Iter < Transitions->num
\
+
&& (TRANSITION_IS_DISABLED (Transitions, Iter) \
+
|| TRANSITION_IS_SHIFT (Transitions, Iter)); \
+ ++Iter)
\
if (!TRANSITION_IS_DISABLED (Transitions, Iter))
if (!TRANSITION_IS_DISABLED (Transitions, Iter))
@@
-193,6
+193,8
@@
typedef struct
| states. |
`---------*/
| states. |
`---------*/
+struct state_list;
+
struct state
{
state_number number;
struct state
{
state_number number;
@@
-201,6
+203,11
@@
struct state
reductions *reductions;
errs *errs;
reductions *reductions;
errs *errs;
+ /* When an includer (such as ielr.c) needs to store states in a list, the
+ includer can define struct state_list as the list node structure and can
+ store in this member a reference to the node containing each state. */
+ struct state_list *state_list;
+
/* If non-zero, then no lookahead sets on reduce actions are needed to
decide what to do in state S. */
char consistent;
/* If non-zero, then no lookahead sets on reduce actions are needed to
decide what to do in state S. */
char consistent;
@@
-208,6
+215,7
@@
struct state
/* If some conflicts were solved thanks to precedence/associativity,
a human readable description of the resolution. */
const char *solved_conflicts;
/* If some conflicts were solved thanks to precedence/associativity,
a human readable description of the resolution. */
const char *solved_conflicts;
+ const char *solved_conflicts_xml;
/* Its items. Must be last, since ITEMS can be arbitrarily large. Sorted
ascendingly on item index in RITEM, which is sorted on rule number. */
/* Its items. Must be last, since ITEMS can be arbitrarily large. Sorted
ascendingly on item index in RITEM, which is sorted on rule number. */
@@
-220,7
+228,8
@@
extern state *final_state;
/* Create a new state with ACCESSING_SYMBOL for those items. */
state *state_new (symbol_number accessing_symbol,
/* Create a new state with ACCESSING_SYMBOL for those items. */
state *state_new (symbol_number accessing_symbol,
- size_t core_size, item_number *core);
+ size_t core_size, item_number *core);
+state *state_new_isocore (state const *s);
/* Set the transitions of STATE. */
void state_transitions_set (state *s, int num, state **trans);
/* Set the transitions of STATE. */
void state_transitions_set (state *s, int num, state **trans);
@@
-236,6
+245,8
@@
void state_errs_set (state *s, int num, symbol **errors);
/* Print on OUT all the lookahead tokens such that this STATE wants to
reduce R. */
void state_rule_lookahead_tokens_print (state *s, rule *r, FILE *out);
/* Print on OUT all the lookahead tokens such that this STATE wants to
reduce R. */
void 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);
/* Create/destroy the states hash table. */
void state_hash_new (void);
/* Create/destroy the states hash table. */
void state_hash_new (void);