Rename struniq -> uniqstr to avoid collision with <string.h>.

diff --git a/src/struniq.c b/src/struniq.c
deleted file mode 100644 (file)
index a42f786..0000000
--- a/src/struniq.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Keeping a unique copy of strings.
-   Copyright (C) 2002 Free Software Foundation, Inc.
-
-   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 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.  */
-
-#include "system.h"
-#include "quotearg.h"
-#include "error.h"
-#include "hash.h"
-#include "struniq.h"
-
-/*-----------------------.
-| A struniq hash table.  |
-`-----------------------*/
-
-/* Initial capacity of struniq hash table.  */
-#define HT_INITIAL_CAPACITY 257
-
-static struct hash_table *struniqs_table = NULL;
-
-/*-------------------------------------.
-| Create the struniq for S if needed.  |
-`-------------------------------------*/
-
-struniq_t
-struniq_new (const char *s)
-{
-  struniq_t res = hash_lookup (struniqs_table, s);
-  if (!res)
-    {
-      /* First insertion in the hash. */
-      res = xstrdup (s);
-      hash_insert (struniqs_table, res);
-    }
-  return res;
-}
-
-
-/*------------------------------.
-| Abort if S is not a struniq.  |
-`------------------------------*/
-
-void
-struniq_assert (const char *s)
-{
-  if (!hash_lookup (struniqs_table, s))
-    {
-      error (0, 0, "not a struniq: %s", quotearg (s));
-      abort ();
-    }
-}
-
-
-/*--------------------.
-| Print the struniq.  |
-`--------------------*/
-
-static bool
-struniq_print (const struniq_t s)
-{
-  fprintf (stderr, "%s\n", s);
-  return true;
-}
-
-\f
-/*-----------------------.
-| A struniq hash table.  |
-`-----------------------*/
-
-static bool
-hash_compare_struniq_t (const struniq_t m1, const struniq_t m2)
-{
-  return strcmp (m1, m2) == 0;
-}
-
-static unsigned int
-hash_struniq_t (const struniq_t m, unsigned int tablesize)
-{
-  return hash_string (m, tablesize);
-}
-
-/* A function to apply to each symbol. */
-typedef bool (*struniq_processor_t) (const struniq_t);
-
-/*----------------------------.
-| Create the struniqs table.  |
-`----------------------------*/
-
-void
-struniqs_new (void)
-{
-  struniqs_table = hash_initialize (HT_INITIAL_CAPACITY,
-                                   NULL,
-                                   (Hash_hasher) hash_struniq_t,
-                                   (Hash_comparator) hash_compare_struniq_t,
-                                   (Hash_data_freer) free);
-}
-
-
-/*-------------------------------------.
-| Perform a task on all the struniqs.  |
-`-------------------------------------*/
-
-static void
-struniqs_do (struniq_processor_t processor, void *processor_data)
-{
-  hash_do_for_each (struniqs_table,
-                   (Hash_processor) processor,
-                   processor_data);
-}
-
-
-/*-----------------.
-| Print them all.  |
-`-----------------*/
-
-void
-struniqs_print (void)
-{
-  struniqs_do (struniq_print, NULL);
-}
-
-
-/*--------------------.
-| Free the struniqs.  |
-`--------------------*/
-
-void
-struniqs_free (void)
-{
-  hash_free (struniqs_table);
-}

diff --git a/src/struniq.h b/src/struniq.h
deleted file mode 100644 (file)
index f72116c..0000000
--- a/src/struniq.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Keeping a unique copy of strings.
-   Copyright (C) 2002 Free Software Foundation, Inc.
-
-   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 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.  */
-
-#ifndef STRUNIQ_H_
-# define STRUNIQ_H_
-
-/*------------------------------------------------------.
-| struniq_t -- pointers to unique copies of C strings.  |
-`------------------------------------------------------*/
-
-typedef const char *struniq_t;
-
-/* Return the struniq for S.  */
-struniq_t struniq_new (const char *s);
-
-/* Two struniq have the same value iff they are the same.  */
-#define STRUNIQ_EQ(S1, S2) ((S1) == (S2))
-
-/*--------------------------------------.
-| Initializing, destroying, debugging.  |
-`--------------------------------------*/
-
-/* Create the string table.  */
-void struniqs_new (void);
-
-/* Die if S is not a struniq.  */
-void struniq_assert (const char *s);
-
-/* Free all the memory allocated for symbols.  */
-void struniqs_free (void);
-
-/* Report them all.  */
-void struniqs_print (void);
-
-#endif /* !STRUNIQ_H_ */