/* Print information on generated parser, for bison,
- Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003
+ Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
+#include <config.h>
#include "system.h"
#include <bitset.h>
#include "state.h"
#include "symtab.h"
-static bitset shiftset;
-static bitset lookaheadset;
+static bitset shift_set;
+static bitset lookahead_set;
#if 0
static void
static void
print_core (FILE *out, state *s)
{
- int i;
+ size_t i;
item_number *sitems = s->items;
- int snritems = s->nitems;
+ size_t snritems = s->nitems;
symbol *previous_lhs = NULL;
/* Output all the items of a state, not only its kernel. */
for (/* Nothing */; *sp >= 0; ++sp)
fprintf (out, " %s", symbols[*sp]->tag);
- /* Display the lookaheads? */
- if (report_flag & report_lookaheads)
- state_rule_lookaheads_print (s, &rules[r], out);
+ /* Display the lookahead tokens? */
+ if (report_flag & report_lookahead_tokens)
+ state_rule_lookahead_tokens_print (s, &rules[r], out);
fputc ('\n', out);
}
size_t width = 0;
int i;
- /* Compute the width of the lookaheads column. */
+ /* Compute the width of the lookahead token column. */
for (i = 0; i < trans->num; i++)
if (!TRANSITION_IS_DISABLED (trans, i)
&& TRANSITION_IS_SHIFT (trans, i) == display_transitions_p)
fputc ('\n', out);
width += 2;
- /* Report lookaheads and shifts. */
+ /* Report lookahead tokens and shifts. */
for (i = 0; i < trans->num; i++)
if (!TRANSITION_IS_DISABLED (trans, i)
&& TRANSITION_IS_SHIFT (trans, i) == display_transitions_p)
size_t width = 0;
int i;
- /* Compute the width of the lookaheads column. */
+ /* Compute the width of the lookahead token column. */
for (i = 0; i < errp->num; ++i)
if (errp->symbols[i])
max_length (&width, errp->symbols[i]->tag);
fputc ('\n', out);
width += 2;
- /* Report lookaheads and errors. */
+ /* Report lookahead tokens and errors. */
for (i = 0; i < errp->num; ++i)
if (errp->symbols[i])
{
if (s->consistent)
return reds->rules[0];
- /* 1. Each reduction is possibly masked by the lookaheads on which
+ /* 1. Each reduction is possibly masked by the lookahead tokens on which
we shift (S/R conflicts)... */
- bitset_zero (shiftset);
+ bitset_zero (shift_set);
{
transitions *trans = s->transitions;
FOR_EACH_SHIFT (trans, i)
default rule. */
if (TRANSITION_IS_ERROR (trans, i))
return NULL;
- bitset_set (shiftset, TRANSITION_SYMBOL (trans, i));
+ bitset_set (shift_set, TRANSITION_SYMBOL (trans, i));
}
}
- /* 2. Each reduction is possibly masked by the lookaheads on which
+ /* 2. Each reduction is possibly masked by the lookahead tokens on which
we raise an error (due to %nonassoc). */
{
errs *errp = s->errs;
for (i = 0; i < errp->num; i++)
if (errp->symbols[i])
- bitset_set (shiftset, errp->symbols[i]->number);
+ bitset_set (shift_set, errp->symbols[i]->number);
}
for (i = 0; i < reds->num; ++i)
{
int count = 0;
- /* How many non-masked lookaheads are there for this reduction?
- */
- bitset_andn (lookaheadset, reds->lookaheads[i], shiftset);
- count = bitset_count (lookaheadset);
+ /* How many non-masked lookahead tokens are there for this
+ reduction? */
+ bitset_andn (lookahead_set, reds->lookahead_tokens[i], shift_set);
+ count = bitset_count (lookahead_set);
if (count > cmax)
{
/* 3. And finally, each reduction is possibly masked by previous
reductions (in R/R conflicts, we keep the first reductions).
*/
- bitset_or (shiftset, shiftset, reds->lookaheads[i]);
+ bitset_or (shift_set, shift_set, reds->lookahead_tokens[i]);
}
return default_rule;
}
-/*--------------------------------------------------------------------.
-| Report a reduction of RULE on LOOKAHEADS (which can be `default'). |
-| If not ENABLED, the rule is masked by a shift or a reduce (S/R and |
-| R/R conflicts). |
-`--------------------------------------------------------------------*/
+/*-------------------------------------------------------------------------.
+| Report a reduction of RULE on LOOKAHEAD_TOKEN (which can be `default'). |
+| If not ENABLED, the rule is masked by a shift or a reduce (S/R and |
+| R/R conflicts). |
+`-------------------------------------------------------------------------*/
static void
print_reduction (FILE *out, size_t width,
- const char *lookahead,
+ const char *lookahead_token,
rule *r, bool enabled)
{
int j;
- fprintf (out, " %s", lookahead);
- for (j = width - strlen (lookahead); j > 0; --j)
+ fprintf (out, " %s", lookahead_token);
+ for (j = width - strlen (lookahead_token); j > 0; --j)
fputc (' ', out);
if (!enabled)
fputc ('[', out);
default_rule = state_default_rule (s);
- bitset_zero (shiftset);
+ bitset_zero (shift_set);
FOR_EACH_SHIFT (trans, i)
- bitset_set (shiftset, TRANSITION_SYMBOL (trans, i));
+ bitset_set (shift_set, TRANSITION_SYMBOL (trans, i));
- /* Compute the width of the lookaheads column. */
+ /* Compute the width of the lookahead token column. */
if (default_rule)
width = strlen (_("$default"));
- if (reds->lookaheads)
+ if (reds->lookahead_tokens)
for (i = 0; i < ntokens; i++)
{
- int count = bitset_test (shiftset, i);
+ bool count = bitset_test (shift_set, i);
for (j = 0; j < reds->num; ++j)
- if (bitset_test (reds->lookaheads[j], i))
+ if (bitset_test (reds->lookahead_tokens[j], i))
{
- if (count == 0)
+ if (! count)
{
if (reds->rules[j] != default_rule)
max_length (&width, symbols[i]->tag);
- count++;
+ count = true;
}
else
{
fputc ('\n', out);
width += 2;
- /* Report lookaheads (or $default) and reductions. */
- if (reds->lookaheads)
+ /* Report lookahead tokens (or $default) and reductions. */
+ if (reds->lookahead_tokens)
for (i = 0; i < ntokens; i++)
{
- int defaulted = 0;
- int count = bitset_test (shiftset, i);
+ bool defaulted = false;
+ bool count = bitset_test (shift_set, i);
for (j = 0; j < reds->num; ++j)
- if (bitset_test (reds->lookaheads[j], i))
+ if (bitset_test (reds->lookahead_tokens[j], i))
{
- if (count == 0)
+ if (! count)
{
if (reds->rules[j] != default_rule)
print_reduction (out, width,
symbols[i]->tag,
reds->rules[j], true);
else
- defaulted = 1;
- count++;
+ defaulted = true;
+ count = true;
}
else
{
print_reduction (out, width,
symbols[i]->tag,
default_rule, true);
- defaulted = 0;
+ defaulted = false;
print_reduction (out, width,
symbols[i]->tag,
reds->rules[j], false);
if (report_flag & report_itemsets)
new_closure (nritems);
/* Storage for print_reductions. */
- shiftset = bitset_create (ntokens, BITSET_FIXED);
- lookaheadset = bitset_create (ntokens, BITSET_FIXED);
+ shift_set = bitset_create (ntokens, BITSET_FIXED);
+ lookahead_set = bitset_create (ntokens, BITSET_FIXED);
for (i = 0; i < nstates; i++)
print_state (out, states[i]);
- bitset_free (shiftset);
- bitset_free (lookaheadset);
+ bitset_free (shift_set);
+ bitset_free (lookahead_set);
if (report_flag & report_itemsets)
free_closure ();
projects / bison.git / blobdiff