Revert doc patch.

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index a971af70a9e15d6f1870adac5e2550d4bc66d15e..a24441cb3e5ea753e3145ab8541db59bc08203be 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -167,8 +167,16 @@ output_token_translations (void)
 static void
 output_gram (void)
 {
-  output_table_data (&output_obstack, rrhs,
-                    0, 1, nrules + 1);
+  {
+    int i;
+    short *values = XCALLOC (short, nrules + 1);
+    for (i = 0; i < nrules + 1; ++i)
+      values[i] = rule_table[i].rhs;
+    output_table_data (&output_obstack, values,
+                      0, 1, nrules + 1);
+    XFREE (values);
+  }
+
   muscle_insert ("prhs", obstack_finish (&output_obstack));
 
   {
@@ -200,7 +208,11 @@ output_gram (void)
 static void
 output_stos (void)
 {
-  output_table_data (&output_obstack, accessing_symbol,
+  int i;
+  short *values = (short *) alloca (sizeof (short) * nstates);
+  for (i = 0; i < nstates; ++i)
+    values[i] = state_table[i].accessing_symbol;
+  output_table_data (&output_obstack, values,
                     0, 1, nstates);
   muscle_insert ("stos", obstack_finish (&output_obstack));
 }
@@ -213,9 +225,16 @@ output_rule_data (void)
   int j;
   short *short_tab = NULL;
 
-  output_table_data (&output_obstack, rline,
-                    0, 1, nrules + 1);
-  muscle_insert ("rline", obstack_finish (&output_obstack));
+  {
+    short *values = XCALLOC (short, nrules + 1);
+    for (i = 0; i < nrules + 1; ++i)
+      values[i] = rule_table[i].line;
+    output_table_data (&output_obstack, values,
+                      0, 1, nrules + 1);
+    muscle_insert ("rline", obstack_finish (&output_obstack));
+    XFREE (values);
+  }
+
 
   j = 0;
   for (i = 0; i < nsyms; i++)
@@ -275,22 +294,27 @@ output_rule_data (void)
   muscle_insert ("toknum", obstack_finish (&output_obstack));
 
   /* Output YYR1. */
-  output_table_data (&output_obstack, rlhs,
-                    0, 1, nrules + 1);
-  muscle_insert ("r1", obstack_finish (&output_obstack));
-  XFREE (rlhs + 1);
+  {
+    short *values = XCALLOC (short, nrules + 1);
+    for (i = 0; i < nrules + 1; ++i)
+      values[i] = rule_table[i].lhs;
+    output_table_data (&output_obstack, values,
+                      0, 1, nrules + 1);
+    muscle_insert ("r1", obstack_finish (&output_obstack));
+    XFREE (values);
+  }
 
   /* Output YYR2. */
   short_tab = XMALLOC (short, nrules + 1);
   for (i = 1; i < nrules; i++)
-    short_tab[i] = rrhs[i + 1] - rrhs[i] - 1;
-  short_tab[nrules] = nitems - rrhs[nrules] - 1;
+    short_tab[i] = rule_table[i + 1].rhs - rule_table[i].rhs - 1;
+  short_tab[nrules] =  nitems - rule_table[nrules].rhs - 1;
   output_table_data (&output_obstack, short_tab,
                     0, 1, nrules + 1);
   muscle_insert ("r2", obstack_finish (&output_obstack));
   XFREE (short_tab);
 
-  XFREE (rrhs + 1);
+  XFREE (rule_table + 1);
 }
 
 /*------------------------------------------------------------------.
@@ -334,7 +358,7 @@ action_row (int state)
 
   default_rule = 0;
   nreds = 0;
-  redp = reduction_table[state];
+  redp = state_table[state].reduction_table;
 
   if (redp)
     {
@@ -344,13 +368,13 @@ action_row (int state)
        {
          /* loop over all the rules available here which require
             lookahead */
-         m = lookaheads[state];
-         n = lookaheads[state + 1];
+         m = state_table[state].lookaheads;
+         n = state_table[state + 1].lookaheads;
 
          for (i = n - 1; i >= m; i--)
            {
              rule = -LAruleno[i];
-             wordp = LA + i * tokensetsize;
+             wordp = LA (i);
              mask = 1;
 
              /* and find each token which the rule finds acceptable
@@ -373,7 +397,7 @@ action_row (int state)
        }
     }
 
-  shiftp = shift_table[state];
+  shiftp = state_table[state].shift_table;
 
   /* Now see which tokens are allowed for shifts in this state.  For
      them, record the shift as the thing to do.  So shift is preferred
@@ -389,7 +413,7 @@ action_row (int state)
          if (!shift_state)
            continue;
 
-         symbol = accessing_symbol[shift_state];
+         symbol = state_table[shift_state].accessing_symbol;
 
          if (ISVAR (symbol))
            break;
@@ -424,7 +448,7 @@ action_row (int state)
 
   if (nreds >= 1 && !nodefault)
     {
-      if (consistent[state])
+      if (state_table[state].consistent)
        default_rule = redp->rules[0];
       else
        {
@@ -543,37 +567,6 @@ token_actions (void)
 }
 
 
-static void
-free_shifts (void)
-{
-  shifts *sp, *sptmp;  /* JF derefrenced freed ptr */
-
-  XFREE (shift_table);
-
-  for (sp = first_shift; sp; sp = sptmp)
-    {
-      sptmp = sp->next;
-      XFREE (sp);
-    }
-}
-
-
-static void
-free_reductions (void)
-{
-  reductions *rp, *rptmp;      /* JF fixed freed ptr */
-
-  XFREE (reduction_table);
-
-  for (rp = first_reduction; rp; rp = rptmp)
-    {
-      rptmp = rp->next;
-      XFREE (rp);
-    }
-}
-
-
-
 static void
 save_column (int symbol, int default_state)
 {
@@ -926,12 +919,10 @@ output_actions (void)
   width = XCALLOC (short, nvectors);
 
   token_actions ();
-  free_shifts ();
-  free_reductions ();
-  XFREE (lookaheads);
+  LIST_FREE (shifts, first_shift);
+  LIST_FREE (reductions, first_reduction);
   XFREE (LA);
   XFREE (LAruleno);
-  XFREE (accessing_symbol);
 
   goto_actions ();
   XFREE (goto_map + ntokens);
@@ -945,6 +936,7 @@ output_actions (void)
   output_table ();
 
   output_check ();
+  XFREE (state_table);
 }
 
 \f
@@ -993,7 +985,6 @@ output_parser (const char *skel_filename, struct obstack *oout)
            obstack_fgrow1 (oout, "%d", line + 1);
          else if (!strcmp (muscle_key, "input_line"))
            obstack_fgrow1 (oout, "%d", lineno);
-         /* FIXME: Insert the code to recognize %%sub-skeleton for exemple.  */
          else
            {
              obstack_sgrow (oout, "%%");
@@ -1022,24 +1013,11 @@ output_master_parser (void)
       else
        skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
     }
+  muscle_insert ("skeleton", skeleton);    
   output_parser (skeleton, &table_obstack);
 }
 
 
-static void
-free_itemsets (void)
-{
-  core *cp, *cptmp;
-
-  XFREE (state_table);
-
-  for (cp = first_state; cp; cp = cptmp)
-    {
-      cptmp = cp->next;
-      XFREE (cp);
-    }
-}
-
 /* FIXME. */
 
 #define MUSCLE_INSERT_INT(Key, Value)                          \
@@ -1099,7 +1077,7 @@ output (void)
 {
   obstack_init (&output_obstack);
 
-  free_itemsets ();
+  LIST_FREE (core, first_state);
 
   output_token_translations ();
   output_gram ();