More changes to pacify C++ compilers.

[bison.git] / src / closure.h

diff --git a/src/closure.h b/src/closure.h
index 32082d15a06468edcf34e4ccc1a5195510e86b46..a2582e89467cccfcf21b2ff49befbcb9710e52fe 100644 (file)
--- a/src/closure.h
+++ b/src/closure.h
@@ -1,5 +1,7 @@
 /* Subroutines for bison
 /* Subroutines for bison

-   Copyright (C) 1984, 1989, 2000, 2001, 2002  Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software
+   Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -15,17 +17,19 @@
 
    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
 
    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.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 #ifndef CLOSURE_H_
 # define CLOSURE_H_
 
 
 #ifndef CLOSURE_H_
 # define CLOSURE_H_
 

+# include "gram.h"
+

 /* Allocates the itemset and ruleset vectors, and precomputes useful
    data so that closure can be called.  n is the number of elements to
    allocate for itemset.  */
 
 /* Allocates the itemset and ruleset vectors, and precomputes useful
    data so that closure can be called.  n is the number of elements to
    allocate for itemset.  */
 

-void new_closure PARAMS ((int n));
+void new_closure (unsigned int n);

 
 
 /* Given the kernel (aka core) of a state (a vector of item numbers
 
 
 /* Given the kernel (aka core) of a state (a vector of item numbers


@@ -42,14 +46,14 @@ void new_closure PARAMS ((int n));
    significant).  CLOSURE places there the indices of all items which
    represent units of input that could arrive next.  */
 
    significant).  CLOSURE places there the indices of all items which
    represent units of input that could arrive next.  */
 

-void closure PARAMS ((short *items, int n));
+void closure (item_number *items, size_t n);

 
 
 /* Frees ITEMSET, RULESET and internal data.  */
 
 
 
 /* Frees ITEMSET, RULESET and internal data.  */
 

-void free_closure PARAMS ((void));
+void free_closure (void);

 
 

-extern short *itemset;
-extern int nritemset;
+extern item_number *itemset;
+extern size_t nritemset;

 
 #endif /* !CLOSURE_H_ */
 
 #endif /* !CLOSURE_H_ */