tests: minor refactoring

[bison.git] / src / uniqstr.c

diff --git a/src/uniqstr.c b/src/uniqstr.c
index 644477bed20a89801e5782082c3ccbc245cd4712..161b24d4ea957ef8cbc1d3ee4b10a87ef4af2a14 100644 (file)
--- a/src/uniqstr.c
+++ b/src/uniqstr.c
@@ -1,6 +1,6 @@
 /* Keep a unique copy of strings.
 
 /* Keep a unique copy of strings.
 

-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002-2005, 2009-2013 Free Software Foundation, Inc.

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


@@ -23,6 +23,7 @@
 #include <error.h>
 #include <hash.h>
 #include <quotearg.h>
 #include <error.h>
 #include <hash.h>
 #include <quotearg.h>

+#include <stdarg.h>

 
 #include "uniqstr.h"
 
 
 #include "uniqstr.h"
 


@@ -47,11 +48,27 @@ uniqstr_new (char const *str)
     {
       /* First insertion in the hash. */
       res = xstrdup (str);
     {
       /* First insertion in the hash. */
       res = xstrdup (str);

-      hash_insert (uniqstrs_table, res);
+      if (!hash_insert (uniqstrs_table, res))
+        xalloc_die ();

     }
   return res;
 }
 
     }
   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.  |
 
 /*------------------------------.
 | Abort if S is not a uniqstr.  |


@@ -63,7 +80,7 @@ uniqstr_assert (char const *str)
   if (!hash_lookup (uniqstrs_table, str))
     {
       error (0, 0,
   if (!hash_lookup (uniqstrs_table, str))
     {
       error (0, 0,

-            "not a uniqstr: %s", quotearg (str));
+             "not a uniqstr: %s", quotearg (str));

       abort ();
     }
 }
       abort ();
     }
 }


@@ -86,7 +103,17 @@ uniqstr_print_processor (void *ustr, void *null ATTRIBUTE_UNUSED)
   return uniqstr_print (ustr);
 }
 
   return uniqstr_print (ustr);
 }
 

-\f
+
+int
+uniqstr_cmp(uniqstr l, uniqstr r)
+{
+  return (l == r ? 0
+          : !l ? -1
+          : !r ? +1
+          : strcmp (l, r));
+}
+
+

 /*-----------------------.
 | A uniqstr hash table.  |
 `-----------------------*/
 /*-----------------------.
 | A uniqstr hash table.  |
 `-----------------------*/


@@ -94,7 +121,7 @@ uniqstr_print_processor (void *ustr, void *null ATTRIBUTE_UNUSED)
 static bool
 hash_compare_uniqstr (void const *m1, void const *m2)
 {
 static bool
 hash_compare_uniqstr (void const *m1, void const *m2)
 {

-  return strcmp (m1, m2) == 0;
+  return STREQ (m1, m2);

 }
 
 static size_t
 }
 
 static size_t


@@ -103,6 +130,7 @@ hash_uniqstr (void const *m, size_t tablesize)
   return hash_string (m, tablesize);
 }
 
   return hash_string (m, tablesize);
 }
 

+

 /*----------------------------.
 | Create the uniqstrs table.  |
 `----------------------------*/
 /*----------------------------.
 | Create the uniqstrs table.  |
 `----------------------------*/


@@ -111,10 +139,10 @@ void
 uniqstrs_new (void)
 {
   uniqstrs_table = hash_initialize (HT_INITIAL_CAPACITY,
 uniqstrs_new (void)
 {
   uniqstrs_table = hash_initialize (HT_INITIAL_CAPACITY,

-                                   NULL,
-                                   hash_uniqstr,
-                                   hash_compare_uniqstr,
-                                   free);
+                                    NULL,
+                                    hash_uniqstr,
+                                    hash_compare_uniqstr,
+                                    free);

 }
 
 
 }