* src/bison.simple (YYSTDERR): Remove, replace `stderr'.

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 05f37bd1849d0b7f7a1d50bd16b06b7fa97cf33a..746fcb50cd6f3fc70e6075e5ef88aed1dc124aa4 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -94,7 +94,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
 {
   int i;
   /* find the rule to reduce by to get precedence of reduction  */
 {
   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;
 
   errs *errp = errs_new (ntokens + 1);
   errp->nerrs = 0;
 


@@ -122,7 +122,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
             For right association, keep only the shift.
             For nonassociation, keep neither.  */
 
             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"));
            {
            case right_assoc:
              log_resolution (state, lookahead, i, _("shift"));


@@ -172,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)
      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])
          {
       for (j = 0; j < tokensetsize; ++j)
        if (LA (state->lookaheadsp + i)[j] & lookaheadset[j])
          {


@@ -204,7 +204,7 @@ solve_conflicts (void)
   lookaheadset = XCALLOC (unsigned, tokensetsize);
 
   for (i = 0; i < nstates; i++)
   lookaheadset = XCALLOC (unsigned, tokensetsize);
 
   for (i = 0; i < nstates; i++)

-    set_conflicts (state_table[i]);
+    set_conflicts (states[i]);

 }
 
 
 }
 
 


@@ -327,8 +327,8 @@ conflicts_output (FILE *out)
     if (conflicts[i])
       {
        fprintf (out, _("State %d contains "), i);
     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)
        printed_sth = TRUE;
       }
   if (printed_sth)


@@ -357,8 +357,8 @@ conflicts_print (void)
   for (i = 0; i < nstates; i++)
     if (conflicts[i])
       {
   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);
       }
 
   src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts);