rdl 1.1.0 → 1.1.1.rc1

data/types/ruby-2.x/integer.rb

@@ -1,31 +1,32 @@
-class Integer
+class Integer < Numeric
   rdl_nowrap
 
-  rdl_alias :ceil, :to_i
-  type :chr, '(?Encoding) -> String'
-  type :denominator, '() -> 1'
-  type :downto, '(Integer limit) { (Integer) -> %any } -> self'
+  type :ceil, '() -> Integer'
+  type :chr, '(Encoding) -> String'
+  type :denominator, '() -> Fixnum'
+  post(:denominator) { |r,x| r == 1 }
+  type :downto, '(Integer) { (Integer) -> %any } -> Integer'
   type :downto, '(Integer limit) -> Enumerator<Integer>'
   type :even?, '() -> %bool'
   type :gcd, '(Integer) -> Integer'
   type :gcdlcm, '(Integer) -> [Integer, Integer]'
-  rdl_alias :floor, :to_i
+  type :floor, '() -> Integer'
   type :integer?, '() -> TrueClass'
   type :lcm, '(Integer) -> Integer'
   type :next, '() -> Integer'
-  type :numerator, '() -> self'
+  type :numerator, '() -> Integer'
   type :odd?, '() -> %bool'
-  type :ord, '() -> self'
+  type :ord, '() -> Integer'
   type :pred, '() -> Integer'
-  type :rationalize, '(?%any eps) -> Rational'
-  type :round, '(?Fixnum ndigits) -> Integer or Float'
-  rdl_alias :succ, :next
-  type :times, '() { (Integer) -> %any } -> self'
+  type :rationalize, '(Numeric) -> Rational'
+  type :round, '(Numeric) -> Numeric'
+  type :succ, '() -> Integer'
+  type :times, '() { (Integer) -> %any } -> Integer'
   type :times, '() -> Enumerator<Integer>'
   type :to_i, '() -> Integer'
-  rdl_alias :to_int, :to_i
+  type :to_int, '() -> Integer'
   type :to_r, '() -> Rational'
-  rdl_alias :truncate, :to_i
-  type :upto, '(Integer limit) { (Integer) -> %any } -> self'
-  type :upto, '(Integer limit) -> Enumerator<Integer>'
+  type :truncate, '() -> Integer'
+  type :upto, '(Integer) { (Integer) -> %any } -> Integer'
+  type :upto, '(Integer) -> Enumerator<Integer>'
 end

data/types/ruby-2.x/numeric.rb

@@ -1,44 +1,54 @@
 class Numeric
   rdl_nowrap
 
-  type :+, '() -> self'
+  type :%, '(Numeric) -> Numeric'
+  pre(:%) { |x| x!=0}
+  type :+, '(Numeric) -> Numeric'
   type :-, '() -> Numeric'
-  type :<=>, '(Numeric) -> -1 or 0 or 1 or nil'
+  type :<=>, '(Numeric) -> Object'
+  post(:<=>) { |r,x| r == -1 || r==0 || r==1 || r==nil}
   type :abs, '() -> Numeric'
-  type :abs2, '() -> %real'
-  type :angle, '() -> 0 or ${Math::PI}'
-  type :arg, '() -> 0 or ${Math::PI}'
+  post(:abs) { |r,x| r >= 0 }
+  type :abs2, '() -> Numeric'
+  post(:abs2) { |r,x| r >= 0 }
+  type :angle, '() -> Numeric'
+  type :arg, '() -> Numeric'
   type :ceil, '() -> Integer'
   type :coerce, '(Numeric) -> [Numeric, Numeric]'
-  type :conj, '() -> self'
-  rdl_alias :conjugate, :conj
+  type :conj, '() -> Numeric'
+  type :conjugate, '() -> Numeric'
   type :denominator, '() -> Integer'
-  post(:denominator) { |r, _| r > 0 }
+  post(:denominator) { |r,x| r >= 0 }
   type :div, '(Numeric) -> Integer'
+  pre(:div) { |x| x!=0}
   type :divmod, '(Numeric) -> [Numeric, Numeric]'
+  pre(:divmod) { |x| x!=0 }
   type :eql?, '(Numeric) -> %bool'
-  type :fdiv, '(Numeric) -> Float'
+  type :fdiv, '(Numeric) -> Numeric'
   type :floor, '() -> Integer'
   type :i, '() -> Complex'
-  type :imag, '() -> 0'
-  rdl_alias :imaginary, :imag
-  # initialize_copy can't be invoked
+  type :imag, '() -> Numeric'
+  type :imaginary, '() -> Numeric'
   type :integer?, '() -> %bool'
   type :magnitude, '() -> Numeric'
   type :modulo, '(Numeric) -> %real'
+  pre(:modulo) { |x| x!=0 }
   type :nonzero?, '() -> self or nil'
   type :numerator, '() -> Integer'
-  type :phase, '() -> 0 or ${Math::PI}'
+  type :phase, '() -> Numeric'
   type :polar, '() -> [Numeric, Numeric]'
-  type :quo, '(Integer or Rational) -> Rational'
-  type :quo, '(Float) -> Float'
-  type :real, '() -> self'
-  type :rect, '() -> [Numeric, 0]'
-  rdl_alias :rectangular, :rect
+  type :quo, '(Numeric) -> Numeric'
+  type :real, '() -> Numeric'
+  type :real?, '() -> Numeric'
+  type :rect, '() -> [Numeric, Numeric]'
+  type :rectangular, '() -> [Numeric, Numeric]'
   type :remainder, '(Numeric) -> %real'
-  type :round, '(?Fixnum ndigits) -> Integer or Float'
-  # singleton_method_added can't be invoked
-  #  type :step, # TODO: hash args
+  type :round, '(Numeric) -> Numeric'
+  type :singleton_method_added, '(Symbol) -> TypeError'
+  type :step, '(Numeric) { (Numeric) -> %any } -> Numeric'
+  type :step, '(Numeric) -> Enumerator<Numeric>'
+  type :step, '(Numeric, Numeric) { (Numeric) -> %any } -> Numeric'
+  type :step, '(Numeric, Numeric) -> Enumerator<Numeric>'
   type :to_c, '() -> Complex'
   type :to_int, '() -> Integer'
   type :truncate, '() -> Integer'

data/types/ruby-2.x/rational.rb

@@ -1,31 +1,209 @@
-class Rational
+class Rational < Numeric
   rdl_nowrap
 
-  type :*, '(Numeric) -> Numeric'
-  type :**, '(Numeric) -> Numeric'
-  type :+, '(Numeric) -> Numeric'
-  type :-, '(Numeric) -> Numeric'
-  type :/, '(Numeric) -> Numeric'
-  type :<=>, '(Numeric) -> -1 or 0 or 1 or nil'
-  type :==, '(%any object) -> %bool'
+  type :%, '(Integer) -> Rational'
+  pre(:%) { |x| x!=0}
+  type :%, '(Float) -> Float'
+  pre(:%) { |x| x!=0&&!x.nan?}
+  type :%, '(Rational) -> Rational'
+  pre(:%) { |x| x!=0}
+  type :%, '(BigDecimal) -> BigDecimal'
+  pre(:%) { |x| x!=0&&!x.nan?}
+
+  type :*, '(Integer) -> Rational'
+  type :*, '(Float) -> Float'
+  type :*, '(Rational) -> Rational'
+  type :*, '(BigDecimal) -> BigDecimal'
+  type :*, '(Complex) -> Complex'
+  pre(:*) { |x| if (x.real.is_a?(BigDecimal)||x.imaginary.is_a?(BigDecimal)) then (if x.real.is_a?(Float) then (x.real!=Float::INFINITY && !(x.real.nan?)) elsif(x.imaginary.is_a?(Float)) then x.imaginary!=Float::INFINITY && !(x.imaginary.nan?) else true end) else true end} #can't have a complex with part BigDecimal, other part infinity/NAN
+
+  type :+, '(Integer) -> Rational'
+  type :+, '(Float) -> Float'
+  type :+, '(Rational) -> Rational'
+  type :+, '(BigDecimal) -> BigDecimal'
+  type :+, '(Complex) -> Complex'
+
+  type :-, '(Integer) -> Rational'
+  type :-, '(Float) -> Float'
+  type :-, '(Rational) -> Rational'
+  type :-, '(BigDecimal) -> BigDecimal'
+  type :-, '(Complex) -> Complex'
+
+  type :-, '() -> Rational'
+
+  type :**, '(Integer) -> Numeric'
+  type :**, '(Float) -> Numeric'
+  type :**, '(Rational) -> Numeric'
+  type :**, '(BigDecimal) -> BigDecimal'
+  pre(:**) { |x| x!=BigDecimal::INFINITY && if self<0 then x<=-1||x>=0 else true end}
+  post(:**) { |r,x| r.real?}
+  type :**, '(Complex) -> Complex'
+  pre(:**) { |x| x!=0 && if (x.real.is_a?(BigDecimal)||x.imaginary.is_a?(BigDecimal)) then (if x.real.is_a?(Float) then (x.real!=Float::INFINITY && !(x.real.nan?)) elsif(x.imaginary.is_a?(Float)) then x.imaginary!=Float::INFINITY && !(x.imaginary.nan?) else true end) else true end}
+
+  type :/, '(Integer) -> Rational'
+  pre(:/) { |x| x!=0}
+  type :/, '(Float) -> Float'
+  pre(:/) { |x| x!=0}
+  type :/, '(Rational) -> Rational'
+  pre(:/) { |x| x!=0}
+  type :/, '(BigDecimal) -> BigDecimal'
+  pre(:/) { |x| x!=0}
+  type :/, '(Complex) -> Complex'
+  pre(:/) { |x| x!=0 && if (x.real.is_a?(BigDecimal)||x.imaginary.is_a?(BigDecimal)) then (if x.real.is_a?(Float) then (x.real!=Float::INFINITY && !(x.real.nan?)) elsif(x.imaginary.is_a?(Float)) then x.imaginary!=Float::INFINITY && !(x.imaginary.nan?) else true end) else true end && if (x.real.is_a?(Rational) && x.imaginary.is_a?(Float)) then !x.imaginary.nan? else true end}
+
+  type :<, '(Integer) -> %bool'
+  type :<, '(Float) -> %bool'
+  pre(:<) { |x| !x.nan?}
+  type :<, '(Rational) -> %bool'
+  type :<, '(BigDecimal) -> %bool'
+  pre(:<) { |x| !x.nan?}
+
+  type :<=, '(Integer) -> %bool'
+  type :<=, '(Float) -> %bool'
+  pre(:<=) { |x| !x.nan?}
+  type :<=, '(Rational) -> %bool'
+  type :<=, '(BigDecimal) -> %bool'
+  pre(:<=) { |x| !x.nan?}
+
+  type :>, '(Integer) -> %bool'
+  type :>, '(Float) -> %bool'
+  pre(:>) { |x| !x.nan?}
+  type :>, '(Rational) -> %bool'
+  type :>, '(BigDecimal) -> %bool'
+  pre(:>) { |x| !x.nan?}
+
+  type :>=, '(Integer) -> %bool'
+  type :>=, '(Float) -> %bool'
+  pre(:>=) { |x| !x.nan?}
+  type :>=, '(Rational) -> %bool'
+  type :>=, '(BigDecimal) -> %bool'
+  pre(:>=) { |x| !x.nan?}
+
+  type :<=>, '(Integer) -> Object'
+  post(:<=>) { |r,x| r == -1 || r==0 || r==1}
+  type :<=>, '(Float) -> Object'
+  post(:<=>) { |r,x| r == -1 || r==0 || r==1}
+  type :<=>, '(Rational) -> Object'
+  post(:<=>) { |r,x| r == -1 || r==0 || r==1}
+  type :<=>, '(BigDecimal) -> Object'
+  post(:<=>) { |r,x| r == -1 || r==0 || r==1}
+
+  type :==, '(Object) -> %bool'
+
+  type :abs, '() -> Rational'
+  post(:abs) { |r,x| r >= 0 }
+
+  type :abs2, '() -> Rational'
+  post(:abs2) { |r,x| r >= 0 }
+
+  type :angle, '() -> Numeric'
+  post(:angle) { |r,x| r == 0 || r == Math::PI}
+
+  type :arg, '() -> Numeric'
+  post(:arg) { |r,x| r == 0 || r == Math::PI}
+
+  type :div, '(Fixnum) -> Integer'
+  pre(:div) { |x| x!=0}
+  type :div, '(Bignum) -> Integer'
+  pre(:div) { |x| x!=0}
+  type :div, '(Float) -> Integer'
+  pre(:div) { |x| x!=0 && !x.nan?}
+  type :div, '(Rational) -> Integer'
+  pre(:div) { |x| x!=0}
+  type :div, '(BigDecimal) -> Integer'
+  pre(:div) { |x| x!=0 && !x.nan?}
+
+  type :modulo, '(Integer) -> Rational'
+  pre(:modulo) { |x| x!=0}
+  type :modulo, '(Float) -> Float'
+  pre(:modulo) { |x| x!=0&&!x.nan?}
+  type :modulo, '(Rational) -> Rational'
+  pre(:modulo) { |x| x!=0}
+  type :modulo, '(BigDecimal) -> BigDecimal'
+  pre(:modulo) { |x| x!=0&&!x.nan?}
+
   type :ceil, '() -> Integer'
-  type :ceil, '(Fixnum precision) -> Rational'
+  type :ceil, '(Integer) -> Numeric'
+
   type :denominator, '() -> Integer'
-  post(:denominator) { |r, _| r > 0 }
-  type :fdiv, '(Numeric) -> Float'
+  post(:denominator) { |r,x| r > 0 }
+
+  type :divmod, '(%real) -> [%real, %real]'
+  pre(:divmod) { |x| x!=0 && if x.is_a?(BigDecimal) then !x.nan? else true end}
+
+  type :equal?, '(Object) -> %bool'
+
+  type :fdiv, '(Integer) -> Float'
+  type :fdiv, '(Float) -> Float'
+  type :fdiv, '(Rational) -> Float'
+  type :fdiv, '(BigDecimal) -> Float'
+  type :fdiv, '(Complex) -> Float'
+  pre(:fdiv) { |x| x.imaginary==0 && x.real.class != Float}
+
   type :floor, '() -> Integer'
-  type :floor, '(Fixnum precision) -> Rational'
+
+  type :floor, '(Integer) -> Numeric'
+
+  type :hash, '() -> Integer'
+
   type :inspect, '() -> String'
+
   type :numerator, '() -> Integer'
-  rdl_alias :quo, :/
-  type :rationalize, '() -> self'
-  type :rationalize, '(Numeric eps) -> Rational'
+
+  type :phase, '() -> Numeric'
+
+  type :quo, '(Integer) -> Rational'
+  pre(:quo) { |x| x!=0}
+  type :quo, '(Float) -> Float'
+  pre(:quo) { |x| x!=0}
+  type :quo, '(Rational) -> Rational'
+  pre(:quo) { |x| x!=0}
+  type :quo, '(BigDecimal) -> BigDecimal'
+  pre(:quo) { |x| x!=0}
+  type :quo, '(Complex) -> Complex'
+  pre(:quo) { |x| x!=0 && if (x.real.is_a?(BigDecimal)||x.imaginary.is_a?(BigDecimal)) then (if x.real.is_a?(Float) then (x.real!=Float::INFINITY && !(x.real.nan?)) elsif(x.imaginary.is_a?(Float)) then x.imaginary!=Float::INFINITY && !(x.imaginary.nan?) else true end) else true end && if (x.real.is_a?(Rational) && x.imaginary.is_a?(Float)) then !x.imaginary.nan? else true end}
+
+  type :rationalize, '() -> Rational'
+
+  type :rationalize, '(Numeric) -> Rational'
+  pre(:quo) { |x| if x.is_a?(Float) then x!=Float::INFINITY && !x.nan? else true end}
+
   type :round, '() -> Integer'
-  type :round, '(Fixnum precision) -> Rational'
+
+  type :round, '(Integer) -> Numeric'
+
   type :to_f, '() -> Float'
+  pre(:to_f) { self<=Float::MAX}
+
   type :to_i, '() -> Integer'
-  type :to_r, '() -> self'
+
+  type :to_r, '() -> Rational'
+
   type :to_s, '() -> String'
+
   type :truncate, '() -> Integer'
-  type :truncate, '(Fixnum precision) -> Rational'
+
+  type :truncate, '(Integer) -> Rational'
+
+  type :zero?, '() -> %bool'
+
+  type :conj, '() -> Rational'
+  type :conjugate, '() -> Rational'
+
+  type :imag, '() -> Fixnum'
+  post(:imag) { |r,x| r == 0 }
+  type :imaginary, '() -> Fixnum'
+  post(:imaginary) { |r,x| r == 0 }
+
+  type :real, '() -> Rational'
+
+  type :real?, '() -> TrueClass'
+
+  type :to_c, '() -> Complex'
+  post(:to_c) { |r,x| r.imaginary == 0 }
+
+  type :coerce, '(Integer) -> [Rational, Rational]'
+  type :coerce, '(Float) -> [Float, Float]'
+  type :coerce, '(Rational) -> [Rational, Rational]'
+  type :coerce, '(Complex) -> [Numeric, Numeric]'
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rdl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1.rc1
 platform: ruby
 authors:
 - Jeffrey S. Foster
 - Brianna M. Ren
 - T. Stephen Strickland
 - Alexander T. Yu
+- Milod Kazerounian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -48,10 +49,69 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGES.md
 - LICENSE
 - 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
 - gemfiles/Gemfile.travis
 - lib/rails_types.rb
 - lib/rdl.rb
@@ -63,7 +123,9 @@ files:
 - lib/rdl/contracts/proc.rb
 - lib/rdl/query.rb
 - lib/rdl/switch.rb
+- lib/rdl/types/.#lexer.rex
 - lib/rdl/types/annotated_arg.rb
+- lib/rdl/types/dependent_arg.rb
 - lib/rdl/types/dots_query.rb
 - lib/rdl/types/finitehash.rb
 - lib/rdl/types/generic.rb
@@ -121,6 +183,7 @@ files:
 - types/ruby-2.x/benchmark.rb
 - types/ruby-2.x/bigdecimal.rb
 - types/ruby-2.x/bigmath.rb
+- types/ruby-2.x/bignum.rb
 - types/ruby-2.x/class.rb
 - types/ruby-2.x/complex.rb
 - types/ruby-2.x/coverage.rb
@@ -173,9 +236,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1