* 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 e90cd2d73b315372556f7e09f51f491bc069aafa..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
+
+   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.
@@ -46,14 +47,14 @@ int typed = 0;
 `-----------------------*/
 
 void
-grammar_start_symbol_set (symbol *s, location loc)
+grammar_start_symbol_set (symbol *sym, location loc)
 {
   if (start_flag)
     complain_at (loc, _("multiple %s declarations"), "%start");
   else
     {
       start_flag = 1;
-      startsymbol = s;
+      startsymbol = sym;
       startsymbol_location = loc;
     }
 }
@@ -127,7 +128,7 @@ get_merge_function (uniqstr name, uniqstr type, location loc)
       break;
   if (syms->next == NULL)
     {
-      syms->next = XMALLOC (merger_list, 1);
+      MALLOC (syms->next, 1);
       syms->next->name = uniqstr_new (name);
       syms->next->type = uniqstr_new (type);
       syms->next->next = NULL;
@@ -180,7 +181,7 @@ free_merger_functions (void)
 /* The (currently) last symbol of GRAMMAR. */
 symbol_list *grammar_end = NULL;
 
-/* Append S to the GRAMMAR. */
+/* Append SYM to the grammar.  */
 void
 grammar_symbol_append (symbol *sym, location loc)
 {
@@ -406,8 +407,8 @@ packgram (void)
   rule_number ruleno = 0;
   symbol_list *p = grammar;
 
-  ritem = XCALLOC (item_number, nritems);
-  rules = XCALLOC (rule, nrules);
+  CALLOC (ritem, nritems);
+  CALLOC (rules, nrules);
 
   while (p)
     {