rubybreaker 0.0.8 → 0.0.9

data/lib/rubybreaker/type/type_unparser.rb

@@ -93,8 +93,7 @@ module RubyBreaker
         t.arg_types.each_with_index do |arg_type,i|
           unparse_pp(pp, arg_type, opts)
           if i < t.arg_types.size - 1
-            pp.text(",")
-            pp.fill_breakable()
+            pp.text(", ")
           end 
         end
         pp.text(")")
@@ -105,16 +104,14 @@ module RubyBreaker
           pp.text("}")
           pp.fill_breakable()
         end
-        pp.text("->")
-        pp.fill_breakable()
+        pp.text("-> ")
         unparse_pp(pp, t.ret_type, opts)
       elsif t.instance_of?(BlockType)
         pp.text("|")
         t.arg_types.each_with_index do |arg_type,i|
           unparse_pp(pp, arg_type, opts)
           if i < t.arg_types.size - 1
-            pp.text(",")
-            pp.fill_breakable()
+            pp.text(", ")
           end 
         end
         pp.text("|")
@@ -125,8 +122,7 @@ module RubyBreaker
           pp.text("}")
           pp.fill_breakable()
         end
-        pp.text("->")
-        pp.fill_breakable()
+        pp.text("-> ")
         unparse_pp(pp, t.ret_type, opts)
       elsif t.instance_of?(MethodListType)
         t.types.each_with_index do |typ,i|

data/lib/rubybreaker/typing/subtyping.rb

@@ -193,6 +193,7 @@ module RubyBreaker
               rhs_arg = rhs_arg.type
             end
           end
+          # Remember, the contra-variance
           if !self.subtype_rel?(rhs_arg, lhs_arg)
             is_subtype = false
             break

data/test/integrated/tc_original_behavior.rb

@@ -22,12 +22,50 @@ class IntegratedOriginalBehaviorTest < Test::Unit::TestCase
       raise "error"
     end
 
+    def neg?(x)
+      return x < 0
+    end
+
+    def x_nil?(x)
+      return x.nil?
+    end
+
+    def factorial(x)
+      if x <= 1 
+        1
+      else
+        x * factorial(x - 1)
+      end
+    end
+
   end
 
   def setup()
     RubyBreaker.break(A)
   end
 
+  def test_una_op
+    a = A.new
+    assert(a.x_nil?(nil))
+    assert(!a.x_nil?(1))
+  end
+
+  def test_bin_op
+    a = A.new
+    assert(a.neg?(-1))
+    assert(!a.neg?(1))
+  end
+
+  def test_factorial
+    a = A.new
+    b = a.factorial(4)
+    assert_equal(24, b)
+    b = a.factorial(1)
+    assert_equal(1, b)
+    b = a.factorial(0)
+    assert_equal(1, b)
+  end
+
   def test_plus()
     a = A.new
     x = 1

data/test/integrated/tc_simple1.rb

@@ -28,18 +28,38 @@ class IntegratedSimpleTest < Test::Unit::TestCase
       self
     end
 
+    def bazzz(x,n)
+      if n == 0
+        x.size
+      end
+      x.to_s
+      return 1
+    end
+
   end
 
   class B
     typesig("baz(string[size], true_class) -> fixnum")
     typesig("baz(string[to_s], false_class) -> string")
     def baz(x,b); end
+
+    typesig("bazzz(string[size, to_s], fixnum[==]) -> fixnum")
+    def bazzz(x, n); end
   end
 
   def setup()
     RubyBreaker.break(A)
   end
 
+  def test_intersect
+    a = A.new
+    a.bazzz("abc", 0)
+    a.bazzz("abc", 1)
+    meth_type = Runtime::Inspector.inspect_meth(A, :bazzz)
+    str = TypeUnparser.unparse(meth_type)
+    assert_equal("bazzz(string[size, to_s], fixnum[==]) -> fixnum", str)
+  end
+
   def test_simple1_a_foo
     a = A.new
     a.foo("test_simple1 >> string")

data/test/integrated/tc_simple_algorithms.rb

@@ -0,0 +1,135 @@
+require "test/unit"
+require_relative "../../lib/rubybreaker"
+
+class IntegratedSimpleAlgorithmsTest < Test::Unit::TestCase
+  include RubyBreaker
+
+  # The contents of the following class is taken from Opus8:
+  #
+  # This class contains the Ruby code from Program 2.x of
+  # "Data Structures and Algorithms
+  # with Object-Oriented Design Patterns in Ruby"
+  # by Bruno R. Preiss.
+  #
+  # Copyright (c) 2004 by Bruno R. Preiss, P.Eng.  All rights reserved.
+  #
+  # http://www.brpreiss.com/books/opus8/
+  #
+  class Opus8
+    def sum(n)
+        result = 0
+        i = 1
+        while i <= n
+            result += i
+            i += 1
+        end
+        return result
+    end
+
+    def horner(a, n, x)
+      result = a[n]
+      i = n - 1
+      while i >= 0
+        result = result * x + a[i]
+        i -= 1
+      end
+      return result
+    end
+
+    def findMaximum(a, n)
+      result = a[0]
+      i = 1
+      while i < n
+        if a[i] > result
+            result = a[i]
+        end
+        i += 1
+      end
+      return result
+    end
+
+    def fibonacci(n)
+      if n == 0 or n == 1
+          return n
+      else
+          return fibonacci(n - 1) + fibonacci(n - 2)
+      end
+    end
+
+    def bucketSort(a, n, buckets, m)
+      for j in 0 ... m
+          buckets[j] = 0
+      end
+      for i in 0 ... n
+          buckets[a[i]] += 1
+      end
+      i = 0
+      for j in 0 ... m
+          for k in 0 ... buckets[j]
+              a[i] = j
+              i += 1
+          end
+      end
+    end
+  end
+
+  class Ref
+    typesig("fibonacci(fixnum[==]) -> fixnum")
+    typesig("fibonacci(fixnum[==,-]) -> fixnum")
+    def fibonacci(n); n end
+  end
+
+  def setup()
+    Runtime.break(Opus8)
+  end
+
+  def test_sum
+    opus8 = Opus8.new
+    result = opus8.sum(5)
+    sum_meth_type = Runtime::Inspector.inspect_meth(Opus8, :sum)
+    str = sum_meth_type.unparse()
+    assert_equal("sum(fixnum[]) -> fixnum", str)
+    assert_equal(15, result)
+  end
+
+  def test_horner()
+    opus8 = Opus8.new
+    result = opus8.horner([1,2,3],2,2)
+    horner_meth_type = Runtime::Inspector.inspect_meth(Opus8, :horner)
+    str = horner_meth_type.unparse()
+    assert_equal("horner(array[[]], fixnum[-], fixnum[]) -> fixnum", str)
+    assert_equal(1 + 4 + 12, result)
+  end
+
+  def test_findMaximum()
+    opus8 = Opus8.new
+    result = opus8.findMaximum([1,4,3,2], 4)
+    max_meth_type = Runtime::Inspector.inspect_meth(Opus8, :findMaximum)
+    str = max_meth_type.unparse()
+    assert_equal("findMaximum(array[[]], fixnum[]) -> fixnum", str)
+    assert_equal(4, result)
+  end
+
+  def test_fibonacci()
+    opus8 = Opus8.new
+    result = opus8.fibonacci(4)
+    fib_meth_type = Runtime::Inspector.inspect_meth(Opus8, :fibonacci)
+    fib_ref_meth_type = Runtime::Inspector.inspect_meth(Ref, :fibonacci)
+    str = fib_meth_type.unparse()
+    # puts fib_meth_type.class
+    assert_equal("fibonacci(fixnum[-, ==]) -> fixnum", str)
+    assert_equal(3, result)
+  end
+
+  def test_bucket_sort()
+    opus8 = Opus8.new
+    array = [5, 1, 3, 7, 11, 9]
+    bucket = []
+    opus8.bucketSort(array, 6, bucket, 12)
+    sort_meth_type = Runtime::Inspector.inspect_meth(Opus8, :bucketSort)
+    str = sort_meth_type.unparse()
+    assert_equal("bucketSort(array[[], []=], fixnum[], array[[], []=], fixnum[]) -> range", str)
+    assert_equal([1, 3, 5, 7, 9, 11], array)
+  end
+
+end

data/test/runtime/tc_obj_wrapper.rb

@@ -144,7 +144,7 @@ class ObjectWrapperTest < Test::Unit::TestCase
     assert(y == wrapped_x)
     assert(wrapped_x == y)
     assert(!y.equal?(wrapped_x)) # try "42".equal?("42") in irb, it will fail
-    assert(wrapped_x.equal?(y))
+    assert(!wrapped_x.equal?(y))
     assert(y.eql?(wrapped_x))
     assert(wrapped_x.eql?(y))
     assert_equal(y, wrapped_x)
@@ -178,7 +178,7 @@ class ObjectWrapperTest < Test::Unit::TestCase
     assert(y == wrapped_x)
     assert(wrapped_x == y)
     assert(!y.equal?(wrapped_x))
-    assert(wrapped_x.equal?(y))
+    assert(!wrapped_x.equal?(y))
     assert(y.eql?(wrapped_x))
     assert(wrapped_x.eql?(y))
     assert_equal(y, wrapped_x)
@@ -212,7 +212,7 @@ class ObjectWrapperTest < Test::Unit::TestCase
     assert(y == wrapped_x)
     assert(wrapped_x == y)
     assert(!y.equal?(wrapped_x)) 
-    assert(wrapped_x.equal?(y))
+    assert(!wrapped_x.equal?(y))
     assert(y.eql?(wrapped_x))
     assert(wrapped_x.eql?(y))
     assert_equal(y, wrapped_x)

data/test/ts_integrated.rb

@@ -8,4 +8,5 @@ require_relative "integrated/tc_class_methods"
 require_relative "integrated/tc_both_documented_and_undocumented"
 require_relative "integrated/tc_namespace"
 require_relative "integrated/tc_checking"
+require_relative "integrated/tc_simple_algorithms"
 

data/test/type/tc_parser.rb

@@ -189,7 +189,19 @@ class GrammarTest < Test::Unit::TestCase
     #puts str
     assert_equal("foo([m1, m2, m3?]) -> fixnum",str)    
   end
+
+  def test_method_duck_array_index_method
+    type = @parser.parse("foo([[]]) -> fixnum").value
+    str = TypeUnparser.unparse(type)
+    assert_equal("foo([[]]) -> fixnum", str)
+  end
   
+  def test_method_duck_array_more_methods
+    type = @parser.parse("foo([[],[]=]) -> fixnum").value
+    str = TypeUnparser.unparse(type)
+    assert_equal("foo([[], []=]) -> fixnum", str)
+  end
+
   def test_method_fusion_arg
     type = @parser.parse("foo(fixnum[to_s]) -> fixnum").value
     str = TypeUnparser.unparse(type)
@@ -204,6 +216,18 @@ class GrammarTest < Test::Unit::TestCase
     assert_equal("foo(fixnum[to_i, to_s]) -> fixnum",str)    
   end
   
+  def test_method_fusion_array_index_method
+    type = @parser.parse("foo(array[[]]) -> fixnum").value
+    str = TypeUnparser.unparse(type)
+    assert_equal("foo(array[[]]) -> fixnum", str)
+  end
+  
+  def test_method_fusion_array_more_methods
+    type = @parser.parse("foo(array[[],[]=]) -> fixnum").value
+    str = TypeUnparser.unparse(type)
+    assert_equal("foo(array[[], []=]) -> fixnum", str)
+  end
+
   def test_space_around
     type = @parser.parse("    foo() -> nil ").value
     str = TypeUnparser.unparse(type)

data/webpage/rdoc/Object.html

@@ -104,8 +104,6 @@
   
     <li><a href="./RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="./RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="./RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="./RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>

data/webpage/rdoc/Rake.html

@@ -98,8 +98,6 @@
   
     <li><a href="./RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="./RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="./RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="./RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>

data/webpage/rdoc/Rake/RubyBreakerTestTask.html

@@ -118,8 +118,6 @@
   
     <li><a href="../RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="../RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="../RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="../RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>

data/webpage/rdoc/RubyBreaker.html

@@ -160,8 +160,6 @@
   
     <li><a href="./RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="./RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="./RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="./RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>
@@ -561,7 +559,7 @@ href="RubyBreaker.html">RubyBreaker</a> as a shell program.</p>
 
           
           <div class="method-source-code" id="run-source">
-            <pre><span class="ruby-comment"># File lib/rubybreaker.rb, line 171</span>
+            <pre><span class="ruby-comment"># File lib/rubybreaker.rb, line 175</span>
 <span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">run</span>(*<span class="ruby-identifier">mods</span>)
   <span class="ruby-constant">RubyBreaker</span>.<span class="ruby-identifier">setup_logger</span>() <span class="ruby-keyword">unless</span> <span class="ruby-constant">RubyBreaker</span>.<span class="ruby-identifier">defined_logger?</span>()
 

data/webpage/rdoc/RubyBreaker/Breakable.html

@@ -108,8 +108,6 @@
   
     <li><a href="../RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="../RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="../RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="../RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>

data/webpage/rdoc/RubyBreaker/Broken.html

@@ -108,8 +108,6 @@
   
     <li><a href="../RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="../RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="../RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="../RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>

data/webpage/rdoc/RubyBreaker/Context.html

@@ -120,8 +120,6 @@
   
     <li><a href="../RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="../RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="../RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="../RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>

data/webpage/rdoc/RubyBreaker/Errors.html

@@ -98,8 +98,6 @@
   
     <li><a href="../RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="../RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="../RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="../RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>

data/webpage/rdoc/RubyBreaker/Errors/ArgumentTypeError.html

@@ -104,8 +104,6 @@
   
     <li><a href="../../RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="../../RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="../../RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="../../RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>

data/webpage/rdoc/RubyBreaker/Errors/ArityError.html

@@ -104,8 +104,6 @@
   
     <li><a href="../../RubyBreaker/Position.html">RubyBreaker::Position</a>
   
-    <li><a href="../../RubyBreaker/RDocSupport.html">RubyBreaker::RDocSupport</a>
-  
     <li><a href="../../RubyBreaker/RubyTypeUtils.html">RubyBreaker::RubyTypeUtils</a>
   
     <li><a href="../../RubyBreaker/Runtime.html">RubyBreaker::Runtime</a>