Fix cdkersey#5. Now you can include cassert. You'd better have a damned good reason.

Author: cdkersey

assert.cpp

@@ -32,7 +32,7 @@ void assertion_t::tick(cdomain_handle_t cd) {
 
 static vector<assertion_t *> assertions;
 
-void chdl::assert(std::string text, node n) {
+void chdl::assert_node_true(std::string text, node n) {
   assertions.push_back(new assertion_t(text, n));
 }
 

assert.h

@@ -1,22 +1,30 @@
 // The assertion system allows certain error conditions to cause simulation to
 // finish with an error message
-#ifndef __ASSERT_H
-#define __ASSERT_H
+#ifndef CHDL_ASSERT_H
+#define CHDL_ASSERT_H
 #include <string>
 
 #include "node.h"
 
 namespace chdl {
-  void assert(std::string text, node node);
+  void assert_node_true(std::string text, node node);
 };
 
 #define CHDL_STRINGIFY_INTERNAL(x) #x
 #define CHDL_STRINGIFY(x) CHDL_STRINGIFY_INTERNAL(x)
 #define CHDL_LINE_STR CHDL_STRINGIFY(__LINE__)
 
+#ifndef CHDL_DISABLE_ASSERT
+#ifdef ASSERT
+  // ASSERT has already been defined by another library. This is only a problem
+  // if it was used in CHDL code.
+  #error ASSERT already #defined. #undef it or define CHDL_DISABLE_ASSERT.
+#else
 #define ASSERT(x) do { \
-    assert(std::string("Failed assertion in ") + \
-           __FILE__  ": Line " CHDL_LINE_STR, x); \
+    assert_node_true(std::string("Failed assertion in ") + \
+                     __FILE__  ": Line " CHDL_LINE_STR, x); \
 } while(0)
+#endif
+#endif
 
 #endif