* lib/xstrdup.c: New file, from the fileutils.

* src/reader.c (parse_token_decl, get_type_name, parse_type_decl)
(parse_assoc_decl, parse_thong_decl, get_type): Use `xstrdup'
instead of strlen + xmalloc + strcpy.
* src/symtab.c (copys): Remove, use xstrdup instead.

diff --git a/ChangeLog b/ChangeLog
index 3c0195361c2cc4fcbf05f5be58f9a33d5e86f3a6..63736de1e7edb7f77fe0b0ac99eb331f0d6ea7fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-02  Akim Demaille  <akim@epita.fr>
+
+       * lib/xstrdup.c: New file, from the fileutils.
+       * src/reader.c (parse_token_decl, get_type_name, parse_type_decl)
+       (parse_assoc_decl, parse_thong_decl, get_type): Use `xstrdup'
+       instead of strlen + xmalloc + strcpy.
+       * src/symtab.c (copys): Remove, use xstrdup instead.
+
+       

 2000-10-02  Akim Demaille  <akim@epita.fr>
 
        * src/gram.h (associativity): New enum type which replaces the
 2000-10-02  Akim Demaille  <akim@epita.fr>
 
        * src/gram.h (associativity): New enum type which replaces the

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b5317f225ad0ce4401be30541aab0a7f609678f3..03df9e52d2fc9d279bb820827c99a5a19ff9286e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,7 +6,7 @@ noinst_LIBRARIES = libbison.a
 
 INCLUDES = -I.. -I$(srcdir) -I../intl
 
 
 INCLUDES = -I.. -I$(srcdir) -I../intl
 

-libbison_a_SOURCES = getopt.c getopt1.c xmalloc.c
+libbison_a_SOURCES = getopt.c getopt1.c xmalloc.c xstrdup.c

 noinst_HEADERS = getopt.h xalloc.h
 
 libbison_a_LIBADD = @LIBOBJS@ @ALLOCA@
 noinst_HEADERS = getopt.h xalloc.h
 
 libbison_a_LIBADD = @LIBOBJS@ @ALLOCA@

diff --git a/lib/xstrdup.c b/lib/xstrdup.c
new file mode 100644 (file)
index 0000000..38674ca
--- /dev/null
+++ b/lib/xstrdup.c
@@ -0,0 +1,46 @@
+/* xstrdup.c -- copy a string with out of memory checking
+   Copyright (C) 1990, 1996, 1998 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifndef PARAMS
+# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+#if STDC_HEADERS || HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#include <sys/types.h>
+
+char *xmalloc PARAMS ((size_t n));
+
+/* Return a newly allocated copy of STRING.  */
+
+char *
+xstrdup (const char *string)
+{
+  return strcpy (xmalloc (strlen (string) + 1), string);
+}

diff --git a/src/reader.c b/src/reader.c
index bd13e044e70baf9c8bee222c1a64760932edbd1a..b22f42d13f3ec179253be6201df8c7222ad54069 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -351,7 +351,6 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
   int token = 0;
   char *typename = 0;
   struct bucket *symbol = NULL;        /* pts to symbol being defined */
   int token = 0;
   char *typename = 0;
   struct bucket *symbol = NULL;        /* pts to symbol being defined */

-  int k;

 
   for (;;)
     {
 
   for (;;)
     {


@@ -370,9 +369,7 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
        }
       if (token == TYPENAME)
        {
        }
       if (token == TYPENAME)
        {

-         k = strlen (token_buffer);
-         typename = XCALLOC (char, k + 1);
-         strcpy (typename, token_buffer);
+         typename = xstrdup (token_buffer);

          value_components_used = 1;
          symbol = NULL;
        }
          value_components_used = 1;
          symbol = NULL;
        }


@@ -488,7 +485,6 @@ get_type_name (int n, symbol_list * rule)
 static void
 parse_type_decl (void)
 {
 static void
 parse_type_decl (void)
 {

-  int k;

   char *name;
 
   if (lex () != TYPENAME)
   char *name;
 
   if (lex () != TYPENAME)


@@ -498,9 +494,7 @@ parse_type_decl (void)
       return;
     }
 
       return;
     }
 

-  k = strlen (token_buffer);
-  name = XCALLOC (char, k + 1);
-  strcpy (name, token_buffer);
+  name = xstrdup (token_buffer);

 
   for (;;)
     {
 
   for (;;)
     {


@@ -547,7 +541,6 @@ parse_type_decl (void)
 static void
 parse_assoc_decl (associativity assoc)
 {
 static void
 parse_assoc_decl (associativity assoc)
 {

-  int k;

   char *name = NULL;
   int prev = 0;
 
   char *name = NULL;
   int prev = 0;
 


@@ -567,11 +560,8 @@ parse_assoc_decl (associativity assoc)
 
       switch (t)
        {
 
       switch (t)
        {

-

        case TYPENAME:
        case TYPENAME:

-         k = strlen (token_buffer);
-         name = XCALLOC (char, k + 1);
-         strcpy (name, token_buffer);
+         name = xstrdup (token_buffer);

          break;
 
        case COMMA:
          break;
 
        case COMMA:


@@ -757,15 +747,13 @@ parse_thong_decl (void)
   int token;
   struct bucket *symbol;
   char *typename = 0;
   int token;
   struct bucket *symbol;
   char *typename = 0;

-  int k, usrtoknum;
+  int usrtoknum;

 
   translations = 1;
   token = lex ();              /* fetch typename or first token */
   if (token == TYPENAME)
     {
 
   translations = 1;
   token = lex ();              /* fetch typename or first token */
   if (token == TYPENAME)
     {

-      k = strlen (token_buffer);
-      typename = XCALLOC (char, k + 1);
-      strcpy (typename, token_buffer);
+      typename = xstrdup (token_buffer);

       value_components_used = 1;
       token = lex ();          /* fetch first token */
     }
       value_components_used = 1;
       token = lex ();          /* fetch first token */
     }


@@ -1253,9 +1241,7 @@ get_type (void)
       return t;
     }
 
       return t;
     }
 

-  k = strlen (token_buffer);
-  name = XCALLOC (char, k + 1);
-  strcpy (name, token_buffer);
+  name = xstrdup (token_buffer);

 
   for (;;)
     {
 
   for (;;)
     {

diff --git a/src/symtab.c b/src/symtab.c
index 1bc2c3779ca727362f3d63986074b2f5d53c5cad..0836153969423d3f544855d9d4456ed75fdbbb13 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,22 +1,22 @@
 /* Symbol table manager for Bison,
 /* Symbol table manager for Bison,

-   Copyright (C) 1984, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000 Free Software Foundation, Inc.

 
 

-This file is part of Bison, the GNU Compiler Compiler.
+   This file is part of Bison, the GNU Compiler Compiler.

 
 

-Bison is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   Bison is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.

 
 

-Bison is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   Bison is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

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


@@ -32,8 +32,8 @@ static bucket **symtab;
 static int
 hash (const char *key)
 {
 static int
 hash (const char *key)
 {

-  register const char *cp;
-  register int k;
+  const char *cp;
+  int k;

 
   cp = key;
   k = 0;
 
   cp = key;
   k = 0;


@@ -44,29 +44,9 @@ hash (const char *key)
 }
 
 
 }
 
 

-
-static char *
-copys (const char *s)
-{
-  register int i;
-  register const char *cp;
-  register char *result;
-
-  i = 1;
-  for (cp = s; *cp; cp++)
-    i++;
-
-  result = XMALLOC(char, i);
-  strcpy(result, s);
-  return result;
-}
-
-

 void
 tabinit (void)
 {
 void
 tabinit (void)
 {

-/*   register int i; JF unused */
-

   symtab = XCALLOC (bucket *, TABSIZE);
 
   firstsymbol = NULL;
   symtab = XCALLOC (bucket *, TABSIZE);
 
   firstsymbol = NULL;


@@ -77,17 +57,17 @@ tabinit (void)
 bucket *
 getsym (const char *key)
 {
 bucket *
 getsym (const char *key)
 {

-  register int hashval;
-  register bucket *bp;
-  register int found;
+  int hashval;
+  bucket *bp;
+  int found;

 
 

-  hashval = hash(key);
+  hashval = hash (key);

   bp = symtab[hashval];
 
   found = 0;
   while (bp != NULL && found == 0)
     {
   bp = symtab[hashval];
 
   found = 0;
   while (bp != NULL && found == 0)
     {

-      if (strcmp(key, bp->tag) == 0)
+      if (strcmp (key, bp->tag) == 0)

        found = 1;
       else
        bp = bp->link;
        found = 1;
       else
        bp = bp->link;


@@ -100,7 +80,7 @@ getsym (const char *key)
       bp = XCALLOC (bucket, 1);
       bp->link = symtab[hashval];
       bp->next = NULL;
       bp = XCALLOC (bucket, 1);
       bp->link = symtab[hashval];
       bp->next = NULL;

-      bp->tag = copys(key);
+      bp->tag = xstrdup (key);

       bp->class = unknown_sym;
 
       if (firstsymbol == NULL)
       bp->class = unknown_sym;
 
       if (firstsymbol == NULL)


@@ -124,8 +104,8 @@ getsym (const char *key)
 void
 free_symtab (void)
 {
 void
 free_symtab (void)
 {

-  register int i;
-  register bucket *bp,*bptmp;/* JF don't use ptr after free */
+  int i;
+  bucket *bp, *bptmp;          /* JF don't use ptr after free */

 
   for (i = 0; i < TABSIZE; i++)
     {
 
   for (i = 0; i < TABSIZE; i++)
     {


@@ -133,13 +113,15 @@ free_symtab (void)
       while (bp)
        {
          bptmp = bp->link;
       while (bp)
        {
          bptmp = bp->link;

-#if 0 /* This causes crashes because one string can appear more than once.  */
+#if 0
+         /* This causes crashes because one string can appear more
+            than once.  */

          if (bp->type_name)
          if (bp->type_name)

-           XFREE(bp->type_name);
+           XFREE (bp->type_name);

 #endif
 #endif

-         XFREE(bp);
+         XFREE (bp);

          bp = bptmp;
        }
     }
          bp = bptmp;
        }
     }

-  XFREE(symtab);
+  XFREE (symtab);

 }
 }