* data/bison.c++: Merge the two generated headers. Insert a copyright

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index c06f439965f5732aaefc16031ac357e5314343be..cf3e18f370bc289c7d6c0e47569a2fd988a5ce66 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -21,7 +21,6 @@
 
 
 #include "system.h"
 
 
 #include "system.h"

-#include "obstack.h"

 #include "quotearg.h"
 #include "quote.h"
 #include "getargs.h"
 #include "quotearg.h"
 #include "quote.h"
 #include "getargs.h"


@@ -41,16 +40,18 @@ typedef struct symbol_list
   struct symbol_list *next;
   bucket *sym;
   int line;
   struct symbol_list *next;
   bucket *sym;
   int line;

+

   /* The action is attached to the LHS of a rule. */
   const char *action;
   int action_line;
   /* The action is attached to the LHS of a rule. */
   const char *action;
   int action_line;

+
+  /* The guard is attached to the LHS of a rule. */
+  const char *guard;
+  int guard_line;

   bucket *ruleprec;
   bucket *ruleprec;

-}
-symbol_list;
+} symbol_list;

 
 int lineno;
 
 int lineno;

-char **tags;
-short *user_toknums;

 static symbol_list *grammar;
 static int start_flag;
 static bucket *startval;
 static symbol_list *grammar;
 static int start_flag;
 static bucket *startval;


@@ -65,9 +66,10 @@ static int typed;
 /* Incremented for each %left, %right or %nonassoc seen */
 static int lastprec;
 
 /* Incremented for each %left, %right or %nonassoc seen */
 static int lastprec;
 

-static bucket *errtoken;
-static bucket *undeftoken;
-
+static bucket *errtoken = NULL;
+static bucket *undeftoken = NULL;
+static bucket *eoftoken = NULL;
+static bucket *axiom = NULL;

 
 static symbol_list *
 symbol_list_new (bucket *sym)
 
 static symbol_list *
 symbol_list_new (bucket *sym)


@@ -76,6 +78,10 @@ symbol_list_new (bucket *sym)
   res->next = NULL;
   res->sym = sym;
   res->line = lineno;
   res->next = NULL;
   res->sym = sym;
   res->line = lineno;

+  res->action = NULL;
+  res->action_line = 0;
+  res->guard = NULL;
+  res->guard_line = 0;

   res->ruleprec = NULL;
   return res;
 }
   res->ruleprec = NULL;
   return res;
 }


@@ -233,25 +239,22 @@ copy_identifier (FILE *fin, struct obstack *oout)
   ungetc (c, fin);
 }
 
   ungetc (c, fin);
 }
 

-/*-----------------------------------------------------------------.
-| Dump the wannabee comment from IN to OUT1 and OUT2 (which can be |
-| NULL).  In fact we just saw a `/', which might or might not be a |
-| comment.  In any case, copy what we saw.                         |
-|                                                                  |
-| OUT2 might be NULL.                                              |
-`-----------------------------------------------------------------*/
+
+/*------------------------------------------------------------------.
+| Dump the wannabee comment from IN to OOUT.  In fact we just saw a |
+| `/', which might or might not be a comment.  In any case, copy    |
+| what we saw.                                                      |
+`------------------------------------------------------------------*/

 
 static inline void
 
 static inline void

-copy_comment2 (FILE *fin, struct obstack *oout1, struct obstack *oout2)
+copy_comment (FILE *fin, struct obstack *oout)

 {
   int cplus_comment;
   int ended;
   int c;
 
   /* We read a `/', output it. */
 {
   int cplus_comment;
   int ended;
   int c;
 
   /* We read a `/', output it. */

-  obstack_1grow (oout1, '/');
-  if (oout2)
-    obstack_1grow (oout2, '/');
+  obstack_1grow (oout, '/');

 
   switch ((c = getc (fin)))
     {
 
   switch ((c = getc (fin)))
     {


@@ -266,9 +269,7 @@ copy_comment2 (FILE *fin, struct obstack *oout1, struct obstack *oout2)
       return;
     }
 
       return;
     }
 

-  obstack_1grow (oout1, c);
-  if (oout2)
-    obstack_1grow (oout2, c);
+  obstack_1grow (oout, c);

   c = getc (fin);
 
   ended = 0;
   c = getc (fin);
 
   ended = 0;


@@ -278,26 +279,20 @@ copy_comment2 (FILE *fin, struct obstack *oout1, struct obstack *oout2)
        {
          while (c == '*')
            {
        {
          while (c == '*')
            {

-             obstack_1grow (oout1, c);
-             if (oout2)
-               obstack_1grow (oout2, c);
+             obstack_1grow (oout, c);

              c = getc (fin);
            }
 
          if (c == '/')
            {
              c = getc (fin);
            }
 
          if (c == '/')
            {

-             obstack_1grow (oout1, c);
-             if (oout2)
-               obstack_1grow (oout2, c);
+             obstack_1grow (oout, c);

              ended = 1;
            }
        }
       else if (c == '\n')
        {
          lineno++;
              ended = 1;
            }
        }
       else if (c == '\n')
        {
          lineno++;

-         obstack_1grow (oout1, c);
-         if (oout2)
-           obstack_1grow (oout2, c);
+         obstack_1grow (oout, c);

          if (cplus_comment)
            ended = 1;
          else
          if (cplus_comment)
            ended = 1;
          else


@@ -307,27 +302,13 @@ copy_comment2 (FILE *fin, struct obstack *oout1, struct obstack *oout2)
        fatal (_("unterminated comment"));
       else
        {
        fatal (_("unterminated comment"));
       else
        {

-         obstack_1grow (oout1, c);
-         if (oout2)
-           obstack_1grow (oout2, c);
+         obstack_1grow (oout, c);

          c = getc (fin);
        }
     }
 }
 
 
          c = getc (fin);
        }
     }
 }
 
 

-/*-------------------------------------------------------------------.
-| Dump the comment (actually the current string starting with a `/') |
-| from FIN to OOUT.                                                  |
-`-------------------------------------------------------------------*/
-
-static inline void
-copy_comment (FILE *fin, struct obstack *oout)
-{
-  copy_comment2 (fin, oout, NULL);
-}
-
-

 /*-----------------------------------------------------------------.
 | FIN is pointing to a location (i.e., a `@').  Output to OOUT a   |
 | reference to this location. STACK_OFFSET is the number of values |
 /*-----------------------------------------------------------------.
 | FIN is pointing to a location (i.e., a `@').  Output to OOUT a   |
 | reference to this location. STACK_OFFSET is the number of values |


@@ -352,9 +333,16 @@ copy_at (FILE *fin, struct obstack *oout, int stack_offset)
 
       ungetc (c, fin);
       n = read_signed_integer (fin);
 
       ungetc (c, fin);
       n = read_signed_integer (fin);

-
-      obstack_fgrow1 (oout, "yylsp[%d]", n - stack_offset);
-      locations_flag = 1;
+      if (n > stack_offset)
+       complain (_("invalid value: %s%d"), "@", n);
+      else
+       {
+         /* Offset is always 0 if parser has already popped the stack
+            pointer.  */
+         obstack_fgrow1 (oout, "yylsp[%d]",
+                         n - (semantic_parser ? 0 : stack_offset));
+         locations_flag = 1;
+       }

     }
   else
     {
     }
   else
     {


@@ -409,16 +397,24 @@ copy_dollar (FILE *fin, struct obstack *oout,
       ungetc (c, fin);
       n = read_signed_integer (fin);
 
       ungetc (c, fin);
       n = read_signed_integer (fin);
 

-      if (!type_name && n > 0)
-       type_name = get_type_name (n, rule);
-
-      obstack_fgrow1 (oout, "yyvsp[%d]", n - stack_offset);
-
-      if (type_name)
-       obstack_fgrow1 (oout, ".%s", type_name);
-      if (!type_name && typed)
-       complain (_("$%d of `%s' has no declared type"),
-                 n, rule->sym->tag);
+      if (n > stack_offset)
+       complain (_("invalid value: %s%d"), "$", n);
+      else
+       {
+         if (!type_name && n > 0)
+           type_name = get_type_name (n, rule);
+
+         /* Offset is always 0 if parser has already popped the stack
+            pointer.  */
+         obstack_fgrow1 (oout, "yyvsp[%d]",
+                         n - (semantic_parser ? 0 : stack_offset));
+
+         if (type_name)
+           obstack_fgrow1 (oout, ".%s", type_name);
+         if (!type_name && typed)
+           complain (_("$%d of `%s' has no declared type"),
+                     n, rule->sym->tag);
+       }

     }
   else
     {
     }
   else
     {


@@ -444,7 +440,7 @@ copy_definition (void)
     {
       obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"),
                      lineno, quotearg_style (c_quoting_style,
     {
       obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"),
                      lineno, quotearg_style (c_quoting_style,

-                                             muscle_find("filename")));
+                                             muscle_find ("filename")));

     }
 
   after_percent = 0;
     }
 
   after_percent = 0;


@@ -576,6 +572,9 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
       else if (symbol && token == tok_number)
        {
          symbol->user_token_number = numval;
       else if (symbol && token == tok_number)
        {
          symbol->user_token_number = numval;

+         /* User defined EOF token? */
+         if (numval == 0)
+           eoftoken = symbol;

        }
       else
        {
        }
       else
        {


@@ -755,30 +754,13 @@ parse_union_decl (void)
   int count = 0;
   bool done = FALSE;
   struct obstack union_obstack;
   int count = 0;
   bool done = FALSE;
   struct obstack union_obstack;

-  const char *prologue = "\
-#ifndef YYSTYPE\n\
-typedef union";
-  const char *epilogue = "\
- yystype;\n\
-# define YYSTYPE yystype\n\
-#endif\n";
-

   if (typed)
     complain (_("multiple %s declarations"), "%union");
 
   typed = 1;
 
   if (typed)
     complain (_("multiple %s declarations"), "%union");
 
   typed = 1;
 

-  /* FIXME: I'm worried: are you sure attrs_obstack is properly
-     filled?  */
-  /* I don't see any reasons to keep this line, because we should
-     create a special skeleton for this option.  */
-  if (no_lines_flag)
-    obstack_1grow (&attrs_obstack, '\n');
-

   obstack_init (&union_obstack);
   obstack_sgrow (&union_obstack, "union");
   obstack_init (&union_obstack);
   obstack_sgrow (&union_obstack, "union");

-  if (defines_flag)
-    obstack_sgrow (&defines_obstack, prologue);

 
   while (!done)
     {
 
   while (!done)
     {


@@ -786,11 +768,7 @@ typedef union";
 
       /* If C contains '/', it is output by copy_comment ().  */
       if (c != '/')
 
       /* If C contains '/', it is output by copy_comment ().  */
       if (c != '/')

-       {
-         obstack_1grow (&union_obstack, c);
-         if (defines_flag)
-           obstack_1grow (&defines_obstack, c);
-       }
+       obstack_1grow (&union_obstack, c);

 
       switch (c)
        {
 
       switch (c)
        {


@@ -799,7 +777,7 @@ typedef union";
          break;
 
        case '/':
          break;
 
        case '/':

-         copy_comment2 (finput, &defines_obstack, &union_obstack);
+         copy_comment (finput, &union_obstack);

          break;
 
        case '{':
          break;
 
        case '{':


@@ -817,8 +795,6 @@ typedef union";
        }
     }
 
        }
     }
 

-  if (defines_flag)
-    obstack_sgrow (&defines_obstack, epilogue);

   /* JF don't choke on trailing semi */
   c = skip_white_space ();
   if (c != ';')
   /* JF don't choke on trailing semi */
   c = skip_white_space ();
   if (c != ';')


@@ -923,12 +899,13 @@ parse_thong_decl (void)
   nsyms--;
 }
 
   nsyms--;
 }
 

+

 static void
 parse_muscle_decl (void)
 {
   int ch = ungetc (skip_white_space (), finput);
 static void
 parse_muscle_decl (void)
 {
   int ch = ungetc (skip_white_space (), finput);

-  char* muscle_key;
-  char* muscle_value;
+  char *muscle_key;
+  char *muscle_value;

 
   /* Read key. */
   if (!isalpha (ch) && ch != '_')
 
   /* Read key. */
   if (!isalpha (ch) && ch != '_')


@@ -1121,178 +1098,89 @@ read_declarations (void)
 | matching `}' into the actions file.  STACK_OFFSET is the number of |
 | values in the current rule so far, which says where to find `$0'   |
 | with respect to the top of the stack.                              |
 | matching `}' into the actions file.  STACK_OFFSET is the number of |
 | values in the current rule so far, which says where to find `$0'   |
 | with respect to the top of the stack.                              |

+|                                                                    |
+| This routine is used both for actions and guards.  Only            |
+| ACTION_OBSTACK is used, but this is fine, since we use only        |
+| pointers to relevant portions inside this obstack.                 |

 `-------------------------------------------------------------------*/
 
 static void
 `-------------------------------------------------------------------*/
 
 static void

-copy_action (symbol_list *rule, int stack_offset)
+parse_braces (symbol_list *rule, int stack_offset)

 {
   int c;
   int count;
 
 {
   int c;
   int count;
 

-  /* offset is always 0 if parser has already popped the stack pointer */
-  if (semantic_parser)
-    stack_offset = 0;
-

   count = 1;
   count = 1;

-  c = getc (finput);
-

   while (count > 0)
     {
   while (count > 0)
     {

-      while (c != '}')
-       {
-         switch (c)
-           {
-           case '\n':
-             obstack_1grow (&action_obstack, c);
-             lineno++;
-             break;
-
-           case '{':
-             obstack_1grow (&action_obstack, c);
-             count++;
-             break;
-
-           case '\'':
-           case '"':
-             copy_string (finput, &action_obstack, c);
-             break;
+      while ((c = getc (finput)) != '}')
+       switch (c)
+         {
+         case '\n':
+           obstack_1grow (&action_obstack, c);
+           lineno++;
+           break;

 
 

-           case '/':
-             copy_comment (finput, &action_obstack);
-             break;
+         case '{':
+           obstack_1grow (&action_obstack, c);
+           count++;
+           break;

 
 

-           case '$':
-             copy_dollar (finput, &action_obstack,
-                          rule, stack_offset);
-             break;
+         case '\'':
+         case '"':
+           copy_string (finput, &action_obstack, c);
+           break;

 
 

-           case '@':
-             copy_at (finput, &action_obstack,
-                      stack_offset);
-             break;
+         case '/':
+           copy_comment (finput, &action_obstack);
+           break;

 
 

-           case EOF:
-             fatal (_("unmatched %s"), "`{'");
+         case '$':
+           copy_dollar (finput, &action_obstack,
+                        rule, stack_offset);
+           break;

 
 

-           default:
-             obstack_1grow (&action_obstack, c);
-           }
+         case '@':
+           copy_at (finput, &action_obstack,
+                    stack_offset);
+           break;

 
 

-         c = getc (finput);
-       }
+         case EOF:
+           fatal (_("unmatched %s"), "`{'");

 
 

-      /* above loop exits when c is '}' */
+         default:
+           obstack_1grow (&action_obstack, c);
+         }

 
 

+      /* Above loop exits when C is '}'.  */

       if (--count)
       if (--count)

-       {
-         obstack_1grow (&action_obstack, c);
-         c = getc (finput);
-       }
+       obstack_1grow (&action_obstack, c);

     }
 
   obstack_1grow (&action_obstack, '\0');
     }
 
   obstack_1grow (&action_obstack, '\0');

-  rule->action = obstack_finish (&action_obstack);
-  rule->action_line = lineno;

 }
 }

-\f
-/*-------------------------------------------------------------------.
-| After `%guard' is seen in the input file, copy the actual guard    |
-| into the guards file.  If the guard is followed by an action, copy |
-| that into the actions file.  STACK_OFFSET is the number of values  |
-| in the current rule so far, which says where to find `$0' with     |
-| respect to the top of the stack, for the simple parser in which    |
-| the stack is not popped until after the guard is run.              |
-`-------------------------------------------------------------------*/
+

 
 static void
 
 static void

-copy_guard (symbol_list *rule, int stack_offset)
+parse_action (symbol_list *rule, int stack_offset)

 {
 {

-  int c;
-  int count;
-  int brace_flag = 0;
-
-  /* offset is always 0 if parser has already popped the stack pointer */
-  if (semantic_parser)
-    stack_offset = 0;
-
-  obstack_fgrow1 (&guard_obstack, "\ncase %d:\n", nrules);
-  if (!no_lines_flag)
-    obstack_fgrow2 (&guard_obstack, muscle_find ("linef"),
-                   lineno, quotearg_style (c_quoting_style,
-                                           muscle_find ("filename")));
-  obstack_1grow (&guard_obstack, '{');
-
-  count = 0;
-  c = getc (finput);
-
-  while (brace_flag ? (count > 0) : (c != ';'))
-    {
-      switch (c)
-       {
-       case '\n':
-         obstack_1grow (&guard_obstack, c);
-         lineno++;
-         break;
-
-       case '{':
-         obstack_1grow (&guard_obstack, c);
-         brace_flag = 1;
-         count++;
-         break;
-
-       case '}':
-         obstack_1grow (&guard_obstack, c);
-         if (count > 0)
-           count--;
-         else
-           {
-             complain (_("unmatched %s"), "`}'");
-             c = getc (finput);        /* skip it */
-           }
-         break;
-
-       case '\'':
-       case '"':
-         copy_string (finput, &guard_obstack, c);
-         break;
-
-       case '/':
-         copy_comment (finput, &guard_obstack);
-         break;
-
-       case '$':
-         copy_dollar (finput, &guard_obstack, rule, stack_offset);
-         break;
-
-       case '@':
-         copy_at (finput, &guard_obstack, stack_offset);
-         break;
-
-       case EOF:
-         fatal ("%s", _("unterminated %guard clause"));
-
-       default:
-         obstack_1grow (&guard_obstack, c);
-       }
-
-      if (c != '}' || count != 0)
-       c = getc (finput);
-    }
+  rule->action_line = lineno;
+  parse_braces (rule, stack_offset);
+  rule->action = obstack_finish (&action_obstack);
+}

 
 

-  c = skip_white_space ();

 
 

-  obstack_sgrow (&guard_obstack, ";\n    break;}");
-  if (c == '{')
-    copy_action (rule, stack_offset);
-  else if (c == '=')
-    {
-      c = getc (finput);       /* why not skip_white_space -wjh */
-      if (c == '{')
-       copy_action (rule, stack_offset);
-    }
-  else
-    ungetc (c, finput);
+static void
+parse_guard (symbol_list *rule, int stack_offset)
+{
+  token_t t = lex ();
+  if (t != tok_left_curly)
+    complain (_("invalid %s declaration"), "%guard");
+  rule->guard_line = lineno;
+  parse_braces (rule, stack_offset);
+  rule->guard = obstack_finish (&action_obstack);

 }
 }

+

 \f
 
 /*-------------------------------------------------------------------.
 \f
 
 /*-------------------------------------------------------------------.


@@ -1466,6 +1354,11 @@ readgram (void)
                p = symbol_list_new (sdummy);
                /* Attach its lineno to that of the host rule. */
                p->line = crule->line;
                p = symbol_list_new (sdummy);
                /* Attach its lineno to that of the host rule. */
                p->line = crule->line;

+               /* Move the action from the host rule to this one. */
+               p->action = crule->action;
+               p->action_line = crule->action_line;
+               crule->action = NULL;
+

                if (crule1)
                  crule1->next = p;
                else
                if (crule1)
                  crule1->next = p;
                else


@@ -1495,7 +1388,7 @@ readgram (void)
              }
            else                /* handle an action.  */
              {
              }
            else                /* handle an action.  */
              {

-               copy_action (crule, rulelength);
+               parse_action (crule, rulelength);

                action_flag = 1;
                xactions++;     /* JF */
              }
                action_flag = 1;
                xactions++;     /* JF */
              }


@@ -1514,20 +1407,22 @@ readgram (void)
            crule->ruleprec = symval;
            t = lex ();
          }
            crule->ruleprec = symval;
            t = lex ();
          }

+

        if (t == tok_guard)
          {
            if (!semantic_parser)
              complain (_("%%guard present but %%semantic_parser not specified"));
 
        if (t == tok_guard)
          {
            if (!semantic_parser)
              complain (_("%%guard present but %%semantic_parser not specified"));
 

-           copy_guard (crule, rulelength);
+           parse_guard (crule, rulelength);

            t = lex ();
          }
            t = lex ();
          }

-       else if (t == tok_left_curly)
+
+       if (t == tok_left_curly)

          {
            /* This case never occurs -wjh */
            if (action_flag)
              complain (_("two actions at end of one rule"));
          {
            /* This case never occurs -wjh */
            if (action_flag)
              complain (_("two actions at end of one rule"));

-           copy_action (crule, rulelength);
+           parse_action (crule, rulelength);

            action_flag = 1;
            xactions++; /* -wjh */
            t = lex ();
            action_flag = 1;
            xactions++; /* -wjh */
            t = lex ();


@@ -1556,12 +1451,8 @@ readgram (void)
        t = lex ();
       }
 
        t = lex ();
       }
 

-

   /* grammar has been read.  Do some checking */
 
   /* grammar has been read.  Do some checking */
 

-  if (nsyms > MAXSHORT)
-    fatal (_("too many symbols (tokens plus nonterminals); maximum %d"),
-          MAXSHORT);

   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 
   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 


@@ -1577,6 +1468,25 @@ readgram (void)
        bp->value = nvars++;
       }
 
        bp->value = nvars++;
       }
 

+  /* Insert the initial rule, which line is that of the first rule
+     (not that of the start symbol):
+
+     axiom: %start EOF.  */
+  p = symbol_list_new (axiom);
+  p->line = grammar->line;
+  p->next = symbol_list_new (startval);
+  p->next->next = symbol_list_new (eoftoken);
+  p->next->next->next = symbol_list_new (NULL);
+  p->next->next->next->next = grammar;
+  nrules += 1;
+  nitems += 3;
+  grammar = p;
+  startval = axiom;
+
+  if (nsyms > MAXSHORT)
+    fatal (_("too many symbols (tokens plus nonterminals); maximum %d"),
+          MAXSHORT);
+

   ntokens = nsyms - nvars;
 }
 
   ntokens = nsyms - nvars;
 }
 


@@ -1595,7 +1505,7 @@ read_additionnal_code (void)
     {
       obstack_fgrow2 (&el_obstack, muscle_find ("linef"),
                      lineno, quotearg_style (c_quoting_style,
     {
       obstack_fgrow2 (&el_obstack, muscle_find ("linef"),
                      lineno, quotearg_style (c_quoting_style,

-                                             muscle_find("filename")));
+                                             muscle_find ("filename")));

     }
 
   while ((c = getc (finput)) != EOF)
     }
 
   while ((c = getc (finput)) != EOF)


@@ -1606,55 +1516,6 @@ read_additionnal_code (void)
 }
 
 \f
 }
 
 \f

-/*--------------------------------------------------------------.
-| For named tokens, but not literal ones, define the name.  The |
-| value is the user token number.                               |
-`--------------------------------------------------------------*/
-
-static void
-output_token_defines (struct obstack *oout)
-{
-  bucket *bp;
-  char *cp, *symbol;
-  char c;
-
-  for (bp = firstsymbol; bp; bp = bp->next)
-    {
-      symbol = bp->tag;                /* get symbol */
-
-      if (bp->value >= ntokens)
-       continue;
-      if (bp->user_token_number == SALIAS)
-       continue;
-      if ('\'' == *symbol)
-       continue;               /* skip literal character */
-      if (bp == errtoken)
-       continue;               /* skip error token */
-      if ('\"' == *symbol)
-       {
-         /* use literal string only if given a symbol with an alias */
-         if (bp->alias)
-           symbol = bp->alias->tag;
-         else
-           continue;
-       }
-
-      /* Don't #define nonliteral tokens whose names contain periods.  */
-      cp = symbol;
-      while ((c = *cp++) && c != '.');
-      if (c != '\0')
-       continue;
-
-      obstack_fgrow2 (oout, "# define\t%s\t%d\n",
-                     symbol, bp->user_token_number);
-      if (semantic_parser)
-       /* FIXME: This is certainly dead wrong, and should be just as
-          above. --akim.  */
-       obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value);
-    }
-}
-
-

 /*------------------------------------------------------------------.
 | Set TOKEN_TRANSLATIONS.  Check that no two symbols share the same |
 | number.                                                           |
 /*------------------------------------------------------------------.
 | Set TOKEN_TRANSLATIONS.  Check that no two symbols share the same |
 | number.                                                           |


@@ -1688,18 +1549,17 @@ token_translations_init (void)
       /* A token which translation has already been set? */
       if (token_translations[bp->user_token_number] != 2)
        complain (_("tokens %s and %s both assigned number %d"),
       /* A token which translation has already been set? */
       if (token_translations[bp->user_token_number] != 2)
        complain (_("tokens %s and %s both assigned number %d"),

-                 tags[token_translations[bp->user_token_number]],
+                 symbols[token_translations[bp->user_token_number]]->tag,

                  bp->tag, bp->user_token_number);
       token_translations[bp->user_token_number] = bp->value;
     }
 }
 
 
                  bp->tag, bp->user_token_number);
       token_translations[bp->user_token_number] = bp->value;
     }
 }
 
 

-/*------------------------------------------------------------------.
-| Assign symbol numbers, and write definition of token names into   |
-| FDEFINES.  Set up vectors TAGS and SPREC of names and precedences |
-| of symbols.                                                       |
-`------------------------------------------------------------------*/
+/*----------------------------------------------------------------.
+| Assign symbol numbers, and write definition of token names into |
+| FDEFINES.  Set up vectors SYMBOL_TABLE, TAGS of symbols.        |
+`----------------------------------------------------------------*/

 
 static void
 packsymbols (void)
 
 static void
 packsymbols (void)


@@ -1707,17 +1567,8 @@ packsymbols (void)
   bucket *bp = NULL;
   int tokno = 1;
   int last_user_token_number;
   bucket *bp = NULL;
   int tokno = 1;
   int last_user_token_number;

-  static char DOLLAR[] = "$";
-
-  tags = XCALLOC (char *, nsyms + 1);
-  user_toknums = XCALLOC (short, nsyms + 1);

 
 

-  sprec = XCALLOC (short, nsyms);
-  sassoc = XCALLOC (short, nsyms);
-
-  /* The EOF token. */
-  tags[0] = DOLLAR;
-  user_toknums[0] = 0;
+  symbols = XCALLOC (bucket *, nsyms);

 
   max_user_token_number = 256;
   last_user_token_number = 256;
 
   max_user_token_number = 256;
   last_user_token_number = 256;


@@ -1730,11 +1581,18 @@ packsymbols (void)
        }
       else if (bp->alias)
        {
        }
       else if (bp->alias)
        {

-         /* this symbol and its alias are a single token defn.
-            allocate a tokno, and assign to both check agreement of
-            ->prec and ->assoc fields and make both the same */
-         if (bp->value == 0)
-           bp->value = bp->alias->value = tokno++;
+         /* This symbol and its alias are a single token defn.
+            Allocate a tokno, and assign to both check agreement of
+            prec and assoc fields and make both the same */
+         if (bp->value == -1)
+           {
+             if (bp == eoftoken || bp->alias == eoftoken)
+               bp->value = bp->alias->value = 0;
+             else
+               {
+                 bp->value = bp->alias->value = tokno++;
+               }
+           }

 
          if (bp->prec != bp->alias->prec)
            {
 
          if (bp->prec != bp->alias->prec)
            {


@@ -1760,13 +1618,17 @@ packsymbols (void)
                bp->assoc = bp->alias->assoc;
            }
 
                bp->assoc = bp->alias->assoc;
            }
 

+         /* Do not do processing below for SALIASs.  */

          if (bp->user_token_number == SALIAS)
          if (bp->user_token_number == SALIAS)

-           continue;           /* do not do processing below for SALIASs */
+           continue;

 
        }
 
        }

-      else                     /* bp->class == token_sym */
+      else /* bp->class == token_sym */

        {
        {

-         bp->value = tokno++;
+         if (bp == eoftoken)
+           bp->value = 0;
+         else
+           bp->value = tokno++;

        }
 
       if (bp->class == token_sym)
        }
 
       if (bp->class == token_sym)


@@ -1777,10 +1639,7 @@ packsymbols (void)
            max_user_token_number = bp->user_token_number;
        }
 
            max_user_token_number = bp->user_token_number;
        }
 

-      tags[bp->value] = bp->tag;
-      user_toknums[bp->value] = bp->user_token_number;
-      sprec[bp->value] = bp->prec;
-      sassoc[bp->value] = bp->assoc;
+      symbols[bp->value] = bp;

     }
 
   token_translations_init ();
     }
 
   token_translations_init ();


@@ -1796,51 +1655,6 @@ packsymbols (void)
 }
 
 
 }
 
 

-/*-----------------------------------.
-| Output definition of token names.  |
-`-----------------------------------*/
-
-static void
-symbols_output (void)
-{
-  {
-    struct obstack tokendefs;
-    obstack_init (&tokendefs);
-    output_token_defines (&tokendefs);
-    obstack_1grow (&tokendefs, 0);
-    muscle_insert ("tokendef", xstrdup (obstack_finish (&tokendefs)));
-    obstack_free (&tokendefs, NULL);
-  }
-
-  if (defines_flag)
-    {
-      output_token_defines (&defines_obstack);
-
-      if (!pure_parser)
-       obstack_fgrow1 (&defines_obstack, "\nextern YYSTYPE %slval;\n",
-                       spec_name_prefix);
-      if (semantic_parser)
-       {
-         int i;
-
-         for (i = ntokens; i < nsyms; i++)
-           {
-             /* don't make these for dummy nonterminals made by gensym.  */
-             if (*tags[i] != '@')
-               obstack_fgrow2 (&defines_obstack,
-                               "# define\tNT%s\t%d\n", tags[i], i);
-           }
-#if 0
-         /* `fdefines' is now a temporary file, so we need to copy its
-            contents in `done', so we can't close it here.  */
-         fclose (fdefines);
-         fdefines = NULL;
-#endif
-       }
-    }
-}
-
-

 /*---------------------------------------------------------------.
 | Convert the rules into the representation using RRHS, RLHS and |
 | RITEMS.                                                        |
 /*---------------------------------------------------------------.
 | Convert the rules into the representation using RRHS, RLHS and |
 | RITEMS.                                                        |


@@ -1853,8 +1667,12 @@ packgram (void)
   int ruleno;
   symbol_list *p;
 
   int ruleno;
   symbol_list *p;
 

+  /* We use short to index items.  */
+  if (nitems >= MAXSHORT)
+    fatal (_("too many items (max %d)"), MAXSHORT);
+

   ritem = XCALLOC (short, nitems + 1);
   ritem = XCALLOC (short, nitems + 1);

-  rule_table = XCALLOC (rule_t, nrules) - 1;
+  rules = XCALLOC (rule_t, nrules) - 1;

 
   itemno = 0;
   ruleno = 1;
 
   itemno = 0;
   ruleno = 1;


@@ -1863,12 +1681,14 @@ packgram (void)
   while (p)
     {
       bucket *ruleprec = p->ruleprec;
   while (p)
     {
       bucket *ruleprec = p->ruleprec;

-      rule_table[ruleno].lhs = p->sym->value;
-      rule_table[ruleno].rhs = itemno;
-      rule_table[ruleno].line = p->line;
-      rule_table[ruleno].useful = TRUE;
-      rule_table[ruleno].action = p->action;
-      rule_table[ruleno].action_line = p->action_line;
+      rules[ruleno].lhs = p->sym->value;
+      rules[ruleno].rhs = itemno;
+      rules[ruleno].line = p->line;
+      rules[ruleno].useful = TRUE;
+      rules[ruleno].action = p->action;
+      rules[ruleno].action_line = p->action_line;
+      rules[ruleno].guard = p->guard;
+      rules[ruleno].guard_line = p->guard_line;

 
       p = p->next;
       while (p && p->sym)
 
       p = p->next;
       while (p && p->sym)


@@ -1878,8 +1698,8 @@ packgram (void)
             of the last token in it.  */
          if (p->sym->class == token_sym)
            {
             of the last token in it.  */
          if (p->sym->class == token_sym)
            {

-             rule_table[ruleno].prec = p->sym->prec;
-             rule_table[ruleno].assoc = p->sym->assoc;
+             rules[ruleno].prec = p->sym->prec;
+             rules[ruleno].assoc = p->sym->assoc;

            }
          if (p)
            p = p->next;
            }
          if (p)
            p = p->next;


@@ -1889,9 +1709,9 @@ packgram (void)
          the specified symbol's precedence replaces the default.  */
       if (ruleprec)
        {
          the specified symbol's precedence replaces the default.  */
       if (ruleprec)
        {

-         rule_table[ruleno].prec = ruleprec->prec;
-         rule_table[ruleno].assoc = ruleprec->assoc;
-         rule_table[ruleno].precsym = ruleprec->value;
+         rules[ruleno].prec = ruleprec->prec;
+         rules[ruleno].assoc = ruleprec->assoc;
+         rules[ruleno].precsym = ruleprec->value;

        }
 
       ritem[itemno++] = -ruleno;
        }
 
       ritem[itemno++] = -ruleno;


@@ -1902,6 +1722,8 @@ packgram (void)
     }
 
   ritem[itemno] = 0;
     }
 
   ritem[itemno] = 0;

+  nritems = itemno;
+  assert (nritems == nitems);

 
   if (trace_flag)
     ritem_print (stderr);
 
   if (trace_flag)
     ritem_print (stderr);


@@ -1921,7 +1743,7 @@ reader (void)
   start_flag = 0;
   startval = NULL;             /* start symbol not specified yet. */
 
   start_flag = 0;
   startval = NULL;             /* start symbol not specified yet. */
 

-  nsyms = 1;
+  nsyms = 0;

   nvars = 0;
   nrules = 0;
   nitems = 0;
   nvars = 0;
   nrules = 0;
   nitems = 0;


@@ -1943,6 +1765,11 @@ reader (void)
   /* Initialize the symbol table.  */
   tabinit ();
 
   /* Initialize the symbol table.  */
   tabinit ();
 

+  /* Construct the axiom symbol. */
+  axiom = getsym ("$axiom");
+  axiom->class = nterm_sym;
+  axiom->value = nvars++;
+

   /* Construct the error token */
   errtoken = getsym ("error");
   errtoken->class = token_sym;
   /* Construct the error token */
   errtoken = getsym ("error");
   errtoken->class = token_sym;


@@ -1954,25 +1781,43 @@ reader (void)
   undeftoken->class = token_sym;
   undeftoken->user_token_number = 2;
 
   undeftoken->class = token_sym;
   undeftoken->user_token_number = 2;
 

+  /* Initialize the obstacks. */
+  obstack_init (&action_obstack);
+  obstack_init (&attrs_obstack);
+  obstack_init (&output_obstack);
+
+  finput = xfopen (infile, "r");
+

   /* Read the declaration section.  Copy %{ ... %} groups to
      TABLE_OBSTACK and FDEFINES file.  Also notice any %token, %left,
      etc. found there.  */
   read_declarations ();
   /* Read the declaration section.  Copy %{ ... %} groups to
      TABLE_OBSTACK and FDEFINES file.  Also notice any %token, %left,
      etc. found there.  */
   read_declarations ();

+
+  /* If the user did not define her EOFTOKEN, do it now. */
+  if (!eoftoken)
+    {
+      eoftoken = getsym ("$");
+      eoftoken->class = token_sym;
+      /* Value specified by POSIX.  */
+      eoftoken->user_token_number = 0;
+    }
+

   /* Read in the grammar, build grammar in list form.  Write out
      guards and actions.  */
   readgram ();
   /* Some C code is given at the end of the grammar file. */
   read_additionnal_code ();
 
   /* Read in the grammar, build grammar in list form.  Write out
      guards and actions.  */
   readgram ();
   /* Some C code is given at the end of the grammar file. */
   read_additionnal_code ();
 

-  /* Now we know whether we need the line-number stack.  If we do,
-     write its type into the .tab.h file.
-     This is no longer need with header skeleton.  */
+  lex_free ();
+  xfclose (finput);

 
   /* Assign the symbols their symbol numbers.  Write #defines for the
      token symbols into FDEFINES if requested.  */
   packsymbols ();
 
   /* Assign the symbols their symbol numbers.  Write #defines for the
      token symbols into FDEFINES if requested.  */
   packsymbols ();

+

   /* Convert the grammar into the format described in gram.h.  */
   packgram ();
   /* Convert the grammar into the format described in gram.h.  */
   packgram ();

-  /* Output the headers. */
-  symbols_output ();
+
+  /* The grammar as a symbol_list is no longer needed. */
+  LIST_FREE (symbol_list, grammar);

 }
 }