* data/yacc.c: (b4_lex_param): Corrected for the case where

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index e85b0420414b69ee488e3700e1ce29bdc0af5c44..3f8cab8b3688ad9c6555a1a7164b362054d3e3ac 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,5 +1,6 @@
-/* Input parser for bison
-   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002
+/* Input parser for Bison
+
+   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002, 2003

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -19,21 +20,22 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 

-

 #include "system.h"
 #include "system.h"

-#include "quotearg.h"
-#include "getargs.h"
+
+#include <quotearg.h>
+
+#include "complain.h"
+#include "conflicts.h"

 #include "files.h"
 #include "files.h"

-#include "symtab.h"
-#include "symlist.h"
+#include "getargs.h"

 #include "gram.h"
 #include "gram.h"

-#include "complain.h"
+#include "muscle_tab.h"

 #include "output.h"
 #include "reader.h"
 #include "output.h"
 #include "reader.h"

-#include "conflicts.h"
-#include "muscle_tab.h"
+#include "symlist.h"
+#include "symtab.h"

 
 

-static symbol_list_t *grammar = NULL;
+static symbol_list *grammar = NULL;

 static int start_flag = 0;
 merger_list *merge_functions;
 
 static int start_flag = 0;
 merger_list *merge_functions;
 


@@ -45,15 +47,15 @@ int typed = 0;
 `-----------------------*/
 
 void
 `-----------------------*/
 
 void

-grammar_start_symbol_set (symbol_t *s, location_t l)
+grammar_start_symbol_set (symbol *sym, location loc)

 {
   if (start_flag)
 {
   if (start_flag)

-    complain_at (l, _("multiple %s declarations"), "%start");
+    complain_at (loc, _("multiple %s declarations"), "%start");

   else
     {
       start_flag = 1;
   else
     {
       start_flag = 1;

-      startsymbol = s;
-      startsymbol_location = l;
+      startsymbol = sym;
+      startsymbol_location = loc;

     }
 }
 
     }
 }
 


@@ -64,14 +66,15 @@ grammar_start_symbol_set (symbol_t *s, location_t l)
 `----------------------------------------------------------------*/
 
 void
 `----------------------------------------------------------------*/
 
 void

-prologue_augment (const char *prologue, location_t location)
+prologue_augment (const char *prologue, location loc)

 {
   struct obstack *oout =
     !typed ? &pre_prologue_obstack : &post_prologue_obstack;
 
 {
   struct obstack *oout =
     !typed ? &pre_prologue_obstack : &post_prologue_obstack;
 

-  obstack_fgrow2 (oout, "]b4_syncline([[%d]], [[%s]])[\n",
-          location.first_line,
-          quotearg_style (escape_quoting_style, location.file));
+  obstack_fgrow1 (oout, "]b4_syncline([[%d]], [[", loc.start.line);
+  MUSCLE_OBSTACK_SGROW (oout,
+                       quotearg_style (c_quoting_style, loc.start.file));
+  obstack_sgrow (oout, "]])[\n");

   obstack_sgrow (oout, prologue);
 }
 
   obstack_sgrow (oout, prologue);
 }
 


@@ -83,28 +86,31 @@ prologue_augment (const char *prologue, location_t location)
 `----------------------*/
 
 void
 `----------------------*/
 
 void

-epilogue_set (const char *epilogue, location_t location)
+epilogue_augment (const char *epilogue, location loc)

 {
 {

-  obstack_fgrow2 (&muscle_obstack, "]b4_syncline([[%d]], [[%s]])[\n",
-                 location.first_line,
-                 quotearg_style (escape_quoting_style, location.file));
+  char *extension = NULL;
+  obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[", loc.start.line);
+  MUSCLE_OBSTACK_SGROW (&muscle_obstack,
+                       quotearg_style (c_quoting_style, loc.start.file));
+  obstack_sgrow (&muscle_obstack, "]])[\n");

   obstack_sgrow (&muscle_obstack, epilogue);
   obstack_1grow (&muscle_obstack, 0);
   obstack_sgrow (&muscle_obstack, epilogue);
   obstack_1grow (&muscle_obstack, 0);

-  muscle_insert ("epilogue", obstack_finish (&muscle_obstack));
+  extension = obstack_finish (&muscle_obstack);
+  muscle_grow ("epilogue", extension, "");
+  obstack_free (&muscle_obstack, extension);

 }
 
 
 \f
 
 }
 
 
 \f
 

- /*-------------------------------------------------------------------.
+/*-------------------------------------------------------------------.

 | Return the merger index for a merging function named NAME, whose   |
 | arguments have type TYPE.  Records the function, if new, in        |
 | Return the merger index for a merging function named NAME, whose   |
 | arguments have type TYPE.  Records the function, if new, in        |

-| merger_list.                                                      |
+| MERGER_LIST.                                                      |

 `-------------------------------------------------------------------*/
 
 static int
 `-------------------------------------------------------------------*/
 
 static int

-get_merge_function (const char* name, const char* type,
-                   location_t loc)
+get_merge_function (uniqstr name, uniqstr type, location loc)

 {
   merger_list *syms;
   merger_list head;
 {
   merger_list *syms;
   merger_list head;


@@ -114,21 +120,21 @@ get_merge_function (const char* name, const char* type,
     return 0;
 
   if (type == NULL)
     return 0;
 
   if (type == NULL)

-    type = "";
+    type = uniqstr_new ("");

 
   head.next = merge_functions;
   for (syms = &head, n = 1; syms->next != NULL; syms = syms->next, n += 1)
 
   head.next = merge_functions;
   for (syms = &head, n = 1; syms->next != NULL; syms = syms->next, n += 1)

-    if (strcmp (name, syms->next->name) == 0)
+    if (UNIQSTR_EQ (name, syms->next->name))

       break;
   if (syms->next == NULL)
     {
       break;
   if (syms->next == NULL)
     {

-      syms->next = XMALLOC (merger_list, 1);
-      syms->next->name = xstrdup (name);
-      syms->next->type = xstrdup (type);
+      MALLOC (syms->next, 1);
+      syms->next->name = uniqstr_new (name);
+      syms->next->type = uniqstr_new (type);

       syms->next->next = NULL;
       merge_functions = head.next;
     }
       syms->next->next = NULL;
       merge_functions = head.next;
     }

-  else if (strcmp (type, syms->next->type) != 0)
+  else if (!UNIQSTR_EQ (type, syms->next->type))

     warn_at (loc, _("result type clash on merge function %s: <%s> != <%s>"),
             name, type, syms->next->type);
   return n;
     warn_at (loc, _("result type clash on merge function %s: <%s> != <%s>"),
             name, type, syms->next->type);
   return n;


@@ -155,7 +161,7 @@ free_merger_functions (void)
 
 \f
 /*-------------------------------------------------------------------.
 
 \f
 /*-------------------------------------------------------------------.

-| Parse the input grammar into a one symbol_list_t structure.  Each  |
+| Parse the input grammar into a one symbol_list structure.  Each    |

 | rule is represented by a sequence of symbols: the left hand side   |
 | followed by the contents of the right hand side, followed by a     |
 | null pointer instead of a symbol to terminate the rule.  The next  |
 | rule is represented by a sequence of symbols: the left hand side   |
 | followed by the contents of the right hand side, followed by a     |
 | null pointer instead of a symbol to terminate the rule.  The next  |


@@ -173,13 +179,13 @@ free_merger_functions (void)
 `-------------------------------------------------------------------*/
 
 /* The (currently) last symbol of GRAMMAR. */
 `-------------------------------------------------------------------*/
 
 /* The (currently) last symbol of GRAMMAR. */

-symbol_list_t *grammar_end = NULL;
+symbol_list *grammar_end = NULL;

 
 

-/* Append S to the GRAMMAR. */
+/* Append SYM to the grammar.  */

 void
 void

-grammar_symbol_append (symbol_t *symbol, location_t location)
+grammar_symbol_append (symbol *sym, location loc)

 {
 {

-  symbol_list_t *p = symbol_list_new (symbol, location);
+  symbol_list *p = symbol_list_new (sym, loc);

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


@@ -192,8 +198,8 @@ grammar_symbol_append (symbol_t *symbol, location_t location)
 /* The rule currently being defined, and the previous rule.
    CURRENT_RULE points to the first LHS of the current rule, while
    PREVIOUS_RULE_END points to the *end* of the previous rule (NULL).  */
 /* The rule currently being defined, and the previous rule.
    CURRENT_RULE points to the first LHS of the current rule, while
    PREVIOUS_RULE_END points to the *end* of the previous rule (NULL).  */

-symbol_list_t *current_rule = NULL;
-symbol_list_t *previous_rule_end = NULL;
+symbol_list *current_rule = NULL;
+symbol_list *previous_rule_end = NULL;

 
 
 /*----------------------------------------------.
 
 
 /*----------------------------------------------.


@@ -201,12 +207,12 @@ symbol_list_t *previous_rule_end = NULL;
 `----------------------------------------------*/
 
 void
 `----------------------------------------------*/
 
 void

-grammar_rule_begin (symbol_t *lhs, location_t location)
+grammar_rule_begin (symbol *lhs, location loc)

 {
   if (!start_flag)
     {
       startsymbol = lhs;
 {
   if (!start_flag)
     {
       startsymbol = lhs;

-      startsymbol_location = location;
+      startsymbol_location = loc;

       start_flag = 1;
     }
 
       start_flag = 1;
     }
 


@@ -215,7 +221,7 @@ grammar_rule_begin (symbol_t *lhs, location_t location)
   ++nritems;
 
   previous_rule_end = grammar_end;
   ++nritems;
 
   previous_rule_end = grammar_end;

-  grammar_symbol_append (lhs, location);
+  grammar_symbol_append (lhs, loc);

   current_rule = grammar_end;
 
   /* Mark the rule's lhs as a nonterminal if not already so.  */
   current_rule = grammar_end;
 
   /* Mark the rule's lhs as a nonterminal if not already so.  */


@@ -227,7 +233,7 @@ grammar_rule_begin (symbol_t *lhs, location_t location)
       ++nvars;
     }
   else if (lhs->class == token_sym)
       ++nvars;
     }
   else if (lhs->class == token_sym)

-    complain_at (location, _("rule given for %s, which is a token"), lhs->tag);
+    complain_at (loc, _("rule given for %s, which is a token"), lhs->tag);

 }
 
 /* Check that the last rule (CURRENT_RULE) is properly defined.  For
 }
 
 /* Check that the last rule (CURRENT_RULE) is properly defined.  For


@@ -236,9 +242,9 @@ grammar_rule_begin (symbol_t *lhs, location_t location)
 static void
 grammar_current_rule_check (void)
 {
 static void
 grammar_current_rule_check (void)
 {

-  symbol_t *lhs = current_rule->sym;
+  symbol *lhs = current_rule->sym;

   char const *lhs_type = lhs->type_name;
   char const *lhs_type = lhs->type_name;

-  symbol_t *first_rhs = current_rule->next->sym;
+  symbol *first_rhs = current_rule->next->sym;

 
   /* If there is an action, then there is nothing we can do: the user
      is allowed to shoot herself in the foot.  */
 
   /* If there is an action, then there is nothing we can do: the user
      is allowed to shoot herself in the foot.  */


@@ -254,15 +260,15 @@ grammar_current_rule_check (void)
   if (first_rhs)
     {
       const char *rhs_type = first_rhs->type_name ? first_rhs->type_name : "";
   if (first_rhs)
     {
       const char *rhs_type = first_rhs->type_name ? first_rhs->type_name : "";

-      if (strcmp (lhs_type, rhs_type))
-       complain_at (current_rule->location,
-                    _("type clash on default action: <%s> != <%s>"),
-                    lhs_type, rhs_type);
+      if (!UNIQSTR_EQ (lhs_type, rhs_type))
+       warn_at (current_rule->location,
+                _("type clash on default action: <%s> != <%s>"),
+                lhs_type, rhs_type);

     }
   /* Warn if there is no default for $$ but we need one.  */
   else
     }
   /* Warn if there is no default for $$ but we need one.  */
   else

-    complain_at (current_rule->location,
-                _("empty rule for typed nonterminal, and no action"));
+    warn_at (current_rule->location,
+            _("empty rule for typed nonterminal, and no action"));

 }
 
 
 }
 
 


@@ -271,11 +277,11 @@ grammar_current_rule_check (void)
 `-------------------------------------*/
 
 void
 `-------------------------------------*/
 
 void

-grammar_rule_end (location_t location)
+grammar_rule_end (location loc)

 {
   /* Put an empty link in the list to mark the end of this rule  */
   grammar_symbol_append (NULL, grammar_end->location);
 {
   /* Put an empty link in the list to mark the end of this rule  */
   grammar_symbol_append (NULL, grammar_end->location);

-  current_rule->location = location;
+  current_rule->location = loc;

   grammar_current_rule_check ();
 }
 
   grammar_current_rule_check ();
 }
 


@@ -296,9 +302,9 @@ grammar_midrule_action (void)
 
   /* Make a DUMMY nonterminal, whose location is that of the midrule
      action.  Create the MIDRULE.  */
 
   /* Make a DUMMY nonterminal, whose location is that of the midrule
      action.  Create the MIDRULE.  */

-  location_t dummy_location = current_rule->action_location;
-  symbol_t *dummy = dummy_symbol_get (dummy_location);
-  symbol_list_t *midrule = symbol_list_new (dummy, dummy_location);
+  location dummy_location = current_rule->action_location;
+  symbol *dummy = dummy_symbol_get (dummy_location);
+  symbol_list *midrule = symbol_list_new (dummy, dummy_location);

 
   /* Make a new rule, whose body is empty, before the current one, so
      that the action just read can belong to it.  */
 
   /* Make a new rule, whose body is empty, before the current one, so
      that the action just read can belong to it.  */


@@ -329,25 +335,24 @@ grammar_midrule_action (void)
 /* Set the precedence symbol of the current rule to PRECSYM. */
 
 void
 /* Set the precedence symbol of the current rule to PRECSYM. */
 
 void

-grammar_current_rule_prec_set (symbol_t *precsym, location_t location)
+grammar_current_rule_prec_set (symbol *precsym, location loc)

 {
   if (current_rule->ruleprec)
 {
   if (current_rule->ruleprec)

-    complain_at (location, _("only one %s allowed per rule"), "%prec");
+    complain_at (loc, _("only one %s allowed per rule"), "%prec");

   current_rule->ruleprec = precsym;
 }
 
 /* Attach dynamic precedence DPREC to the current rule. */
 
 void
   current_rule->ruleprec = precsym;
 }
 
 /* Attach dynamic precedence DPREC to the current rule. */
 
 void

-grammar_current_rule_dprec_set (int dprec, location_t location)
+grammar_current_rule_dprec_set (int dprec, location loc)

 {
   if (! glr_parser)
 {
   if (! glr_parser)

-    warn_at (location, _("%s affects only GLR parsers"), "%dprec");
+    warn_at (loc, _("%s affects only GLR parsers"), "%dprec");

   if (dprec <= 0)
   if (dprec <= 0)

-    complain_at (location,
-                _("%s must be followed by positive number"), "%dprec");
+    complain_at (loc, _("%s must be followed by positive number"), "%dprec");

   else if (current_rule->dprec != 0)
   else if (current_rule->dprec != 0)

-    complain_at (location, _("only one %s allowed per rule"), "%dprec");
+    complain_at (loc, _("only one %s allowed per rule"), "%dprec");

   current_rule->dprec = dprec;
 }
 
   current_rule->dprec = dprec;
 }
 


@@ -355,38 +360,38 @@ grammar_current_rule_dprec_set (int dprec, location_t location)
    rule. */
 
 void
    rule. */
 
 void

-grammar_current_rule_merge_set (const char* name, location_t location)
+grammar_current_rule_merge_set (uniqstr name, location loc)

 {
   if (! glr_parser)
 {
   if (! glr_parser)

-    warn_at (location, _("%s affects only GLR parsers"), "%merge");
+    warn_at (loc, _("%s affects only GLR parsers"), "%merge");

   if (current_rule->merger != 0)
   if (current_rule->merger != 0)

-    complain_at (location, _("only one %s allowed per rule"), "%merge");
+    complain_at (loc, _("only one %s allowed per rule"), "%merge");

   current_rule->merger =
   current_rule->merger =

-    get_merge_function (name, current_rule->sym->type_name, location);
+    get_merge_function (name, current_rule->sym->type_name, loc);

 }
 
 }
 

-/* Attach a SYMBOL to the current rule.  If needed, move the previous
+/* Attach SYM to the current rule.  If needed, move the previous

    action as a mid-rule action.  */
 
 void
    action as a mid-rule action.  */
 
 void

-grammar_current_rule_symbol_append (symbol_t *symbol, location_t location)
+grammar_current_rule_symbol_append (symbol *sym, location loc)

 {
   if (current_rule->action)
     grammar_midrule_action ();
   ++nritems;
 {
   if (current_rule->action)
     grammar_midrule_action ();
   ++nritems;

-  grammar_symbol_append (symbol, location);
+  grammar_symbol_append (sym, loc);

 }
 
 /* Attach an ACTION to the current rule.  If needed, move the previous
    action as a mid-rule action.  */
 
 void
 }
 
 /* Attach an ACTION to the current rule.  If needed, move the previous
    action as a mid-rule action.  */
 
 void

-grammar_current_rule_action_append (const char *action, location_t location)
+grammar_current_rule_action_append (const char *action, location loc)

 {
   if (current_rule->action)
     grammar_midrule_action ();
   current_rule->action = action;
 {
   if (current_rule->action)
     grammar_midrule_action ();
   current_rule->action = action;

-  current_rule->action_location = location;
+  current_rule->action_location = loc;

 }
 
 \f
 }
 
 \f


@@ -399,15 +404,15 @@ static void
 packgram (void)
 {
   unsigned int itemno = 0;
 packgram (void)
 {
   unsigned int itemno = 0;

-  rule_number_t ruleno = 0;
-  symbol_list_t *p = grammar;
+  rule_number ruleno = 0;
+  symbol_list *p = grammar;

 
 

-  ritem = XCALLOC (item_number_t, nritems);
-  rules = XCALLOC (rule_t, nrules);
+  CALLOC (ritem, nritems);
+  CALLOC (rules, nrules);

 
   while (p)
     {
 
   while (p)
     {

-      symbol_t *ruleprec = p->ruleprec;
+      symbol *ruleprec = p->ruleprec;

       rules[ruleno].user_number = ruleno;
       rules[ruleno].number = ruleno;
       rules[ruleno].lhs = p->sym;
       rules[ruleno].user_number = ruleno;
       rules[ruleno].number = ruleno;
       rules[ruleno].lhs = p->sym;


@@ -422,7 +427,7 @@ packgram (void)
       p = p->next;
       while (p && p->sym)
        {
       p = p->next;
       while (p && p->sym)
        {

-         /* item_number_t = symbol_number_t.
+         /* item_number = symbol_number.

             But the former needs to contain more: negative rule numbers. */
          ritem[itemno++] = symbol_number_as_item_number (p->sym->number);
          /* A rule gets by default the precedence and associativity
             But the former needs to contain more: negative rule numbers. */
          ritem[itemno++] = symbol_number_as_item_number (p->sym->number);
          /* A rule gets by default the precedence and associativity


@@ -447,7 +452,8 @@ packgram (void)
        p = p->next;
     }
 
        p = p->next;
     }
 

-  assert (itemno == nritems);
+  if (itemno != nritems)
+    abort ();

 
   if (trace_flag & trace_sets)
     ritem_print (stderr);
 
   if (trace_flag & trace_sets)
     ritem_print (stderr);


@@ -463,8 +469,6 @@ packgram (void)
 void
 reader (void)
 {
 void
 reader (void)
 {

-  gram_control_t gram_control;
-

   /* Initialize the symbol table.  */
   symbols_new ();
 
   /* Initialize the symbol table.  */
   symbols_new ();
 


@@ -488,13 +492,13 @@ reader (void)
   obstack_init (&pre_prologue_obstack);
   obstack_init (&post_prologue_obstack);
 
   obstack_init (&pre_prologue_obstack);
   obstack_init (&post_prologue_obstack);
 

-  finput = xfopen (infile, "r");
+  finput = xfopen (grammar_file, "r");

   gram_in = finput;
 
   gram__flex_debug = trace_flag & trace_scan;
   gram_debug = trace_flag & trace_parse;
   scanner_initialize ();
   gram_in = finput;
 
   gram__flex_debug = trace_flag & trace_scan;
   gram_debug = trace_flag & trace_parse;
   scanner_initialize ();

-  gram_parse (&gram_control);
+  gram_parse ();

 
   /* If something went wrong during the parsing, don't try to
      continue.  */
 
   /* If something went wrong during the parsing, don't try to
      continue.  */


@@ -523,7 +527,7 @@ reader (void)
 
      accept: %start EOF.  */
   {
 
      accept: %start EOF.  */
   {

-    symbol_list_t *p = symbol_list_new (accept, empty_location);
+    symbol_list *p = symbol_list_new (accept, empty_location);

     p->location = grammar->location;
     p->next = symbol_list_new (startsymbol, empty_location);
     p->next->next = symbol_list_new (endtoken, empty_location);
     p->location = grammar->location;
     p->next = symbol_list_new (startsymbol, empty_location);
     p->next->next = symbol_list_new (endtoken, empty_location);


@@ -534,11 +538,8 @@ reader (void)
     grammar = p;
   }
 
     grammar = p;
   }
 

-  if (SYMBOL_NUMBER_MAX < nsyms)
-    fatal (_("too many symbols (tokens plus nonterminals); maximum %d"),
-          SYMBOL_NUMBER_MAX);
-
-  assert (nsyms == ntokens + nvars);
+  if (! (nsyms <= SYMBOL_NUMBER_MAXIMUM && nsyms == ntokens + nvars))
+    abort ();

 
   xfclose (finput);
 
 
   xfclose (finput);
 


@@ -549,6 +550,6 @@ reader (void)
   /* 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_t is no longer needed. */
-  LIST_FREE (symbol_list_t, grammar);
+  /* The grammar as a symbol_list is no longer needed. */
+  LIST_FREE (symbol_list, grammar);

 }
 }