fastruby 0.0.17 → 0.0.18

data/spec/scope_mode/base_spec.rb

@@ -6,8 +6,17 @@ require "fastruby/translator/scope_mode_helper"
 $parser = RubyParser.new
 
 describe FastRuby::ScopeModeHelper, "scope mode helper" do
-  it "method with only ONE call and read after call should return :dag scope mode" do
+    
+  def get_scope_mode(tree)
     FastRuby::ScopeModeHelper.get_scope_mode(
+      FastRuby::Reductor.new.reduce(
+        FastRuby::FastRubySexp.from_sexp(tree)
+        )
+        )
+  end
+  
+  it "method with only ONE call and read after call should return :dag scope mode" do
+    get_scope_mode(
       $parser.parse "def foo(a,b,c) 
         a+b
         c
@@ -16,7 +25,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "method with only ONE call and self read after call should return :dag scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c) 
         a+b
         self
@@ -25,7 +34,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "method with only ONE call and yield after call should return :dag scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c) 
         a+b
         yield
@@ -34,7 +43,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "method with only ONE call and local call after call should return :dag scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c) 
         a+b
         foo
@@ -43,7 +52,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "method call AFTER read inside while should return :dag scope" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b)
         while (true) 
           a=b

data/spec/scope_mode/block_spec.rb

@@ -6,8 +6,17 @@ require "fastruby/translator/scope_mode_helper"
 $parser = RubyParser.new
 
 describe FastRuby::ScopeModeHelper, "scope mode helper" do
-  it "iter call with block accessing locals should return dag" do
+    
+  def get_scope_mode(tree)
     FastRuby::ScopeModeHelper.get_scope_mode(
+      FastRuby::Reductor.new.reduce(
+        FastRuby::FastRubySexp.from_sexp(tree)
+        )
+        )
+  end
+  
+  it "iter call with block accessing locals should return dag" do
+    get_scope_mode(
       $parser.parse "def foo(a)
         bar do
           a
@@ -17,7 +26,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
   
   it "iter call with block doing yield should return dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a)
         bar do
           yield
@@ -27,7 +36,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end  
   
   it "iter call with block with arguments should return dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a)
         bar do |x|
         end
@@ -36,7 +45,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end  
 
   it "iter call with block writing local variable should return dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a)
         bar do
           a = 87
@@ -46,7 +55,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "two iter call, one empty and the second with yield should return dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a)
         bar do
         end
@@ -59,7 +68,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
   
   it "lambda with yield must return :dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "          def foo
             lambda {
               yield
@@ -70,7 +79,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end  
 
   it "method with return from inside block return :dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "    def bar
             foo do
               return 9
@@ -81,7 +90,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
   
   it "method with self from inside block return :dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "    def bar
             foo do
               self
@@ -92,7 +101,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
   
   it "local call from inside block should return :dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "    def bar
             foo do
               print

data/spec/scope_mode/call_spec.rb

@@ -6,8 +6,17 @@ require "fastruby/translator/scope_mode_helper"
 $parser = RubyParser.new
 
 describe FastRuby::ScopeModeHelper, "scope mode helper" do
-  it "method with two nested calls refering local vars should return :dag scope mode" do
+    
+  def get_scope_mode(tree)
     FastRuby::ScopeModeHelper.get_scope_mode(
+      FastRuby::Reductor.new.reduce(
+        FastRuby::FastRubySexp.from_sexp(tree)
+        )
+        )
+  end
+  
+  it "method with two nested calls refering local vars should return :dag scope mode" do
+    get_scope_mode(
       $parser.parse "def foo(a,b,c) 
         a+b+c
       end"
@@ -15,7 +24,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "method with two nested calls refering local vars should return :dag scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c) 
         a.foo(b){}.foo(c){}
       end"

data/spec/scope_mode/exception_spec.rb

@@ -6,8 +6,17 @@ require "fastruby/translator/scope_mode_helper"
 $parser = RubyParser.new
 
 describe FastRuby::ScopeModeHelper, "scope mode helper" do
-  it "method with read on begin body, call on rescue body and retry should return :dag scope mode" do
+    
+  def get_scope_mode(tree)
     FastRuby::ScopeModeHelper.get_scope_mode(
+      FastRuby::Reductor.new.reduce(
+        FastRuby::FastRubySexp.from_sexp(tree)
+        )
+        )
+  end
+  
+  it "method with read on begin body, call on rescue body and retry should return :dag scope mode" do
+    get_scope_mode(
       $parser.parse "def foo(a,b,c) 
         begin
           b
@@ -20,7 +29,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
   
   it "method with read on begin body and retry should return :dag scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c) 
         begin
           nil.bar(b)

data/spec/scope_mode/flow_spec.rb

@@ -2,12 +2,22 @@ require "fastruby"
 require "sexp"
 require "ruby_parser"
 require "fastruby/translator/scope_mode_helper"
+require "fastruby/reductor/reductor"
 
 $parser = RubyParser.new
 
 describe FastRuby::ScopeModeHelper, "scope mode helper" do
-  it "possible read on if after call should return :dag scope mode" do
+  
+  def get_scope_mode(tree)
     FastRuby::ScopeModeHelper.get_scope_mode(
+      FastRuby::Reductor.new.reduce(
+        FastRuby::FastRubySexp.from_sexp(tree)
+        )
+        )
+  end
+  
+  it "possible read on if after call should return :dag scope mode" do
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         if (a > 0)
           c
@@ -17,7 +27,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "possible read on case after call should return :dag scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         case (a > 0)
           when 0
@@ -28,7 +38,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "possible read on case (on enum) after call should return :dag scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         case (a > 0)
           when c
@@ -39,7 +49,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "for with local read and call should return :dag scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         for a in b
           foo
@@ -50,7 +60,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "empty for with local read should return :dag scope mode (because for is a iter call to each with one argument)" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         for a in b
         end
@@ -59,7 +69,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "case with a when should act as call and local read after case when should return :dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         case b
           when c
@@ -70,7 +80,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
   
   it "case with a when should act as call and local read after case when should return :dag" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         case b
           when c
@@ -83,7 +93,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end  
 
   it "case with two call (when) after read should return :dag scope" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         case a
           when b # call to a.===(b)

data/spec/scope_mode/optimization_spec.rb

@@ -6,14 +6,22 @@ require "fastruby/translator/scope_mode_helper"
 $parser = RubyParser.new
 
 describe FastRuby::ScopeModeHelper, "scope mode helper" do
-  it "empty method should return :linear scope mode" do
+  def get_scope_mode(tree)
     FastRuby::ScopeModeHelper.get_scope_mode(
+      FastRuby::Reductor.new.reduce(
+        FastRuby::FastRubySexp.from_sexp(tree)
+        )
+        )
+  end
+  
+  it "empty method should return :linear scope mode" do
+    get_scope_mode(
       $parser.parse "def foo(); end"
     ).should be == :linear
   end
 
   it "method without calls should return :linear scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c) 
         a
       end"
@@ -21,7 +29,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "method with only ONE call should return :linear scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b) 
         a+b
       end"
@@ -29,7 +37,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "method call AFTER read should return :linear scope" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b) 
         a=b
         a+b
@@ -38,7 +46,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
   
   it "empty if should return :linear scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         if (a)
         end
@@ -46,7 +54,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
     ).should be == :linear
   end
   it "iter call with empty block should return linear" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo
         bar do
         end
@@ -55,7 +63,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
   
   it "return of simple call should return :linear" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b)
       return a+b
       end"
@@ -63,7 +71,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "call on if body and read on condition should return :linear (no read after call risk)" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b)
         if a
           b.foo
@@ -73,7 +81,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end  
 
   it "call on if body and read on else body should return :linear (no read after call risk)" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b)
         if true
           b
@@ -85,7 +93,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end  
 
   it "method with read on begin body should return :linear scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         begin
           nil.bar(b)
@@ -96,7 +104,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "method with read on begin body and call on rescue body   should return :linear scope mode" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         begin
           b
@@ -108,7 +116,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "case with call (when) after read should return :linear scope" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b,c)
         case a
           when b
@@ -119,7 +127,7 @@ describe FastRuby::ScopeModeHelper, "scope mode helper" do
   end
 
   it "read of variable AFTER write without call between them should return :linear scope" do
-    FastRuby::ScopeModeHelper.get_scope_mode(
+    get_scope_mode(
       $parser.parse "def foo(a,b) 
         a+b
         c=55

data/spec/static/base_spec.rb

@@ -0,0 +1,54 @@
+require "fastruby"
+
+describe FastRuby::FastRubySexp, "FastRubySexp" do
+
+  it "should accept _static keyword to compile static C calls" do
+    fastruby "
+    class STATICX1
+      def foo(a)
+        _static {
+           INT2FIX(FIX2INT(a))
+        }
+      end
+    end
+    "
+    
+    STATICX1.new.foo(100).should be == 100
+  end
+  
+  it "should allow native inmediates inside static blocks as native C semantic" do
+    fastruby "
+    class STATICX2
+      def foo
+        _static {
+           INT2FIX(100)
+        }
+      end
+    end
+    "
+    
+    STATICX2.new.foo.should be == 100
+  end
+  
+  it "should accept _dynamic to activate ruby sematic inside _static block" do
+    fastruby "
+    class STATICX3
+      def bar(a)
+        a+1
+      end
+      
+      def foo(a)
+        _static {
+           INT2FIX(
+              FIX2INT(
+                  _dynamic{bar(a)}
+              )
+           )
+        }
+      end
+    end
+    "
+    
+    STATICX3.new.foo(100).should be == 101
+  end  
+end

data/spec/static/flow_spec.rb

@@ -0,0 +1,48 @@
+require "fastruby"
+
+describe FastRuby::FastRubySexp, "FastRubySexp" do
+    fastruby "
+      class STATICFLOW1
+        def foo(a)
+          _static do
+            if (FIX2INT(a))
+              INT2FIX(20)
+            else
+              INT2FIX(40)
+            end
+          end
+        end
+      end
+    "
+    
+    
+  def self.test_static_if(*args)
+    args.each do |arg|
+      it "should should evaluate #{arg} as #{arg != 0} on static if" do
+        STATICFLOW1.new.foo(arg).should be == (arg == 0 ? 40 : 20)
+      end
+    end
+  end
+
+  test_static_if false.__id__, true.__id__, nil.__id__, 10, 11
+  
+  it "should allow static while" do
+    fastruby "
+      class STATICFLOW2
+        def foo(a)
+          ret = 0
+          _static do
+            while (FIX2INT(a) > 0)
+              a = INT2FIX(FIX2INT(a) - 1)
+              ret = INT2FIX(FIX2INT(ret) + 1)
+            end
+          end
+          ret
+        end
+      end
+    "
+    
+    STATICFLOW2.new.foo(7).should be == 7
+    STATICFLOW2.new.foo(0).should be == 0
+  end
+end

data/spec/static/operator_spec.rb

@@ -0,0 +1,104 @@
+require "fastruby"
+
+describe FastRuby::FastRubySexp, "FastRubySexp" do
+
+  def self.test_binary_operator(op, classname, input, expected)
+    it "should accept native operator #{op} with two numbers input:#{input} expected:#{expected}}" do
+      fastruby "
+      class #{classname}
+        def foo(a)
+          _static {
+             INT2FIX(FIX2INT(a)#{op}2)
+          }
+        end
+      end
+      "
+      
+      eval(classname).new.foo(input).should be == expected
+    end
+  end
+  
+  test_binary_operator("+", "STATICX1_1", 10, 12)
+  test_binary_operator("-", "STATICX1_2", 10, 8)
+  test_binary_operator("*", "STATICX1_3", 10, 20)
+  test_binary_operator("/", "STATICX1_4", 10, 5)
+
+  (3..4).each do |i|
+    test_binary_operator(">", "STATICX1_5_#{i}", i, 1)
+  end
+
+  (-1..2).each do |i|
+    test_binary_operator(">", "STATICX1_6_#{i.to_s.gsub('-','__')}", i, 0)
+  end
+
+  (-1..1).each do |i|
+    test_binary_operator("<", "STATICX1_6_#{i.to_s.gsub('-','__')}", i, 1)
+  end
+
+  (2..3).each do |i|
+    test_binary_operator("<", "STATICX1_7_#{i}", i, 0)
+  end
+  
+
+  (2..4).each do |i|
+    test_binary_operator(">=", "STATICX1_8_#{i}", i, 1)
+  end
+
+  (-1..1).each do |i|
+    test_binary_operator(">=", "STATICX1_9_#{i.to_s.gsub('-','__')}", i, 0)
+  end
+
+  (-1..2).each do |i|
+    test_binary_operator("<=", "STATICX1_10_#{i.to_s.gsub('-','__')}", i, 1)
+  end
+
+  (3..4).each do |i|
+    test_binary_operator("<=", "STATICX1_11_#{i}", i, 0)
+  end
+  
+
+  (3..5).each do |i|
+    test_binary_operator("==", "STATICX1_12_#{i}", i, i == 2 ? 1 : 0)
+  end
+  
+  (3..5).each do |i|
+    test_binary_operator("===", "STATICX1_13_#{i}", i, i == 2 ? 1 : 0)
+  end
+  
+  def self.test_bool_operator(code, classname, expected)
+    it "should execute boolean operation #{code} expected:#{expected}}" do
+      fastruby "
+      class #{classname}
+        def foo
+          _static {
+             if (#{code})
+               INT2FIX(40)
+             else
+               INT2FIX(20)
+             end
+          }
+        end
+      end
+      "
+      
+      eval(classname).new.foo.should be == expected
+    end
+  end
+  
+  test_bool_operator "4 and 4", "STATIC1_14", 40
+  test_bool_operator "4 or 4", "STATIC1_15", 40
+  
+  it "should execute boolean operation not" do
+    fastruby "
+      class STATIC1_16
+        def foo
+          _static {
+             INT2FIX((not 4))
+          }
+        end
+      end
+      "
+      
+    STATIC1_16.new.foo.should be == 0
+  end
+end