* tests/calc.m4 (calc.y): Do not assign to stdin, as it's not

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index cb0e67db246793d5318d20d1834fc101d66a1fd9..b201562007fe5a2588a757b7aa7d61754f8de4d4 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.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
-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.  */
 
 #include <stdio.h>
 #include "system.h"
@@ -37,23 +38,24 @@ extern short *lookaheads;
 extern int verboseflag;
 extern int fixed_outfiles;
 
-void initialize_conflicts PARAMS((void));
-void set_conflicts PARAMS((int));
-void resolve_sr_conflict PARAMS((int, int));
-void flush_shift PARAMS((int, int));
-void log_resolution PARAMS((int, int, int, char *));
-void conflict_log PARAMS((void));
-void verbose_conflict_log PARAMS((void));
-void total_conflicts PARAMS((void));
-void count_sr_conflicts PARAMS((int));
-void count_rr_conflicts PARAMS((int));
-void print_reductions PARAMS((int));
-void finalize_conflicts PARAMS((void));
+extern void initialize_conflicts PARAMS((void));
+extern void conflict_log PARAMS((void));
+extern void verbose_conflict_log PARAMS((void));
+extern void print_reductions PARAMS((int));
+extern void finalize_conflicts PARAMS((void));
+
+static void set_conflicts PARAMS((int));
+static void resolve_sr_conflict PARAMS((int, int));
+static void flush_shift PARAMS((int, int));
+static void log_resolution PARAMS((int, int, int, char *));
+static void total_conflicts PARAMS((void));
+static void count_sr_conflicts PARAMS((int));
+static void count_rr_conflicts PARAMS((int));
 
 char any_conflicts;
-char *conflicts;
 errs **err_table;
 int expected_conflicts;
+static char *conflicts;
 
 
 static unsigned *shiftset;
@@ -83,7 +85,7 @@ initialize_conflicts (void)
 }
 
 
-void
+static void
 set_conflicts (int state)
 {
   register int i;
@@ -169,7 +171,7 @@ It has already been checked that the rule has a precedence.
 A conflict is resolved by modifying the shift or reduce tables
 so that there is no longer a conflict.  */
 
-void
+static void
 resolve_sr_conflict (int state, int lookaheadnum)
 {
   register int i;
@@ -270,7 +272,7 @@ resolve_sr_conflict (int state, int lookaheadnum)
 /* turn off the shift recorded for the specified token in the specified state.
 Used when we resolve a shift-reduce conflict in favor of the reduction.  */
 
-void
+static void
 flush_shift (int state, int token)
 {
   register shifts *shiftp;
@@ -291,7 +293,7 @@ flush_shift (int state, int token)
 }
 
 
-void
+static void
 log_resolution (int state, int LAno, int token, char *resolution)
 {
   fprintf(foutput,
@@ -364,7 +366,7 @@ verbose_conflict_log (void)
 }
 
 
-void
+static void
 total_conflicts (void)
 {
   if (src_total == expected_conflicts && rrc_total == 0)
@@ -406,7 +408,7 @@ total_conflicts (void)
 }
 
 
-void
+static void
 count_sr_conflicts (int state)
 {
   register int i;
@@ -473,7 +475,7 @@ count_sr_conflicts (int state)
 }
 
 
-void
+static void
 count_rr_conflicts (int state)
 {
   register int i;
@@ -535,7 +537,7 @@ print_reductions (int state)
   register int m;
   register int n;
   register int default_LA;
-  register int default_rule;
+  register int default_rule = 0;
   register int cmax;
   register int count;
   register shifts *shiftp;