rdl 2.0.1 → 2.1.0

data/test/test_types.rb

@@ -11,13 +11,13 @@ class TestTypes < Minitest::Test
 
   def test_nil_top
     tnil = NominalType.new :NilClass
-    assert_equal $__rdl_nil_type, tnil
+    assert_equal RDL::Globals.types[:nil], tnil
     tnil2 = SingletonType.new nil
-    assert_equal $__rdl_nil_type, tnil2
+    assert_equal RDL::Globals.types[:nil], tnil2
     ttop = TopType.new
     ttop2 = TopType.new
     assert_equal ttop, ttop2
-    assert ($__rdl_nil_type != ttop)
+    assert (RDL::Globals.types[:nil] != ttop)
   end
 
   def test_nominal
@@ -63,31 +63,31 @@ class TestTypes < Minitest::Test
     assert_equal 2, t1.types.length
     t2 = c.new tb, ta
     assert_equal t1, t2
-    t3 = c.new $__rdl_top_type, $__rdl_top_type
-    assert_equal t3, $__rdl_top_type
-    t4 = c.new $__rdl_top_type, $__rdl_nil_type, $__rdl_top_type, $__rdl_nil_type
-    assert_equal t4, $__rdl_top_type
-    t5 = c.new $__rdl_nil_type, $__rdl_nil_type
-    assert_equal t5, $__rdl_nil_type
-    t6 = c.new ta, tb, tc
-    assert_equal 3, t6.types.length
-    t7 = c.new ta, (c.new tb, tc)
-    assert_equal t6, t7
-    t8 = c.new (c.new tc, tb), (c.new ta)
-    assert_equal t6, t8
-    assert (t1 != $__rdl_nil_type)
+    t3 = c.new RDL::Globals.types[:top], RDL::Globals.types[:top]
+    assert_equal RDL::Globals.types[:top], t3
+    t4 = c.new RDL::Globals.types[:nil], RDL::Globals.types[:nil]
+    assert_equal RDL::Globals.types[:nil], t4
+    t5 = c.new ta, tb, tc
+    assert_equal 3, t5.types.length
+    t6 = c.new ta, (c.new tb, tc)
+    assert_equal t5, t6
+    t7 = c.new (c.new tc, tb), (c.new ta)
+    assert_equal t5, t7
+    assert (t1 != RDL::Globals.types[:nil])
   end
 
   def test_union_intersection
     u_or_i UnionType
     u_or_i IntersectionType
+    t = UnionType.new RDL::Globals.types[:top], RDL::Globals.types[:nil], RDL::Globals.types[:top], RDL::Globals.types[:nil]
+    assert_equal RDL::Globals.types[:top], t
   end
 
   def test_optional
     ta = NominalType.new :A
-    t1 = OptionalType.new $__rdl_nil_type
-    assert_equal $__rdl_nil_type, t1.type
-    t2 = OptionalType.new $__rdl_nil_type
+    t1 = OptionalType.new RDL::Globals.types[:nil]
+    assert_equal RDL::Globals.types[:nil], t1.type
+    t2 = OptionalType.new RDL::Globals.types[:nil]
     assert_equal t1, t2
     t3 = OptionalType.new ta
     assert (t1 != t3)
@@ -95,9 +95,9 @@ class TestTypes < Minitest::Test
 
   def test_vararg
     ta = NominalType.new :A
-    t1 = VarargType.new $__rdl_nil_type
-    assert_equal $__rdl_nil_type, t1.type
-    t2 = VarargType.new $__rdl_nil_type
+    t1 = VarargType.new RDL::Globals.types[:nil]
+    assert_equal RDL::Globals.types[:nil], t1.type
+    t2 = VarargType.new RDL::Globals.types[:nil]
     assert_equal t1, t2
     t3 = VarargType.new ta
     assert (t1 != t3)
@@ -107,11 +107,11 @@ class TestTypes < Minitest::Test
     ta = NominalType.new :A
     tb = NominalType.new :B
     tc = NominalType.new :C
-    t1 = MethodType.new [ta, tb, tc], nil, $__rdl_nil_type
+    t1 = MethodType.new [ta, tb, tc], nil, RDL::Globals.types[:nil]
     assert_equal [ta, tb, tc], t1.args
     assert_nil t1.block
-    assert_equal $__rdl_nil_type, t1.ret
-    t2 = MethodType.new [$__rdl_nil_type], t1, $__rdl_nil_type
+    assert_equal RDL::Globals.types[:nil], t1.ret
+    t2 = MethodType.new [RDL::Globals.types[:nil]], t1, RDL::Globals.types[:nil]
     assert_equal t1, t2.block
   end
 
@@ -136,7 +136,7 @@ class TestTypes < Minitest::Test
     ta = NominalType.new :A
     tb = NominalType.new :B
     tc = NominalType.new :C
-    tm1 = MethodType.new [ta, tb, tc], nil, $__rdl_nil_type
+    tm1 = MethodType.new [ta, tb, tc], nil, RDL::Globals.types[:nil]
     tm2 = MethodType.new [ta], tm1, tb
     t1 = StructuralType.new(m1: tm1, m2: tm2)
     assert_equal tm1, t1.methods[:m1]
@@ -166,7 +166,7 @@ class TestTypes < Minitest::Test
     tinterAB = IntersectionType.new(tA, tB)
     tsyma = SingletonType.new(:a)
     tstring = NominalType.new :String
-    tfixnum = NominalType.new :Fixnum
+    tinteger = NominalType.new :Integer
     ta = VarType.new :a
     tb = VarType.new :b
     tc = VarType.new :c
@@ -174,28 +174,28 @@ class TestTypes < Minitest::Test
     thash = NominalType.new :Hash
     thashAB = GenericType.new(thash, tA, tB)
     thashab = GenericType.new(thash, ta, tb)
-    thashstringfixnum = GenericType.new(thash, tstring, tfixnum)
-    inst = {a: tstring, b: tfixnum, d: tsyma}
+    thashstringfixnum = GenericType.new(thash, tstring, tinteger)
+    inst = {a: tstring, b: tinteger, d: tsyma}
     ttupleAB = TupleType.new(tA, tB)
     ttupleab = TupleType.new(ta, tb)
-    ttuplestringfixnum = TupleType.new(tstring, tfixnum)
+    ttuplestringfixnum = TupleType.new(tstring, tinteger)
     tfinitehashaAbB = FiniteHashType.new({a: tA, b: tB}, nil)
     tfinitehashaabb = FiniteHashType.new({a: ta, b: tb}, nil)
-    tfinitehashastringbfixnum = FiniteHashType.new({a: tstring, b: tfixnum}, nil)
+    tfinitehashastringbfixnum = FiniteHashType.new({a: tstring, b: tinteger}, nil)
     tfinitehashaabbrd = FiniteHashType.new({a: ta, b: tb}, td)
-    tfinitehashastringbfixnumrsyma = FiniteHashType.new({a: tstring, b: tfixnum}, tsyma)
+    tfinitehashastringbfixnumrsyma = FiniteHashType.new({a: tstring, b: tinteger}, tsyma)
     tmethAAB = MethodType.new([tA, tA], nil, tB)
     tmethaab = MethodType.new([ta, ta], nil, tb)
-    tmethstringstringfixnum = MethodType.new([tstring, tstring], nil, tfixnum)
-    tmethbAABn = MethodType.new([], tmethAAB, $__rdl_nil_type)
-    tmethbaabn = MethodType.new([], tmethaab, $__rdl_nil_type)
-    tmethbssfn = MethodType.new([], tmethstringstringfixnum, $__rdl_nil_type)
+    tmethstringstringfixnum = MethodType.new([tstring, tstring], nil, tinteger)
+    tmethbAABn = MethodType.new([], tmethAAB, RDL::Globals.types[:nil])
+    tmethbaabn = MethodType.new([], tmethaab, RDL::Globals.types[:nil])
+    tmethbssfn = MethodType.new([], tmethstringstringfixnum, RDL::Globals.types[:nil])
     tstructorig = StructuralType.new(m1: tmethAAB, m2: tmethaab,
                                      m3: tmethbAABn, m4: tmethbaabn)
     tstructinst = StructuralType.new(m1: tmethAAB, m2: tmethstringstringfixnum,
                                      m3: tmethbAABn, m4: tmethbssfn)
-    assert_equal $__rdl_nil_type, $__rdl_nil_type.instantiate(inst)
-    assert_equal $__rdl_top_type, $__rdl_top_type.instantiate(inst)
+    assert_equal RDL::Globals.types[:nil], RDL::Globals.types[:nil].instantiate(inst)
+    assert_equal RDL::Globals.types[:top], RDL::Globals.types[:top].instantiate(inst)
     assert_equal tA, tA.instantiate(inst)
     assert_equal toptionalA, toptionalA.instantiate(inst)
     assert_equal tvarargA, tvarargA.instantiate(inst)
@@ -205,7 +205,7 @@ class TestTypes < Minitest::Test
     assert_equal tinterAB, tinterAB.instantiate(inst)
     assert_equal tsyma, tsyma.instantiate(inst)
     assert_equal tstring, ta.instantiate(inst)
-    assert_equal tfixnum, tb.instantiate(inst)
+    assert_equal tinteger, tb.instantiate(inst)
     assert_equal tc, tc.instantiate(inst)
     assert_equal thashAB, thashAB.instantiate(inst)
     assert_equal thashstringfixnum, thashab.instantiate(inst)

data/test/test_wrap.rb

@@ -3,6 +3,7 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 require 'rdl'
 
 class TestWrap < Minitest::Test
+  extend RDL::Annotate
   class C
     def foo_public(x)
       foo(x)
@@ -16,7 +17,7 @@ class TestWrap < Minitest::Test
   end
 
   def test_private_wrap
-    type C, :foo, '(Fixnum) -> Fixnum'
+    RDL.type C, :foo, '(Integer) -> Integer'
     c = C.new
 
     assert_raises RDL::Type::TypeError do
@@ -37,7 +38,7 @@ class TestWrap < Minitest::Test
   end
 
   def test_protected_wrap
-    type D, :foo, '(Fixnum) -> Fixnum'
+    RDL.type D, :foo, '(Integer) -> Integer'
     d = D.new
 
     assert_raises RDL::Type::TypeError do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdl
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeffrey S. Foster
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -52,64 +52,7 @@ files:
 - README.md
 - Rakefile
 - bin/rdl_query
-- extras/type_tests/%.rb
-- extras/type_tests/&.rb
-- extras/type_tests/**.rb
-- extras/type_tests/*.rb
-- extras/type_tests/+.rb
-- extras/type_tests/-.rb
-- extras/type_tests/1scomp.rb
-- extras/type_tests/<.rb
-- extras/type_tests/<<.rb
-- extras/type_tests/>>.rb
-- extras/type_tests/[].rb
-- extras/type_tests/^.rb
-- extras/type_tests/abs.rb
-- extras/type_tests/abs2.rb
-- extras/type_tests/angle.rb
-- extras/type_tests/arg.rb
-- extras/type_tests/bit_length.rb
-- extras/type_tests/ceil.rb
-- extras/type_tests/ceilRational.rb
-- extras/type_tests/conj.rb
-- extras/type_tests/defwhere.rb
-- extras/type_tests/denominator.rb
-- extras/type_tests/div.rb
-- extras/type_tests/divslash.rb
-- extras/type_tests/even?.rb
-- extras/type_tests/fdiv.rb
-- extras/type_tests/finite?.rb
-- extras/type_tests/floor.rb
-- extras/type_tests/floorRational.rb
-- extras/type_tests/hash.rb
-- extras/type_tests/imag.rb
-- extras/type_tests/infinite?.rb
-- extras/type_tests/modulo.rb
-- extras/type_tests/nan?.rb
-- extras/type_tests/neg.rb
-- extras/type_tests/next.rb
-- extras/type_tests/next_float.rb
-- extras/type_tests/numerator.rb
-- extras/type_tests/phase.rb
-- extras/type_tests/prev_float.rb
-- extras/type_tests/quo.rb
-- extras/type_tests/rationalize.rb
-- extras/type_tests/rationalizeArg.rb
-- extras/type_tests/real.rb
-- extras/type_tests/real?.rb
-- extras/type_tests/round.rb
-- extras/type_tests/roundArg.rb
-- extras/type_tests/size.rb
-- extras/type_tests/to_c.rb
-- extras/type_tests/to_f.rb
-- extras/type_tests/to_i.rb
-- extras/type_tests/to_r.rb
-- extras/type_tests/to_s.rb
-- extras/type_tests/truncate.rb
-- extras/type_tests/truncateArg.rb
-- extras/type_tests/type tests
-- extras/type_tests/zero?.rb
-- extras/type_tests/|.rb
+- extras/type_tests/typetests.rb
 - gemfiles/Gemfile.travis
 - lib/rdl.rb
 - lib/rdl/boot.rb
@@ -153,66 +96,94 @@ files:
 - lib/rdl/util.rb
 - lib/rdl/wrap.rb
 - lib/rdl_disable.rb
-- lib/types/core-ruby-2.x/_aliases.rb
-- lib/types/core-ruby-2.x/abbrev.rb
-- lib/types/core-ruby-2.x/array.rb
-- lib/types/core-ruby-2.x/base64.rb
-- lib/types/core-ruby-2.x/basic_object.rb
-- lib/types/core-ruby-2.x/benchmark.rb
-- lib/types/core-ruby-2.x/bigdecimal.rb
-- lib/types/core-ruby-2.x/bigmath.rb
-- lib/types/core-ruby-2.x/bignum.rb
-- lib/types/core-ruby-2.x/class.rb
-- lib/types/core-ruby-2.x/complex.rb
-- lib/types/core-ruby-2.x/coverage.rb
-- lib/types/core-ruby-2.x/csv.rb
-- lib/types/core-ruby-2.x/date.rb
-- lib/types/core-ruby-2.x/dir.rb
-- lib/types/core-ruby-2.x/encoding.rb
-- lib/types/core-ruby-2.x/enumerable.rb
-- lib/types/core-ruby-2.x/enumerator.rb
-- lib/types/core-ruby-2.x/exception.rb
-- lib/types/core-ruby-2.x/file.rb
-- lib/types/core-ruby-2.x/fileutils.rb
-- lib/types/core-ruby-2.x/fixnum.rb
-- lib/types/core-ruby-2.x/float.rb
-- lib/types/core-ruby-2.x/gem.rb
-- lib/types/core-ruby-2.x/hash.rb
-- lib/types/core-ruby-2.x/integer.rb
-- lib/types/core-ruby-2.x/io.rb
-- lib/types/core-ruby-2.x/kernel.rb
-- lib/types/core-ruby-2.x/marshal.rb
-- lib/types/core-ruby-2.x/matchdata.rb
-- lib/types/core-ruby-2.x/math.rb
-- lib/types/core-ruby-2.x/module.rb
-- lib/types/core-ruby-2.x/nil.rb
-- lib/types/core-ruby-2.x/numeric.rb
-- lib/types/core-ruby-2.x/object.rb
-- lib/types/core-ruby-2.x/pathname.rb
-- lib/types/core-ruby-2.x/proc.rb
-- lib/types/core-ruby-2.x/process.rb
-- lib/types/core-ruby-2.x/random.rb
-- lib/types/core-ruby-2.x/range.rb
-- lib/types/core-ruby-2.x/rational.rb
-- lib/types/core-ruby-2.x/regexp.rb
-- lib/types/core-ruby-2.x/set.rb
-- lib/types/core-ruby-2.x/string.rb
-- lib/types/core-ruby-2.x/strscan.rb
-- lib/types/core-ruby-2.x/symbol.rb
-- lib/types/core-ruby-2.x/time.rb
-- lib/types/core-ruby-2.x/uri.rb
-- lib/types/core-ruby-2.x/yaml.rb
 - lib/types/core.rb
-- lib/types/rails-5.x/_helpers.rb
-- lib/types/rails-5.x/action_controller/mime_responds.rb
-- lib/types/rails-5.x/action_controller/strong_parameters.rb
-- lib/types/rails-5.x/action_dispatch/routing.rb
-- lib/types/rails-5.x/active_model/errors.rb
-- lib/types/rails-5.x/active_model/validations.rb
-- lib/types/rails-5.x/active_record/associations.rb
-- lib/types/rails-5.x/active_record/core.rb
-- lib/types/rails-5.x/active_record/model_schema.rb
-- lib/types/rails-5.x/fixnum.rb
+- lib/types/core/_aliases.rb
+- lib/types/core/abbrev.rb
+- lib/types/core/array.rb
+- lib/types/core/base64.rb
+- lib/types/core/basic_object.rb
+- lib/types/core/benchmark.rb
+- lib/types/core/bigdecimal.rb
+- lib/types/core/bigmath.rb
+- lib/types/core/bignum.rb
+- lib/types/core/class.rb
+- lib/types/core/complex.rb
+- lib/types/core/coverage.rb
+- lib/types/core/csv.rb
+- lib/types/core/date.rb
+- lib/types/core/dir.rb
+- lib/types/core/encoding.rb
+- lib/types/core/enumerable.rb
+- lib/types/core/enumerator.rb
+- lib/types/core/exception.rb
+- lib/types/core/file.rb
+- lib/types/core/fileutils.rb
+- lib/types/core/fixnum.rb
+- lib/types/core/float.rb
+- lib/types/core/gem.rb
+- lib/types/core/hash.rb
+- lib/types/core/integer.rb
+- lib/types/core/io.rb
+- lib/types/core/kernel.rb
+- lib/types/core/marshal.rb
+- lib/types/core/matchdata.rb
+- lib/types/core/math.rb
+- lib/types/core/module.rb
+- lib/types/core/nil.rb
+- lib/types/core/numeric.rb
+- lib/types/core/object.rb
+- lib/types/core/pathname.rb
+- lib/types/core/proc.rb
+- lib/types/core/process.rb
+- lib/types/core/random.rb
+- lib/types/core/range.rb
+- lib/types/core/rational.rb
+- lib/types/core/regexp.rb
+- lib/types/core/set.rb
+- lib/types/core/string.rb
+- lib/types/core/strscan.rb
+- lib/types/core/symbol.rb
+- lib/types/core/time.rb
+- lib/types/core/uri.rb
+- lib/types/core/yaml.rb
+- lib/types/devise.rb
+- lib/types/devise/controller_helpers.rb
+- lib/types/devise/parameter_sanitizer.rb
+- lib/types/pundit.rb
+- lib/types/rails/_helpers.rb
+- lib/types/rails/abstract_controller/translation.rb
+- lib/types/rails/action_controller/base.rb
+- lib/types/rails/action_controller/instrumentation.rb
+- lib/types/rails/action_controller/metal.rb
+- lib/types/rails/action_controller/mime_responds.rb
+- lib/types/rails/action_controller/parameters.rb
+- lib/types/rails/action_controller/strong_parameters.rb
+- lib/types/rails/action_dispatch/flashhash.rb
+- lib/types/rails/action_dispatch/routing.rb
+- lib/types/rails/action_mailer/base.rb
+- lib/types/rails/action_mailer/message_delivery.rb
+- lib/types/rails/action_view/helpers_sanitizehelper.rb
+- lib/types/rails/action_view/helpers_urlhelper.rb
+- lib/types/rails/active_model/errors.rb
+- lib/types/rails/active_model/validations.rb
+- lib/types/rails/active_record/associations.rb
+- lib/types/rails/active_record/base.rb
+- lib/types/rails/active_record/core.rb
+- lib/types/rails/active_record/finder_methods.rb
+- lib/types/rails/active_record/model_schema.rb
+- lib/types/rails/active_record/relation.rb
+- lib/types/rails/active_record/schema_types.rb
+- lib/types/rails/active_record/validations.rb
+- lib/types/rails/active_support/base.rb
+- lib/types/rails/active_support/logger.rb
+- lib/types/rails/active_support/tagged_logging.rb
+- lib/types/rails/active_support/time_with_zone.rb
+- lib/types/rails/active_support/time_zone.rb
+- lib/types/rails/fixnum.rb
+- lib/types/rails/integer.rb
+- lib/types/rails/rack/request.rb
+- lib/types/rails/string.rb
+- lib/types/rails/time.rb
 - rdl.gemspec
 - test/disabled_test_coverage.rb
 - test/disabled_test_rdoc.rb
@@ -252,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby type and contract system

data/extras/type_tests/%.rb

@@ -1,171 +0,0 @@
-#!/usr/bin/env ruby
-
- require 'bigdecimal'
- require 'rdl'
- require 'rdl_types'
-
-MAX_FIXNUM = 2**(0.size*8-2)-1 #Largest fixnum. -2 since 1 bit used for sign, 1 bit used as int marker.
-MIN_FIXNUM = -(2**(0.size*8-2)) #Smallest fixnum.
-
- def test()
-	x = gen_number(0.2,0.2,0.2,0.05,0.05,0.2,0,0.1)
-	type_one = x.class.to_s
-	if type_one=="BigDecimal"
-		y = gen_number(0.25,0.25,0.2,0,0,0.2,0,0.1)
-		type_two = y.class.to_s
-	elsif type_one=="Rational"
-		y = gen_number(0.2,0.2,0.2,0.1,0,0.2,0,0.1)
-		type_two = y.class.to_s		
-	elsif x.is_a?(Float)&&(x==Float::INFINITY|| x.nan?)
-		y = gen_number(0.2,0.2,0,0.1,0.1,0.3,0,0.1)
-		type_two = y.class.to_s
-	else
-		y = gen_number(0.2,0.2,0.2,0.05,0.05,0.2,0,0.1)
-	        type_two = y.class.to_s
-	end
-	#puts "Arg1= #{x} and type = #{type_one}"
-	#puts "Arg2= #{y} and type = #{type_two}"
-	operation_type = query(type_one+'#%',y)
-	expected_type = operation_type[operation_type.index('->')+3..-1]
-	w = x%y
-	#puts "here"
-	test_result = w.is_a?(Object.const_get(expected_type))
-	if !test_result
-		puts "Arg1= #{x} (type: #{type_one})"
-		puts "Arg2= #{y} (type: #{type_two})"
-		puts "Res= #{w}"
-		puts "Expected type: #{expected_type}"
-		puts "Received type: #{w.class}"
-	end
-	#puts test_result
- 	return test_result
- end
-
-def gen_fixnum()
-	return Random.rand(MIN_FIXNUM..MAX_FIXNUM)
-end
-
-def gen_bignum()
-	r = Random.rand()
-	if r<0.5
-		return Random.rand(MAX_FIXNUM+1..MAX_FIXNUM*1000)
-	else
-		return -1*Random.rand(MAX_FIXNUM+1..MAX_FIXNUM*1000)
-	end
-end
-
-def gen_float()
-	r = Random.rand()
-	if r<0.5
-		return Float::MAX*Random.rand
-	else
-		return -1*Float::MAX*Random.rand
-	end
-end
-
-def gen_bigdec()
-	r = Random.rand()
-	if r<0.33
-		return BigDecimal.new(gen_fixnum())
-	elsif r<0.66
-		return BigDecimal.new(gen_bignum())
-	else
-		return BigDecimal.new(gen_float(),0)
-	end
-end
-
-def gen_complex()
-	x = gen_number(0.2,0.2,0.1,0.05,0.05,0.3,0,0.1)
-	#puts x
-	y = gen_number(0.2,0.2,0.1,0.05,0.05,0.3,0,0.1)
-	#puts y
-	return Complex(x,y)
-end
-
-def gen_rational()
-	x = gen_fixnum()
-	y = gen_fixnum()
-	return Rational(x,y)
-end
-	
-
-def gen_number(probFixnum,probBignum,probBigDec,probInf,probNAN,probFloat,probComplex,probRational)
-	r = Random.rand()
-	if r<probFixnum then
-		#Fixnum type
-		x = gen_fixnum()
-	elsif r<(probFixnum+probBignum)
-		x = gen_bignum()
-	elsif r<(probFixnum+probBignum+probBigDec)
-		#BigDecimal type
-		x = gen_bigdec()
-	elsif r<(probFixnum+probBignum+probBigDec+probInf)
-		x=Float::INFINITY
-	elsif r<(probFixnum+probBignum+probBigDec+probInf+probNAN)
-		x=Float::NAN
-	elsif r<(probFixnum+probBignum+probBigDec+probInf+probNAN+probFloat)
-		#Random Float type
-		x = gen_float()
-        elsif r<(probFixnum+probBignum+probBigDec+probInf+probNAN+probFloat+probComplex)
-		x= gen_complex()
-	elsif (probFixnum+probBignum+probBigDec+probInf+probNAN+probFloat+probComplex+probRational)
-		x = gen_rational()
-	end
-	return x
-end
-
- def rounds(x)
-	counter = 0
-	for i in 0..x
-		b= test()
-		if (!b) then
-			counter=counter+1
-		end
-	
-	end
-	return counter
- end	
-
-
-def query(q,y)
-    $__rdl_contract_switch.off {
-      if q =~ /^(\w+(#|\.))?(\w+(!|\?|=)?|!|~|\+|\*\*|-|\*|\/|%|<<|>>|&|\||\^|<|<=|=>|>|==|===|!=|=~|!~|<=>|\[\]|\[\]=)$/
-        klass = nil
-        klass_pref = nil
-        meth = nil
-        if q =~ /(.+)#(.+)/
-          klass = $1
-          klass_pref = "#{klass}#"
-          meth = $2.to_sym
-        elsif q =~ /(.+)\.(.+)/
-          klass_pref = "#{$1}."
-          klass = RDL::Util.add_singleton_marker($1)
-          meth = $2.to_sym
-        else
-          klass = self.class.to_s
-          klass_pref = "#{klass}#"
-          meth = q.to_sym
-        end
-        if RDL::Wrap.has_contracts?(klass, meth, :type)
-          typs = RDL::Wrap.get_contracts(klass, meth, :type)
-          typs.each { |t|
-            #puts "#{klass_pref}#{meth}: #{t}"
-	    t_string = "#{t}"
-	    t_string =~ /\((\w*)\)(.+)/
-	
-	    #puts y
-	    if y.is_a?(Object.const_get($1))
-		return t_string
-	    end
-	    #return "#{t}" 
-          }
-          nil
-        else
-          #puts "No type for #{klass_pref}#{meth}"
-        end
-      else
-        #puts "Not implemented"
-      end
-    }
-  end
-