* data/bison.simple (yyparse): Do not implement @$ = @1.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 5c1ef12751c1014e1f932e894ee0f52cfc491dd7..ec5a12ad8fa60a37f0d3b80c6f2cc1a8d3903919 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -69,24 +69,24 @@ static void
 print_core (FILE *out, state_t *state)
 {
   int i;
 print_core (FILE *out, state_t *state)
 {
   int i;

-  short *sitems = state->items;
-  int snitems   = state->nitems;
+  item_number_t *sitems = state->items;
+  int snritems   = state->nitems;

 
   /* New experimental feature: if TRACE_FLAGS output all the items of
      a state, not only its kernel.  */
   if (trace_flag)
     {
 
   /* New experimental feature: if TRACE_FLAGS output all the items of
      a state, not only its kernel.  */
   if (trace_flag)
     {

-      closure (sitems, snitems);
+      closure (sitems, snritems);

       sitems = itemset;
       sitems = itemset;

-      snitems = nitemset;
+      snritems = nritemset;

     }
 
     }
 

-  if (snitems)
+  if (snritems)

     {
     {

-      for (i = 0; i < snitems; i++)
+      for (i = 0; i < snritems; i++)

        {
        {

-         short *sp;
-         short *sp1;
+         item_number_t *sp;
+         item_number_t *sp1;

          int rule;
 
          sp1 = sp = ritem + sitems[i];
          int rule;
 
          sp1 = sp = ritem + sitems[i];


@@ -124,7 +124,7 @@ print_shifts (FILE *out, state_t *state)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
        int state1 = shiftp->shifts[i];
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
        int state1 = shiftp->shifts[i];

-       int symbol = states[state1]->accessing_symbol;
+       token_number_t symbol = states[state1]->accessing_symbol;

        fprintf (out,
                 _("    %-4s\tshift, and go to state %d\n"),
                 escape (symbols[symbol]->tag), state1);
        fprintf (out,
                 _("    %-4s\tshift, and go to state %d\n"),
                 escape (symbols[symbol]->tag), state1);


@@ -166,7 +166,7 @@ print_gotos (FILE *out, state_t *state)
        if (!SHIFT_IS_DISABLED (shiftp, i))
          {
            int state1 = shiftp->shifts[i];
        if (!SHIFT_IS_DISABLED (shiftp, i))
          {
            int state1 = shiftp->shifts[i];

-           int symbol = states[state1]->accessing_symbol;
+           token_number_t symbol = states[state1]->accessing_symbol;

            fprintf (out, _("    %-4s\tgo to state %d\n"),
                     escape (symbols[symbol]->tag), state1);
          }
            fprintf (out, _("    %-4s\tgo to state %d\n"),
                     escape (symbols[symbol]->tag), state1);
          }


@@ -190,7 +190,7 @@ print_reductions (FILE *out, state_t *state)
   if (state->consistent)
     {
       int rule = redp->rules[0];
   if (state->consistent)
     {
       int rule = redp->rules[0];

-      int symbol = rules[rule].lhs->number;
+      token_number_t symbol = rules[rule].lhs->number;

       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
               rule - 1, escape (symbols[symbol]->tag));
       return;
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
               rule - 1, escape (symbols[symbol]->tag));
       return;


@@ -360,19 +360,20 @@ do {                                              \
 static void
 print_grammar (FILE *out)
 {
 static void
 print_grammar (FILE *out)
 {

-  int i, j;
-  short *rule;
+  token_number_t i;
+  int j;
+  item_number_t *rule;

   char buffer[90];
   int column = 0;
 
   /* rule # : LHS -> RHS */
   fprintf (out, "%s\n\n", _("Grammar"));
   fprintf (out, "  %s\n", _("Number, Line, Rule"));
   char buffer[90];
   int column = 0;
 
   /* rule # : LHS -> RHS */
   fprintf (out, "%s\n\n", _("Grammar"));
   fprintf (out, "  %s\n", _("Number, Line, Rule"));

-  for (i = 1; i < nrules + 1; i++)
+  for (j = 1; j < nrules + 1; j++)

     {
       fprintf (out, _("  %3d %3d %s ->"),
     {
       fprintf (out, _("  %3d %3d %s ->"),

-              i - 1, rules[i].line, escape (rules[i].lhs->tag));
-      rule = rules[i].rhs;
+              j - 1, rules[j].line, escape (rules[j].lhs->tag));
+      rule = rules[j].rhs;

       if (*rule >= 0)
        while (*rule >= 0)
          fprintf (out, " %s", escape (symbols[*rule++]->tag));
       if (*rule >= 0)
        while (*rule >= 0)
          fprintf (out, " %s", escape (symbols[*rule++]->tag));


@@ -386,7 +387,7 @@ print_grammar (FILE *out)
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
   for (i = 0; i < max_user_token_number + 1; i++)
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
   for (i = 0; i < max_user_token_number + 1; i++)

-    if (token_translations[i] != 2)
+    if (token_translations[i] != undeftoken->number)

       {
        buffer[0] = 0;
        column = strlen (escape (symbols[token_translations[i]]->tag));
       {
        buffer[0] = 0;
        column = strlen (escape (symbols[token_translations[i]]->tag));


@@ -396,7 +397,7 @@ print_grammar (FILE *out)
 
        for (j = 1; j < nrules + 1; j++)
          for (rule = rules[j].rhs; *rule >= 0; rule++)
 
        for (j = 1; j < nrules + 1; j++)
          for (rule = rules[j].rhs; *rule >= 0; rule++)

-           if (*rule == token_translations[i])
+           if (item_number_as_token_number (*rule) == token_translations[i])

              {
                END_TEST (65);
                sprintf (buffer + strlen (buffer), " %d", j - 1);
              {
                END_TEST (65);
                sprintf (buffer + strlen (buffer), " %d", j - 1);


@@ -417,7 +418,7 @@ print_grammar (FILE *out)
          if (rules[j].lhs->number == i)
            left_count++;
          for (rule = rules[j].rhs; *rule >= 0; rule++)
          if (rules[j].lhs->number == i)
            left_count++;
          for (rule = rules[j].rhs; *rule >= 0; rule++)

-           if (*rule == i)
+           if (item_number_as_token_number (*rule) == i)

              {
                right_count++;
                break;
              {
                right_count++;
                break;


@@ -452,7 +453,7 @@ print_grammar (FILE *out)
          for (j = 1; j < nrules + 1; j++)
            {
              for (rule = rules[j].rhs; *rule >= 0; rule++)
          for (j = 1; j < nrules + 1; j++)
            {
              for (rule = rules[j].rhs; *rule >= 0; rule++)

-               if (*rule == i)
+               if (item_number_as_token_number (*rule) == i)

                  {
                    END_TEST (65);
                    sprintf (buffer + strlen (buffer), " %d", j - 1);
                  {
                    END_TEST (65);
                    sprintf (buffer + strlen (buffer), " %d", j - 1);