Fix some error messages

Author: yitzchak

include/clasp/clbind/names.h

@@ -49,4 +49,4 @@ inline std::string PrepareName(const RawName& name) { return name._raw_name; }
 // eg:  scope.def("foo<ThisIsATest>"_raw, ...)
 //          ;; This will bind the symbol |foo<ThisIsATest>|
 //
-inline clbind::RawName operator"" _raw(const char* arg, size_t len) { return clbind::RawName(std::string(arg, len)); }
+inline clbind::RawName operator""_raw(const char* arg, size_t len) { return clbind::RawName(std::string(arg, len)); }

include/clasp/gctools/hardErrors.h

@@ -45,12 +45,15 @@ class HardError {
 };
 
 [[noreturn]] void throw_hard_error(const std::string& msg);
+
+#define HARD_ERROR(msg) \
+  throw_hard_error(fmt::format("{}:{}:{} {}\n", __FILE__, __LINE__, __FUNCTION__, msg))
+
 [[noreturn]] void throw_hard_error_not_applicable_method(const char* msg);
 [[noreturn]] void throw_hard_error_bad_client(void* ptr);
 [[noreturn]] void throw_hard_error_bad_layout_command(int cmd);
 [[noreturn]] void throw_hard_error_side_stack_damaged(size_t totalSize, size_t calcSize);
 [[noreturn]] void throw_hard_error_mps_bad_result(int result);
-[[noreturn]] void throw_hard_error_failed_assertion(const char* assertion);
 [[noreturn]] void throw_hard_error_cast_failed(const char* type, const char* from);
 [[noreturn]] void throw_hard_error_cannot_cast_tagged_pointer(const char* name, size_t kind);
 [[noreturn]] void throw_hard_error_implement_me(const char* funcname, const char* filename, size_t lineno) noexcept(false);
@@ -87,12 +90,12 @@ class HardError {
 #define GCTOOLS_ASSERT(x)                                                                                                          \
   {                                                                                                                                \
     if (!(x))                                                                                                                      \
-      throw_hard_error_failed_assertion(#x);                                                                                       \
+      HARD_ERROR("Failed assertion: " #x);                                                                                       \
   };
 #define GCTOOLS_ASSERTF(x, msg)                                                                                                    \
   {                                                                                                                                \
     if (!(x))                                                                                                                      \
-      throw_hard_error_failed_assertion(#x " " msg);                                                                               \
+      HARD_ERROR("Failed assertion: " #x " " msg);                                                                               \
   };
 #else
 #define GCTOOLS_ASSERT(x)

include/clasp/gctools/smart_pointers.h

@@ -133,9 +133,7 @@ template <class T> class base_ptr {
 
   template <class o_class> inline base_ptr<o_class> as_assert() const {
 #ifdef DEBUG_ASSERT
-    if (!TaggedCast<o_class*, Type*>::isA(this->theObject)) {
-      throw_hard_error_failed_assertion("as_assert failed!");
-    }
+    GCTOOLS_ASSERT(TaggedCast<o_class*, Type*>::isA(this->theObject))
 #endif
     base_ptr<o_class> ret((Tagged)this->theObject);
     return ret;
@@ -403,9 +401,7 @@ template <> class smart_ptr<core::T_O> {
 
   template <class o_class> inline smart_ptr<o_class> as_assert() const {
 #ifdef DEBUG_ASSERT
-    if (!TaggedCast<o_class*, Type*>::isA(this->theObject)) {
-      throw_hard_error_failed_assertion("as_assert failed!");
-    }
+    GCTOOLS_ASSERT(TaggedCast<o_class*, Type*>::isA(this->theObject))
 #endif
     smart_ptr<o_class> ret((Tagged)this->theObject);
     return ret;
@@ -690,9 +686,7 @@ template <> class smart_ptr<core::Cons_O> {
   }
   template <class o_class> inline smart_ptr<o_class> as_assert() const {
 #ifdef DEBUG_ASSERT
-    if (!TaggedCast<o_class*, Type*>::isA(this->theObject)) {
-      throw_hard_error_failed_assertion("as_assert failed!");
-    }
+    GCTOOLS_ASSERT(TaggedCast<o_class*, Type*>::isA(this->theObject))
 #endif
     smart_ptr<o_class> ret((Tagged)this->theObject);
     return ret;
@@ -823,9 +817,7 @@ template <> class smart_ptr<core::List_V> {
   }
   template <class o_class> inline smart_ptr<o_class> as_assert() const {
 #ifdef DEBUG_ASSERT
-    if (!TaggedCast<o_class*, Type*>::isA(this->theObject)) {
-      throw_hard_error_failed_assertion("as_assert failed!");
-    }
+    GCTOOLS_ASSERT(TaggedCast<o_class*, Type*>::isA(this->theObject))
 #endif
     smart_ptr<o_class> ret((Tagged)this->theObject);
     return ret;

src/gctools/hardErrors.cc

@@ -17,11 +17,6 @@
   abort();
 }
 
-[[noreturn]] void throw_hard_error_failed_assertion(const char* assertion) {
-  printf("%s:%d:%s %s\n", __FILE__, __LINE__, __FUNCTION__, assertion);
-  abort();
-}
-
 [[noreturn]] void throw_hard_error_not_applicable_method(const char* method) {
   printf("%s:%d:%s %s\n", __FILE__, __LINE__, __FUNCTION__, method);
   abort();