tests: improve the generic yylex implementation.

[bison.git] / src / uniqstr.c

diff --git a/src/uniqstr.c b/src/uniqstr.c
index 644477bed20a89801e5782082c3ccbc245cd4712..62d09ca97b198bc6f22f5058e62d5ef3dd2cb1dd 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-2012 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.  |