(struniq_assert): Now returns void, and aborts if the assertion is false.

[bison.git] / src / struniq.c

diff --git a/src/struniq.c b/src/struniq.c
index 4260a70f0cdfdadeab94b28233d6bc5b2787a343..a42f78629b29df349056363489bb7e10c6f50fd6 100644 (file)
--- a/src/struniq.c
+++ b/src/struniq.c
@@ -20,6 +20,7 @@
 
 #include "system.h"
 #include "quotearg.h"
 
 #include "system.h"
 #include "quotearg.h"

+#include "error.h"

 #include "hash.h"
 #include "struniq.h"
 
 #include "hash.h"
 #include "struniq.h"
 


@@ -36,23 +37,35 @@ static struct hash_table *struniqs_table = NULL;
 | Create the struniq for S if needed.  |
 `-------------------------------------*/
 
 | Create the struniq for S if needed.  |
 `-------------------------------------*/
 

-const struniq_t
+struniq_t

 struniq_new (const char *s)
 {
 struniq_new (const char *s)
 {

-  /* Keep the struniqs in a printable form.  */
-  struniq_t res = hash_lookup (struniqs_table, 
-                              quotearg_style (escape_quoting_style, s));
-
+  struniq_t res = hash_lookup (struniqs_table, s);

   if (!res)
     {
       /* First insertion in the hash. */
   if (!res)
     {
       /* First insertion in the hash. */

-      res = xstrdup (quotearg_style (escape_quoting_style, s));
+      res = xstrdup (s);

       hash_insert (struniqs_table, res);
     }
   return res;
 }
 
 
       hash_insert (struniqs_table, res);
     }
   return res;
 }
 
 

+/*------------------------------.
+| Abort if S is not a struniq.  |
+`------------------------------*/
+
+void
+struniq_assert (const char *s)
+{
+  if (!hash_lookup (struniqs_table, s))
+    {
+      error (0, 0, "not a struniq: %s", quotearg (s));
+      abort ();
+    }
+}
+
+

 /*--------------------.
 | Print the struniq.  |
 `--------------------*/
 /*--------------------.
 | Print the struniq.  |
 `--------------------*/