rdl 1.1.1 → 2.0.0.rc1

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

@@ -1,20 +1,15 @@
 class Bignum < Integer
   rdl_nowrap
 
-  type :%, '(Fixnum) -> Fixnum'
-  pre(:%) { |x| x!=0}
-  type :%, '(Bignum) -> Integer'
-  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 :&, '(Integer) -> Fixnum'
-
-  type :*, '(Fixnum) -> Integer'
+  type :%, '(Fixnum x {{ x!=0 }}) -> Fixnum'
+  type :%, '(Bignum x {{ x!=0 }}) -> %integer'
+  type :%, '(Float x {{ x!=0 }}) -> Float'
+  type :%, '(Rational x {{ x!=0 }}) -> Rational'
+  type :%, '(BigDecimal x {{ x!=0 }}) -> BigDecimal'
+
+  type :&, '(%integer) -> Fixnum'
+
+  type :*, '(Fixnum) -> %integer'
   type :*, '(Bignum) -> Bignum'
   type :*, '(Float) -> Float'
   type :*, '(Rational) -> Rational'
@@ -22,53 +17,49 @@ class Bignum < Integer
   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) -> Numeric'
-  type :**, '(Float) -> Numeric'
-  type :**, '(Rational) -> Numeric'
+  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) -> Integer'
+  type :+, '(%integer) -> %integer'
   type :+, '(Float) -> Float'
   type :+, '(Rational) -> Rational'
   type :+, '(BigDecimal) -> BigDecimal'
   type :+, '(Complex) -> Complex'
 
-  type :-, '(Integer) -> Integer'
+  type :-, '(%integer) -> %integer'
   type :-, '(Float) -> Float'
   type :-, '(Rational) -> Rational'
   type :-, '(BigDecimal) -> BigDecimal'
   type :-, '(Complex) -> Complex'
 
-  type :-, '() -> Integer'
+  type :-, '() -> %integer'
 
-  type :/, '(Integer) -> Integer'
-  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 x {{ x!=0 }}) -> %integer'
+  type :/, '(Float x {{ x!=0 }}) -> Float'
+  type :/, '(Rational x {{ x!=0 }}) -> Rational'
+  type :/, '(BigDecimal x {{ x!=0 }}) -> BigDecimal'
+  type :/, '(Complex x {{ x!=0 }}) -> 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 && if (x.real.is_a?(Rational) && x.imaginary.is_a?(Float)) then !x.imaginary.nan? else true end}
 
-  type :<, '(Integer) -> %bool'
+  type :<, '(%integer) -> %bool'
   type :<, '(Float) -> %bool'
   type :<, '(Rational) -> %bool'
   type :<, '(BigDecimal) -> %bool'
 
-  type :<<, '(Fixnum) -> Integer'
+  type :<<, '(Fixnum) -> %integer'
 
-  type :<=, '(Integer) -> %bool'
+  type :<=, '(%integer) -> %bool'
   type :<=, '(Float) -> %bool'
   type :<=, '(Rational) -> %bool'
   type :<=, '(BigDecimal) -> %bool'
 
-  type :<=>, '(Integer) -> Object'
+  type :<=>, '(%integer) -> Object'
   post(:<=>) { |r,x| r == -1 || r==0 || r==1}
   type :<=>, '(Float) -> Object'
   post(:<=>) { |r,x| r == -1 || r==0 || r==1}
@@ -81,20 +72,20 @@ class Bignum < Integer
 
   type :===, '(Object) -> %bool'
 
-  type :>, '(Integer) -> %bool'
+  type :>, '(%integer) -> %bool'
   type :>, '(Float) -> %bool'
   type :>, '(Rational) -> %bool'
   type :>, '(BigDecimal) -> %bool'
 
-  type :>=, '(Integer) -> %bool'
+  type :>=, '(%integer) -> %bool'
   type :>=, '(Float) -> %bool'
   type :>=, '(Rational) -> %bool'
   type :>=, '(BigDecimal) -> %bool'
 
-  type :>>, '(Integer) -> Integer'
+  type :>>, '(%integer) -> %integer'
   post(:>>) { |r,x| r >= 0 }
 
-  type :[], '(Integer) -> Fixnum'
+  type :[], '(%integer) -> Fixnum'
   post(:[]) { |r,x| r == 0 || r==1}
   type :[], '(Rational) -> Fixnum'
   post(:[]) { |r,x| r == 0 || r==1}
@@ -105,40 +96,32 @@ class Bignum < Integer
   pre(:[]) { |x| x!=BigDecimal::INFINITY && !x.nan? }
   post(:[]) { |r,x| r == 0 || r==1}
 
-  type :^, '(Integer) -> Integer'
+  type :^, '(%integer) -> %integer'
 
-  type :|, '(Integer) -> Integer'
+  type :|, '(%integer) -> %integer'
 
   type :~, '() -> Bignum'
 
-  type :abs, '() -> Bignum'
-  post(:abs) { |r,x| r >= 0 }
+  type :abs, '() -> Bignum r {{ r>=0 }}'
 
-  type :bit_length, '() -> Integer'
-  post(:bit_length) { |r,x| r >= 0 }
+  type :bit_length, '() -> %integer r {{ r>=0 }}'
 
-  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 :div, '(%integer x {{ x!=0 }}) -> %integer'
+  type :div, '(Float x {{ x!=0 && !x.nan? }}) -> %integer'
+  type :div, '(Rational x {{ x!=0 }}) -> %integer'
+  type :div, '(BigDecimal x {{ x!=0 && !x.nan?}}) -> %integer'
 
   type :divmod, '(%real) -> [%real, %real]'
   pre(:divmod) { |x| x!=0 && if x.is_a?(Float) then !x.nan? else true end}
 
   type :even?, '() -> %bool'
 
-  type :fdiv, '(Integer) -> Float'
+  type :fdiv, '(%integer) -> Float'
   type :fdiv, '(Float) -> Float'
   type :fdiv, '(Rational) -> Float'
   type :fdiv, '(BigDecimal) -> BigDecimal'
   type :fdiv, '(Complex) -> Complex'
-  pre(:fdiv) { |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}
+  pre(:fdiv) { |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 && if (x.real.is_a?(Rational) && x.imaginary.is_a?(Float)) then !x.imaginary.nan? else true end}
 
   type :to_s, '() -> String'
   type :inspect, '() -> String'
@@ -146,108 +129,86 @@ class Bignum < Integer
   type :magnitude, '() -> Bignum'
   post(:magnitude) { |r,x| r >= 0 }
 
-  type :modulo, '(Fixnum) -> Fixnum'
-  pre(:modulo) { |x| x!=0}
-  type :modulo, '(Bignum) -> Integer'
-  pre(:modulo) { |x| x!=0}
-  type :modulo, '(Float) -> Float'
-  pre(:modulo) { |x| x!=0}
-  type :modulo, '(Rational) -> Rational'
-  pre(:modulo) { |x| x!=0}
-  type :modulo, '(BigDecimal) -> BigDecimal'
-  pre(:modulo) { |x| x!=0}
+  type :modulo, '(Fixnum x {{ x!=0 }}) -> Fixnum'
+  type :modulo, '(Bignum x {{ x!=0 }}) -> %integer'
+  type :modulo, '(Float x {{ x!=0 }}) -> Float'
+  type :modulo, '(Rational x {{ x!=0 }}) -> Rational'
+  type :modulo, '(BigDecimal x {{ x!=0 }}) -> BigDecimal'
 
-  type :next, '() -> Integer'
+  type :next, '() -> %integer'
 
   type :odd?, '() -> %bool'
 
-  type :size, '() -> Integer'
+  type :size, '() -> %integer'
 
-  type :succ, '() -> Integer'
+  type :succ, '() -> %integer'
 
   type :to_f, '() -> Float'
 
   type :zero?, '() -> %bool'
 
-  type :ceil, '() -> Integer'
+  type :ceil, '() -> %integer'
 
-  type :denominator, '() -> Fixnum'
-  post(:denominator) { |r,x| r == 1 }
+  type :denominator, '() -> Fixnum r {{ r==1 }}'
 
-  type :floor, '() -> Integer'
+  type :floor, '() -> %integer'
 
   type :numerator, '() -> Bignum'
 
-  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 :quo, '(%integer x {{ x!=0 }}) -> Rational'
+  type :quo, '(Float x {{ x!=0 }}) -> Float'
+  type :quo, '(Rational x {{ x!=0 }}) -> Rational'
+  type :quo, '(BigDecimal x {{ x!=0 }}) -> BigDecimal'
+  type :quo, '(Complex x {{ x!=0 }}) -> Complex'
+  pre(:quo) { 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, '() -> Rational'
 
-  type :rationalize, '(Numeric) -> Rational'
+  type :rationalize, '(%numeric) -> Rational'
 
-  type :round, '() -> Integer'
+  type :round, '() -> %integer'
 
-  type :round, '(Numeric) -> Numeric'
+  type :round, '(%numeric) -> %numeric'
   pre(:round) { |x| x!=0 && if x.is_a?(Complex) then x.imaginary==0 && (if x.real.is_a?(Float)||x.real.is_a?(BigDecimal) then !x.real.infinite? && !x.real.nan? else true end) elsif x.is_a?(Float) then x!=Float::INFINITY && !x.nan? elsif x.is_a?(BigDecimal) then x!=BigDecimal::INFINITY && !x.nan? else true end} #Also, x must be in range [-2**31, 2**31].
 
   type :to_i, '() -> Bignum'
 
   type :to_r, '() -> Rational'
 
-  type :truncate, '() -> Integer'
+  type :truncate, '() -> %integer'
 
-  type :angle, '() -> Numeric'
+  type :angle, '() -> %numeric'
   post(:angle) { |r,x| r == 0 || r == Math::PI}
 
-  type :arg, '() -> Numeric'
+  type :arg, '() -> %numeric'
   post(:arg) { |r,x| r == 0 || r == Math::PI}
 
-  type :equal?, '(Object) -> %bool' 
+  type :equal?, '(Object) -> %bool'
   type :eql?, '(Object) -> %bool'
 
-  type :hash, '() -> Integer'
+  type :hash, '() -> %integer'
 
-  type :phase, '() -> Numeric'
+  type :phase, '() -> %numeric'
 
-  type :abs2, '() -> Bignum'
-  post(:abs2) { |r,x| r >= 0 }
+  type :abs2, '() -> Bignum r {{ r>=0 }}'
 
   type :conj, '() -> Bignum'
   type :conjugate, '() -> Bignum'
 
-  type :imag, '() -> Fixnum'
-  post(:imag) { |r,x| r == 0 }
-  type :imaginary, '() -> Fixnum'
-  post(:imaginary) { |r,x| r == 0 }
+  type :imag, '() -> Fixnum r {{ r==0 }}'
+  type :imaginary, '() -> Fixnum r {{ r==0 }}'
 
   type :real, '() -> Bignum'
 
-  type :real?, '() -> TrueClass'
-
-  type :to_c, '() -> Complex'
-  post(:to_c) { |r,x| r.imaginary == 0 }
-
-  type :remainder, '(Fixnum) -> Fixnum'
-  pre(:remainder) { |x| x!=0}
-  post(:remainder) { |r,x| r>0}
-  type :remainder, '(Bignum) -> Fixnum'
-  pre(:remainder) { |x| x!=0}
-  post(:remainder) { |r,x| r>0}
-  type :remainder, '(Float) -> Float'
-  pre(:remainder) { |x| x!=0}
-  type :remainder, '(Rational) -> Rational'
-  pre(:remainder) { |x| x!=0}
-  post(:remainder) { |r,x| r>0}
-  type :remainder, '(BigDecimal) -> BigDecimal'
-  pre(:remainder) { |x| x!=0}
-
-  type :coerce, '(Integer) -> [Integer, Integer]'
+  type :real?, '() -> true'
+
+  type :to_c, '() -> Complex r {{ r.imaginary==0 }}'
+
+  type :remainder, '(Fixnum x {{ x!=0 }}) -> Fixnum r {{ r>=0 }}'
+  type :remainder, '(Bignum x {{ x!=0 }}) -> Fixnum r {{ r>=0 }}'
+  type :remainder, '(Float x {{ x!=0 }}) -> Float'
+  type :remainder, '(Rational x {{ x!=0 }}) -> Rational r {{ r>=0 }}'
+  type :remainder, '(BigDecimal x {{ x!=0 }}) -> BigDecimal'
+
+  type :coerce, '(%integer) -> [%integer, %integer]'
 end

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

@@ -1,7 +1,7 @@
 class Complex < Numeric
   rdl_nowrap
 
-  type :*, '(Integer) -> Complex' 
+  type :*, '(%integer) -> Complex'
   type :*, '(Float) -> Complex'
   pre(:*) { |x| if x.infinite?||x.nan? then !self.imaginary.is_a?(BigDecimal)&&!self.real.is_a?(BigDecimal) else true end}
   type :*, '(Rational) -> Complex'
@@ -10,15 +10,14 @@ class Complex < Numeric
   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}
 
-  type :**, '(Integer) -> Complex'
+  type :**, '(%integer) -> Complex'
   type :**, '(Float) -> Complex'
   type :**, '(Rational) -> Complex'
-  type :**, '(BigDecimal) -> Complex'
-  pre(:**) { |x| x!=BigDecimal::INFINITY && !x.nan? && x>=0}
+  type :**, '(BigDecimal x {{ !x.infinite? && !x.nan? && x>=0 }}) -> Complex'
   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) -> Complex' 
+  type :+, '(%integer) -> Complex'
   type :+, '(Float) -> Complex'
   pre(:+) { |x| if x.infinite?||x.nan? then !self.real.is_a?(BigDecimal) else true end}
   type :+, '(Rational) -> Complex'
@@ -26,8 +25,8 @@ class Complex < Numeric
   pre(:+) {if x.real.is_a?(Float) then !x.real.infinite? && !x.real.nan? else true end}
   type :+, '(Complex) -> Complex'
   pre(:+) { |x| if (x.real.is_a?(BigDecimal) && self.real.is_a?(Float)) then !(self.real.infinite?||self.real.nan?) elsif x.real.is_a?(Float)&&self.real.is_a?(BigDecimal) then !(x.real.infinite?||x.real.nan?) elsif (x.imaginary.is_a?(BigDecimal) && self.imaginary.is_a?(Float)) then !(self.imaginary.infinite?||self.imaginary.nan?) elsif x.imaginary.is_a?(Float)&&self.imaginary.is_a?(BigDecimal) then !(x.imaginary.infinite?||x.imaginary.nan?) else true end}
-  
-  type :-, '(Integer) -> Complex' 
+
+  type :-, '(%integer) -> Complex'
   type :-, '(Float) -> Complex'
   pre(:-) { |x| if x.infinite?||x.nan? then !self.real.is_a?(BigDecimal) else true end}
   type :-, '(Rational) -> Complex'
@@ -38,24 +37,20 @@ class Complex < Numeric
 
   type :-, '() -> Complex'
 
-  type :/, '(Integer) -> Complex'
-  pre(:/) { |x| x!=0}
-  type :/, '(Float) -> Complex'
-  pre(:/) { |x| x!=0 && if x.infinte?||x.nan? then !self.real.is_a?(BigDecimal) && !self.imaginary.is_a?(BigDecimal) else true end}
-  type :/, '(Rational) -> Complex'
-  pre(:/) { |x| x!=0}
-  type :/, '(BigDecimal) -> Complex'
-  pre(:/) { |x| x!=0 && if self.real.is_a?(Float) then !self.real.infinite? && !self.real.nan? else true end && if self.imaginary.is_a?(Float) then !self.imaginary.infinite? && !self.imaginary.nan? else true end}
-  type :/, '(Complex) -> Complex'
-  pre(:/) { |x| x!=0 && if (x.real.is_a?(BigDecimal)||x.imaginary.is_a?(BigDecimal) || self.real.is_a?(BigDecimal) || self.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) && if self.real.is_a?(Float) then !self.real.infinite? && !self.real.nan? else true end && if self.imaginary.is_a?(Float) then !self.imaginary.infinite? && !self.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 x {{ x!=0 }}) -> Complex'
+  type :/, '(Float x {{ x!=0 }}) -> Complex'
+  pre(:/) { |x| if x.infinte?||x.nan? then !self.real.is_a?(BigDecimal) && !self.imaginary.is_a?(BigDecimal) else true end}
+  type :/, '(Rational x {{ x!=0 }}) -> Complex'
+  type :/, '(BigDecimal x {{ x!=0 }}) -> Complex'
+  pre(:/) { |x| if self.real.is_a?(Float) then !self.real.infinite? && !self.real.nan? else true end && if self.imaginary.is_a?(Float) then !self.imaginary.infinite? && !self.imaginary.nan? else true end}
+  type :/, '(Complex x {{ x!=0 }}) -> Complex'
+  pre(:/) { |x| if (x.real.is_a?(BigDecimal)||x.imaginary.is_a?(BigDecimal) || self.real.is_a?(BigDecimal) || self.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) && if self.real.is_a?(Float) then !self.real.infinite? && !self.real.nan? else true end && if self.imaginary.is_a?(Float) then !self.imaginary.infinite? && !self.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:==, '(Object) -> %bool'
 
-  type :abs, '() -> Numeric'
-  post(:abs) { |r,x| r >= 0 }
+  type :abs, '() -> %numeric r {{ r>=0 }}'
 
-  type :abs2, '() -> Numeric'
-  post(:abs2) { |r,x| r >= 0 }
+  type :abs2, '() -> %numeric r {{ r>=0 }}'
 
   type :angle, '() -> Float'
 
@@ -64,16 +59,16 @@ class Complex < Numeric
   type :conj, '() -> Complex'
   type :conjugate, '() -> Complex'
 
-  type :denominator, '() -> Integer'
+  type :denominator, '() -> %integer'
 
   type :equal?, '(Object) -> %bool'
   type :eql?, '(Object) -> %bool'
 
-  type :fdiv, '(Numeric) -> Complex'
+  type :fdiv, '(%numeric) -> Complex'
   pre(:fdiv) { |x| if (self.real.is_a?(Float) && (self.real.infinite? || self.real.nan?))||(self.imaginary.is_a?(Float) && (self.imaginary.infinite? || self.imaginary.nan?)) then !x.is_a?(BigDecimal) && (if x.is_a?(Complex) then !x.real.is_a?(BigDecimal) && !x.imaginary.is_a?(BigDecimal) else true end) else true end}
 
-  type :hash, '() -> Integer'
-  
+  type :hash, '() -> %integer'
+
   type :imag, '() -> %real'
   type :imaginary, '() -> %real'
 
@@ -85,29 +80,27 @@ class Complex < Numeric
 
   type :phase, '() -> Float'
 
-  type :polar, '() -> [%real, %real]' 
+  type :polar, '() -> [%real, %real]'
 
 
-  type :quo, '(Integer) -> Complex'
-  pre(:quo) { |x| x!=0}
-  type :quo, '(Float) -> Complex'
-  pre(:quo) { |x| x!=0 && if self.real.is_a?(BigDecimal)||self.imaginary.is_a?(BigDecimal) then !x.infinite? && !x.nan? else true end}
-  type :quo, '(Rational) -> Complex'
-  pre(:quo) { |x| x!=0}
-  type :quo, '(BigDecimal) -> BigDecimal'
-  pre(:quo) { |x| x!=0 && if self.real.is_a?(Float) then !self.real.infinite?&&!self.real.nan? else true end && if self.imaginary.is_a?(Float) then !self.imaginary.infinite? && !self.imaginary.nan? else true end}
-  type :quo, '(Complex) -> Complex'
-  pre(:quo) { |x| x!=0 && if (x.real.is_a?(BigDecimal)||x.imaginary.is_a?(BigDecimal) || self.real.is_a?(BigDecimal) || self.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) && if self.real.is_a?(Float) then !self.real.infinite? && !self.real.nan? else true end && if self.imaginary.is_a?(Float) then !self.imaginary.infinite? && !self.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 :quo, '(%integer x {{ x!=0 }}) -> Complex'
+  type :quo, '(Float x {{ x!=0 }}) -> Complex'
+  pre(:quo) { |x| if self.real.is_a?(BigDecimal)||self.imaginary.is_a?(BigDecimal) then !x.infinite? && !x.nan? else true end}
+  type :quo, '(Rational x {{ x!=0 }}) -> Complex'
+  type :quo, '(BigDecimal x {{ x!=0 }}) -> BigDecimal'
+  pre(:quo) { |x| if self.real.is_a?(Float) then !self.real.infinite?&&!self.real.nan? else true end && if self.imaginary.is_a?(Float) then !self.imaginary.infinite? && !self.imaginary.nan? else true end}
+  type :quo, '(Complex x {{ x!=0 }}) -> Complex'
+  pre(:quo) { |x| if (x.real.is_a?(BigDecimal)||x.imaginary.is_a?(BigDecimal) || self.real.is_a?(BigDecimal) || self.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) && if self.real.is_a?(Float) then !self.real.infinite? && !self.real.nan? else true end && if self.imaginary.is_a?(Float) then !self.imaginary.infinite? && !self.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'
   pre(:rationalize) { self.imaginary==0 && if self.real.is_a?(Float)||self.real.is_a?(BigDecimal) then !self.real.infinite? && !self.real.nan? else true end}
 
-  type :rationalize, '(Numeric) -> Rational'
+  type :rationalize, '(%numeric) -> Rational'
   pre(:rationalize) { |x| self.imaginary==0 && if self.real.is_a?(Float)||self.real.is_a?(Rational) then (if x.is_a?(Float)||x.is_a?(BigDecimal) then !x.infinite? && !x.nan? else true end) else true end && if self.real.is_a?(Float)||self.real.is_a?(BigDecimal) then !self.real.infinite? && !self.real.nan? else true end}
 
   type :real, '() -> %real'
 
-  type :real?, '() -> FalseClass'
+  type :real?, '() -> false'
 
   type :rect, '() -> [%real, %real]'
   type :rectangular, '() -> [%real, %real]'
@@ -117,7 +110,7 @@ class Complex < Numeric
   type :to_f, '() -> Float'
   pre(:to_f) { self.imaginary==0}
 
-  type :to_i, '() -> Integer'
+  type :to_i, '() -> %integer'
   pre(:to_i) { self.imaginary==0 && if self.real.is_a?(Float)||self.real.is_a?(BigDecimal) then !self.real.infinite? && !self.real.nan? else true end}
 
   type :to_r, '() -> Rational'
@@ -127,5 +120,5 @@ class Complex < Numeric
 
   type :zero?, '() -> %bool'
 
-  type :coerce, '(Numeric) -> [Complex, Complex]'
+  type :coerce, '(%numeric) -> [Complex, Complex]'
 end