z3 0.0.20160221 → 0.0.20160323

data/lib/z3.rb

@@ -1,43 +1,33 @@
 module Z3
-  class <<self
-    def version
-      Z3::LowLevel.get_version.join(".")
-    end
-
-    def set_param(k,v)
-      Z3::LowLevel.global_param_set(k,v)
-    end
-  end
-end
-
-class Z3::Exception < StandardError
 end
 
+# Low level base classes, do not use directly
 require_relative "z3/very_low_level"
+require_relative "z3/very_low_level_auto"
 require_relative "z3/low_level"
+require_relative "z3/low_level_auto"
+
+# Classes
 require_relative "z3/context"
 require_relative "z3/solver"
-require_relative "z3/sort"
-require_relative "z3/ast"
 require_relative "z3/model"
+require_relative "z3/exception"
 require_relative "z3/func_decl"
 
-Z3::LowLevel.set_error_handler do |ctx, error|
-  error_codes_enum = %W[
-    Z3_OK
-    Z3_SORT_ERROR
-    Z3_IOB
-    Z3_INVALID_ARG
-    Z3_PARSER_ERROR
-    Z3_NO_PARSER
-    Z3_INVALID_PATTERN
-    Z3_MEMOUT_FAIL
-    Z3_FILE_ACCESS_ERROR
-    Z3_INTERNAL_FATAL
-    Z3_INVALID_USAGE
-    Z3_DEC_REF_ERROR
-    Z3_EXCEPTION
-  ]
-  error = error_codes_enum[error] || error
-  raise Z3::Exception, "Z3 library failed with error #{error}"
-end
+# Sorts
+require_relative "z3/sort/sort"
+require_relative "z3/sort/int_sort"
+require_relative "z3/sort/real_sort"
+require_relative "z3/sort/bool_sort"
+require_relative "z3/sort/bitvec_sort"
+
+# ASTs
+require_relative "z3/value/value"
+require_relative "z3/value/arith_value"
+require_relative "z3/value/int_value"
+require_relative "z3/value/real_value"
+require_relative "z3/value/bool_value"
+require_relative "z3/value/bitvec_value"
+
+# Python-style interface
+require_relative "z3/interface"

data/spec/integration/bit_tricks_spec.rb

@@ -0,0 +1,21 @@
+describe "Bit Tricks" do
+  let(:executable) { "#{__dir__}/../../examples/bit_tricks" }
+  it "can validate bit tricks" do
+    expect(IO.popen(executable).read.gsub(/ *$/, "")).to eq <<EOF
+Validating sign trick:
+Proven
+Validating sign trick:
+Proven
+Validating abs without branching, version 1
+Proven
+Validating abs without branching, version 2
+Proven
+Validating min without branching
+Proven
+Validating max without branching
+Proven
+Validating is power of two
+Proven
+EOF
+  end
+end

data/spec/model_spec.rb

@@ -1,9 +1,9 @@
 # Solver and Model specs are codependent, so half of functionality of each is tested in other class's tests
 describe Z3::Model do
   let(:solver) { Z3::Solver.new }
-  let(:a) { Z3::Ast.int("a") }
-  let(:b) { Z3::Ast.int("b") }
-  let(:c) { Z3::Ast.int("c") }
+  let(:a) { Z3.Int("a") }
+  let(:b) { Z3.Int("b") }
+  let(:c) { Z3.Int("c") }
   let(:model) { solver.model }
 
   it "knows how many variables are in the model" do
@@ -19,12 +19,12 @@ describe Z3::Model do
     solver.assert(a == 2)
     solver.assert(b == a+2)
     expect(solver.check).to eq(:sat)
-    expect(model.model_eval(a).inspect).to eq("Z3::Ast<2 :: Int>")
-    expect(model.model_eval(b).inspect).to eq("Z3::Ast<4 :: Int>")
-    expect(model.model_eval(c).inspect).to eq("Z3::Ast<c :: Int>")
-    expect(model.model_eval(a, true).inspect).to eq("Z3::Ast<2 :: Int>")
-    expect(model.model_eval(b, true).inspect).to eq("Z3::Ast<4 :: Int>")
-    expect(model.model_eval(c, true).inspect).to eq("Z3::Ast<0 :: Int>")
+    expect(model.model_eval(a).to_s).to eq("2")
+    expect(model.model_eval(b).to_s).to eq("4")
+    expect(model.model_eval(c).to_s).to eq("c")
+    expect(model.model_eval(a, true).to_s).to eq("2")
+    expect(model.model_eval(b, true).to_s).to eq("4")
+    expect(model.model_eval(c, true).to_s).to eq("0")
   end
 
   it "#to_s" do

data/spec/solver_spec.rb

@@ -1,8 +1,8 @@
 # Solver and Model specs are codependent, so half of functionality of each is tested in other class's tests
 describe Z3::Solver do
   let(:solver) { Z3::Solver.new }
-  let(:a) { Z3::Ast.int("a") }
-  let(:b) { Z3::Ast.int("b") }
+  let(:a) { Z3.Int("a") }
+  let(:b) { Z3.Int("b") }
 
   it "basic functionality" do
     solver.assert(a == b)

data/spec/sort_spec.rb

@@ -1,22 +1,47 @@
 describe Z3::Sort do
-  it "#bool creates Bool sort" do
-    expect(Z3::Sort.bool.to_s).to eq("Bool")
-    expect(Z3::Sort.bool.inspect).to eq("Z3::Sort<Bool>")
+  let(:bool_sort) { Z3::BoolSort.new }
+  let(:int_sort)  { Z3::IntSort.new }
+  let(:real_sort) { Z3::RealSort.new }
+  let(:bv8_sort)  { Z3::BitvecSort.new(8) }
+  let(:bv32_sort) { Z3::BitvecSort.new(32) }
+
+  let(:sorts) { [bool_sort, int_sort, real_sort, bv8_sort, bv32_sort] }
+
+  it "can't instantiate Sort abstract superclass" do
+    expect{ Z3::Sort.new }.to raise_error(NoMethodError)
   end
 
-  it "#int creates Int sort" do
-    expect(Z3::Sort.int.to_s).to eq("Int")
-    expect(Z3::Sort.int.inspect).to eq("Z3::Sort<Int>")
+  it "#to_s" do
+    expect(bool_sort.to_s).to eq("Bool")
+    expect( int_sort.to_s).to eq("Int")
+    expect(real_sort.to_s).to eq("Real")
+    expect( bv8_sort.to_s).to eq("Bitvec(8)")
+    expect(bv32_sort.to_s).to eq("Bitvec(32)")
   end
 
-  it "#real creates Real sort" do
-    expect(Z3::Sort.real.to_s).to eq("Real")
-    expect(Z3::Sort.real.inspect).to eq("Z3::Sort<Real>")
+  it "#inspect" do
+    expect(bool_sort.inspect).to eq("BoolSort")
+    expect( int_sort.inspect).to eq("IntSort")
+    expect(real_sort.inspect).to eq("RealSort")
+    expect( bv8_sort.inspect).to eq("BitvecSort(8)")
+    expect(bv32_sort.inspect).to eq("BitvecSort(32)")
   end
 
-  it "supports ==" do
-    expect(Z3::Sort.bool).to eq(Z3::Sort.bool)
-    expect(Z3::Sort.int).to eq(Z3::Sort.int)
-    expect(Z3::Sort.bool).to_not eq(Z3::Sort.int)
+  describe "==" do
+    it "all Sorts are value-objects" do
+      expect(bool_sort).to eq( Z3::BoolSort.new )
+      expect( int_sort).to eq( Z3::IntSort.new )
+      expect(real_sort).to eq( Z3::RealSort.new )
+      expect( bv8_sort).to eq( Z3::BitvecSort.new(8) )
+      expect(bv32_sort).to eq( Z3::BitvecSort.new(32) )
+    end
+
+    it "is == to itself and no other sort" do
+      sorts.each do |sort1|
+        sorts.each do |sort2|
+          expect(sort1 == sort2).to eq(sort1.to_s == sort2.to_s)
+        end
+      end
+    end
   end
 end

data/spec/{ast_spec.rb → value_spec.rb}

@@ -1,15 +1,15 @@
-describe Z3::Ast do
-  let(:a) { Z3::Ast.int("a") }
-  let(:b) { Z3::Ast.int("b") }
-  let(:c) { Z3::Ast.bool("c") }
-  let(:d) { Z3::Ast.bool("d") }
-  let(:e) { Z3::Ast.real("e") }
-  let(:f) { Z3::Ast.real("f") }
+describe Z3::Value do
+  let(:a) { Z3.Int("a") }
+  let(:b) { Z3.Int("b") }
+  let(:c) { Z3.Bool("c") }
+  let(:d) { Z3.Bool("d") }
+  let(:e) { Z3.Real("e") }
+  let(:f) { Z3.Real("f") }
 
   it "#sort returns Sort object" do
-    expect(a.sort).to eq(Z3::Sort.int)
-    expect(c.sort).to eq(Z3::Sort.bool)
-    expect(e.sort).to eq(Z3::Sort.real)
+    expect(a.sort).to eq(Z3::IntSort.new)
+    expect(c.sort).to eq(Z3::BoolSort.new)
+    expect(e.sort).to eq(Z3::RealSort.new)
   end
 
   it "#to_s" do
@@ -17,8 +17,8 @@ describe Z3::Ast do
   end
 
   it "#inspect" do
-    expect(a.inspect).to eq("Z3::Ast<a :: Int>")
-    expect((e+f).inspect).to eq("Z3::Ast<(+ e f) :: Real>")
+    expect(a.inspect).to eq("Value<a :: Int>")
+    expect((e+f).inspect).to eq("Value<(+ e f) :: Real>")
   end
 
   describe "#~" do
@@ -27,8 +27,8 @@ describe Z3::Ast do
     end
 
     it "raises exception if type cast is not possible" do
-      expect{~a}.to raise_error(Z3::Exception)
-      expect{~e}.to raise_error(Z3::Exception)
+      expect{~a}.to raise_error(NoMethodError)
+      expect{~e}.to raise_error(NoMethodError)
     end
   end
 
@@ -38,12 +38,12 @@ describe Z3::Ast do
     end
 
     it "raises exception if type cast is not possible" do
-      expect{a&b}.to raise_error(Z3::Exception)
-      expect{e&f}.to raise_error(Z3::Exception)
-      expect{a&c}.to raise_error(Z3::Exception)
-      expect{e&c}.to raise_error(Z3::Exception)
-      expect{c&a}.to raise_error(Z3::Exception)
-      expect{c&e}.to raise_error(Z3::Exception)
+      expect{a&b}.to raise_error(NoMethodError)
+      expect{e&f}.to raise_error(NoMethodError)
+      expect{a&c}.to raise_error(NoMethodError)
+      expect{e&c}.to raise_error(NoMethodError)
+      expect{c&a}.to raise_error(ArgumentError)
+      expect{c&e}.to raise_error(ArgumentError)
     end
   end
 
@@ -53,12 +53,12 @@ describe Z3::Ast do
     end
 
     it "raises exception if type cast is not possible" do
-      expect{a|b}.to raise_error(Z3::Exception)
-      expect{e|f}.to raise_error(Z3::Exception)
-      expect{a|c}.to raise_error(Z3::Exception)
-      expect{e|c}.to raise_error(Z3::Exception)
-      expect{c|a}.to raise_error(Z3::Exception)
-      expect{c|e}.to raise_error(Z3::Exception)
+      expect{a|b}.to raise_error(NoMethodError)
+      expect{e|f}.to raise_error(NoMethodError)
+      expect{a|c}.to raise_error(NoMethodError)
+      expect{e|c}.to raise_error(NoMethodError)
+      expect{c|a}.to raise_error(ArgumentError)
+      expect{c|e}.to raise_error(ArgumentError)
     end
   end
 
@@ -83,17 +83,20 @@ describe Z3::Ast do
       end
 
       it "raises exception if type cast is not possible" do
-        expect{a.send op, c}.to raise_error(Z3::Exception)
-        expect{c.send op, a}.to raise_error(Z3::Exception)
-        expect{e.send op, c}.to raise_error(Z3::Exception)
-        expect{c.send op, e}.to raise_error(Z3::Exception)
-        expect{c.send op, d}.to raise_error(Z3::Exception)
-        expect{a.send op, true}.to raise_error(Z3::Exception)
-        expect{c.send op, true}.to raise_error(Z3::Exception)
-        expect{e.send op, true}.to raise_error(Z3::Exception)
-        expect{a.send op, false}.to raise_error(Z3::Exception)
-        expect{c.send op, false}.to raise_error(Z3::Exception)
-        expect{e.send op, false}.to raise_error(Z3::Exception)
+        # Int/Real has #>= #+ etc. but they don't like these arguments
+        expect{a.send op, c}.to raise_error(ArgumentError)
+        expect{e.send op, c}.to raise_error(ArgumentError)
+        expect{a.send op, true}.to raise_error(ArgumentError)
+        expect{a.send op, false}.to raise_error(ArgumentError)
+        expect{e.send op, true}.to raise_error(ArgumentError)
+        expect{e.send op, false}.to raise_error(ArgumentError)
+
+        # Bool doesn't have #>= #+ etc.
+        expect{c.send op, a}.to raise_error(NoMethodError)
+        expect{c.send op, d}.to raise_error(NoMethodError)
+        expect{c.send op, e}.to raise_error(NoMethodError)
+        expect{c.send op, true}.to raise_error(NoMethodError)
+        expect{c.send op, false}.to raise_error(NoMethodError)
       end
     end
   end
@@ -121,16 +124,16 @@ describe Z3::Ast do
     end
 
     it "raises exception if type cast is not possible" do
-      expect{a == c}.to raise_error(Z3::Exception)
-      expect{e == c}.to raise_error(Z3::Exception)
-      expect{a == true}.to raise_error(Z3::Exception)
-      expect{e == true}.to raise_error(Z3::Exception)
-      # expect{true == a}.to raise_error(Z3::Exception)
-      # expect{true == e}.to raise_error(Z3::Exception)
-      expect{c == 42}.to raise_error(Z3::Exception)
-      expect{c == 42.5}.to raise_error(Z3::Exception)
-      expect{42 == c}.to raise_error(Z3::Exception)
-      expect{42.5 == c}.to raise_error(Z3::Exception)
+      expect{a == c}.to raise_error(ArgumentError)
+      expect{e == c}.to raise_error(ArgumentError)
+      expect{a == true}.to raise_error(ArgumentError)
+      expect{e == true}.to raise_error(ArgumentError)
+      # expect{true == a}.to raise_error(ArgumentError)
+      # expect{true == e}.to raise_error(ArgumentError)
+      expect{c == 42}.to raise_error(ArgumentError)
+      expect{c == 42.5}.to raise_error(ArgumentError)
+      expect{42 == c}.to raise_error(ArgumentError)
+      expect{42.5 == c}.to raise_error(ArgumentError)
     end
   end
 
@@ -157,16 +160,16 @@ describe Z3::Ast do
     end
 
     it "raises exception if type cast is not possible" do
-      expect{a != c}.to raise_error(Z3::Exception)
-      expect{e != c}.to raise_error(Z3::Exception)
-      expect{a != true}.to raise_error(Z3::Exception)
-      expect{e != true}.to raise_error(Z3::Exception)
-      # expect{true != a}.to raise_error(Z3::Exception)
-      # expect{true != e}.to raise_error(Z3::Exception)
-      expect{c != 42}.to raise_error(Z3::Exception)
-      expect{c != 42.5}.to raise_error(Z3::Exception)
-      # expect{42 != c}.to raise_error(Z3::Exception)
-      # expect{42.5 != c}.to raise_error(Z3::Exception)
+      expect{a != c}.to raise_error(ArgumentError)
+      expect{e != c}.to raise_error(ArgumentError)
+      expect{a != true}.to raise_error(ArgumentError)
+      expect{e != true}.to raise_error(ArgumentError)
+      # expect{true != a}.to raise_error(ArgumentError)
+      # expect{true != e}.to raise_error(ArgumentError)
+      expect{c != 42}.to raise_error(ArgumentError)
+      expect{c != 42.5}.to raise_error(ArgumentError)
+      # expect{42 != c}.to raise_error(ArgumentError)
+      # expect{42.5 != c}.to raise_error(ArgumentError)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z3
 version: !ruby/object:Gem::Version
-  version: 0.0.20160221
+  version: 0.0.20160323
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -34,7 +34,10 @@ files:
 - examples/algebra_problems
 - examples/basic_int_math
 - examples/basic_logic
+- examples/bit_tricks
 - examples/bridges_solver
+- examples/clogic_puzzle_solver
+- examples/four_hackers_puzzle
 - examples/geometry_problem
 - examples/kakuro_solver
 - examples/kinematics_problems
@@ -45,20 +48,31 @@ files:
 - examples/sudoku_solver
 - examples/verbal_arithmetic
 - lib/z3.rb
-- lib/z3/ast.rb
 - lib/z3/context.rb
+- lib/z3/exception.rb
 - lib/z3/func_decl.rb
+- lib/z3/interface.rb
 - lib/z3/low_level.rb
 - lib/z3/low_level_auto.rb
 - lib/z3/model.rb
 - lib/z3/solver.rb
-- lib/z3/sort.rb
+- lib/z3/sort/bitvec_sort.rb
+- lib/z3/sort/bool_sort.rb
+- lib/z3/sort/int_sort.rb
+- lib/z3/sort/real_sort.rb
+- lib/z3/sort/sort.rb
+- lib/z3/value/arith_value.rb
+- lib/z3/value/bitvec_value.rb
+- lib/z3/value/bool_value.rb
+- lib/z3/value/int_value.rb
+- lib/z3/value/real_value.rb
+- lib/z3/value/value.rb
 - lib/z3/very_low_level.rb
 - lib/z3/very_low_level_auto.rb
-- spec/ast_spec.rb
 - spec/integration/algebra_problems_spec.rb
-- spec/integration/bagic_int_math_spec.rb
+- spec/integration/basic_int_math_spec.rb
 - spec/integration/basic_logic_spec.rb
+- spec/integration/bit_tricks_spec.rb
 - spec/integration/bridges_spec.rb
 - spec/integration/geometry_problem_spec.rb
 - spec/integration/kakuro_spec.rb
@@ -73,6 +87,7 @@ files:
 - spec/solver_spec.rb
 - spec/sort_spec.rb
 - spec/spec_helper.rb
+- spec/value_spec.rb
 - spec/z3_spec.rb
 homepage: https://github.com/taw/z3
 licenses: