Revert doc patch.

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index fbb78d282f2b747c3a3f4cae515ce278c431f2cc..a24441cb3e5ea753e3145ab8541db59bc08203be 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -94,7 +94,6 @@
 #include "obstack.h"
 #include "quotearg.h"
 #include "getargs.h"
 #include "obstack.h"
 #include "quotearg.h"
 #include "getargs.h"

-#include "xalloc.h"

 #include "files.h"
 #include "gram.h"
 #include "LR0.h"
 #include "files.h"
 #include "gram.h"
 #include "LR0.h"


@@ -109,17 +108,17 @@ extern void berror PARAMS((const char *));
 
 static int nvectors;
 static int nentries;
 
 static int nvectors;
 static int nentries;

-static short **froms;
-static short **tos;
-static short *tally;
-static short *width;
-static short *actrow;
-static short *state_count;
-static short *order;
-static short *base;
-static short *pos;
-static short *table;
-static short *check;
+static short **froms = NULL;
+static short **tos = NULL;
+static short *tally = NULL;
+static short *width = NULL;
+static short *actrow = NULL;
+static short *state_count = NULL;
+static short *order = NULL;
+static short *base = NULL;
+static short *pos = NULL;
+static short *table = NULL;
+static short *check = NULL;

 static int lowzero;
 static int high;
 
 static int lowzero;
 static int high;
 


@@ -129,15 +128,15 @@ struct obstack output_obstack;
 /* FIXME. */
 
 static inline void
 /* FIXME. */
 
 static inline void

-output_table_data (struct obstack *oout, 
-                  short *table_data, 
-                  short first, 
-                  short begin, 
+output_table_data (struct obstack *oout,
+                  short *table_data,
+                  short first,
+                  short begin,

                   short end)
 {
   int i;
   int j = 1;
                   short end)
 {
   int i;
   int j = 1;

-  
+

   obstack_fgrow1 (oout, "%6d", first);
   for (i = begin; i < end; ++i)
     {
   obstack_fgrow1 (oout, "%6d", first);
   for (i = begin; i < end; ++i)
     {


@@ -158,19 +157,28 @@ output_table_data (struct obstack *oout,
 static void
 output_token_translations (void)
 {
 static void
 output_token_translations (void)
 {

-  output_table_data (&output_obstack, token_translations, 
+  output_table_data (&output_obstack, token_translations,

                     0, 1, max_user_token_number + 1);
   muscle_insert ("translate", obstack_finish (&output_obstack));
                     0, 1, max_user_token_number + 1);
   muscle_insert ("translate", obstack_finish (&output_obstack));

+  XFREE (token_translations);

 }
 
 
 static void
 output_gram (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));
   muscle_insert ("prhs", obstack_finish (&output_obstack));

-  
+

   {
     size_t yyrhs_size = 1;
     short *yyrhs, *sp;
   {
     size_t yyrhs_size = 1;
     short *yyrhs, *sp;


@@ -183,7 +191,7 @@ output_gram (void)
     for (sp = ritem + 1, i = 1; *sp; ++sp, ++i)
       yyrhs[i] = *sp > 0 ? *sp : 0;
 
     for (sp = ritem + 1, i = 1; *sp; ++sp, ++i)
       yyrhs[i] = *sp > 0 ? *sp : 0;
 

-    output_table_data (&output_obstack, yyrhs, 
+    output_table_data (&output_obstack, yyrhs,

                       ritem[0], 1, yyrhs_size);
     muscle_insert ("rhs", obstack_finish (&output_obstack));
 
                       ritem[0], 1, yyrhs_size);
     muscle_insert ("rhs", obstack_finish (&output_obstack));
 


@@ -200,7 +208,11 @@ output_gram (void)
 static void
 output_stos (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));
 }
                     0, 1, nstates);
   muscle_insert ("stos", obstack_finish (&output_obstack));
 }


@@ -213,9 +225,16 @@ output_rule_data (void)
   int j;
   short *short_tab = NULL;
 
   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++)
 
   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. */
   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++)
 
   /* 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;
-  output_table_data (&output_obstack, short_tab, 
+    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);
 
                     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;
 
   default_rule = 0;
   nreds = 0;

-  redp = reduction_table[state];
+  redp = state_table[state].reduction_table;

 
   if (redp)
     {
 
   if (redp)
     {


@@ -344,13 +368,13 @@ action_row (int state)
        {
          /* loop over all the rules available here which require
             lookahead */
        {
          /* 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];
 
          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
              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
 
   /* 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;
 
          if (!shift_state)
            continue;
 

-         symbol = accessing_symbol[shift_state];
+         symbol = state_table[shift_state].accessing_symbol;

 
          if (ISVAR (symbol))
            break;
 
          if (ISVAR (symbol))
            break;


@@ -424,7 +448,7 @@ action_row (int state)
 
   if (nreds >= 1 && !nodefault)
     {
 
   if (nreds >= 1 && !nodefault)
     {

-      if (consistent[state])
+      if (state_table[state].consistent)

        default_rule = redp->rules[0];
       else
        {
        default_rule = redp->rules[0];
       else
        {


@@ -534,46 +558,15 @@ token_actions (void)
       save_row (i);
     }
 
       save_row (i);
     }
 

-  output_table_data (&output_obstack, yydefact, 
+  output_table_data (&output_obstack, yydefact,

                     yydefact[0], 1, nstates);
   muscle_insert ("defact", obstack_finish (&output_obstack));
                     yydefact[0], 1, nstates);
   muscle_insert ("defact", obstack_finish (&output_obstack));

-  
+

   XFREE (actrow);
   XFREE (yydefact);
 }
 
 
   XFREE (actrow);
   XFREE (yydefact);
 }
 
 

-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)
 {
 static void
 save_column (int symbol, int default_state)
 {


@@ -675,7 +668,7 @@ goto_actions (void)
       yydefgoto[i - ntokens] = default_state;
     }
 
       yydefgoto[i - ntokens] = default_state;
     }
 

-  output_table_data (&output_obstack, yydefgoto, 
+  output_table_data (&output_obstack, yydefgoto,

                     yydefgoto[0], 1, nsyms - ntokens);
   muscle_insert ("defgoto", obstack_finish (&output_obstack));
 
                     yydefgoto[0], 1, nsyms - ntokens);
   muscle_insert ("defgoto", obstack_finish (&output_obstack));
 


@@ -880,12 +873,12 @@ static void
 output_base (void)
 {
   /* Output pact. */
 output_base (void)
 {
   /* Output pact. */

-  output_table_data (&output_obstack, base, 
+  output_table_data (&output_obstack, base,

                     base[0], 1, nstates);
   muscle_insert ("pact", obstack_finish (&output_obstack));
 
   /* Output pgoto. */
                     base[0], 1, nstates);
   muscle_insert ("pact", obstack_finish (&output_obstack));
 
   /* Output pgoto. */

-  output_table_data (&output_obstack, base, 
+  output_table_data (&output_obstack, base,

                     base[nstates], nstates + 1, nvectors);
   muscle_insert ("pgoto", obstack_finish (&output_obstack));
 
                     base[nstates], nstates + 1, nvectors);
   muscle_insert ("pgoto", obstack_finish (&output_obstack));
 


@@ -896,7 +889,7 @@ output_base (void)
 static void
 output_table (void)
 {
 static void
 output_table (void)
 {

-  output_table_data (&output_obstack, table, 
+  output_table_data (&output_obstack, table,

                     table[0], 1, high + 1);
   muscle_insert ("table", obstack_finish (&output_obstack));
   XFREE (table);
                     table[0], 1, high + 1);
   muscle_insert ("table", obstack_finish (&output_obstack));
   XFREE (table);


@@ -906,7 +899,7 @@ output_table (void)
 static void
 output_check (void)
 {
 static void
 output_check (void)
 {

-  output_table_data (&output_obstack, check, 
+  output_table_data (&output_obstack, check,

                     check[0], 1, high + 1);
   muscle_insert ("check", obstack_finish (&output_obstack));
   XFREE (check);
                     check[0], 1, high + 1);
   muscle_insert ("check", obstack_finish (&output_obstack));
   XFREE (check);


@@ -926,12 +919,10 @@ output_actions (void)
   width = XCALLOC (short, nvectors);
 
   token_actions ();
   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 (LA);
   XFREE (LAruleno);

-  XFREE (accessing_symbol);

 
   goto_actions ();
   XFREE (goto_map + ntokens);
 
   goto_actions ();
   XFREE (goto_map + ntokens);


@@ -945,28 +936,23 @@ output_actions (void)
   output_table ();
 
   output_check ();
   output_table ();
 
   output_check ();

+  XFREE (state_table);

 }
 
 }
 

-/*------------------------------------------.
-| Copy the parser code into TABLE_OBSTACK.  |
-`------------------------------------------*/
+\f
+/*------------------------------------------------------------.
+| Copy the parser code from SKEL_FILENAME into OOUT obstack.  |
+| and do the muscle substitution.                             |
+`------------------------------------------------------------*/

 
 static void
 
 static void

-output_parser (void)
+output_parser (const char *skel_filename, struct obstack *oout)

 {
   int c;
   FILE *fskel;
   size_t line;
 
 {
   int c;
   FILE *fskel;
   size_t line;
 

-  /* Loop over lines in the standard parser file.  */
-  if (!skeleton)
-    {
-      if (semantic_parser)
-       skeleton = skeleton_find ("BISON_HAIRY", BISON_HAIRY);
-      else
-       skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
-    }
-  fskel = xfopen (skeleton, "r");
+  fskel = xfopen (skel_filename, "r");

 
   /* New output code.  */
   line = 1;
 
   /* New output code.  */
   line = 1;


@@ -977,7 +963,7 @@ output_parser (void)
        {
          if (c == '\n')
            ++line;
        {
          if (c == '\n')
            ++line;

-         obstack_1grow (&table_obstack, c);
+         obstack_1grow (oout, c);

          c = getc (fskel);
        }
       else if ((c = getc (fskel)) == '%')
          c = getc (fskel);
        }
       else if ((c = getc (fskel)) == '%')


@@ -985,6 +971,7 @@ output_parser (void)
          /* Read the muscle.  */
          const char *muscle_key = 0;
          const char *muscle_value = 0;
          /* Read the muscle.  */
          const char *muscle_key = 0;
          const char *muscle_value = 0;

+

          while (isalnum (c = getc (fskel)) || c == '_')
            obstack_1grow (&muscle_obstack, c);
          obstack_1grow (&muscle_obstack, 0);
          while (isalnum (c = getc (fskel)) || c == '_')
            obstack_1grow (&muscle_obstack, c);
          obstack_1grow (&muscle_obstack, 0);


@@ -993,43 +980,44 @@ output_parser (void)
          muscle_key = obstack_finish (&muscle_obstack);
          muscle_value = muscle_find (muscle_key);
          if (muscle_value)
          muscle_key = obstack_finish (&muscle_obstack);
          muscle_value = muscle_find (muscle_key);
          if (muscle_value)

-           obstack_sgrow (&table_obstack, muscle_value);
+           obstack_sgrow (oout, muscle_value);

          else if (!strcmp (muscle_key, "line"))
          else if (!strcmp (muscle_key, "line"))

-           obstack_fgrow1 (&table_obstack, "%d", line + 1);
-         else if (!strcmp (muscle_key, "action"))
-           {
-             size_t size = obstack_object_size (&action_obstack);
-             obstack_grow (&table_obstack, 
-                           obstack_finish (&action_obstack), size);
-           }
+           obstack_fgrow1 (oout, "%d", line + 1);
+         else if (!strcmp (muscle_key, "input_line"))
+           obstack_fgrow1 (oout, "%d", lineno);

          else
            {
          else
            {

-             obstack_sgrow (&table_obstack, "%%");
-             obstack_sgrow (&table_obstack, muscle_key);
+             obstack_sgrow (oout, "%%");
+             obstack_sgrow (oout, muscle_key);

            }
        }
       else
            }
        }
       else

-       obstack_1grow (&table_obstack, '%');
+       obstack_1grow (oout, '%');

     }
 
   /* End.  */
   xfclose (fskel);
 }
 
     }
 
   /* End.  */
   xfclose (fskel);
 }
 

+/*----------------------------------------.
+| Prepare the master parser to be output  |
+`----------------------------------------*/
+

 static void
 static void

-free_itemsets (void)
+output_master_parser (void)

 {
 {

-  core *cp, *cptmp;
-
-  XFREE (state_table);
-
-  for (cp = first_state; cp; cp = cptmp)
+  if (!skeleton)

     {
     {

-      cptmp = cp->next;
-      XFREE (cp);
+      if (semantic_parser)
+       skeleton = skeleton_find ("BISON_HAIRY", BISON_HAIRY);
+      else
+       skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);

     }
     }

+  muscle_insert ("skeleton", skeleton);    
+  output_parser (skeleton, &table_obstack);

 }
 
 }
 

+

 /* FIXME. */
 
 #define MUSCLE_INSERT_INT(Key, Value)                          \
 /* FIXME. */
 
 #define MUSCLE_INSERT_INT(Key, Value)                          \


@@ -1073,6 +1061,9 @@ prepare (void)
 
   MUSCLE_INSERT_INT ("locations_flag", locations_flag);
 
 
   MUSCLE_INSERT_INT ("locations_flag", locations_flag);
 

+  /* We need to save the actions in the muscle %%action.  */
+  muscle_insert ("action", obstack_finish (&action_obstack));
+

   if (spec_name_prefix)
     MUSCLE_INSERT_STRING ("prefix", spec_name_prefix);
 }
   if (spec_name_prefix)
     MUSCLE_INSERT_STRING ("prefix", spec_name_prefix);
 }


@@ -1086,7 +1077,7 @@ output (void)
 {
   obstack_init (&output_obstack);
 
 {
   obstack_init (&output_obstack);
 

-  free_itemsets ();
+  LIST_FREE (core, first_state);

 
   output_token_translations ();
   output_gram ();
 
   output_token_translations ();
   output_gram ();


@@ -1095,16 +1086,19 @@ output (void)
   if (semantic_parser)
     output_stos ();
   output_rule_data ();
   if (semantic_parser)
     output_stos ();
   output_rule_data ();

+  XFREE (user_toknums);

   output_actions ();
   output_actions ();

-  
+

 #if 0
   if (!no_parser_flag) */
 #endif
   prepare ();
   /* Copy definitions in directive.  */
   muscle_insert ("prologue", obstack_finish (&attrs_obstack));
 #if 0
   if (!no_parser_flag) */
 #endif
   prepare ();
   /* Copy definitions in directive.  */
   muscle_insert ("prologue", obstack_finish (&attrs_obstack));

-  output_parser ();
+
+  output_master_parser ();

 
   obstack_free (&muscle_obstack, 0);
   obstack_free (&output_obstack, 0);
 
   obstack_free (&muscle_obstack, 0);
   obstack_free (&output_obstack, 0);

+  obstack_free (&action_obstack, 0);

 }
 }