* doc/bison.texinfo (Debugging): Split into...

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 3375fa2a3f48d250d39401e6a436c7e777a0ff35..93df69a6c4f8bc0911791a0f8a4a61447c60b41b 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -45,9 +45,6 @@ typedef struct symbol_list
   const char *action;
   int action_line;
 
   const char *action;
   int action_line;
 

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

   symbol_t *ruleprec;
 } symbol_list;
 
   symbol_t *ruleprec;
 } symbol_list;
 


@@ -80,8 +77,6 @@ symbol_list_new (symbol_t *sym)
   res->line = lineno;
   res->action = NULL;
   res->action_line = 0;
   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;
 }


@@ -131,7 +126,7 @@ symbol_make_alias (symbol_t *symbol, char *typename)
       symval->class = token_sym;
       symval->type_name = typename;
       symval->user_token_number = symbol->user_token_number;
       symval->class = token_sym;
       symval->type_name = typename;
       symval->user_token_number = symbol->user_token_number;

-      symbol->user_token_number = SALIAS;
+      symbol->user_token_number = USER_NUMBER_ALIAS;

       symval->alias = symbol;
       symbol->alias = symval;
       /* symbol and symval combined are only one symbol */
       symval->alias = symbol;
       symbol->alias = symval;
       /* symbol and symval combined are only one symbol */


@@ -154,7 +149,7 @@ static bool
 symbol_check_alias_consistence (symbol_t *this)
 {
   /* Check only those who _are_ the aliases. */
 symbol_check_alias_consistence (symbol_t *this)
 {
   /* Check only those who _are_ the aliases. */

-  if (this->alias && this->user_token_number == SALIAS)
+  if (this->alias && this->user_token_number == USER_NUMBER_ALIAS)

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


@@ -209,8 +204,8 @@ symbol_pack (symbol_t *this)
              this->number = this->alias->number;
            }
        }
              this->number = this->alias->number;
            }
        }

-      /* Do not do processing below for SALIASs.  */
-      if (this->user_token_number == SALIAS)
+      /* Do not do processing below for USER_NUMBER_ALIASs.  */
+      if (this->user_token_number == USER_NUMBER_ALIAS)

        return TRUE;
     }
   else /* this->class == token_sym */
        return TRUE;
     }
   else /* this->class == token_sym */


@@ -234,7 +229,7 @@ symbol_translation (symbol_t *this)
 {
   /* Non-terminal? */
   if (this->class == token_sym
 {
   /* Non-terminal? */
   if (this->class == token_sym

-      && this->user_token_number != SALIAS)
+      && this->user_token_number != USER_NUMBER_ALIAS)

     {
       /* A token which translation has already been set? */
       if (token_translations[this->user_token_number] != undeftoken->number)
     {
       /* A token which translation has already been set? */
       if (token_translations[this->user_token_number] != undeftoken->number)


@@ -492,23 +487,22 @@ copy_comment (FILE *fin, struct obstack *oout)
 }
 
 
 }
 
 

-/*-----------------------------------------------------------------.
-| FIN is pointing to a location (i.e., a `@').  Output to OOUT a   |
-| reference to this location. 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.                                 |
-`-----------------------------------------------------------------*/
+/*-------------------------------------------------------------------.
+| FIN is pointing to a location (i.e., a `@').  Output to OOUT a     |
+| reference to this location. RULE_LENGTH 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.                                   |
+`-------------------------------------------------------------------*/

 
 static inline void
 
 static inline void

-copy_at (FILE *fin, struct obstack *oout, int stack_offset)
+copy_at (FILE *fin, struct obstack *oout, int rule_length)

 {
 {

-  int c;
+  int c = getc (fin);
+  locations_flag = 1;

 
 

-  c = getc (fin);

   if (c == '$')
     {
   if (c == '$')
     {

-      obstack_sgrow (oout, "yyloc");
-      locations_flag = 1;
+      obstack_sgrow (oout, "]b4_lhs_location[");

     }
   else if (isdigit (c) || c == '-')
     {
     }
   else if (isdigit (c) || c == '-')
     {


@@ -516,16 +510,11 @@ 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);

-      if (n > stack_offset)
+      if (n > rule_length)

        complain (_("invalid value: %s%d"), "@", n);
       else
        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;
-       }
+       obstack_fgrow2 (oout, "]b4_rhs_location([%d], [%d])[",
+                       rule_length, n);

     }
   else
     {
     }
   else
     {


@@ -536,19 +525,19 @@ copy_at (FILE *fin, struct obstack *oout, int stack_offset)
 }
 
 
 }
 
 

-/*-------------------------------------------------------------------.
-| FIN is pointing to a wannabee semantic value (i.e., a `$').        |
-|                                                                    |
-| Possible inputs: $[<TYPENAME>]($|integer)                          |
-|                                                                    |
-| Output to OOUT a reference to this semantic value. 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.                 |
-`-------------------------------------------------------------------*/
+/*------------------------------------------------------------------.
+| FIN is pointing to a wannabee semantic value (i.e., a `$').       |
+|                                                                   |
+| Possible inputs: $[<TYPENAME>]($|integer)                         |
+|                                                                   |
+| Output to OOUT a reference to this semantic value. RULE_LENGTH 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.                |
+`------------------------------------------------------------------*/

 
 static inline void
 copy_dollar (FILE *fin, struct obstack *oout,
 
 static inline void
 copy_dollar (FILE *fin, struct obstack *oout,

-            symbol_list *rule, int stack_offset)
+            symbol_list *rule, int rule_length)

 {
   int c = getc (fin);
   const char *type_name = NULL;
 {
   int c = getc (fin);
   const char *type_name = NULL;


@@ -564,15 +553,15 @@ copy_dollar (FILE *fin, struct obstack *oout,
 
   if (c == '$')
     {
 
   if (c == '$')
     {

-      obstack_sgrow (oout, "yyval");
-

       if (!type_name)
        type_name = get_type_name (0, rule);
       if (!type_name)
        type_name = get_type_name (0, rule);

-      if (type_name)
-       obstack_fgrow1 (oout, ".%s", type_name);

       if (!type_name && typed)
        complain (_("$$ of `%s' has no declared type"),
                  rule->sym->tag);
       if (!type_name && typed)
        complain (_("$$ of `%s' has no declared type"),
                  rule->sym->tag);

+      if (!type_name)
+       type_name = "";
+      obstack_fgrow1 (oout,
+                     "]b4_lhs_value([%s])[", type_name);

     }
   else if (isdigit (c) || c == '-')
     {
     }
   else if (isdigit (c) || c == '-')
     {


@@ -580,23 +569,19 @@ copy_dollar (FILE *fin, struct obstack *oout,
       ungetc (c, fin);
       n = read_signed_integer (fin);
 
       ungetc (c, fin);
       n = read_signed_integer (fin);
 

-      if (n > stack_offset)
+      if (n > rule_length)

        complain (_("invalid value: %s%d"), "$", n);
       else
        {
          if (!type_name && n > 0)
            type_name = get_type_name (n, rule);
        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);
          if (!type_name && typed)
            complain (_("$%d of `%s' has no declared type"),
                      n, rule->sym->tag);

+         if (!type_name)
+           type_name = "";
+         obstack_fgrow3 (oout, "]b4_rhs_value([%d], [%d], [%s])[",
+                         rule_length, n, type_name);

        }
     }
   else
        }
     }
   else


@@ -1013,10 +998,10 @@ parse_expect_decl (void)
 |                                                                    |
 | Two symbols are entered in the table, one for the token symbol and |
 | one for the literal.  Both are given the <type>, if any, from the  |
 |                                                                    |
 | Two symbols are entered in the table, one for the token symbol and |
 | one for the literal.  Both are given the <type>, if any, from the  |

-| declaration.  The ->user_token_number of the first is SALIAS and   |
-| the ->user_token_number of the second is set to the number, if     |
-| any, from the declaration.  The two symbols are linked via         |
-| pointers in their ->alias fields.                                  |
+| declaration.  The ->user_token_number of the first is              |
+| USER_NUMBER_ALIAS and the ->user_token_number of the second is set |
+| to the number, if any, from the declaration.  The two symbols are  |
+| linked via pointers in their ->alias fields.                       |

 |                                                                    |
 | During OUTPUT_DEFINES_TABLE, the symbol is reported thereafter,    |
 | only the literal string is retained it is the literal string that  |
 |                                                                    |
 | During OUTPUT_DEFINES_TABLE, the symbol is reported thereafter,    |
 | only the literal string is retained it is the literal string that  |


@@ -1029,7 +1014,7 @@ parse_thong_decl (void)
   token_t token;
   symbol_t *symbol;
   char *typename = 0;
   token_t token;
   symbol_t *symbol;
   char *typename = 0;

-  int usrtoknum = SUNDEF;
+  int usrtoknum = USER_NUMBER_UNDEFINED;

 
   token = lex ();              /* fetch typename or first token */
   if (token == tok_typename)
 
   token = lex ();              /* fetch typename or first token */
   if (token == tok_typename)


@@ -1050,7 +1035,7 @@ parse_thong_decl (void)
     }
   symval->class = token_sym;
   symval->type_name = typename;
     }
   symval->class = token_sym;
   symval->type_name = typename;

-  symval->user_token_number = SALIAS;
+  symval->user_token_number = USER_NUMBER_ALIAS;

   symbol = symval;
 
   token = lex ();              /* get number or literal string */
   symbol = symval;
 
   token = lex ();              /* get number or literal string */


@@ -1277,36 +1262,36 @@ read_declarations (void)
     }
 }
 \f
     }
 }
 \f

-/*-------------------------------------------------------------------.
-| Assuming that a `{' has just been seen, copy everything up to the  |
-| 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.                 |
-`-------------------------------------------------------------------*/
+/*------------------------------------------------------------------.
+| Assuming that a `{' has just been seen, copy everything up to the |
+| matching `}' into ACTION_OBSTACK.                                 |
+|                                                                   |
+| RULE_LENGTH 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.  It is not the same as the rule->length in the case of mid |
+| rule actions.                                                     |
+|                                                                   |
+| This routine is used for actions.                                 |
+`------------------------------------------------------------------*/

 
 static void
 
 static void

-parse_braces (symbol_list *rule, int stack_offset)
+parse_action (symbol_list *rule, int rule_length)

 {
 {

-  int c;
-  int count;
-
-  count = 1;
+  int count = 1;
+  rule->action_line = lineno;

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

+      int c;

       while ((c = getc (finput)) != '}')
        switch (c)
          {
          case '\n':
       while ((c = getc (finput)) != '}')
        switch (c)
          {
          case '\n':

-           obstack_1grow (&action_obstack, c);
+           copy_character (&action_obstack, c);

            ++lineno;
            break;
 
          case '{':
            ++lineno;
            break;
 
          case '{':

-           obstack_1grow (&action_obstack, c);
+           copy_character (&action_obstack, c);

            ++count;
            break;
 
            ++count;
            break;
 


@@ -1320,51 +1305,29 @@ parse_braces (symbol_list *rule, int stack_offset)
            break;
 
          case '$':
            break;
 
          case '$':

-           copy_dollar (finput, &action_obstack,
-                        rule, stack_offset);
+           copy_dollar (finput, &action_obstack, rule, rule_length);

            break;
 
          case '@':
            break;
 
          case '@':

-           copy_at (finput, &action_obstack,
-                    stack_offset);
+           copy_at (finput, &action_obstack, rule_length);

            break;
 
          case EOF:
            fatal (_("unmatched %s"), "`{'");
 
          default:
            break;
 
          case EOF:
            fatal (_("unmatched %s"), "`{'");
 
          default:

-           obstack_1grow (&action_obstack, c);
+           copy_character (&action_obstack, c);

          }
 
       /* Above loop exits when C is '}'.  */
       if (--count)
          }
 
       /* Above loop exits when C is '}'.  */
       if (--count)

-       obstack_1grow (&action_obstack, c);
+       copy_character (&action_obstack, c);

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

-}
-
-
-static void
-parse_action (symbol_list *rule, int stack_offset)
-{
-  rule->action_line = lineno;
-  parse_braces (rule, stack_offset);

   rule->action = obstack_finish (&action_obstack);
 }
 
   rule->action = obstack_finish (&action_obstack);
 }
 

-
-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
 
 /*-------------------------------------------------------------------.


@@ -1396,8 +1359,8 @@ gensym (void)
 | null pointer instead of a symbol to terminate the rule.  The next  |
 | symbol is the lhs of the following rule.                           |
 |                                                                    |
 | null pointer instead of a symbol to terminate the rule.  The next  |
 | symbol is the lhs of the following rule.                           |
 |                                                                    |

-| All guards and actions are copied out to the appropriate files,    |
-| labelled by the rule number they apply to.                         |
+| All actions are copied out, labelled by the rule number they apply |
+| to.                                                                |

 |                                                                    |
 | Bison used to allow some %directives in the rules sections, but    |
 | this is no longer consider appropriate: (i) the documented grammar |
 |                                                                    |
 | Bison used to allow some %directives in the rules sections, but    |
 | this is no longer consider appropriate: (i) the documented grammar |


@@ -1594,15 +1557,6 @@ readgram (void)
            t = lex ();
          }
 
            t = lex ();
          }
 

-       if (t == tok_guard)
-         {
-           if (!semantic_parser)
-             complain (_("%%guard present but %%semantic_parser not specified"));
-
-           parse_guard (crule, rulelength);
-           t = lex ();
-         }
-

        if (t == tok_left_curly)
          {
            /* This case never occurs -wjh */
        if (t == tok_left_curly)
          {
            /* This case never occurs -wjh */


@@ -1712,7 +1666,7 @@ token_translations_init (void)
   for (i = 0; i < ntokens; ++i)
     {
       symbol_t *this = symbols[i];
   for (i = 0; i < ntokens; ++i)
     {
       symbol_t *this = symbols[i];

-      if (this->user_token_number != SUNDEF)
+      if (this->user_token_number != USER_NUMBER_UNDEFINED)

        {
          if (this->user_token_number > max_user_token_number)
            max_user_token_number = this->user_token_number;
        {
          if (this->user_token_number > max_user_token_number)
            max_user_token_number = this->user_token_number;


@@ -1722,7 +1676,8 @@ token_translations_init (void)
     }
 
   /* If 256 is not used, assign it to error, to follow POSIX.  */
     }
 
   /* If 256 is not used, assign it to error, to follow POSIX.  */

-  if (num_256_available_p && errtoken->user_token_number == SUNDEF)
+  if (num_256_available_p
+      && errtoken->user_token_number == USER_NUMBER_UNDEFINED)

     errtoken->user_token_number = 256;
 
   /* Set the missing user numbers. */
     errtoken->user_token_number = 256;
 
   /* Set the missing user numbers. */


@@ -1732,7 +1687,7 @@ token_translations_init (void)
   for (i = 0; i < ntokens; ++i)
     {
       symbol_t *this = symbols[i];
   for (i = 0; i < ntokens; ++i)
     {
       symbol_t *this = symbols[i];

-      if (this->user_token_number == SUNDEF)
+      if (this->user_token_number == USER_NUMBER_UNDEFINED)

        this->user_token_number = ++max_user_token_number;
       if (this->user_token_number > max_user_token_number)
        max_user_token_number = this->user_token_number;
        this->user_token_number = ++max_user_token_number;
       if (this->user_token_number > max_user_token_number)
        max_user_token_number = this->user_token_number;


@@ -1781,11 +1736,11 @@ packsymbols (void)
 static void
 packgram (void)
 {
 static void
 packgram (void)
 {

-  int itemno;
+  unsigned int itemno;

   int ruleno;
   symbol_list *p;
 
   int ruleno;
   symbol_list *p;
 

-  ritem = XCALLOC (item_number_t, nritems + 1);
+  ritem = XCALLOC (item_number_t, nritems);

   rules = XCALLOC (rule_t, nrules) - 1;
 
   itemno = 0;
   rules = XCALLOC (rule_t, nrules) - 1;
 
   itemno = 0;


@@ -1803,8 +1758,6 @@ packgram (void)
       rules[ruleno].useful = TRUE;
       rules[ruleno].action = p->action;
       rules[ruleno].action_line = p->action_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)


@@ -1834,20 +1787,18 @@ packgram (void)
        p = p->next;
     }
 
        p = p->next;
     }
 

-  ritem[itemno] = 0;

   assert (itemno == nritems);
 
   if (trace_flag)
     ritem_print (stderr);
 }
 \f
   assert (itemno == nritems);
 
   if (trace_flag)
     ritem_print (stderr);
 }
 \f

-/*-------------------------------------------------------------------.
-| Read in the grammar specification and record it in the format      |
-| described in gram.h.  All guards are copied into the GUARD_OBSTACK |
-| and all actions into ACTION_OBSTACK, in each case forming the body |
-| of a C function (YYGUARD or YYACTION) which contains a switch      |
-| statement to decide which guard or action to execute.              |
-`-------------------------------------------------------------------*/
+/*------------------------------------------------------------------.
+| Read in the grammar specification and record it in the format     |
+| described in gram.h.  All actions are copied into ACTION_OBSTACK, |
+| in each case forming the body of a C function (YYACTION) which    |
+| contains a switch statement to decide which action to execute.    |
+`------------------------------------------------------------------*/

 
 void
 reader (void)
 
 void
 reader (void)


@@ -1901,7 +1852,7 @@ reader (void)
     }
 
   /* Read in the grammar, build grammar in list form.  Write out
     }
 
   /* Read in the grammar, build grammar in list form.  Write out

-     guards and actions.  */
+     actions.  */

   readgram ();
   /* Some C code is given at the end of the grammar file. */
   read_additionnal_code ();
   readgram ();
   /* Some C code is given at the end of the grammar file. */
   read_additionnal_code ();


@@ -1919,12 +1870,3 @@ reader (void)
   /* The grammar as a symbol_list is no longer needed. */
   LIST_FREE (symbol_list, grammar);
 }
   /* The grammar as a symbol_list is no longer needed. */
   LIST_FREE (symbol_list, grammar);
 }

-
-void
-grammar_free (void)
-{
-  XFREE (ritem);
-  free (rules + 1);
-  /* Free the symbol table data structure.  */
-  symbols_free ();
-}