fastruby 0.0.11 → 0.0.12

data/lib/fastruby/translator.rb

@@ -727,7 +727,7 @@ module FastRuby
           plocals = (void*)pframe->plocals;
 
           if (FIX2LONG(plocals->block_function_address) == 0) {
-            rb_raise(rb_eLocalJumpError, \"no block given\");
+            #{_raise("rb_eLocalJumpError", "no block given")};
           } else {
             return ((VALUE(*)(int,VALUE*,VALUE,VALUE))FIX2LONG(plocals->block_function_address))(#{tree.size-1}, block_args, FIX2LONG(plocals->block_function_param), (VALUE)pframe);
           }
@@ -808,9 +808,7 @@ module FastRuby
          target_frame_ = (void*)FIX2LONG(plocals->call_frame);
 
          if (target_frame_ == 0) {
-            pframe->thread_data->exception = #{literal_value LocalJumpError.exception};
-            longjmp(pframe->jmp,FASTRUBY_TAG_RAISE);
-            return Qnil;
+            #{_raise("rb_eLocalJumpError","illegal break")};
          }
 
          plocals->call_frame = LONG2FIX(0);
@@ -829,9 +827,7 @@ module FastRuby
          target_frame_ = (void*)FIX2LONG(plocals->call_frame);
 
          if (target_frame_ == 0) {
-            pframe->thread_data->exception = rb_funcall(rb_eLocalJumpError, #{intern_num :exception},0);
-            longjmp(pframe->jmp, FASTRUBY_TAG_RAISE);
-            return Qnil;
+            #{_raise("rb_eLocalJumpError","illegal retry")};
          }
 
          target_frame_->targetted = 1;
@@ -846,11 +842,7 @@ module FastRuby
           return Qnil;
           "
       else
-         inline_block "
-            pframe->thread_data->exception = #{literal_value LocalJumpError.exception};
-            longjmp(pframe->jmp,FASTRUBY_TAG_RAISE);
-            return Qnil;
-          "
+          _raise("rb_eLocalJumpError","illegal redo");
       end
     end
 
@@ -862,12 +854,7 @@ module FastRuby
         return Qnil;
         "
       else
-        inline_block("
-            pframe->thread_data->exception = #{literal_value LocalJumpError.exception};
-            longjmp(pframe->jmp,FASTRUBY_TAG_RAISE);
-            return Qnil;
-            ")
-
+        _raise("rb_eLocalJumpError","illegal next");
       end
     end
 
@@ -1541,7 +1528,11 @@ module FastRuby
     end
 
     def to_c_gvar(tree)
-      "rb_gvar_get((struct global_entry*)#{global_entry(tree[1])})"
+      if (tree[1] == :$!)
+        "pframe->thread_data->exception"
+      else
+        "rb_gvar_get((struct global_entry*)#{global_entry(tree[1])})"
+      end
     end
 
     def to_c_gasgn(tree)
@@ -1570,8 +1561,7 @@ module FastRuby
             return rb_const_get_from(klass, #{intern_num tree[2]});
             break;
           default:
-            rb_raise(rb_eTypeError, \"%s is not a class/module\",
-               RSTRING(rb_obj_as_string(klass))->ptr);
+            #{_raise("rb_eTypeError","not a class/module")};
             break;
         }
       }
@@ -1589,15 +1579,17 @@ module FastRuby
         if klass
 
           verify_type_function = proc { |name| "
-            static VALUE #{name}(VALUE arg) {
-              if (CLASS_OF(arg)!=#{literal_value klass}) rb_raise(#{literal_value FastRuby::TypeMismatchAssignmentException}, \"Illegal assignment at runtime (type mismatch)\");
+            static VALUE #{name}(VALUE arg, void* pframe ) {
+              if (CLASS_OF(arg)!=#{literal_value klass}) {
+                #{_raise(literal_value(FastRuby::TypeMismatchAssignmentException), "Illegal assignment at runtime (type mismatch)")};
+              }
               return arg;
             }
           "
           }
 
 
-          "_lvar_assing(&#{locals_accessor}#{tree[1]}, #{anonymous_function(&verify_type_function)}(#{to_c tree[2]}))"
+          "_lvar_assing(&#{locals_accessor}#{tree[1]}, #{anonymous_function(&verify_type_function)}(#{to_c tree[2]},pframe))"
         else
           "_lvar_assing(&#{locals_accessor}#{tree[1]},#{to_c tree[2]})"
         end
@@ -1664,24 +1656,60 @@ module FastRuby
         end
       else
         resbody_tree = tree[2]
-        else_tree = tree[3]
+        else_tree = nil
+        if tree[-1]
+          if tree[-1][0] != :resbody
+            else_tree = tree[-1]
+          end
+        end
+
+        catch_condition_array = []
+        lasgn_code = ""
+        resbody_code = to_c(resbody_tree[2])
+
+        rescue_code = ""
+
+        tree[1..-1].each do |resbody_tree|
+          next if resbody_tree[0] != :resbody
+
+          if resbody_tree[1].size == 1
+            resbody_tree[1][1] = [:const, :Exception]
+          end
+
+          if resbody_tree[1].last[0] == :lasgn
+            lasgn_code = to_c(resbody_tree[1].last)
+          end
+
+          resbody_tree[1][1..-1].each do |xtree|
+            if xtree[0] != :lasgn
+              trapcode = "rb_eException";
+
+              if xtree
+                trapcode = to_c(xtree)
+              end
+
+              catch_condition_array << "(rb_obj_is_kind_of(frame.thread_data->exception,#{trapcode}) == Qtrue)"
+            end
+          end
+
+          rescue_code << "
+            if (aux == FASTRUBY_TAG_RAISE) {
+              if (#{catch_condition_array.join(" || ")})
+              {
+                // trap exception
+                frame.targetted = 1;
+
+                #{lasgn_code};
 
-        trapcode = "rb_eException";
-        if resbody_tree[1][1]
-          trapcode = to_c(resbody_tree[1][1])
+                 #{resbody_code};
+              }
+            }
+          "
         end
 
         frame_call(
           frame(to_c(tree[1])+";","
-          if (aux == FASTRUBY_TAG_RAISE) {
-            if (rb_obj_is_kind_of(frame.thread_data->exception,#{trapcode}) == Qtrue)
-            {
-              // trap exception
-              frame.targetted = 1;
-
-               #{to_c(resbody_tree[2])};
-            }
-          }
+            #{rescue_code}
           ", else_tree ? to_c(else_tree) : nil, 1)
 
           )
@@ -1699,6 +1727,31 @@ module FastRuby
       end
     end
 
+    def _raise(class_tree, message_tree = nil)
+      class_tree = to_c class_tree unless class_tree.instance_of? String
+
+      if message_tree.instance_of? String
+        message_tree = "rb_str_new2(#{message_tree.inspect})"
+      else
+        message_tree = to_c message_tree
+      end
+
+      if message_tree
+        return inline_block("
+            pframe->thread_data->exception = rb_funcall(#{class_tree}, #{intern_num :exception},1,#{message_tree});
+            longjmp(pframe->jmp, FASTRUBY_TAG_RAISE);
+            return Qnil;
+            ")
+      else
+        return inline_block("
+            pframe->thread_data->exception = rb_funcall(#{class_tree}, #{intern_num :exception},0);
+            longjmp(pframe->jmp, FASTRUBY_TAG_RAISE);
+            return Qnil;
+            ")
+      end
+
+    end
+
     def to_c_call(tree, repass_var = nil)
       directive_code = directive(tree)
       if directive_code
@@ -1710,12 +1763,7 @@ module FastRuby
       elsif tree[2] == :raise
         # raise code
         args = tree[3]
-
-        return inline_block("
-            pframe->thread_data->exception = rb_funcall(#{to_c args[1]}, #{intern_num :exception},0);
-            longjmp(pframe->jmp, FASTRUBY_TAG_RAISE);
-            return Qnil;
-            ")
+        return _raise(args[1],args[2])
       end
 
       recv = tree[1]

data/lib/fastruby.rb

@@ -33,6 +33,6 @@ module FastRuby
   FastRuby.fastruby_script_path = File.expand_path(__FILE__)
   FastRuby.fastruby_load_path = File.expand_path(File.dirname(__FILE__))
 
-  VERSION = "0.0.11" unless defined? FastRuby::VERSION
+  VERSION = "0.0.12" unless defined? FastRuby::VERSION
 end
 

data/spec/exception/exc_trap_spec.rb

@@ -281,6 +281,4 @@ describe FastRuby, "fastruby" do
   basic_unhandled_exception("3", "RuntimeError")
   basic_unhandled_exception("4", "StandardError")
   basic_unhandled_exception("5", "Errno::ENOENT")
-
-
 end

data/spec/exception/internal_ex_spec.rb

@@ -0,0 +1,86 @@
+require "fastruby"
+
+describe FastRuby, "fastruby" do
+
+  it "should trap 'no block given" do
+    fastruby "
+      class LLJ1
+        attr_accessor :a
+
+        def bar
+          yield
+        end
+
+        def foo
+          bar # this will raise LocalJumpError
+        ensure
+          @a = 1
+        end
+      end
+    "
+
+    llj1 = LLJ1.new
+
+    lambda {
+      llj1.foo
+    }.should raise_error(LocalJumpError)
+
+    llj1.a.should be == 1
+  end
+
+
+  it "should trap 'TypeError" do
+    fastruby "
+      class LLJ2
+        attr_accessor :a
+
+        def bar
+          4::X
+        end
+
+        def foo
+          bar # this will raise TypeError
+        ensure
+          @a = 1
+        end
+      end
+    "
+
+    llj2 = LLJ2.new
+
+    lambda {
+      llj2.foo
+    }.should raise_error(TypeError)
+
+    llj2.a.should be == 1
+  end
+
+  it "should trap FastRuby::TypeMismatchAssignmentException" do
+    fastruby "
+      class LLJ3
+        attr_accessor :a
+
+        def bar
+          a = 0
+          lvar_type(a,Fixnum)
+          a = 'wrong value'
+        end
+
+        def foo
+          bar # this will raise FastRuby::TypeMismatchAssignmentException
+        ensure
+          @a = 1
+        end
+      end
+    ", :validate_lvar_types => true
+
+    llj3 = LLJ3.new
+
+    lambda {
+      llj3.foo
+    }.should raise_error(FastRuby::TypeMismatchAssignmentException)
+
+    llj3.a.should be == 1
+  end
+
+end

data/spec/exception/syntaxis_spec.rb

@@ -60,9 +60,9 @@ describe FastRuby, "fastruby" do
             end
              "
 
-      l = eval(random_name).new
-      l.foo.should be == 222
-     end
+    l = eval(random_name).new
+    l.foo.should be == 222
+   end
 
     def self.argumentless_rescue(exceptionname)
         fastruby "
@@ -86,4 +86,78 @@ describe FastRuby, "fastruby" do
 
     argumentless_rescue("RuntimeError")
 
+  it "should read exception into local" do
+    fastruby "
+      class ::LLX1
+        def foo
+          begin
+            raise Exception,'message'
+          rescue Exception => a
+          end
+
+          a
+        end
+      end
+    "
+
+    llx1 = ::LLX1.new
+    llx1.foo.message.should be == "message"
+  end
+
+  it "should read exception into local with traps of two exceptions" do
+    fastruby "
+      class ::LLX2
+        def foo
+          begin
+            raise RuntimeError,'message2'
+          rescue LocalJumpError, RuntimeError => b
+          end
+
+          b
+        end
+      end
+    "
+
+    llx2 = ::LLX2.new
+    llx2.foo.message.should be == "message2"
+  end
+
+  it "should trap exception with multiple rescue clauses" do
+    fastruby "
+      class ::LLX3
+        def foo
+          begin
+            raise RuntimeError,'message2'
+          rescue LocalJumpError
+          rescue RuntimeError => b
+          end
+
+          b
+        end
+      end
+    "
+
+    llx3 = ::LLX3.new
+    llx3.foo.message.should be == "message2"
+  end
+
+  it "should trap exception with multiple rescue clauses 2" do
+    fastruby "
+      class ::LLX4
+        def foo
+          begin
+            raise LocalJumpError,'message2'
+          rescue LocalJumpError => a
+          rescue RuntimeError
+          end
+
+          a
+        end
+      end
+    "
+
+    llx4 = ::LLX4.new
+    llx4.foo.message.should be == "message2"
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fastruby
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Dario Seminara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 -03:00
+date: 2011-10-06 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,8 @@ files:
 - lib/fastruby/sexp_extension.rb
 - lib/fastruby/translator.rb
 - lib/fastruby/object.rb
+- lib/fastruby/translator/iter.rb
+- lib/fastruby/translator/call.rb
 - lib/fastruby/fastruby_sexp.rb
 - lib/fastruby/method_extension.rb
 - lib/fastruby/cache/cache.rb
@@ -100,6 +102,7 @@ files:
 - spec/exception/syntaxis_spec.rb
 - spec/exception/base_spec.rb
 - spec/exception/ensure_spec.rb
+- spec/exception/internal_ex_spec.rb
 - spec/block_spec.rb
 - spec/flow_control/case_spec.rb
 - spec/flow_control/for_spec.rb