More fixes for python interface

diff --git a/src/expr/expr.i b/src/expr/expr.i
index b50686f522b32c3e8e1418651de7a8686345563c..ae8b85560f8765a1de8eefc23265821303614580 100644 (file)
--- a/src/expr/expr.i
+++ b/src/expr/expr.i
@@ -130,7 +130,14 @@ namespace CVC4 {
 
 %include "expr/expr.h"
 
+#ifdef SWIGPYTHON
+/* The python bindings on Mac OS X have trouble with this one - leave it
+ * out for now. */
+*/
+//%template(getConstTypeConstant) CVC4::Expr::getConst<CVC4::TypeConstant>;
+#else
 %template(getConstTypeConstant) CVC4::Expr::getConst<CVC4::TypeConstant>;
+#endif
 %template(getConstArrayStoreAll) CVC4::Expr::getConst<CVC4::ArrayStoreAll>;
 %template(getConstBitVectorSize) CVC4::Expr::getConst<CVC4::BitVectorSize>;
 %template(getConstAscriptionType) CVC4::Expr::getConst<CVC4::AscriptionType>;

diff --git a/src/expr/expr_manager.i b/src/expr/expr_manager.i
index 0158df3bdd19971d3764632395e9c696d21d3fd6..11c1e284d556f4e5aea7c3a674e774035c233f71 100644 (file)
--- a/src/expr/expr_manager.i
+++ b/src/expr/expr_manager.i
@@ -40,7 +40,6 @@
 
 %include "expr/expr_manager.h"
 
-%template(mkConst) CVC4::ExprManager::mkConst<CVC4::TypeConstant>;
 %template(mkConst) CVC4::ExprManager::mkConst<CVC4::ArrayStoreAll>;
 %template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVectorSize>;
 %template(mkConst) CVC4::ExprManager::mkConst<CVC4::AscriptionType>;
@@ -83,15 +82,17 @@
 %template(mkBoolConst) CVC4::ExprManager::mkConst<bool>;
 
 // These cases have trouble too.  Remove them for now.
+//%template(mkConst) CVC4::ExprManager::mkConst<CVC4::TypeConstant>;
 //%template(mkConst) CVC4::ExprManager::mkConst<CVC4::TupleSelect>;
 //%template(mkConst) CVC4::ExprManager::mkConst<CVC4::Record>;
 //%template(mkConst) CVC4::ExprManager::mkConst<CVC4::RecordSelect>;
 
 #else
-%template(mkConst) CVC4::ExprManager::mkConst<bool>;             %template(mkConst) CVC4::ExprManager::mkConst<bool>;
+%template(mkConst) CVC4::ExprManager::mkConst<CVC4::TypeConstant>;
 %template(mkConst) CVC4::ExprManager::mkConst<CVC4::TupleSelect>;
 %template(mkConst) CVC4::ExprManager::mkConst<CVC4::Record>;
 %template(mkConst) CVC4::ExprManager::mkConst<CVC4::RecordSelect>;
+%template(mkConst) CVC4::ExprManager::mkConst<bool>;
 #endif
 
 %include "expr/expr_manager.h"