fastruby 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.0.5	Support for case..when..end
+
+		Fixes on wrapping/translation of fastruby frames through ruby calls
+
 0.0.4	Basic support fot non-local goto: return, break, next
 
 		Basic support for exceptions

data/Rakefile

@@ -7,7 +7,7 @@ require "rspec/core/rake_task"
 
 spec = Gem::Specification.new do |s|
   s.name = 'fastruby'
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   s.author = 'Dario Seminara'
   s.email = 'robertodarioseminara@gmail.com'
   s.platform = Gem::Platform::RUBY

data/lib/fastruby/object.rb

@@ -22,9 +22,11 @@ require "fastruby/translator"
 require "fastruby/builder"
 require "fastruby/getlocals"
 require "fastruby/method_extension"
+require "fastruby/translator"
 require "ruby_parser"
 require "inline"
 
+
 # clean rubyinline cache
 system("rm -fr #{ENV["HOME"]}/.ruby_inline/*")
 
@@ -292,7 +294,23 @@ class Object
 
           int aux = setjmp(frame.jmp);
           if (aux != 0) {
-            rb_funcall(self, #{:raise.to_i}, 1, frame.exception);
+            if (frame.target_frame == (void*)-1) {
+              rb_funcall(self, #{:raise.to_i}, 1, frame.exception);
+            }
+
+            if (frame.target_frame != &frame) {
+                VALUE ex = rb_funcall(
+                        (VALUE)#{FastRuby::Context::UnwindFastrubyFrame.internal_value},
+                        #{:new.to_i},
+                        3,
+                        frame.exception,
+                        LONG2FIX(frame.target_frame),
+                        frame.return_value
+                        );
+
+                rb_funcall(self, #{:raise.to_i}, 1, ex);
+            }
+
             return Qnil;
           }
 

data/lib/fastruby/translator.rb

@@ -286,24 +286,21 @@ module FastRuby
         str_arg_initialization
 
         block_code = proc { |name| "
-          static VALUE #{name}(VALUE arg, VALUE _parent_frame) {
+          static VALUE #{name}(VALUE arg, VALUE _plocals) {
             // block for call to #{call_tree[2]}
             VALUE last_expression = Qnil;
 
             #{@frame_struct} frame;
             #{@frame_struct} *pframe = (void*)&frame;
-            #{@frame_struct} *parent_frame = (void*)_parent_frame;
-            #{@locals_struct} *plocals;
+            #{@locals_struct} *plocals = (void*)_plocals;
 
-            frame.plocals = parent_frame->plocals;
-            frame.parent_frame = parent_frame;
+            frame.plocals = plocals;
+            frame.parent_frame = 0;
             frame.return_value = Qnil;
             frame.target_frame = &frame;
             frame.exception = Qnil;
             frame.rescue = 0;
 
-            plocals = frame.plocals;
-
             if (setjmp(frame.jmp) != 0) {
               if (pframe->target_frame != pframe) {
                 if (pframe->target_frame == (void*)-3) {
@@ -318,6 +315,7 @@ module FastRuby
                         LONG2FIX(pframe->target_frame),
                         pframe->return_value
                         );
+
                 rb_funcall(plocals->self, #{:raise.to_i}, 1, ex);
               }
               return frame.return_value;
@@ -332,7 +330,7 @@ module FastRuby
         "
         }
 
-        protected_block("rb_iterate(#{anonymous_function(&caller_code)}, (VALUE)pframe, #{anonymous_function(&block_code)}, (VALUE)pframe)", true)
+        protected_block("rb_iterate(#{anonymous_function(&caller_code)}, (VALUE)pframe, #{anonymous_function(&block_code)}, (VALUE)plocals)", true)
 
       elsif convention == :fastruby
 
@@ -474,11 +472,13 @@ module FastRuby
         @yield_signature = new_yield_signature
       end
 
-      if tree.size > 1
-        anonymous_function(&block_code)+"((VALUE)pframe, (VALUE[]){#{tree[1..-1].map{|subtree| to_c subtree}.join(",")}})"
-      else
-        anonymous_function(&block_code)+"((VALUE)pframe, (VALUE[]){})"
-      end
+      ret = if tree.size > 1
+          anonymous_function(&block_code)+"((VALUE)pframe, (VALUE[]){#{tree[1..-1].map{|subtree| to_c subtree}.join(",")}})"
+        else
+          anonymous_function(&block_code)+"((VALUE)pframe, (VALUE[]){})"
+        end
+
+      protected_block(ret, true)
     end
 
     def to_c_block(tree)
@@ -503,7 +503,7 @@ module FastRuby
     end
 
     def to_c_return(tree)
-      "pframe->target_frame = ((typeof(pframe))plocals->pframe); plocals->return_value = #{to_c(tree[1])}; longjmp(pframe->jmp, 1);\n"
+      "pframe->target_frame = ((typeof(pframe))plocals->pframe); plocals->return_value = #{to_c(tree[1])}; longjmp(pframe->jmp, 1); return Qnil;\n"
     end
 
     def to_c_break(tree)
@@ -621,6 +621,36 @@ module FastRuby
       end
     end
 
+    def to_c_case(tree)
+
+      tmpvarname = "tmp" + rand(1000000).to_s;
+
+      code = tree[2..-2].map{|subtree|
+
+              # this subtree is a when
+            subtree[1][1..-1].map{|subsubtree|
+              c_calltree = s(:call, nil, :inline_c, s(:arglist, s(:str, tmpvarname), s(:false)))
+              calltree = s(:call, subsubtree, :===, s(:arglist, c_calltree))
+              "
+                if (RTEST(#{to_c_call(calltree, tmpvarname)})) {
+                   return #{to_c(subtree[2])};
+                }
+
+              "
+            }.join("\n")
+
+          }.join("\n")
+
+      inline_block "
+
+        VALUE #{tmpvarname} = #{to_c tree[1]};
+
+        #{code};
+
+        return #{to_c tree[-1]};
+      "
+    end
+
     def to_c_const(tree)
       "rb_const_get(CLASS_OF(plocals->self), #{tree[1].to_i})"
     end
@@ -966,7 +996,7 @@ module FastRuby
       end
     end
 
-    def to_c_call(tree)
+    def to_c_call(tree, repass_var = nil)
       directive_code = directive(tree)
       if directive_code
         return directive_code
@@ -1046,8 +1076,13 @@ module FastRuby
           len = getlen(mobject)
         end
 
-        extraargs = ""
-        extraargs = ", Qfalse" if convention == :fastruby
+        if repass_var
+          extraargs = ","+repass_var
+          extraargs_signature = ",VALUE " + repass_var
+        else
+          extraargs = ""
+          extraargs_signature = ""
+        end
 
         if address then
           if argnum == 0
@@ -1072,7 +1107,7 @@ module FastRuby
               protected_block(
 
                 anonymous_function{ |name| "
-                  static VALUE #{name}(VALUE recv) {
+                  static VALUE #{name}(VALUE recv#{extraargs_signature}) {
                     // call to #{recvtype}##{mname}
                     if (rb_block_given_p()) {
                       // no passing block, recall
@@ -1081,8 +1116,7 @@ module FastRuby
                       return ((VALUE(*)(#{value_cast}))0x#{address.to_s(16)})(#{str_incall_args});
                     }
                   }
-                " } + "(#{to_c(recv)})"
-              )
+                " } + "(#{to_c(recv)}#{extraargs})", false, repass_var)
             end
           else
             value_cast = ( ["VALUE"]*(args.size) ).join(",")
@@ -1116,24 +1150,24 @@ module FastRuby
                       return ((VALUE(*)(#{value_cast}))0x#{address.to_s(16)})(#{str_incall_args});
                     }
                   }
-                " } + "(#{to_c(recv)}, #{strargs})"
+                " } + "(#{to_c(recv)}, #{strargs})", false, repass_var
               )
             end
           end
         else
 
           if argnum == 0
-            protected_block("rb_funcall(#{to_c recv}, #{tree[2].to_i}, 0)")
+            protected_block("rb_funcall(#{to_c recv}, #{tree[2].to_i}, 0)", false, repass_var)
           else
-            protected_block("rb_funcall(#{to_c recv}, #{tree[2].to_i}, #{argnum}, #{strargs} )")
+            protected_block("rb_funcall(#{to_c recv}, #{tree[2].to_i}, #{argnum}, #{strargs} )", false, repass_var)
           end
         end
 
       else
         if argnum == 0
-          protected_block("rb_funcall(#{to_c recv}, #{tree[2].to_i}, 0)")
+          protected_block("rb_funcall(#{to_c recv}, #{tree[2].to_i}, 0)", false, repass_var)
         else
-          protected_block("rb_funcall(#{to_c recv}, #{tree[2].to_i}, #{argnum}, #{strargs} )")
+          protected_block("rb_funcall(#{to_c recv}, #{tree[2].to_i}, #{argnum}, #{strargs} )", false, repass_var)
         end
       end
     end
@@ -1212,16 +1246,23 @@ module FastRuby
       elsif mname == :block_given?
         return "#{locals_accessor}block_function_address == 0 ? Qfalse : Qtrue"
       elsif mname == :inline_c
+
         code = args[1][1]
 
-        return anonymous_function{ |name| "
-           static VALUE #{name}(VALUE param) {
-            #{@locals_struct} *plocals = (void*)param;
-            #{code};
-            return Qnil;
-          }
-         "
-        }+"((VALUE)plocals)"
+        unless (args[2] == s(:false))
+          return anonymous_function{ |name| "
+             static VALUE #{name}(VALUE param) {
+              #{@frame_struct} *pframe = (void*)param;
+              #{@locals_struct} *plocals = (void*)pframe->plocals;
+              #{code};
+              return Qnil;
+            }
+           "
+          }+"((VALUE)pframe)"
+        else
+          code
+        end
+
       else
         nil
       end
@@ -1249,9 +1290,9 @@ module FastRuby
       }
     end
 
-    def inline_block(code)
+    def inline_block(code, repass_var = nil)
       anonymous_function{ |name| "
-        static VALUE #{name}(VALUE param) {
+        static VALUE #{name}(VALUE param#{repass_var ? ",VALUE " + repass_var : "" }) {
           #{@frame_struct} *pframe = (void*)param;
           #{@locals_struct} *plocals = (void*)pframe->plocals;
           VALUE last_expression = Qnil;
@@ -1259,7 +1300,7 @@ module FastRuby
           #{code}
           }
         "
-      } + "((VALUE)pframe)"
+      } + "((VALUE)pframe#{repass_var ? ", " + repass_var : "" })"
     end
 
     def inline_ruby(proced, parameter)
@@ -1274,7 +1315,7 @@ module FastRuby
             ")
     end
 
-    def protected_block(inner_code, always_rescue = false)
+    def protected_block(inner_code, always_rescue = false,repass_var = nil)
       wrapper_code = "
          if (pframe->last_error != Qnil) {
               if (CLASS_OF(pframe->last_error)==(VALUE)#{UnwindFastrubyFrame.internal_value}) {
@@ -1292,6 +1333,7 @@ module FastRuby
                 return Qnil;
 
               } else {
+
                 // raise emulation
                   #{@frame_struct} *pframe = (void*)param;
                   pframe->target_frame = (void*)-1;
@@ -1302,7 +1344,29 @@ module FastRuby
 
           }
       "
-      rescue_code = "rb_rescue2(#{inline_block_reference "return #{inner_code};"},(VALUE)pframe,#{anonymous_function{|name| "
+
+
+      body = nil
+      rescue_args = nil
+      if repass_var
+        body =  anonymous_function{ |name| "
+          static VALUE #{name}(VALUE param) {
+            #{@frame_struct} *pframe = ((void**)param)[0];
+            #{@locals_struct} *plocals = pframe->plocals;
+            VALUE #{repass_var} = (VALUE)((void**)param)[1];
+            return #{inner_code};
+            }
+          "
+        }
+
+        rescue_args = ""
+        rescue_args = "(VALUE)(VALUE[]){(VALUE)pframe,#{repass_var}}"
+      else
+        body = inline_block_reference("return #{inner_code}")
+        rescue_args = "(VALUE)pframe"
+      end
+
+      rescue_code = "rb_rescue2(#{body},#{rescue_args},#{anonymous_function{|name| "
         static VALUE #{name}(VALUE param, VALUE error) {
             #{@frame_struct} *pframe = (void*)param;
             pframe->last_error = error;
@@ -1318,7 +1382,7 @@ module FastRuby
           #{wrapper_code}
 
           return result;
-        "
+        ", repass_var
       else
         inline_block "
           VALUE result;
@@ -1333,7 +1397,7 @@ module FastRuby
           #{wrapper_code}
 
           return result;
-        "
+        ", repass_var
       end
 
     end
@@ -1382,6 +1446,7 @@ module FastRuby
       "
     end
 
+
     def frame(code, jmp_code, not_jmp_code = "", rescued = nil)
 
       anonymous_function{ |name| "
@@ -1414,7 +1479,6 @@ module FastRuby
               pframe->exception = original_frame->exception;
               pframe->target_frame = original_frame->target_frame;
               pframe->return_value = original_frame->return_value;
-
               longjmp(pframe->jmp,1);
             }
 

data/lib/fastruby.rb

@@ -24,5 +24,5 @@ require "fastruby/exceptions"
 require "fastruby/custom_require"
 
 module FastRuby
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/spec/block_spec.rb

@@ -415,4 +415,90 @@ describe FastRuby, "fastruby" do
     y28 = ::Y28.new
     y28.foo(::Y27.new, 713).should be == 713
   end
+
+  class ::Y29
+    fastruby "
+      def foo(ary)
+        cc = nil
+        ary.each do |x|
+          cc = x
+        end
+        cc
+      end
+    "
+  end
+
+  it "should assign variables from inside a block" do
+    ::Y29.new.foo([1,2,3]).should be == 3
+  end
+
+
+  class ::Y30
+    attr_accessor :a, :b, :c
+
+      def bar
+        begin
+          doo do
+            yield
+          end
+        ensure
+          @a = 15
+        end
+      end
+
+    fastruby "
+
+      def doo
+        begin
+          yield
+        ensure
+          @b = 16
+        end
+      end
+
+      def foo
+        cc = nil
+        bar do
+          return
+        end
+      ensure
+        @c = 17
+      end
+    "
+  end
+
+  it "should assign variables from inside a block" do
+    y = ::Y30.new
+    y.foo
+
+    y.a.should be == 15
+    y.b.should be == 16
+    y.c.should be == 17
+  end
+
+  class ::Y31
+    fastruby "
+
+      def bar
+        begin
+          yield
+        rescue
+        end
+      end
+
+      def foo
+        bar do
+          return 8
+        end
+        return 0
+      end
+    "
+  end
+
+  it "should return values from block through rescue" do
+    y = ::Y31.new
+    y.foo.should be == 8
+  end
+
+
 end

data/spec/flow_control/case_spec.rb

@@ -0,0 +1,136 @@
+require "fastruby"
+
+describe FastRuby, "case statement" do
+  class ::O1
+    fastruby '
+      def foo(a)
+        case a
+        when 1
+          2
+        when 2
+          10
+        when 3
+          9
+        else
+          11
+        end
+      end
+    '
+  end
+
+  it "should execute" do
+    o1 = ::O1.new
+    o1.foo(1).should be == 2
+    o1.foo(2).should be == 10
+    o1.foo(3).should be == 9
+    o1.foo(4).should be == 11
+  end
+
+  class ::O2
+    fastruby '
+      def foo(a)
+        case a
+          when 34
+            32
+        end
+      end
+    '
+  end
+
+  it "should return nil when any option is matched" do
+    o2 = ::O2.new
+    o2.foo(1).should be == nil
+  end
+
+  class ::O3
+    fastruby '
+      def foo(a,b,c,d)
+        case a
+          when b
+            32
+          when c
+            15
+          when d
+            16
+        end
+      end
+    '
+  end
+
+  it "should call === on each comparison" do
+    obj = Object.new
+
+    b = ""
+    c = ""
+    d = ""
+
+    b.should_receive(:===).with(obj)
+    c.should_receive(:===).with(obj)
+    d.should_receive(:===).with(obj)
+
+    o3 = ::O3.new
+    o3.foo(obj,b,c,d).should be == nil
+  end
+
+  class ::O4
+    fastruby '
+      def foo(a)
+        case a
+        when 1,3
+          2
+        when 2,4
+          10
+        end
+      end
+    '
+  end
+
+  it "should execute case with arrays in when" do
+    o4 = ::O4.new
+    o4.foo(1).should be == 2
+    o4.foo(2).should be == 10
+    o4.foo(3).should be == 2
+    o4.foo(4).should be == 10
+  end
+
+  class ::O5
+    fastruby '
+      def foo(a)
+        case a
+        when /a/
+          2
+        else
+          nil
+        end
+      end
+    '
+  end
+
+  it "should execute case with regular expressions" do
+    o5 = ::O5.new
+    o5.foo("aaa").should be == 2
+  end
+
+
+  class ::O6
+    fastruby '
+      def foo(a)
+        case a
+        when 5..10
+          2
+        else
+          nil
+        end
+      end
+    '
+  end
+
+  it "should execute case with ranges" do
+    o6 = ::O6.new
+
+    (5..10).each do |i|
+      o6.foo(i).should be == 2
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fastruby
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Dario Seminara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 -03:00
+date: 2011-08-20 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - spec/block/next_spec.rb
 - spec/block/break_spec.rb
 - spec/block_spec.rb
+- spec/flow_control/case_spec.rb
 - spec/sugar_spec.rb
 - spec/literal_spec.rb
 - spec/singleton_spec.rb