FYI: GCC Warnings

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        Kill GCC warnings.

        * src/reduce.c (nonterminals_reduce): Don't loop over RITEM: loop
        over the RHS of each rule.
        * src/gram.h, src/gram.c (nritems): Is `unsigned int', not int.
        * src/state.h (state_t): Member `nitems' is unsigned short.
        * src/LR0.c (get_state): Adjust.
        * src/reader.c (packgram): Likewise.
        * src/output.c (GENERATE_MUSCLE_INSERT_TABLE): `max' is of type
        `Type'.
        (muscle_insert_int_table): Remove, unused.
        (prepare_rules): Remove `max'.

Index: src/LR0.c
===================================================================
RCS file: /cvsroot/bison/bison/src/LR0.c,v
retrieving revision 1.64
diff -u -u -r1.64 LR0.c
--- src/LR0.c 6 May 2002 08:23:41 -0000 1.64
+++ src/LR0.c 7 May 2002 08:06:53 -0000
@@ -231,7 +231,7 @@
 get_state (token_number_t symbol, size_t core_size, item_number_t *core)
 {
   int key;
-  int i;
+  size_t i;
   state_t *sp;
 
   if (trace_flag)
Index: src/gram.c
===================================================================
RCS file: /cvsroot/bison/bison/src/gram.c,v
retrieving revision 1.32
diff -u -u -r1.32 gram.c
--- src/gram.c 5 May 2002 11:56:27 -0000 1.32
+++ src/gram.c 7 May 2002 08:06:53 -0000
@@ -29,7 +29,7 @@
 /* comments for these variables are in gram.h  */
 
 item_number_t *ritem = NULL;
-int nritems = 0;
+unsigned int nritems = 0;
 
 rule_t *rules = NULL;
 int nrules = 0;
@@ -70,7 +70,7 @@
 void
 ritem_print (FILE *out)
 {
-  int i;
+  unsigned int i;
   fputs ("RITEM\n", out);
   for (i = 0; i < nritems; ++i)
     if (ritem[i] >= 0)
Index: src/gram.h
===================================================================
RCS file: /cvsroot/bison/bison/src/gram.h,v
retrieving revision 1.35
diff -u -u -r1.35 gram.h
--- src/gram.h 6 May 2002 08:23:27 -0000 1.35
+++ src/gram.h 7 May 2002 08:06:53 -0000
@@ -110,7 +110,7 @@
 #define ITEM_NUMBER_MAX INT_MAX
 typedef int item_number_t;
 extern item_number_t *ritem;
-extern int nritems;
+extern unsigned int nritems;
 
 /* There is weird relationship between item_number_t and
    token_number_t: we store token_number_t in item_number_t, but in
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.153
diff -u -u -r1.153 output.c
--- src/output.c 5 May 2002 11:56:27 -0000 1.153
+++ src/output.c 7 May 2002 08:06:53 -0000
@@ -184,7 +184,7 @@
       int begin,                                                       \
       int end)                                                         \
 {                                                                      \
-  long int max = first;                                                        
\
+  Type max = first;                                                    \
   int i;                                                               \
   int j = 1;                                                           \
                                                                        \
@@ -209,10 +209,10 @@
   /* Build `NAME_max' in the obstack. */                               \
   obstack_fgrow1 (&format_obstack, "%s_max", name);                    \
   obstack_1grow (&format_obstack, 0);                                  \
-  MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack), max);      \
+  MUSCLE_INSERT_LONG_INT (obstack_finish (&format_obstack),            \
+                         (long int) max);                              \
 }
 
-GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_int_table, int)
 GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_unsigned_int_table, unsigned int)
 GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_short_table, short)
 GENERATE_MUSCLE_INSERT_TABLE(muscle_insert_token_number_table, token_number_t)
@@ -285,7 +285,6 @@
 static void
 prepare_rules (void)
 {
-  long int max;
   int r;
   unsigned int i = 0;
   item_number_t *rhs = XMALLOC (item_number_t, nritems);
Index: src/reader.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reader.c,v
retrieving revision 1.176
diff -u -u -r1.176 reader.c
--- src/reader.c 6 May 2002 08:23:28 -0000 1.176
+++ src/reader.c 7 May 2002 08:06:53 -0000
@@ -1736,7 +1736,7 @@
 static void
 packgram (void)
 {
-  int itemno;
+  unsigned int itemno;
   int ruleno;
   symbol_list *p;
 
Index: src/reduce.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reduce.c,v
retrieving revision 1.62
diff -u -u -r1.62 reduce.c
--- src/reduce.c 6 May 2002 08:23:28 -0000 1.62
+++ src/reduce.c 7 May 2002 08:06:54 -0000
@@ -306,11 +306,17 @@
     free (symbols_sorted + ntokens);
   }
 
-  for (i = 0; i < nritems; ++i)
-    if (ISVAR (ritem[i]))
-      ritem[i] = token_number_as_item_number (nontermmap[ritem[i]]);
-
-  start_symbol = nontermmap[start_symbol];
+  {
+    int r;
+    for (r = 1; r < nrules + 1; ++r)
+      {
+       item_number_t *rhsp;
+       for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
+         if (ISVAR (*rhsp))
+           *rhsp =  token_number_as_item_number (nontermmap[*rhsp]);
+      }
+    start_symbol = nontermmap[start_symbol];
+  }
 
   nsyms -= nuseless_nonterminals;
   nvars -= nuseless_nonterminals;
Index: src/state.h
===================================================================
RCS file: /cvsroot/bison/bison/src/state.h,v
retrieving revision 1.23
diff -u -u -r1.23 state.h
--- src/state.h 22 Apr 2002 08:21:55 -0000 1.23
+++ src/state.h 7 May 2002 08:06:54 -0000
@@ -185,7 +185,7 @@
   int nlookaheads;
 
   /* Its items. */
-  short nitems;
+  unsigned short nitems;
   item_number_t items[1];
 } state_t;