* src/system.h (OUTPUT_EXT, TAB_EXT): Define only if not defined

[bison.git] / src / lalr.h

diff --git a/src/lalr.h b/src/lalr.h
index c0ca461ce089eca508d0b2bc8e1fd98e2edb4775..1d6eeb4c313f8e9ccb5398902527aac5853a3d70 100644 (file)
--- a/src/lalr.h
+++ b/src/lalr.h
@@ -1,5 +1,7 @@
 /* Compute look-ahead criteria for bison,
-   Copyright (C) 1984, 1986, 1989, 2000, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -21,25 +23,25 @@
 #ifndef LALR_H_
 # define LALR_H_
 
-# include "bitset.h"
-# include "bitsetv.h"
-
-/* Import the definition of CORE, TRANSITIONS and REDUCTIONS. */
-# include "state.h"
+# include <bitset.h>
+# include <bitsetv.h>
 
 /* Import the definition of RULE_T. */
 # include "gram.h"
 
+/* Import the definition of CORE, TRANSITIONS and REDUCTIONS. */
+# include "state.h"
+
 /* Compute how to make the finite state machine deterministic; find
-   which rules need lookahead in each state, and which lookahead
+   which rules need look-ahead in each state, and which look-ahead
    tokens they accept.  */
 
-void lalr PARAMS ((void));
+void lalr (void);
 
-/* Release the information related to lookaheads.  Can be performed
+/* Release the information related to look-ahead tokens.  Can be performed
    once the action tables are computed.  */
 
-void lalr_free PARAMS ((void));
+void lalr_free (void);
 
 
 /* lalr() builds these data structures. */
@@ -54,12 +56,12 @@ void lalr_free PARAMS ((void));
    together and GOTO_MAP[I - NTOKENS] is the index in FROM_STATE and
    TO_STATE of the first of them.  */
 
-typedef short goto_number_t;
-# define GOTO_NUMBER_MAX ((goto_number_t) SHRT_MAX)
+typedef size_t goto_number;
+# define GOTO_NUMBER_MAXIMUM ((goto_number) -1)
 
-extern goto_number_t *goto_map;
-extern state_number_t *from_state;
-extern state_number_t *to_state;
+extern goto_number *goto_map;
+extern state_number *from_state;
+extern state_number *to_state;
 
 
 #endif /* !LALR_H_ */