disable dotnet in ci script. It seems to get turned on even if dotnet bindings are not requested

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

contrib/ci/scripts/build_z3_cmake.sh

@@ -78,17 +78,17 @@ else
 fi
 
 # .NET bindings?
-if [ "X${DOTNET_BINDINGS}" = "X1" ]; then
+#if [ "X${DOTNET_BINDINGS}" = "X1" ]; then
-  ADDITIONAL_Z3_OPTS+=( \
+#  ADDITIONAL_Z3_OPTS+=( \
-    '-DBUILD_DOTNET_BINDINGS=ON' \
+#    '-DBUILD_DOTNET_BINDINGS=ON' \
-    '-DINSTALL_DOTNET_BINDINGS=ON' \
+#    '-DINSTALL_DOTNET_BINDINGS=ON' \
-  )
+#  )
-else
+#else
-  ADDITIONAL_Z3_OPTS+=( \
+#  ADDITIONAL_Z3_OPTS+=( \
-    '-DBUILD_DOTNET_BINDINGS=OFF' \
+#    '-DBUILD_DOTNET_BINDINGS=OFF' \
-    '-DINSTALL_DOTNET_BINDINGS=OFF' \
+#    '-DINSTALL_DOTNET_BINDINGS=OFF' \
-  )
+#  )
-fi
+#fi
 
 # Java bindings?
 if [ "X${JAVA_BINDINGS}" = "X1" ]; then

src/api/python/z3/z3.py

@@ -2176,6 +2176,8 @@ class ArithRef(ExprRef):
         >>> (x * y).sort()
         Real
         """
+        if isinstance(other, BoolRef):
+           return If(other, self, 0)
         a, b = _coerce_exprs(self, other)
         return ArithRef(_mk_bin(Z3_mk_mul, a, b), self.ctx)
 

src/smt/smt_farkas_util.cpp

@@ -312,6 +312,13 @@ namespace smt {
     }
     
     expr_ref farkas_util::get() {
+        TRACE("arith", 
+              for (unsigned i = 0; i < m_coeffs.size(); ++i) {
+                  tout << m_coeffs[i] << " * (" << mk_pp(m_ineqs[i].get(), m) << ") ";
+              }
+              tout << "\n";
+              );
+
         m_normalize_factor = rational::one();
         expr_ref res(m);
         if (m_coeffs.empty()) {
@@ -330,13 +337,12 @@ namespace smt {
             partition_ineqs();
             expr_ref_vector lits(m);
             unsigned lo = 0;
-            for (unsigned i = 0; i < m_his.size(); ++i) {
+            for (unsigned hi : m_his) {
-                unsigned hi = m_his[i];
                 lits.push_back(extract_consequence(lo, hi));
                 lo = hi;
             }
             bool_rewriter(m).mk_or(lits.size(), lits.c_ptr(), res);
-            IF_VERBOSE(2, { if (lits.size() > 1) { verbose_stream() << "combined lemma: " << mk_pp(res, m) << "\n"; } });
+            IF_VERBOSE(2, { if (lits.size() > 1) { verbose_stream() << "combined lemma: " << res << "\n"; } });
         }
         else {
             res = extract_consequence(0, m_coeffs.size());

src/test/pb2bv.cpp

@@ -18,6 +18,7 @@ Copyright (c) 2015 Microsoft Corporation
 #include "ast/rewriter/th_rewriter.h"
 #include "tactic/fd_solver/fd_solver.h"
 #include "solver/solver.h"
+#include "ast/arith_decl_plugin.h"
 
 static void test1() {
     ast_manager m;
@@ -194,9 +195,20 @@ static void test3() {
     }
 }
 
+static void test4() {
+    ast_manager m;
+    reg_decl_plugins(m);
+    arith_util arith(m);
+    expr_ref a(m.mk_const(symbol("a"), arith.mk_int()), m);
+    expr_ref b(m.mk_const(symbol("b"), arith.mk_int()), m);
+    expr_ref eq(m.mk_eq(a,b), m);
+    std::cout << "is_atom: " << is_atom(m, eq) << "\n";
+}
+
 void tst_pb2bv() {
     test1();
     test2();
     test3();
+    test4();
 }