X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2cec70b9f139dd207022c35fdbe8b49fd1cf230d..8e864447445e3674133ddd8906f42f5a4cddc1d9:/src/conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 2f9b4c24..bd29bf97 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -21,6 +21,7 @@
 #include "system.h"
 #include "complain.h"
 #include "getargs.h"
+#include "symtab.h"
 #include "files.h"
 #include "gram.h"
 #include "state.h"
@@ -44,7 +45,8 @@ log_resolution (state_t *state, int LAno, int token, char *resolution)
     obstack_fgrow4 (&output_obstack,
 		    _("\
 Conflict in state %d between rule %d and token %s resolved as %s.\n"),
-		    state->number, LAruleno[LAno], tags[token], resolution);
+		    state->number, LAruleno[LAno], symbols[token]->tag,
+		    resolution);
 }
 
 
@@ -92,24 +94,24 @@ resolve_sr_conflict (state_t *state, int lookahead)
 {
   int i;
   /* find the rule to reduce by to get precedence of reduction  */
-  int redprec = rule_table[LAruleno[lookahead]].prec;
+  int redprec = rules[LAruleno[lookahead]].prec;
   errs *errp = errs_new (ntokens + 1);
   errp->nerrs = 0;
 
   for (i = 0; i < ntokens; i++)
     if (BITISSET (LA (lookahead), i)
 	&& BITISSET (lookaheadset, i)
-	&& sprec[i])
+	&& symbols[i]->prec)
       {
 	/* Shift-reduce conflict occurs for token number i
 	   and it has a precedence.
 	   The precedence of shifting is that of token i.  */
-	if (sprec[i] < redprec)
+	if (symbols[i]->prec < redprec)
 	  {
 	    log_resolution (state, lookahead, i, _("reduce"));
 	    flush_shift (state, i);
 	  }
-	else if (sprec[i] > redprec)
+	else if (symbols[i]->prec > redprec)
 	  {
 	    log_resolution (state, lookahead, i, _("shift"));
 	    flush_reduce (lookahead, i);
@@ -120,7 +122,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
 	     For right association, keep only the shift.
 	     For nonassociation, keep neither.  */
 
-	  switch (sassoc[i])
+	  switch (symbols[i]->assoc)
 	    {
 	    case right_assoc:
 	      log_resolution (state, lookahead, i, _("shift"));
@@ -170,7 +172,7 @@ set_conflicts (state_t *state)
      check for shift-reduce conflict, and try to resolve using
      precedence */
   for (i = 0; i < state->nlookaheads; ++i)
-    if (rule_table[LAruleno[state->lookaheadsp + i]].prec)
+    if (rules[LAruleno[state->lookaheadsp + i]].prec)
       for (j = 0; j < tokensetsize; ++j)
 	if (LA (state->lookaheadsp + i)[j] & lookaheadset[j])
 	  {
@@ -202,7 +204,7 @@ solve_conflicts (void)
   lookaheadset = XCALLOC (unsigned, tokensetsize);
 
   for (i = 0; i < nstates; i++)
-    set_conflicts (state_table[i]);
+    set_conflicts (states[i]);
 }
 
 
@@ -263,7 +265,7 @@ count_rr_conflicts (state_t *state)
       int count = 0;
       int j;
       for (j = 0; j < state->nlookaheads; ++j)
-	if (BITISSET (LA (state->lookaheadsp), state->lookaheadsp + j))
+	if (BITISSET (LA (state->lookaheadsp + j), i))
 	  count++;
 
       if (count >= 2)
@@ -325,8 +327,8 @@ conflicts_output (FILE *out)
     if (conflicts[i])
       {
 	fprintf (out, _("State %d contains "), i);
-	fputs (conflict_report (count_sr_conflicts (state_table[i]),
-				count_rr_conflicts (state_table[i])), out);
+	fputs (conflict_report (count_sr_conflicts (states[i]),
+				count_rr_conflicts (states[i])), out);
 	printed_sth = TRUE;
       }
   if (printed_sth)
@@ -355,8 +357,8 @@ conflicts_print (void)
   for (i = 0; i < nstates; i++)
     if (conflicts[i])
       {
-	src_total += count_sr_conflicts (state_table[i]);
-	rrc_total += count_rr_conflicts (state_table[i]);
+	src_total += count_sr_conflicts (states[i]);
+	rrc_total += count_rr_conflicts (states[i]);
       }
 
   src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts);