z3 0.0.20211213 → 0.0.20220630

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c73d508e9644e0c32681754a8f33959bc54d838c21d13f896223225e8b275a76
-  data.tar.gz: 12e017b721b97aaec2d8e1a75145f0c5d3f0769eee2badc89e08e2b0ff11fef1
+  metadata.gz: a9289c94f0a177c8e59d2c18c65775344414bb3558151ac58fc02e932b3a7eb1
+  data.tar.gz: 3171e750dc3a36d1534ffc0c069274ff8bc7bc4d59d15e6792add5c4ab5f90b6
 SHA512:
-  metadata.gz: d4993e91a238ad4e1c70e78bfe12301e1bd83759d9ad610fca64f89267868b9c8959c6e51ba98f175836235702c66f9cde8b19d73ddcd2cb760da75aed1f564d
-  data.tar.gz: cca1389567fb61df3d4dc2fa6281b833edcc3c3a2c5872fec2b71089c9f9c927ba0d3e2d164127d5be167c2bb1cc4fd86f2360718631e0a8fbc473bda68ec90b
+  metadata.gz: d19511280987279176db440a5c5f3764d9029b49c74185c32cbf3dd01e6f02bcefa92b5800b24d4e872f052cb40a8daddf756783c81f3fdb63055d1be950b119
+  data.tar.gz: '09eedf827d3dfae3c56fd6d1c165160cdb5e3aeab0e2faae429dd81da91b7eaafd6640a6f28ed2a1b45e8a3a3c3e12a03d38327e86ac497b69e974e5f431cee6'

data/lib/z3/expr/bitvec_expr.rb

@@ -49,11 +49,31 @@ module Z3
     end
 
     def /(other)
-      raise "Use signed_div or unsigned_div"
+      raise Z3::Exception, "Use signed_div or unsigned_div"
+    end
+
+    def signed_div(other)
+      BitvecExpr.SignedDiv(self, other)
+    end
+
+    def unsigned_div(other)
+      BitvecExpr.UnsignedDiv(self, other)
     end
 
     def %(other)
-      raise "Use signed_mod or signed_rem or unsigned_rem"
+      raise Z3::Exception, "Use signed_mod or signed_rem or unsigned_rem"
+    end
+
+    def signed_mod(other)
+      BitvecExpr.SignedMod(self, other)
+    end
+
+    def signed_rem(other)
+      BitvecExpr.SignedRem(self, other)
+    end
+
+    def unsigned_rem(other)
+      BitvecExpr.UnsignedRem(self, other)
     end
 
     def rotate_left(num)
@@ -257,6 +277,31 @@ module Z3
         a.sort.new(LowLevel.mk_bvshl(a, b))
       end
 
+      def SignedDiv(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvsdiv(a, b))
+      end
+
+      def UnsignedDiv(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvudiv(a, b))
+      end
+
+      def SignedMod(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvsmod(a, b))
+      end
+
+      def SignedRem(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvsrem(a, b))
+      end
+
+      def UnsignedRem(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvurem(a, b))
+      end
+
       def Xnor(*args)
         args = coerce_to_same_bv_sort(*args)
         args.inject do |a,b|

data/lib/z3/optimize.rb

@@ -3,7 +3,6 @@ module Z3
     attr_reader :_optimize
 
     def initialize
-      raise Z3::Exception, "This is known to crash in Z3 4.8.13"
       @_optimize = LowLevel.mk_optimize
       LowLevel.optimize_inc_ref(self)
       reset_model!

data/lib/z3/very_low_level.rb

@@ -4,7 +4,7 @@ require "ffi"
 module Z3
   module VeryLowLevel
     extend FFI::Library
-    ffi_lib ["libz3.so.4.8", "libz3.so", "z3"]
+    ffi_lib ["libz3.so.4.8", "libz3.so", "z3", "libz3"]
 
     class << self
       # Aliases defined just to make APIs below look nicer

data/spec/bitvec_expr_spec.rb

@@ -36,6 +36,19 @@ module Z3
       expect([a == 30, b == 42, c == (a * b)]).to have_solution(c => 236)
     end
 
+    it "/" do
+      expect{ a / b }.to raise_error(Z3::Exception)
+      expect([a == 200, b == 20, c == a.unsigned_div(b)]).to have_solution(c => 10)
+      expect([a == 200, b == 20, c == a.signed_div(b)]).to have_solution(c => 254)
+    end
+
+    it "%" do
+      expect{ a % b }.to raise_error(Z3::Exception)
+      expect([a == 200, b == 20, c == a.signed_mod(b)]).to have_solution(c => 4)
+      expect([a == 200, b == 20, c == a.signed_rem(b)]).to have_solution(c => 240)
+      expect([a == 200, b == 20, c == a.unsigned_rem(b)]).to have_solution(c => 0)
+    end
+
     it "&" do
       expect([a == 50, b == 27, c == (a & b)]).to have_solution(c => 18)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z3
 version: !ruby/object:Gem::Version
-  version: 0.0.20211213
+  version: 0.0.20220630
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -331,7 +331,8 @@ files:
 homepage: https://github.com/taw/z3
 licenses:
 - MIT
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: z3
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -348,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - z3 library (4.8+)
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Z3 Constraint Solver