better assert

Author: matbesancon

src/wrapper.jl

@@ -5,9 +5,15 @@ const SCIP_ = LibSCIP.SCIP
 const TRUE = LibSCIP.TRUE
 const FALSE = LibSCIP.FALSE
 
-# SCIP_CALL: macro to check return codes, inspired by @assert
+# SCIP_CALL: macro to check return codes
 macro SCIP_CALL(ex)
-    return :(@assert $(esc(ex)) == SCIP_OKAY)
+    quote
+        v = $(esc(ex))
+        if v != SCIP_OKAY
+            s = $(string(ex))
+            error("$s yielded SCIP code $v")
+        end
+    end
 end
 
 const SCIP_STATISTICS_FUNCS = [

test/runtests.jl

@@ -80,3 +80,15 @@ end
 end
 
 include("MOI_conshdlr.jl")
+
+using Test
+using SCIP
+
+@testset "SCIP_CALL printing" begin
+    f() = SCIP.SCIP_OKAY
+    g(args...) = SCIP.SCIP_ERROR
+    SCIP.@SCIP_CALL f()
+    h() = SCIP.@SCIP_CALL(g(1, 2))
+    @test_throws ErrorException("g() yielded SCIP code SCIP_ERROR") SCIP.@SCIP_CALL g()
+    @test_throws ErrorException("g(1, 2) yielded SCIP code SCIP_ERROR") h()
+end