X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/da2a7671e11663b9ad941aa3e1f3014d6ad950cb..e0c653e7e660c353c59b054de571474450aa4c92:/src/tables.c
diff --git a/src/tables.c b/src/tables.c
index ba2c7a0e..e22b0892 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1,26 +1,24 @@
/* Output the generated parsing program for Bison.
- Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006 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 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.
+ 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 3 of the License, or
+ (at your option) any later version.
- Bison 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.
+ 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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
-
+ along with this program. If not, see . */
+#include
#include "system.h"
#include
@@ -42,13 +40,15 @@
Of course vector_number_t ought to be wide enough to contain
state_number and symbol_number. */
-typedef short int vector_number;
+typedef int vector_number;
+#if 0 /* Not currently used. */
static inline vector_number
state_number_to_vector_number (state_number s)
{
return s;
}
+#endif
static inline vector_number
symbol_number_to_vector_number (symbol_number sym)
@@ -84,7 +84,7 @@ int nvectors;
static base_number **froms;
static base_number **tos;
static unsigned int **conflict_tos;
-static short int *tally;
+static int *tally;
static base_number *width;
@@ -94,8 +94,8 @@ static base_number *width;
If N = MIN, stands for `raise a syntax error'.
If N > 0, stands for `shift SYMBOL and go to n'.
If N < 0, stands for `reduce -N'. */
-typedef short int action_number;
-#define ACTION_NUMBER_MINIMUM SHRT_MIN
+typedef int action_number;
+#define ACTION_NUMBER_MINIMUM INT_MIN
static action_number *actrow;
@@ -171,7 +171,7 @@ table_grow (int desired)
/*-------------------------------------------------------------------.
| For GLR parsers, for each conflicted token in S, as indicated |
-| by non-zero entries in CONFLROW, create a list of possible |
+| by non-zero entries in CONFLROW, create a list of possible |
| reductions that are alternatives to the shift or reduction |
| currently recorded for that token in S. Store the alternative |
| reductions followed by a 0 in CONFLICT_LIST, updating |
@@ -196,20 +196,18 @@ conflict_row (state *s)
/* Find all reductions for token J, and record all that do not
match ACTROW[J]. */
for (i = 0; i < reds->num; i += 1)
- if (bitset_test (reds->look_ahead_tokens[i], j)
+ if (bitset_test (reds->lookahead_tokens[i], j)
&& (actrow[j]
!= rule_number_as_item_number (reds->rules[i]->number)))
{
- if (conflict_list_free <= 0)
- abort ();
+ aver (0 < conflict_list_free);
conflict_list[conflict_list_cnt] = reds->rules[i]->number + 1;
conflict_list_cnt += 1;
conflict_list_free -= 1;
}
/* Leave a 0 at the end. */
- if (conflict_list_free <= 0)
- abort ();
+ aver (0 < conflict_list_free);
conflict_list[conflict_list_cnt] = 0;
conflict_list_cnt += 1;
conflict_list_free -= 1;
@@ -219,7 +217,7 @@ conflict_row (state *s)
/*------------------------------------------------------------------.
| Decide what to do for each type of token if seen as the |
-| look-ahead in specified state. The value returned is used as the |
+| lookahead in specified state. The value returned is used as the |
| default action (yydefact) for the state. In addition, ACTROW is |
| filled with what to do for each kind of token, index by symbol |
| number, with zero meaning do the default action. The value |
@@ -227,7 +225,7 @@ conflict_row (state *s)
| situation is an error. The parser recognizes this value |
| specially. |
| |
-| This is where conflicts are resolved. The loop over look-ahead |
+| This is where conflicts are resolved. The loop over lookahead |
| rules considered lower-numbered rules last, and the last rule |
| considered that likes a token gets to handle it. |
| |
@@ -252,17 +250,17 @@ action_row (state *s)
for (i = 0; i < ntokens; i++)
actrow[i] = conflrow[i] = 0;
- if (reds->look_ahead_tokens)
+ if (reds->lookahead_tokens)
{
int j;
bitset_iterator biter;
/* loop over all the rules available here which require
- look-ahead (in reverse order to give precedence to the first
+ lookahead (in reverse order to give precedence to the first
rule) */
for (i = reds->num - 1; i >= 0; --i)
/* and find each token which the rule finds acceptable
to come next */
- BITSET_FOR_EACH (biter, reds->look_ahead_tokens[i], j, 0)
+ BITSET_FOR_EACH (biter, reds->lookahead_tokens[i], j, 0)
{
/* and record this rule as the rule to use if that
token follows. */
@@ -410,7 +408,7 @@ save_row (state_number s)
/*------------------------------------------------------------------.
| Figure out the actions for the specified state, indexed by |
-| look-ahead token type. |
+| lookahead token type. |
| |
| The YYDEFACT table is output now. The detailed info is saved for |
| putting into YYTABLE later. |
@@ -516,14 +514,14 @@ save_column (symbol_number sym, state_number default_state)
`-------------------------------------------------------------*/
static state_number
-default_goto (symbol_number sym, short int state_count[])
+default_goto (symbol_number sym, size_t state_count[])
{
state_number s;
goto_number i;
goto_number m = goto_map[sym - ntokens];
goto_number n = goto_map[sym - ntokens + 1];
state_number default_state = -1;
- int max = 0;
+ size_t max = 0;
if (m == n)
return -1;
@@ -558,7 +556,7 @@ static void
goto_actions (void)
{
symbol_number i;
- short int *state_count = xnmalloc (nstates, sizeof *state_count);
+ size_t *state_count = xnmalloc (nstates, sizeof *state_count);
yydefgoto = xnmalloc (nvars, sizeof *yydefgoto);
/* For a given nterm I, STATE_COUNT[S] is the number of times there
@@ -673,16 +671,14 @@ pack_vector (vector_number vector)
base_number *to = tos[i];
unsigned int *conflict_to = conflict_tos[i];
- if (!t)
- abort ();
+ aver (t != 0);
for (j = lowzero - from[0]; ; j++)
{
int k;
bool ok = true;
- if (table_size <= j)
- abort ();
+ aver (j < table_size);
for (k = 0; ok && k < t; k++)
{
@@ -715,8 +711,7 @@ pack_vector (vector_number vector)
if (loc > high)
high = loc;
- if (! (BASE_MINIMUM <= j && j <= BASE_MAXIMUM))
- abort ();
+ aver (BASE_MINIMUM <= j && j <= BASE_MAXIMUM);
return j;
}
}
@@ -808,9 +803,8 @@ tables_generate (void)
/* This is a poor way to make sure the sizes are properly
correlated. In particular the signedness is not taken into
account. But it's not useless. */
- verify (sizes_are_properly_correlated,
- (sizeof nstates <= sizeof nvectors
- && sizeof nvars <= sizeof nvectors));
+ verify (sizeof nstates <= sizeof nvectors
+ && sizeof nvars <= sizeof nvectors);
nvectors = state_number_as_int (nstates) + nvars;