fastruby 0.0.15 → 0.0.16

data/lib/fastruby/translator/translator.rb

@@ -75,8 +75,6 @@ module FastRuby
         "
 
       extra_code << "
-        #include \"node.h\"
-
         #define FASTRUBY_TAG_RETURN 0x80
         #define FASTRUBY_TAG_NEXT 0x81
         #define FASTRUBY_TAG_BREAK 0x82
@@ -99,18 +97,35 @@ module FastRuby
       init_extra << "
         rb_eval_string(#{ruby_code.inspect});
     	"
+	
+	
+      if RUBY_VERSION =~ /^1\.8/
 
       @lambda_node_gvar = add_global_name("NODE*", 0);
       @proc_node_gvar = add_global_name("NODE*", 0);
       @procnew_node_gvar = add_global_name("NODE*", 0);
       @callcc_node_gvar = add_global_name("NODE*", 0);
-
+      
       init_extra << "
         #{@lambda_node_gvar} = rb_method_node(rb_cObject, #{intern_num :lambda});
         #{@proc_node_gvar} = rb_method_node(rb_cObject, #{intern_num :proc});
         #{@procnew_node_gvar} = rb_method_node(CLASS_OF(rb_cProc), #{intern_num :new});
         #{@callcc_node_gvar} = rb_method_node(rb_mKernel, #{intern_num :callcc});
       "
+     elsif RUBY_VERSION =~ /^1\.9/
+
+      @lambda_node_gvar = add_global_name("void*", 0);
+      @proc_node_gvar = add_global_name("void*", 0);
+      @procnew_node_gvar = add_global_name("void*", 0);
+      @callcc_node_gvar = add_global_name("void*", 0);
+      
+      init_extra << "
+        #{@lambda_node_gvar} = rb_method_entry(rb_cObject, #{intern_num :lambda});
+        #{@proc_node_gvar} = rb_method_entry(rb_cObject, #{intern_num :proc});
+        #{@procnew_node_gvar} = rb_method_entry(CLASS_OF(rb_const_get(rb_cObject, #{intern_num :Proc})), #{intern_num :new});
+        #{@callcc_node_gvar} = rb_method_entry(rb_mKernel, #{intern_num :callcc});
+      "
+	   end
 
       @common_func = common_func
       if common_func
@@ -137,7 +152,15 @@ module FastRuby
         "
 
         extra_code << "static VALUE __rb_cvar_set(VALUE recv,ID idvar, VALUE value, int warn) {
-          rb_cvar_set(recv,idvar,value,warn);
+          #{if RUBY_VERSION =~ /^1\.9/
+            "rb_cvar_set(recv,idvar,value);"
+            elsif RUBY_VERSION =~ /^1\.8/
+            "rb_cvar_set(recv,idvar,value,warn);"
+            else
+              raise RuntimeError, "unsupported ruby version #{RUBY_VERSION}"
+            end 
+          }
+         
           return value;
         }
         "
@@ -270,7 +293,7 @@ module FastRuby
                 #{literal_value signature}
                 );
 
-          ID id = rb_intern(RSTRING(method_name)->ptr);
+          ID id = rb_intern(RSTRING_PTR(method_name));
           
           rb_funcall(
                 #{literal_value FastRuby},
@@ -540,8 +563,10 @@ module FastRuby
 
           proc_reyield_block_tree = s(:iter, s(:call, nil, :proc, s(:arglist)), s(:masgn, s(:array, s(:splat, s(:lasgn, :__xproc_arguments)))), s(:yield, s(:splat, s(:lvar, :__xproc_arguments))))
 
+          require "fastruby/sexp_extension"
+
           read_arguments_code << "
-            plocals->#{block_argument.to_s.gsub("&","")} = #{to_c proc_reyield_block_tree.to_fastruby_sexp};
+            plocals->#{block_argument.to_s.gsub("&","")} = #{to_c FastRuby::FastRubySexp.from_sexp(proc_reyield_block_tree)};
           "
         end
 
@@ -741,6 +766,7 @@ module FastRuby
               #{@frame_struct} *pframe = (void*)param;
               #{@locals_struct} *plocals = (void*)pframe->plocals;
               #{code};
+
               return Qnil;
             }
            "
@@ -971,10 +997,18 @@ module FastRuby
             rb_funcall(#{name},#{intern_num :gc_register_object},0);
           "
         else
+          
+          require "base64"
 
           init_extra << "
-            #{name} = rb_marshal_load(rb_str_new(#{c_escape str}, #{str.size}));
-            rb_funcall(#{name},#{intern_num :gc_register_object},0);
+          
+            {
+              VALUE encoded_str = rb_str_new2(#{Base64.encode64(str).inspect});
+              VALUE str = rb_funcall(rb_cObject, #{intern_num :decode64}, 1, encoded_str);
+              #{name} = rb_marshal_load(str);
+              
+              rb_funcall(#{name},#{intern_num :gc_register_object},0);
+            }
 
           "
         end
@@ -1063,7 +1097,7 @@ module FastRuby
           fptr = *#{address_name};
           
           #{
-            if args_tree.size < 25
+            if args_tree.size < 25 and RUBY_VERSION =~ /^1\.8/
             "
             if (fptr == 0) {
               fptr = *#{cfunc_address_name};
@@ -1144,7 +1178,7 @@ module FastRuby
             VALUE rb_method_hash;
             void** address = 0;
             void** default_address = 0;
-            id = rb_intern(RSTRING(rb_str_signature)->ptr);
+            id = rb_intern(RSTRING_PTR(rb_str_signature));
             rb_method_hash = rb_funcall(recvtype, #{intern_num :method_hash},1,mname);
 
             if (rb_method_hash != Qnil) {
@@ -1161,9 +1195,13 @@ module FastRuby
             
             if (default_address==0) {
               default_address = malloc(sizeof(void*));
-              NODE* body = rb_method_node(recvtype,#{intern_num mname});
               *default_address = 0;
-              
+
+#ifdef RUBY_1_8
+
+			// this only works with ruby1.8
+
+              NODE* body = rb_method_node(recvtype,#{intern_num mname});
               if (body != 0) {
                 if (nd_type(body) == NODE_CFUNC) {
                   if (body->nd_argc == #{args_tree.size-1}) {
@@ -1178,7 +1216,8 @@ module FastRuby
                   }
                 }
               }
-            
+#endif
+
               if (recvtype != Qnil) { 
                 rb_funcall(
                     recvtype,
@@ -1262,7 +1301,7 @@ module FastRuby
 
       anonymous_function{ |name| "
         static VALUE #{name}(VALUE param) {
-          VALUE last_expression;
+          VALUE last_expression = Qnil;
           #{@frame_struct} frame, *pframe, *parent_frame;
           #{@locals_struct} *plocals;
 

data/lib/fastruby.rb

@@ -23,7 +23,14 @@ require "fastruby/object"
 require "fastruby/exceptions"
 require "fastruby/custom_require"
 require "fastruby/set_tree"
+require "base64"
+
+class Object
+  def self.decode64(value)
+    Base64.decode64(value)
+  end
+end
 
 module FastRuby
-  VERSION = "0.0.15" unless defined? FastRuby::VERSION
+  VERSION = "0.0.16" unless defined? FastRuby::VERSION
 end

data/lib/len

@@ -0,0 +1,280 @@
+fastruby/builder.rb   78|      (1..signature.size-1).each do |i|
+fastruby/builder.rb  109|          RbConfig::CONFIG['CFLAGS'] << " -DRUBY_1_8 -Wno-clobbered"
+fastruby/builder.rb  111|          RbConfig::CONFIG['CFLAGS'] << " -DRUBY_1_9 -Wno-clobbered"
+fastruby/getlocals.rb   40|        tree[1..-1].each do |subtree|
+fastruby/object.rb   28|system("rm -fr #{ENV["HOME"]}/.ruby_inline/*")
+fastruby/translator/modules/flow.rb   30|      code = tree[2..-2].map{|subtree|
+fastruby/translator/modules/flow.rb   33|        subtree[1][1..-1].map{|subsubtree|
+fastruby/translator/modules/flow.rb   52|        return #{to_c tree[-1]};
+fastruby/translator/modules/variable.rb   27|      "rb_cvar_get(CLASS_OF(plocals->self) != rb_cClass ? CLASS_OF(plocals->self) : plocals->self,#{intern_num tree[1]})"
+fastruby/translator/modules/variable.rb   31|      "__rb_cvar_set(CLASS_OF(plocals->self) != rb_cClass ? CLASS_OF(plocals->self) : plocals->self,#{intern_num tree[1]},#{to_c tree[2]},Qfalse)"
+fastruby/translator/modules/variable.rb   36|        "pframe->thread_data->exception"
+fastruby/translator/modules/variable.rb   55|      "rb_const_get(CLASS_OF(plocals->self), #{intern_num(tree[1])})"
+fastruby/translator/modules/variable.rb  156|      'rb_str_new2("local-variable")'
+fastruby/translator/modules/variable.rb  158|      "rb_gvar_defined((struct global_entry*)#{global_entry(tree[1][1])}) ? #{literal_value "global-variable"} : Qnil"
+fastruby/translator/modules/variable.rb  170|      "rb_ivar_defined(plocals->self,#{intern_num tree[1][1]}) ? #{literal_value "instance-variable"} : Qnil"
+fastruby/translator/modules/exceptions.rb   38|        if tree[-1]
+fastruby/translator/modules/exceptions.rb   39|          if tree[-1][0] != :resbody
+fastruby/translator/modules/exceptions.rb   40|            else_tree = tree[-1]
+fastruby/translator/modules/exceptions.rb   50|        tree[1..-1].each do |resbody_tree|
+fastruby/translator/modules/exceptions.rb   61|          resbody_tree[1][1..-1].each do |xtree|
+fastruby/translator/modules/exceptions.rb   69|              catch_condition_array << "(rb_obj_is_kind_of(frame.thread_data->exception,#{trapcode}) == Qtrue)"
+fastruby/translator/modules/exceptions.rb  119|            pframe->thread_data->exception = rb_funcall(#{class_tree}, #{intern_num :exception},1,#{message_tree});
+fastruby/translator/modules/exceptions.rb  120|            longjmp(pframe->jmp, FASTRUBY_TAG_RAISE);
+fastruby/translator/modules/exceptions.rb  125|            pframe->thread_data->exception = rb_funcall(#{class_tree}, #{intern_num :exception},0);
+fastruby/translator/modules/exceptions.rb  126|            longjmp(pframe->jmp, FASTRUBY_TAG_RAISE);
+fastruby/translator/modules/defn.rb   46|        rb_define_method(plocals->self, #{method_name.to_s.inspect}, #{anonymous_method_name}, -1);
+fastruby/translator/modules/defn.rb   48|        #{global_klass_variable} = plocals->self;
+fastruby/translator/modules/defn.rb   84|        rb_define_singleton_method(obj, #{method_name.to_s.inspect}, #{anonymous_method_name}, -1 );
+fastruby/translator/modules/defn.rb  210|                  rb_funcall(self, #{intern_num :raise}, 1, frame.thread_data->exception);
+fastruby/translator/modules/method_group.rb   91|            VALUE rb_stack_chunk = frame.thread_data->rb_stack_chunk;
+fastruby/translator/modules/method_group.rb  104|              frame.thread_data->rb_stack_chunk = rb_stack_chunk;
+fastruby/translator/modules/method_group.rb  115|            plocals->parent_locals = LONG2FIX(frame.thread_data->last_plocals);
+fastruby/translator/modules/method_group.rb  116|            void* old_parent_locals = frame.thread_data->last_plocals;
+fastruby/translator/modules/method_group.rb  117|            frame.thread_data->last_plocals = plocals;
+fastruby/translator/modules/method_group.rb  120|            plocals->active = Qtrue;
+fastruby/translator/modules/method_group.rb  121|            plocals->self = self;
+fastruby/translator/modules/method_group.rb  122|            plocals->targetted = Qfalse;
+fastruby/translator/modules/method_group.rb  123|            plocals->call_frame = LONG2FIX(0);
+fastruby/translator/modules/method_group.rb  131|              frame.thread_data->rb_stack_chunk = rb_previous_stack_chunk;
+fastruby/translator/modules/method_group.rb  134|            plocals->active = Qfalse;
+fastruby/translator/modules/method_group.rb  136|            frame.thread_data->last_plocals = old_parent_locals;
+fastruby/translator/modules/iter.rb   57|        call_args_tree[1..-1].each do |arg|
+fastruby/translator/modules/iter.rb   72|                                plocals = (void*)pframe->plocals;
+fastruby/translator/modules/iter.rb   83|              str_impl = anonymous_impl[1..-2].map{ |subtree|
+fastruby/translator/modules/iter.rb   87|              if anonymous_impl[-1][0] != :return and anonymous_impl[-1][0] != :break and anonymous_impl[-1][0] != :next
+fastruby/translator/modules/iter.rb   88|                str_impl = str_impl + ";last_expression = (#{to_c(anonymous_impl[-1])});"
+fastruby/translator/modules/iter.rb   90|                str_impl = str_impl + ";#{to_c(anonymous_impl[-1])};"
+fastruby/translator/modules/iter.rb  106|          str_arg_initialization << "plocals->#{args_tree[1]} = arg;"
+fastruby/translator/modules/iter.rb  117|                } else if (RARRAY(arg)->len <= 1) {
+fastruby/translator/modules/iter.rb  123|          arguments = args_tree[1][1..-1]
+fastruby/translator/modules/iter.rb  125|          (0..arguments.size-1).each do |i|
+fastruby/translator/modules/iter.rb  128|              str_arg_initialization << "plocals->#{arguments[i].last} = rb_ary_entry(arg,#{i});\n"
+fastruby/translator/modules/iter.rb  130|              str_arg_initialization << "plocals->#{arg.last.last} = rb_ary_new2(RARRAY(arg)->len-#{i});\n
+fastruby/translator/modules/iter.rb  133|                for (i=#{i};i<RARRAY(arg)->len;i++){
+fastruby/translator/modules/iter.rb  134|                  rb_ary_store(plocals->#{arg.last.last},i-#{i},rb_ary_entry(arg,i));
+fastruby/translator/modules/iter.rb  144|          str_recv = "pframe->next_recv"
+fastruby/translator/modules/iter.rb  146|          str_recv = "plocals->self" unless recv_tree
+fastruby/translator/modules/iter.rb  160|                  int argc = #{call_args_tree.size-2};
+fastruby/translator/modules/iter.rb  161|                  VALUE argv[#{call_args_tree.size} + RARRAY(array)->len];
+fastruby/translator/modules/iter.rb  164|                    i = -1
+fastruby/translator/modules/iter.rb  165|                    call_args_tree[1..-2].map {|arg|
+fastruby/translator/modules/iter.rb  171|                  int array_len = RARRAY(array)->len;
+fastruby/translator/modules/iter.rb  184|              str_called_code_args = call_args_tree[1..-1].map{ |subtree| to_c subtree }.join(",")
+fastruby/translator/modules/iter.rb  190|                  return rb_funcall(#{str_recv}, #{intern_num call_tree[2]}, #{call_args_tree.size-1}, #{str_called_code_args});
+fastruby/translator/modules/iter.rb  198|          str_recv = "pframe->next_recv"
+fastruby/translator/modules/iter.rb  199|          str_recv = "plocals->self" unless recv_tree
+fastruby/translator/modules/iter.rb  220|                VALUE rb_stack_chunk = thread_data->rb_stack_chunk;
+fastruby/translator/modules/iter.rb  260|              VALUE old_call_frame = ((typeof(plocals))(pframe->plocals))->call_frame;
+fastruby/translator/modules/iter.rb  261|              ((typeof(plocals))(pframe->plocals))->call_frame = LONG2FIX(pframe);
+fastruby/translator/modules/iter.rb  268|                   return pframe->thread_data->accumulator;
+fastruby/translator/modules/iter.rb  272|                   rb_funcall(((typeof(plocals))(pframe->plocals))->self, #{intern_num :raise}, 1, frame.thread_data->exception);
+fastruby/translator/modules/iter.rb  276|                    if (plocals->targetted == 1) {
+fastruby/translator/modules/iter.rb  277|                      ((typeof(plocals))(pframe->plocals))->call_frame = old_call_frame;
+fastruby/translator/modules/iter.rb  278|                      return ((typeof(plocals))(pframe->plocals))->return_value;
+fastruby/translator/modules/iter.rb  286|                  ((typeof(plocals))(pframe->plocals))->call_frame = old_call_frame;
+fastruby/translator/modules/iter.rb  295|             ((typeof(plocals))(pframe->plocals))->call_frame = old_call_frame;
+fastruby/translator/modules/iter.rb  318|              VALUE old_call_frame = ((typeof(plocals))(pframe->plocals))->call_frame;
+fastruby/translator/modules/iter.rb  319|              ((typeof(plocals))(pframe->plocals))->call_frame = LONG2FIX(pframe);
+fastruby/translator/modules/iter.rb  324|                       return pframe->thread_data->accumulator;
+fastruby/translator/modules/iter.rb  328|                       rb_funcall(((typeof(plocals))(pframe->plocals))->self, #{intern_num :raise}, 1, frame.thread_data->exception);
+fastruby/translator/modules/iter.rb  331|                      if (plocals->targetted == 1) {
+fastruby/translator/modules/iter.rb  332|                        if (plocals->active == Qfalse) {
+fastruby/translator/modules/iter.rb  333|                          rb_raise(rb_eLocalJumpError,\"return from proc-closure\");
+fastruby/translator/modules/iter.rb  335|                          ((typeof(plocals))(pframe->plocals))->call_frame = old_call_frame;
+fastruby/translator/modules/iter.rb  347|            ((typeof(plocals))(pframe->plocals))->call_frame = old_call_frame;
+fastruby/translator/modules/iter.rb  375|                  return pframe->thread_data->accumulator;
+fastruby/translator/modules/iter.rb  413|                  return pframe->thread_data->accumulator;
+fastruby/translator/modules/iter.rb  424|              rb_ivar_set(arg,#{intern_num :__stack_chunk},thread_data->rb_stack_chunk);
+fastruby/translator/modules/iter.rb  441|          fastruby_str_arg_initialization = "plocals->#{args_tree[1]} = argv[0];"
+fastruby/translator/modules/iter.rb  443|          arguments = args_tree[1][1..-1]
+fastruby/translator/modules/iter.rb  445|          (0..arguments.size-1).each do |i|
+fastruby/translator/modules/iter.rb  448|              fastruby_str_arg_initialization << "plocals->#{arg.last} = #{i} < argc ? argv[#{i}] : Qnil;\n"
+fastruby/translator/modules/iter.rb  450|              fastruby_str_arg_initialization << "plocals->#{arg.last.last} = rb_ary_new2(#{arguments.size-1-i});\n
+fastruby/translator/modules/iter.rb  454|                  rb_ary_store(plocals->#{arg.last.last},i-#{i},argv[i]);
+fastruby/translator/modules/iter.rb  476|            frame.thread_data = parent_frame->thread_data;
+fastruby/translator/modules/iter.rb  483|                if (pframe->targetted == 0) {
+fastruby/translator/modules/iter.rb  485|                    return pframe->thread_data->accumulator;
+fastruby/translator/modules/iter.rb  489|                    longjmp(((typeof(pframe))_parent_frame)->jmp,aux);
+fastruby/translator/modules/iter.rb  503|        str_recv = "plocals->self"
+fastruby/translator/modules/iter.rb  527|                VALUE old_call_frame = plocals->call_frame;
+fastruby/translator/modules/iter.rb  528|                plocals->call_frame = LONG2FIX(&call_frame);
+fastruby/translator/modules/iter.rb  538|                      longjmp(pframe_->jmp,aux);
+fastruby/translator/modules/iter.rb  541|                    plocals->call_frame = old_call_frame;
+fastruby/translator/modules/iter.rb  551|              pframe->next_recv = #{recv_tree ? to_c(recv_tree) : "plocals->self"};
+fastruby/translator/modules/iter.rb  553|              NODE* node = rb_method_node(CLASS_OF(pframe->next_recv), #{intern_num mname});
+fastruby/translator/modules/iter.rb  561|                  VALUE rb_stack_chunk = thread_data->rb_stack_chunk;
+fastruby/translator/modules/iter.rb  581|                thread_data->rb_stack_chunk = saved_rb_stack_chunk;  
+fastruby/translator/modules/iter.rb  596|              if (pframe->thread_data == 0) pframe->thread_data = rb_current_thread_data();
+fastruby/translator/modules/iter.rb  597|              void* last_plocals = pframe->thread_data->last_plocals;
+fastruby/translator/modules/iter.rb  600|              NODE* node = rb_method_node(CLASS_OF(pframe->next_recv), #{intern_num mname});
+fastruby/translator/modules/iter.rb  609|              } else if (node == #{@procnew_node_gvar} && pframe->next_recv == rb_cProc) {
+fastruby/translator/modules/iter.rb  634|                current_plocals = pframe->thread_data->last_plocals;
+fastruby/translator/modules/iter.rb  636|                  current_plocals->active = Qfalse;
+fastruby/translator/modules/iter.rb  637|                  current_plocals = (typeof(current_plocals))FIX2LONG(current_plocals->parent_locals); 
+fastruby/translator/modules/iter.rb  641|                pframe->thread_data->last_plocals = last_plocals;
+fastruby/translator/modules/iter.rb  647|                  current_plocals->active = Qtrue;
+fastruby/translator/modules/iter.rb  648|                  current_plocals = (typeof(current_plocals))FIX2LONG(current_plocals->parent_locals); 
+fastruby/translator/modules/iter.rb  675|                plocals->call_frame = old_call_frame;
+fastruby/translator/modules/iter.rb  684|                plocals->call_frame = old_call_frame;
+fastruby/translator/modules/call.rb   70|      argnum = args.size - 1
+fastruby/translator/modules/call.rb   88|            int argc = #{args.size-2};
+fastruby/translator/modules/call.rb   89|            VALUE argv[#{args.size} + RARRAY(array)->len];
+fastruby/translator/modules/call.rb   92|              i = -1
+fastruby/translator/modules/call.rb   93|              args[1..-2].map {|arg|
+fastruby/translator/modules/call.rb   99|            int array_len = RARRAY(array)->len;
+fastruby/translator/modules/call.rb  113|      strargs = args[1..-1].map{|arg| to_c arg}.join(",")
+fastruby/translator/modules/call.rb  123|        args[1..-1].each do |arg|
+fastruby/translator/modules/block.rb   34|          plocals = (void*)pframe->plocals;
+fastruby/translator/modules/block.rb   36|          if (FIX2LONG(plocals->block_function_address) == 0) {
+fastruby/translator/modules/block.rb   39|            return ((VALUE(*)(int,VALUE*,VALUE,VALUE))FIX2LONG(plocals->block_function_address))(size, block_args, FIX2LONG(plocals->block_function_param), (VALUE)pframe);
+fastruby/translator/modules/block.rb   52|            VALUE block_args[RARRAY(splat_array)->len + #{tree.size}];
+fastruby/translator/modules/block.rb   55|              (0..tree.size-3).map{|i|
+fastruby/translator/modules/block.rb   60|            for (i=0; i<RARRAY(splat_array)->len; i++) {
+fastruby/translator/modules/block.rb   61|              block_args[i+#{tree.size-2}] = rb_ary_entry(splat_array,i);
+fastruby/translator/modules/block.rb   64|            return #{anonymous_function(&block_code)}((VALUE)pframe, block_args, RARRAY(splat_array)->len + #{tree.size-2});
+fastruby/translator/modules/block.rb   68|              (0..tree.size-3).map{|i|
+fastruby/translator/modules/block.rb   73|            block_args[#{tree.size-2}] = splat_array;
+fastruby/translator/modules/block.rb   74|            return #{anonymous_function(&block_code)}((VALUE)pframe, block_args, #{tree.size-1});
+fastruby/translator/modules/block.rb   80|            anonymous_function(&block_code)+"((VALUE)pframe, (VALUE[]){#{tree[1..-1].map{|subtree| to_c subtree}.join(",")}},#{tree.size-1})"
+fastruby/translator/modules/block.rb   82|            anonymous_function(&block_code)+"((VALUE)pframe, (VALUE[]){}, #{tree.size-1})"
+fastruby/translator/modules/block.rb   95|      str = tree[1..-2].map{ |subtree|
+fastruby/translator/modules/block.rb   99|      if tree[-1]
+fastruby/translator/modules/block.rb  101|        if tree[-1][0] != :return
+fastruby/translator/modules/block.rb  102|          str = str + ";last_expression = #{to_c(tree[-1])};"
+fastruby/translator/modules/block.rb  104|          str = str + ";#{to_c(tree[-1])};"
+fastruby/translator/modules/nonlocal.rb   27|        plocals->return_value = #{to_c(tree[1])};
+fastruby/translator/modules/nonlocal.rb   28|        plocals->targetted = 1;
+fastruby/translator/modules/nonlocal.rb   29|        longjmp(pframe->jmp, FASTRUBY_TAG_RETURN);
+fastruby/translator/modules/nonlocal.rb   41|         target_frame_ = (void*)FIX2LONG(plocals->call_frame);
+fastruby/translator/modules/nonlocal.rb   47|         plocals->call_frame = LONG2FIX(0);
+fastruby/translator/modules/nonlocal.rb   49|         target_frame_->return_value = value;
+fastruby/translator/modules/nonlocal.rb   50|         target_frame_->targetted = 1;
+fastruby/translator/modules/nonlocal.rb   51|         pframe->thread_data->exception = Qnil;
+fastruby/translator/modules/nonlocal.rb   52|         longjmp(pframe->jmp,FASTRUBY_TAG_BREAK);"
+fastruby/translator/modules/nonlocal.rb   60|         target_frame_ = (void*)FIX2LONG(plocals->call_frame);
+fastruby/translator/modules/nonlocal.rb   66|         target_frame_->targetted = 1;
+fastruby/translator/modules/nonlocal.rb   67|         longjmp(pframe->jmp,FASTRUBY_TAG_RETRY);"
+fastruby/translator/modules/nonlocal.rb   74|          longjmp(pframe->jmp,FASTRUBY_TAG_REDO);
+fastruby/translator/modules/nonlocal.rb   85|        pframe->thread_data->accumulator = #{tree[1] ? to_c(tree[1]) : "Qnil"};
+fastruby/translator/modules/nonlocal.rb   86|        longjmp(pframe->jmp,FASTRUBY_TAG_NEXT);
+fastruby/translator/modules/literal.rb   40|      (0..(tree.size-3)/2).each do |i|
+fastruby/translator/modules/literal.rb   51|          plocals = (void*)pframe->plocals;
+fastruby/translator/modules/literal.rb   62|        strargs = tree[1..-1].map{|subtree| to_c subtree}.join(",")
+fastruby/translator/modules/literal.rb   63|        "rb_ary_new3(#{tree.size-1}, #{strargs})"
+fastruby/translator/translator.rb  197|        call_frame.thread_data = old_pframe->thread_data;
+fastruby/translator/translator.rb  200|        VALUE old_call_frame = plocals->call_frame;
+fastruby/translator/translator.rb  201|        plocals->call_frame = LONG2FIX(&call_frame);
+fastruby/translator/translator.rb  209|                    longjmp(old_pframe->jmp,aux);
+fastruby/translator/translator.rb  213|                    plocals->call_frame = old_call_frame;
+fastruby/translator/translator.rb  219|                    plocals->call_frame = old_call_frame;
+fastruby/translator/translator.rb  230|        plocals->call_frame = old_call_frame;
+fastruby/translator/translator.rb  341|          "VALUE self, VALUE block, VALUE _parent_frame, #{(0..signature.size-1).map{|x| "VALUE arg#{x}"}.join(",")}"
+fastruby/translator/translator.rb  361|          VALUE rb_stack_chunk = frame.thread_data->rb_stack_chunk;
+fastruby/translator/translator.rb  374|            frame.thread_data->rb_stack_chunk = rb_stack_chunk;
+fastruby/translator/translator.rb  385|          plocals->parent_locals = LONG2FIX(frame.thread_data->last_plocals);
+fastruby/translator/translator.rb  386|          void* old_parent_locals = frame.thread_data->last_plocals;
+fastruby/translator/translator.rb  387|          frame.thread_data->last_plocals = plocals;
+fastruby/translator/translator.rb  389|          plocals->active = Qtrue;
+fastruby/translator/translator.rb  390|          plocals->targetted = Qfalse;
+fastruby/translator/translator.rb  391|          plocals->pframe = LONG2FIX(&frame);
+fastruby/translator/translator.rb  398|          int aux = setjmp(pframe->jmp);
+fastruby/translator/translator.rb  404|              frame.thread_data->rb_stack_chunk = rb_previous_stack_chunk;
+fastruby/translator/translator.rb  407|            plocals->active = Qfalse;
+fastruby/translator/translator.rb  408|            frame.thread_data->last_plocals = old_parent_locals;
+fastruby/translator/translator.rb  409|            return plocals->return_value;
+fastruby/translator/translator.rb  412|          plocals->self = self;
+fastruby/translator/translator.rb  414|          #{args_tree[1..-1].map { |arg|
+fastruby/translator/translator.rb  417|            "plocals->#{arg} = #{arg};\n"
+fastruby/translator/translator.rb  420|          plocals->block_function_address = LONG2FIX(0);
+fastruby/translator/translator.rb  421|          plocals->block_function_param = LONG2FIX(Qnil);
+fastruby/translator/translator.rb  422|          plocals->call_frame = LONG2FIX(0);
+fastruby/translator/translator.rb  429|            frame.thread_data->rb_stack_chunk = rb_previous_stack_chunk;
+fastruby/translator/translator.rb  432|          plocals->active = Qfalse;
+fastruby/translator/translator.rb  434|          frame.thread_data->last_plocals = old_parent_locals;
+fastruby/translator/translator.rb  447|        splat_arg = args_tree[1..-1].find{|x| x.to_s.match(/\*/) }
+fastruby/translator/translator.rb  449|        maxargnum = args_tree[1..-1].count{ |x|
+fastruby/translator/translator.rb  459|        args_tree[1..-1].each do |subtree|
+fastruby/translator/translator.rb  462|              minargnum = minargnum - (subtree.size-1)
+fastruby/translator/translator.rb  467|        if args_tree[1..-1].find{|x| x.to_s.match(/\*/)}
+fastruby/translator/translator.rb  474|        validate_arguments_code = if signature.size-1 < minargnum
+fastruby/translator/translator.rb  476|              rb_raise(rb_eArgError, \"wrong number of arguments (#{signature.size-1} for #{minargnum})\");
+fastruby/translator/translator.rb  478|        elsif signature.size-1 > maxargnum
+fastruby/translator/translator.rb  480|              rb_raise(rb_eArgError, \"wrong number of arguments (#{signature.size-1} for #{maxargnum})\");
+fastruby/translator/translator.rb  484|            default_block_tree = args_tree[1..-1].find{|subtree|
+fastruby/translator/translator.rb  494|            i = -1
+fastruby/translator/translator.rb  496|            normalargsnum = args_tree[1..-1].count{|subtree|
+fastruby/translator/translator.rb  506|            read_arguments_code = args_tree[1..-1].map { |arg_|
+fastruby/translator/translator.rb  511|                  if i < signature.size-1
+fastruby/translator/translator.rb  512|                    "plocals->#{arg} = argv[#{i}];\n"
+fastruby/translator/translator.rb  516|                      initialize_tree = default_block_tree[1..-1].find{|subtree| subtree[1] == arg_}
+fastruby/translator/translator.rb  532|                  if signature.size-1 < normalargsnum then
+fastruby/translator/translator.rb  534|                      plocals->#{splat_arg.to_s.gsub("*","")} = rb_ary_new3(0);
+fastruby/translator/translator.rb  538|                      plocals->#{splat_arg.to_s.gsub("*","")} = rb_ary_new4(
+fastruby/translator/translator.rb  539|                            #{(signature.size-1) - (normalargsnum)}, argv+#{normalargsnum} 
+fastruby/translator/translator.rb  557|            plocals->#{block_argument.to_s.gsub("&","")} = #{to_c FastRuby::FastRubySexp.from_sexp(proc_reyield_block_tree)};
+fastruby/translator/translator.rb  571|          frame.thread_data = ((typeof(pframe))_parent_frame)->thread_data;
+fastruby/translator/translator.rb  576|          VALUE rb_stack_chunk = frame.thread_data->rb_stack_chunk;
+fastruby/translator/translator.rb  589|            frame.thread_data->rb_stack_chunk = rb_stack_chunk;
+fastruby/translator/translator.rb  603|          plocals->parent_locals = LONG2FIX(frame.thread_data->last_plocals);
+fastruby/translator/translator.rb  604|          void* old_parent_locals = frame.thread_data->last_plocals;
+fastruby/translator/translator.rb  605|          frame.thread_data->last_plocals = plocals;
+fastruby/translator/translator.rb  608|          plocals->active = Qtrue;
+fastruby/translator/translator.rb  609|          plocals->targetted = Qfalse;
+fastruby/translator/translator.rb  610|          plocals->pframe = LONG2FIX(&frame);
+fastruby/translator/translator.rb  611|          plocals->call_frame = LONG2FIX(0);
+fastruby/translator/translator.rb  618|          int aux = setjmp(pframe->jmp);
+fastruby/translator/translator.rb  620|            plocals->active = Qfalse;
+fastruby/translator/translator.rb  626|              frame.thread_data->rb_stack_chunk = rb_previous_stack_chunk;
+fastruby/translator/translator.rb  629|            if (plocals->targetted == Qfalse || aux != FASTRUBY_TAG_RETURN) {
+fastruby/translator/translator.rb  630|              frame.thread_data->last_plocals = old_parent_locals;
+fastruby/translator/translator.rb  632|              longjmp(((typeof(pframe))_parent_frame)->jmp,aux);
+fastruby/translator/translator.rb  635|            frame.thread_data->last_plocals = old_parent_locals;
+fastruby/translator/translator.rb  637|            return plocals->return_value;
+fastruby/translator/translator.rb  640|          plocals->self = self;
+fastruby/translator/translator.rb  646|            plocals->block_function_address = LONG2FIX(pblock->block_function_address);
+fastruby/translator/translator.rb  647|            plocals->block_function_param = LONG2FIX(pblock->block_function_param);
+fastruby/translator/translator.rb  649|            plocals->block_function_address = LONG2FIX(0);
+fastruby/translator/translator.rb  650|            plocals->block_function_param = LONG2FIX(Qnil);
+fastruby/translator/translator.rb  658|            frame.thread_data->rb_stack_chunk = rb_previous_stack_chunk;
+fastruby/translator/translator.rb  661|          plocals->active = Qfalse;
+fastruby/translator/translator.rb  663|          frame.thread_data->last_plocals = old_parent_locals;
+fastruby/translator/translator.rb  680|      "plocals->"
+fastruby/translator/translator.rb  746|        return "FIX2LONG(plocals->block_function_address) == 0 ? Qfalse : Qtrue"
+fastruby/translator/translator.rb  755|              #{@locals_struct} *plocals = (void*)pframe->plocals;
+fastruby/translator/translator.rb  786|          #{nolocals ? "" : "#{@locals_struct} *plocals = (void*)pframe->plocals;"}
+fastruby/translator/translator.rb  801|          #{nolocals ? "" : "#{@locals_struct} *plocals = (void*)pframe->plocals;"}
+fastruby/translator/translator.rb  837|            frame.thread_data = parent_frame->thread_data;
+fastruby/translator/translator.rb  838|            frame.next_recv = parent_frame->next_recv;
+fastruby/translator/translator.rb  844|            nolocals ? "frame.plocals = 0;" : "#{@locals_struct}* plocals = parent_frame->plocals;
+fastruby/translator/translator.rb  877|              longjmp(pframe->jmp, str.state);
+fastruby/translator/translator.rb  881|                  pframe->thread_data->exception = str.last_error;
+fastruby/translator/translator.rb  882|                  longjmp(pframe->jmp, FASTRUBY_TAG_RAISE);
+fastruby/translator/translator.rb  899|              pstr->state = FIX2INT(rb_funcall(err, #{intern_num :state}, 0));
+fastruby/translator/translator.rb  901|              pstr->last_error = err;
+fastruby/translator/translator.rb  918|          pframe->last_error = Qnil;
+fastruby/translator/translator.rb  933|          pframe->last_error = Qnil;
+fastruby/translator/translator.rb  935|          if (pframe->rescue) {
+fastruby/translator/translator.rb  964|          container_str = value.to_s.split("::")[0..-2].join("::")
+fastruby/translator/translator.rb  974|          container_str = value.to_s.split("::")[0..-2].join("::")
+fastruby/translator/translator.rb 1033|      strargs_signature = (0..args_tree.size-2).map{|x| "VALUE arg#{x}"}.join(",")
+fastruby/translator/translator.rb 1034|      strargs = (0..args_tree.size-2).map{|x| "arg#{x}"}.join(",")
+fastruby/translator/translator.rb 1035|      inprocstrargs = (1..args_tree.size-1).map{|x| "((VALUE*)method_arguments)[#{x}]"}.join(",")
+fastruby/translator/translator.rb 1061|            protected_block "rb_funcall(((VALUE*)method_arguments)[0], #{intern_num mname.to_sym}, #{args_tree.size-1}#{inprocstrargs});", false, "method_arguments"
+fastruby/translator/translator.rb 1095|                VALUE params[2] = {self,LONG2FIX(#{args_tree.size-1})};
+fastruby/translator/translator.rb 1105|              protected_block "rb_funcall(((VALUE*)method_arguments)[0], #{intern_num mname.to_sym}, #{args_tree.size-1}#{inprocstrargs});", false, "method_arguments"
+fastruby/translator/translator.rb 1108|            return ( (VALUE(*)(VALUE,VALUE,VALUE,int,VALUE*)) (fptr) )(self,(VALUE)block,(VALUE)frame,#{args_tree.size-1},method_arguments+1);  
+fastruby/translator/translator.rb 1197|                  if (body->nd_argc == #{args_tree.size-1}) {
+fastruby/translator/translator.rb 1199|                    #{cfunc_real_address_name} = (void*)body->nd_cfnc;
+fastruby/translator/translator.rb 1200|                  } else if (body->nd_argc == -1) {
+fastruby/translator/translator.rb 1202|                    #{cfunc_real_address_name} = (void*)body->nd_cfnc;
+fastruby/translator/translator.rb 1203|                  } else if (body->nd_argc == -2) {
+fastruby/translator/translator.rb 1205|                    #{cfunc_real_address_name} = (void*)body->nd_cfnc;
+fastruby/translator/translator.rb 1301|          frame.plocals = parent_frame->plocals;
+fastruby/translator/translator.rb 1302|          frame.rescue = #{rescued ? rescued : "parent_frame->rescue"};
+fastruby/translator/translator.rb 1304|          frame.thread_data = parent_frame->thread_data;
+fastruby/translator/translator.rb 1312|            last_expression = pframe->return_value;
+fastruby/translator/translator.rb 1320|            if (original_frame->targetted == 0) {
+fastruby/translator/translator.rb 1321|              longjmp(pframe->jmp,aux);
+fastruby/cache/cache.rb   69|      @base_path + "/#{hash[0..1]}/#{hash[2..-1]}/"
+fastruby/cache/cache.rb   74|      create_dir_if_not_exists(@base_path + "/#{hash[0..1]}/#{hash[2..-1]}/")

data/spec/block/callcc_spec.rb

@@ -1,4 +1,7 @@
 require "fastruby"
+if RUBY_VERSION =~ /^1\.9/
+require "continuation"
+end
 
 describe FastRuby, "fastruby" do
   class ::N1

data/spec/block_spec.rb

@@ -56,6 +56,22 @@ describe FastRuby, "fastruby" do
   it "should compile blocks with code inside refering multiple block arguments" do
     ::X9.new.foo({1 => 2, 3 => 4}).sort.should be == [3,7]
   end
+  
+  class ::X9_11
+    fastruby "
+      def foo
+        proc do |k,v|
+          k+v
+        end
+      end
+    "
+  end
+
+  it "should compile blocks with code inside refering multiple block arguments (proc)" do
+    pr = ::X9_11.new.foo
+    {1 => 2, 3 => 4}.map(&pr).sort.should be == [3,7]
+  end
+  
 
   class ::Y10
     def bar(arg1)

data/spec/defn/multiple_args_spec.rb

@@ -272,12 +272,12 @@ describe FastRuby, "fastruby" do
       fastruby "
         class ::CF18
           def foo(*x)
-            x.to_s
+            x
           end
         end
       "
 
-      ::CF18.new.foo(1,2,3,4,5).should be == "12345"
+      ::CF18.new.foo(1,2,3,4,5).should be == [1,2,3,4,5]
   end
   
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fastruby
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Dario Seminara
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 -03:00
-default_executable: 
+date: 2011-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RubyInline
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 43
         segments: 
         - 3
-        - 9
+        - 11
         - 0
-        version: 3.9.0
+        version: 3.11.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -95,9 +94,10 @@ files:
 - lib/fastruby/translator/translator.rb
 - lib/fastruby/fastruby_sexp.rb
 - lib/fastruby/method_extension.rb
+- lib/fastruby/self
 - lib/fastruby/cache/cache.rb
 - lib/fastruby.rb
-- lib/targetted
+- lib/len
 - spec/variable_spec.rb
 - spec/control_spec.rb
 - spec/return_spec.rb
@@ -141,7 +141,6 @@ files:
 - Rakefile
 - TODO
 - CHANGELOG
-has_rdoc: true
 homepage: http://github.com/tario/fastruby
 licenses: []
 
@@ -171,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: fast execution of ruby code