projects
/
bison.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: remove quote magic from the bison test wrapper.
[bison.git]
/
src
/
state.c
diff --git
a/src/state.c
b/src/state.c
index b1e5f5dd8403e708279ab46203bfec7c46857b67..c1ac3f171b2f966f488547597a077201d1747565 100644
(file)
--- a/
src/state.c
+++ b/
src/state.c
@@
-1,7
+1,6
@@
/* Type definitions for the finite state machine for Bison.
/* Type definitions for the finite state machine for Bison.
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
- 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.
@@
-29,9
+28,9
@@
#include "print-xml.h"
#include "print-xml.h"
- /*-------------------.
- | Shifts and Gotos. |
- `-------------------*/
+
/*-------------------.
+
| Shifts and Gotos. |
+
`-------------------*/
/*-----------------------------------------.
/*-----------------------------------------.
@@
-62,14
+61,14
@@
transitions_to (transitions *shifts, symbol_number sym)
{
aver (j < shifts->num);
if (TRANSITION_SYMBOL (shifts, j) == sym)
{
aver (j < shifts->num);
if (TRANSITION_SYMBOL (shifts, j) == sym)
- return shifts->states[j];
+
return shifts->states[j];
}
}
}
}
- /*--------------------.
- | Error transitions. |
- `--------------------*/
+
/*--------------------.
+
| Error transitions. |
+
`--------------------*/
/*---------------------------------.
/*---------------------------------.
@@
-89,9
+88,9
@@
errs_new (int num, symbol **tokens)
- /*-------------.
- | Reductions. |
- `-------------*/
+
/*-------------.
+
| Reductions. |
+
`-------------*/
/*---------------------------------------.
/*---------------------------------------.
@@
-111,9
+110,9
@@
reductions_new (int num, rule **reds)
- /*---------.
- | States. |
- `---------*/
+
/*---------.
+
| States. |
+
`---------*/
state_number nstates = 0;
state_number nstates = 0;
@@
-129,7
+128,7
@@
state *final_state = NULL;
state *
state_new (symbol_number accessing_symbol,
state *
state_new (symbol_number accessing_symbol,
- size_t nitems, item_number *core)
+
size_t nitems, item_number *core)
{
state *res;
size_t items_size = nitems * sizeof *core;
{
state *res;
size_t items_size = nitems * sizeof *core;
@@
-265,17
+264,17
@@
state_rule_lookahead_tokens_print (state *s, rule *r, FILE *out)
char const *sep = "";
fprintf (out, " [");
BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
char const *sep = "";
fprintf (out, " [");
BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
- {
- fprintf (out, "%s%s", sep, symbols[k]->tag);
- sep = ", ";
- }
+
{
+
fprintf (out, "%s%s", sep, symbols[k]->tag);
+
sep = ", ";
+
}
fprintf (out, "]");
}
}
void
state_rule_lookahead_tokens_print_xml (state *s, rule *r,
fprintf (out, "]");
}
}
void
state_rule_lookahead_tokens_print_xml (state *s, rule *r,
- FILE *out, int level)
+
FILE *out, int level)
{
/* Find the reduction we are handling. */
reductions *reds = s->reductions;
{
/* Find the reduction we are handling. */
reductions *reds = s->reductions;
@@
-288,10
+287,10
@@
state_rule_lookahead_tokens_print_xml (state *s, rule *r,
int k;
xml_puts (out, level, "<lookaheads>");
BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
int k;
xml_puts (out, level, "<lookaheads>");
BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
- {
- xml_printf (out, level + 1, "<symbol>%s</symbol>",
- xml_escape (symbols[k]->tag));
- }
+
{
+
xml_printf (out, level + 1, "<symbol>%s</symbol>",
+
xml_escape (symbols[k]->tag));
+
}
xml_puts (out, level, "</lookaheads>");
}
}
xml_puts (out, level, "</lookaheads>");
}
}
@@
-354,10
+353,10
@@
void
state_hash_new (void)
{
state_table = hash_initialize (HT_INITIAL_CAPACITY,
state_hash_new (void)
{
state_table = hash_initialize (HT_INITIAL_CAPACITY,
- NULL,
- state_hasher,
- state_comparator,
- NULL);
+
NULL,
+
state_hasher,
+
state_comparator,
+
NULL);
}
}