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

[bison.git] / src / struniq.h

diff --git a/src/struniq.h b/src/struniq.h
index bd33c8c34251c8626af280fcee3d1bb83fa3a70d..f72116c34b8c435e836e2c88c1f89468a60282ec 100644 (file)
--- a/src/struniq.h
+++ b/src/struniq.h
@@ -28,7 +28,7 @@
 typedef const char *struniq_t;
 
 /* Return the struniq for S.  */
 typedef const char *struniq_t;
 
 /* Return the struniq for S.  */

-const struniq_t struniq_new (const char *s);
+struniq_t struniq_new (const char *s);

 
 /* Two struniq have the same value iff they are the same.  */
 #define STRUNIQ_EQ(S1, S2) ((S1) == (S2))
 
 /* Two struniq have the same value iff they are the same.  */
 #define STRUNIQ_EQ(S1, S2) ((S1) == (S2))


@@ -41,8 +41,7 @@ const struniq_t struniq_new (const char *s);
 void struniqs_new (void);
 
 /* Die if S is not a struniq.  */
 void struniqs_new (void);
 
 /* Die if S is not a struniq.  */

-#define struniq_assert(S) assert (struniq_assert_p (S));
-bool struniq_assert_p (const char *s);
+void struniq_assert (const char *s);

 
 /* Free all the memory allocated for symbols.  */
 void struniqs_free (void);
 
 /* Free all the memory allocated for symbols.  */
 void struniqs_free (void);