Merge pull request #4 from mattn/fix-build

Fix build

Author: mitchellh

error.go

@@ -50,7 +50,7 @@ func (c *Context) SetErrorHandler(f ErrorHandler) {
 //
 // Maps: Z3_get_error_msg_ex
 func (c *Context) Error(code ErrorCode) string {
-	return C.GoString(C.Z3_get_error_msg_ex(c.raw, C.Z3_error_code(code)))
+	return C.GoString(C.Z3_get_error_msg(c.raw, C.Z3_error_code(code)))
 }
 
 //export goZ3ErrorHandler

model.go

@@ -1,6 +1,12 @@
 package z3
 
 // #include "go-z3.h"
+/*
+int _Z3_model_eval(Z3_context c, Z3_model m, Z3_ast t, int model_completion, Z3_ast * v) {
+  return Z3_model_eval(c, m, t, (bool) model_completion, v);
+}
+
+*/
 import "C"
 
 // Model represents a model from a solver.
@@ -34,7 +40,7 @@ func (m *Model) String() string {
 // Maps: Z3_model_eval
 func (m *Model) Eval(c *AST) *AST {
 	var result C.Z3_ast
-	if C.Z3_model_eval(m.rawCtx, m.rawModel, c.rawAST, C.Z3_TRUE, &result) != C.Z3_TRUE {
+	if C._Z3_model_eval(m.rawCtx, m.rawModel, c.rawAST, 1, &result) == 0 {
 		return nil
 	}
 

model_test.go

@@ -29,7 +29,7 @@ func TestModelAssignments(t *testing.T) {
 	// Solve
 	result := s.Check()
 	if result != True {
-		t.Fatalf("bad: %s", result)
+		t.Fatalf("bad: %v", result)
 	}
 
 	// Get the model
@@ -71,7 +71,7 @@ func TestModelEval(t *testing.T) {
 	// Solve
 	result := s.Check()
 	if result != True {
-		t.Fatalf("bad: %s", result)
+		t.Fatalf("bad: %v", result)
 	}
 
 	// Get the model

solver_test.go

@@ -29,7 +29,7 @@ func TestSolver(t *testing.T) {
 	// Solve
 	result := s.Check()
 	if result != True {
-		t.Fatalf("bad: %s", result)
+		t.Fatalf("bad: %v", result)
 	}
 
 	// Get the model