tests: minor refactoring

[bison.git] / src / uniqstr.c

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

-   Copyright (C) 2002 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.
 

-   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
    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
    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 <http://www.gnu.org/licenses/>.  */

 
 

+#include <config.h>

 #include "system.h"
 
 #include <error.h>
 #include <hash.h>
 #include <quotearg.h>
 #include "system.h"
 
 #include <error.h>
 #include <hash.h>
 #include <quotearg.h>

+#include <stdarg.h>

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


@@ -41,29 +41,46 @@ static struct hash_table *uniqstrs_table = NULL;
 `-------------------------------------*/
 
 uniqstr
 `-------------------------------------*/
 
 uniqstr

-uniqstr_new (char const *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. */
   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;
 }
 
     }
   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
 
 /*------------------------------.
 | Abort if S is not a uniqstr.  |
 `------------------------------*/
 
 void

-uniqstr_assert (char const *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 ();
     }
 }
       abort ();
     }
 }


@@ -74,19 +91,29 @@ uniqstr_assert (char const *s)
 `--------------------*/
 
 static inline bool
 `--------------------*/
 
 static inline bool

-uniqstr_print (uniqstr s)
+uniqstr_print (uniqstr ustr)

 {
 {

-  fprintf (stderr, "%s\n", s);
+  fprintf (stderr, "%s\n", ustr);

   return true;
 }
 
 static bool
   return true;
 }
 
 static bool

-uniqstr_print_processor (void *s, void *null ATTRIBUTE_UNUSED)
+uniqstr_print_processor (void *ustr, void *null ATTRIBUTE_UNUSED)

 {
 {

-  return uniqstr_print (s);
+  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,15 +121,16 @@ uniqstr_print_processor (void *s, 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 unsigned int
-hash_uniqstr (void const *m, unsigned int tablesize)
+static size_t
+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);

 }
 
 
 }