Clean the error reporting functions.

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index 31ca44dac3678e6afa1f91a41d1e5c979744757b..767c646e65596973d1d77d51b8f9b31d035871dd 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -15,7 +15,8 @@ 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
 
 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */

 
 
 /* Compute how to make the finite state machine deterministic;
 
 
 /* Compute how to make the finite state machine deterministic;


@@ -23,7 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 lalr(), the entry point, builds these data structures:
 
 
 lalr(), the entry point, builds these data structures:
 

-goto_map, from_state and to_state 
+goto_map, from_state and to_state

  record each shift transition which accepts a variable (a nonterminal).
 ngotos is the number of such transitions.
 from_state[t] is the state number which a transition leads from
  record each shift transition which accepts a variable (a nonterminal).
 ngotos is the number of such transitions.
 from_state[t] is the state number which a transition leads from


@@ -38,7 +39,7 @@ The elements of LAruleno that apply to state s are those from
  lookaheads[s] through lookaheads[s+1]-1.
 Each element of LAruleno is a rule number.
 
  lookaheads[s] through lookaheads[s+1]-1.
 Each element of LAruleno is a rule number.
 

-If lr is the length of LAruleno, then a number from 0 to lr-1 
+If lr is the length of LAruleno, then a number from 0 to lr-1

 can specify both a rule and a state where the rule might be applied.
 
 LA is a lr by ntokens matrix of bits.
 can specify both a rule and a state where the rule might be applied.
 
 LA is a lr by ntokens matrix of bits.


@@ -54,7 +55,7 @@ If LA[l, i] and LA[l, j] are both 1 for i != j, it is a conflict.
 #include "state.h"
 #include "alloc.h"
 #include "gram.h"
 #include "state.h"
 #include "alloc.h"
 #include "gram.h"

-
+#include "complain.h"

 
 extern short **derives;
 extern char *nullable;
 
 extern short **derives;
 extern char *nullable;


@@ -73,24 +74,25 @@ short *goto_map;
 short *from_state;
 short *to_state;
 
 short *from_state;
 short *to_state;
 

-short **transpose();
-void set_state_table();
-void set_accessing_symbol();
-void set_shift_table();
-void set_reduction_table();
-void set_maxrhs();
-void initialize_LA();
-void set_goto_map();
-void initialize_F();
-void build_relations();
-void add_lookback_edge();
-void compute_FOLLOWS();
-void compute_lookaheads();
-void digraph();
-void traverse();
-
-extern void toomany();
-extern void berror();
+void lalr PARAMS((void));
+short **transpose PARAMS((short **, int));
+void set_state_table PARAMS((void));
+void set_accessing_symbol PARAMS((void));
+void set_shift_table PARAMS((void));
+void set_reduction_table PARAMS((void));
+void set_maxrhs PARAMS((void));
+void initialize_LA PARAMS((void));
+void set_goto_map PARAMS((void));
+int map_goto PARAMS((int, int));
+void initialize_F PARAMS((void));
+void build_relations PARAMS((void));
+void add_lookback_edge PARAMS((int, int, int));
+void compute_FOLLOWS PARAMS((void));
+void compute_lookaheads PARAMS((void));
+void digraph PARAMS((short **));
+void traverse PARAMS((register int));
+
+extern void berror PARAMS((char *));

 
 static int infinity;
 static int maxrhs;
 
 static int infinity;
 static int maxrhs;


@@ -105,7 +107,7 @@ static int top;
 
 
 void
 
 
 void

-lalr()
+lalr (void)

 {
   tokensetsize = WORDSIZE(ntokens);
 
 {
   tokensetsize = WORDSIZE(ntokens);
 


@@ -124,7 +126,7 @@ lalr()
 
 
 void
 
 
 void

-set_state_table()
+set_state_table (void)

 {
   register core *sp;
 
 {
   register core *sp;
 


@@ -136,7 +138,7 @@ set_state_table()
 
 
 void
 
 
 void

-set_accessing_symbol()
+set_accessing_symbol (void)

 {
   register core *sp;
 
 {
   register core *sp;
 


@@ -148,7 +150,7 @@ set_accessing_symbol()
 
 
 void
 
 
 void

-set_shift_table()
+set_shift_table (void)

 {
   register shifts *sp;
 
 {
   register shifts *sp;
 


@@ -160,7 +162,7 @@ set_shift_table()
 
 
 void
 
 
 void

-set_reduction_table()
+set_reduction_table (void)

 {
   register reductions *rp;
 
 {
   register reductions *rp;
 


@@ -172,7 +174,7 @@ set_reduction_table()
 
 
 void
 
 
 void

-set_maxrhs()
+set_maxrhs (void)

 {
   register short *itemp;
   register int length;
 {
   register short *itemp;
   register int length;


@@ -198,7 +200,7 @@ set_maxrhs()
 
 
 void
 
 
 void

-initialize_LA()
+initialize_LA (void)

 {
   register int i;
   register int j;
 {
   register int i;
   register int j;


@@ -256,7 +258,7 @@ initialize_LA()
     {
       if (!consistent[i])
        {
     {
       if (!consistent[i])
        {

-         if (rp = reduction_table[i])
+         if ((rp = reduction_table[i]))

            for (j = 0; j < rp->nreds; j++)
              *np++ = rp->rules[j];
        }
            for (j = 0; j < rp->nreds; j++)
              *np++ = rp->rules[j];
        }


@@ -265,7 +267,7 @@ initialize_LA()
 
 
 void
 
 
 void

-set_goto_map()
+set_goto_map (void)

 {
   register shifts *sp;
   register int i;
 {
   register shifts *sp;
   register int i;


@@ -288,7 +290,7 @@ set_goto_map()
          if (ISTOKEN(symbol)) break;
 
          if (ngotos == MAXSHORT)
          if (ISTOKEN(symbol)) break;
 
          if (ngotos == MAXSHORT)

-           toomany(_("gotos"));
+           fatal (_("too many gotos (max %d)"), MAXSHORT);

 
          ngotos++;
          goto_map[symbol]++;
 
          ngotos++;
          goto_map[symbol]++;


@@ -335,9 +337,7 @@ set_goto_map()
 /*  Map_goto maps a state/symbol pair into its numeric representation. */
 
 int
 /*  Map_goto maps a state/symbol pair into its numeric representation. */
 
 int

-map_goto(state, symbol)
-int state;
-int symbol;
+map_goto (int state, int symbol)

 {
   register int high;
   register int low;
 {
   register int high;
   register int low;


@@ -366,7 +366,7 @@ int symbol;
 
 
 void
 
 
 void

-initialize_F()
+initialize_F (void)

 {
   register int i;
   register int j;
 {
   register int i;
   register int j;


@@ -412,7 +412,7 @@ initialize_F()
              if (nullable[symbol])
                edge[nedges++] = map_goto(stateno, symbol);
            }
              if (nullable[symbol])
                edge[nedges++] = map_goto(stateno, symbol);
            }

-       
+

          if (nedges)
            {
              reads[i] = rp = NEW2(nedges + 1, short);
          if (nedges)
            {
              reads[i] = rp = NEW2(nedges + 1, short);


@@ -442,7 +442,7 @@ initialize_F()
 
 
 void
 
 
 void

-build_relations()
+build_relations (void)

 {
   register int i;
   register int j;
 {
   register int i;
   register int j;


@@ -537,10 +537,7 @@ build_relations()
 
 
 void
 
 
 void

-add_lookback_edge(stateno, ruleno, gotono)
-int stateno;
-int ruleno;
-int gotono;
+add_lookback_edge (int stateno, int ruleno, int gotono)

 {
   register int i;
   register int k;
 {
   register int i;
   register int k;


@@ -570,9 +567,7 @@ int gotono;
 
 
 short **
 
 
 short **

-transpose(R_arg, n)
-short **R_arg;
-int n;
+transpose (short **R_arg, int n)

 {
   register short **new_R;
   register short **temp_R;
 {
   register short **new_R;
   register short **temp_R;


@@ -627,7 +622,7 @@ int n;
 
 
 void
 
 
 void

-compute_FOLLOWS()
+compute_FOLLOWS (void)

 {
   register int i;
 
 {
   register int i;
 


@@ -643,7 +638,7 @@ compute_FOLLOWS()
 
 
 void
 
 
 void

-compute_lookaheads()
+compute_lookaheads (void)

 {
   register int i;
   register int n;
 {
   register int i;
   register int n;


@@ -686,8 +681,7 @@ compute_lookaheads()
 
 
 void
 
 
 void

-digraph(relation)
-short **relation;
+digraph (short **relation)

 {
   register int i;
 
 {
   register int i;
 


@@ -713,8 +707,7 @@ short **relation;
 
 
 void
 
 
 void

-traverse(i)
-register int i;
+traverse (register int i)

 {
   register unsigned *fp1;
   register unsigned *fp2;
 {
   register unsigned *fp1;
   register unsigned *fp2;