X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2cec9080f685192e231333686b411fb524239a1b..782e8187185a009ce698ad294c87e49a0a30c3a1:/src/uniqstr.c
diff --git a/src/uniqstr.c b/src/uniqstr.c
index 8804a80e..f2954443 100644
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,23 +1,21 @@
/* Keep a unique copy of strings.
- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002-2005, 2009-2012 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include "system.h"
@@ -25,6 +23,7 @@
#include
#include
#include
+#include
#include "uniqstr.h"
@@ -49,11 +48,27 @@ uniqstr_new (char const *str)
{
/* First insertion in the hash. */
res = xstrdup (str);
- hash_insert (uniqstrs_table, res);
+ 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. |
@@ -65,7 +80,7 @@ uniqstr_assert (char const *str)
if (!hash_lookup (uniqstrs_table, str))
{
error (0, 0,
- "not a uniqstr: %s", quotearg (str));
+ "not a uniqstr: %s", quotearg (str));
abort ();
}
}
@@ -96,7 +111,7 @@ uniqstr_print_processor (void *ustr, void *null ATTRIBUTE_UNUSED)
static bool
hash_compare_uniqstr (void const *m1, void const *m2)
{
- return strcmp (m1, m2) == 0;
+ return STREQ (m1, m2);
}
static size_t
@@ -113,10 +128,10 @@ void
uniqstrs_new (void)
{
uniqstrs_table = hash_initialize (HT_INITIAL_CAPACITY,
- NULL,
- hash_uniqstr,
- hash_compare_uniqstr,
- free);
+ NULL,
+ hash_uniqstr,
+ hash_compare_uniqstr,
+ free);
}