Regen.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index d19126240f06ea7577194c231a5fa1e08dd8899b..cf3e18f370bc289c7d6c0e47569a2fd988a5ce66 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -52,8 +52,6 @@ typedef struct symbol_list
 } symbol_list;
 
 int lineno;
 } symbol_list;
 
 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;


@@ -68,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)


@@ -334,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
     {


@@ -391,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
     {


@@ -426,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;


@@ -558,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
        {


@@ -882,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 != '_')


@@ -1081,8 +1099,8 @@ read_declarations (void)
 | values in the current rule so far, which says where to find `$0'   |
 | with respect to the top of the stack.                              |
 |                                                                    |
 | 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 the        |
-| actions_obstack is used, but this is fine, since we use only       |
+| 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.                 |
 `-------------------------------------------------------------------*/
 
 | pointers to relevant portions inside this obstack.                 |
 `-------------------------------------------------------------------*/
 


@@ -1092,10 +1110,6 @@ 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;
   while (count > 0)
     {
   count = 1;
   while (count > 0)
     {


@@ -1140,10 +1154,7 @@ parse_braces (symbol_list *rule, int stack_offset)
 
       /* Above loop exits when C is '}'.  */
       if (--count)
 
       /* Above loop exits when C is '}'.  */
       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');


@@ -1343,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


@@ -1435,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"));
 


@@ -1456,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;
 }
 


@@ -1474,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)


@@ -1518,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)


@@ -1537,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;


@@ -1560,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)
            {


@@ -1590,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)


@@ -1607,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 ();


@@ -1626,60 +1655,6 @@ packsymbols (void)
 }
 
 
 }
 
 

-/*---------------------------------------------------------------.
-| Save the definition of token names in the `TOKENDEFS' muscle.  |
-`---------------------------------------------------------------*/
-
-static void
-symbols_save (void)
-{
-  struct obstack tokendefs;
-  bucket *bp;
-  char *cp, *symbol;
-  char c;
-  obstack_init (&tokendefs);
-
-  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 (&tokendefs, "# define %s\t%d\n",
-                     symbol, bp->user_token_number);
-      if (semantic_parser)
-       /* FIXME: This is probably wrong, and should be just as
-          above. --akim.  */
-       obstack_fgrow2 (&tokendefs, "# define T%s\t%d\n", symbol, bp->value);
-    }
-
-  obstack_1grow (&tokendefs, 0);
-  muscle_insert ("tokendef", xstrdup (obstack_finish (&tokendefs)));
-  obstack_free (&tokendefs, NULL);
-}
-
-

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


@@ -1697,7 +1672,7 @@ packgram (void)
     fatal (_("too many items (max %d)"), MAXSHORT);
 
   ritem = XCALLOC (short, nitems + 1);
     fatal (_("too many items (max %d)"), MAXSHORT);
 
   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;


@@ -1706,14 +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;
-      rule_table[ruleno].guard = p->guard;
-      rule_table[ruleno].guard_line = p->guard_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)


@@ -1723,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;


@@ -1734,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;


@@ -1747,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);


@@ -1766,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;


@@ -1788,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;


@@ -1810,6 +1792,16 @@ reader (void)
      TABLE_OBSTACK and FDEFINES file.  Also notice any %token, %left,
      etc. found there.  */
   read_declarations ();
      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 ();
   /* Read in the grammar, build grammar in list form.  Write out
      guards and actions.  */
   readgram ();


@@ -1822,9 +1814,10 @@ reader (void)
   /* 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 ();

-  /* Save them. */
-  symbols_save ();

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

+
+  /* The grammar as a symbol_list is no longer needed. */
+  LIST_FREE (symbol_list, grammar);

 }
 }