X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5bab03fcf8db5771b6a9fc22d917e61bf143dde2..75ae8299840bbd854fa2474d38402bbb933c6511:/src/uniqstr.c
diff --git a/src/uniqstr.c b/src/uniqstr.c
index 9350df1b..161b24d4 100644
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,28 +1,29 @@
-/* Keeping a unique copy of strings.
- Copyright (C) 2002 Free Software Foundation, Inc.
+/* Keep a unique copy of strings.
+
+ Copyright (C) 2002-2005, 2009-2013 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
+ 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.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bison is distributed in the hope that it will be useful,
+ 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 Bison; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
+#include
#include "system.h"
#include
#include
#include
+#include
#include "uniqstr.h"
@@ -40,29 +41,46 @@ static struct hash_table *uniqstrs_table = NULL;
`-------------------------------------*/
uniqstr
-uniqstr_new (const char *s)
+uniqstr_new (char const *str)
{
- uniqstr res = hash_lookup (uniqstrs_table, s);
+ uniqstr res = hash_lookup (uniqstrs_table, str);
if (!res)
{
/* First insertion in the hash. */
- res = xstrdup (s);
- hash_insert (uniqstrs_table, res);
+ res = xstrdup (str);
+ if (!hash_insert (uniqstrs_table, res))
+ xalloc_die ();
}
return res;
}
+uniqstr
+uniqstr_vsprintf (char const *format, ...)
+{
+ va_list args;
+ size_t length;
+ va_start (args, format);
+ length = vsnprintf (NULL, 0, format, args);
+ va_end (args);
+
+ char res[length + 1];
+ va_start (args, format);
+ vsprintf (res, format, args);
+ va_end (args);
+ return uniqstr_new (res);
+}
/*------------------------------.
| Abort if S is not a uniqstr. |
`------------------------------*/
void
-uniqstr_assert (const char *s)
+uniqstr_assert (char const *str)
{
- if (!hash_lookup (uniqstrs_table, s))
+ if (!hash_lookup (uniqstrs_table, str))
{
- error (0, 0, "not a uniqstr: %s", quotearg (s));
+ error (0, 0,
+ "not a uniqstr: %s", quotearg (str));
abort ();
}
}
@@ -72,32 +90,46 @@ uniqstr_assert (const char *s)
| Print the uniqstr. |
`--------------------*/
-static bool
-uniqstr_print (const uniqstr s)
+static inline bool
+uniqstr_print (uniqstr ustr)
{
- fprintf (stderr, "%s\n", s);
+ fprintf (stderr, "%s\n", ustr);
return true;
}
-
+static bool
+uniqstr_print_processor (void *ustr, void *null ATTRIBUTE_UNUSED)
+{
+ return uniqstr_print (ustr);
+}
+
+
+int
+uniqstr_cmp(uniqstr l, uniqstr r)
+{
+ return (l == r ? 0
+ : !l ? -1
+ : !r ? +1
+ : strcmp (l, r));
+}
+
+
/*-----------------------.
| A uniqstr hash table. |
`-----------------------*/
static bool
-hash_compare_uniqstr (const uniqstr m1, const uniqstr m2)
+hash_compare_uniqstr (void const *m1, void const *m2)
{
- return strcmp (m1, m2) == 0;
+ return STREQ (m1, m2);
}
-static unsigned int
-hash_uniqstr (const uniqstr m, unsigned int tablesize)
+static size_t
+hash_uniqstr (void const *m, size_t tablesize)
{
return hash_string (m, tablesize);
}
-/* A function to apply to each symbol. */
-typedef bool (*uniqstr_processor) (const uniqstr);
/*----------------------------.
| Create the uniqstrs table. |
@@ -107,10 +139,10 @@ void
uniqstrs_new (void)
{
uniqstrs_table = hash_initialize (HT_INITIAL_CAPACITY,
- NULL,
- (Hash_hasher) hash_uniqstr,
- (Hash_comparator) hash_compare_uniqstr,
- (Hash_data_freer) free);
+ NULL,
+ hash_uniqstr,
+ hash_compare_uniqstr,
+ free);
}
@@ -119,11 +151,9 @@ uniqstrs_new (void)
`-------------------------------------*/
static void
-uniqstrs_do (uniqstr_processor processor, void *processor_data)
+uniqstrs_do (Hash_processor processor, void *processor_data)
{
- hash_do_for_each (uniqstrs_table,
- (Hash_processor) processor,
- processor_data);
+ hash_do_for_each (uniqstrs_table, processor, processor_data);
}
@@ -134,7 +164,7 @@ uniqstrs_do (uniqstr_processor processor, void *processor_data)
void
uniqstrs_print (void)
{
- uniqstrs_do (uniqstr_print, NULL);
+ uniqstrs_do (uniqstr_print_processor, NULL);
}