Allow more useful error messages in _assert macro.

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index 9ed5792ac3560afee0cc351be40a2e1354f3fcc6..8c03ef6a703c5efcd7d55cbcdf7235a89773ec39 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -51,15 +51,16 @@
     #line
 #define _assert__(line) \
     _assert___(line)
-#define _assert_(e) \
-    throw __FILE__ "(" _assert__(__LINE__) "): _assert(" e ")"
 
-#define _assert(expr) \
+#define _assert_(expr, format, ...) \
     do if (!(expr)) { \
-        fprintf(stderr, "%s(%u): _assert(%s); errno=%u\n", __FILE__, __LINE__, #expr, errno); \
-        _assert_(#expr); \
+        fprintf(stderr, "%s(%u): _assert(): " format "\n", __FILE__, __LINE__, ## __VA_ARGS__); \
+        throw __FILE__ "(" _assert__(__LINE__) "): _assert(" #expr ")"; \
     } while (false)
 
+#define _assert(expr) \
+    _assert_(expr, "%s", #expr)
+
 #define _syscall(expr) ({ \
     __typeof__(expr) _value; \
     do if ((long) (_value = (expr)) != -1) \
@@ -68,7 +69,7 @@
         case EINTR: \
             continue; \
         default: \
-            _assert(false); \
+            _assert_(false, "errno=%u", errno); \
     } while (true); \
     _value; \
 })
@@ -923,43 +924,6 @@ class Map {
     }
 };
 
-// I wish Apple cared about providing quality toolchains :/
-
-template <typename Function_>
-class Functor;
-
-template <typename Type_, typename... Args_>
-class Functor<Type_ (Args_...)> {
-  public:
-    virtual Type_ operator ()(Args_... args) const = 0;
-};
-
-template <typename Function_>
-class FunctorImpl;
-
-template <typename Value_, typename Type_, typename... Args_>
-class FunctorImpl<Type_ (Value_::*)(Args_...) const> :
-    public Functor<Type_ (Args_...)>
-{
-  private:
-    const Value_ *value_;
-
-  public:
-    FunctorImpl(const Value_ &value) :
-        value_(&value)
-    {
-    }
-
-    virtual Type_ operator ()(Args_... args) const {
-        return (*value_)(args...);
-    }
-};
-
-template <typename Function_>
-FunctorImpl<decltype(&Function_::operator())> fun(const Function_ &value) {
-    return value;
-}
-
 namespace ldid {
 
 static void Allocate(void *idata, size_t isize, std::streambuf &output, const Functor<size_t (size_t)> &allocate, const Functor<size_t (std::streambuf &output, size_t, const std::string &, const char *)> &save) {