fastruby 0.0.18 → 0.0.19

data/lib/fastruby/translator/modules/static.rb

@@ -86,7 +86,7 @@ module FastRuby
         
         result_variable = result_variable_ || "last_expression"
         
-        code = "
+        code = proc {"
           {
             VALUE condition_result;
             #{to_c condition_tree, "condition_result"};
@@ -99,12 +99,12 @@ module FastRuby
               " : ""
             }
           }
-        "
+        "}
   
         if result_variable_
-          code
+          code.call
         else
-          inline_block code + "; return last_expression;"
+          inline_block(&code) + "; return last_expression;"
         end      
       end
       
@@ -112,7 +112,7 @@ module FastRuby
         begin_while = "begin_while_"+rand(10000000).to_s
         end_while = "end_while_"+rand(10000000).to_s
         aux_varname = "_aux_" + rand(10000000).to_s
-        code = "
+        code = proc {"
           {
             VALUE while_condition;
             VALUE #{aux_varname};
@@ -132,12 +132,12 @@ module FastRuby
             end
             }
           }
-        "
+        "}
         
         if result_var
-          code
+          code.call
         else
-          inline_block code
+          inline_block &code
         end
         
       end

data/lib/fastruby/translator/modules/variable.rb

@@ -101,17 +101,17 @@ module FastRuby
       result_var = result_var_ || "value"
       
       if tree[1].instance_of? Symbol
-        code = "
+        code = proc{"
           {
             // set constant #{tree[1].to_s}
             #{to_c tree[2], result_var};
             rb_const_set(rb_cObject, #{intern_num tree[1]}, #{result_var});
           }
-          "
+          "}
       elsif tree[1].instance_of? FastRuby::FastRubySexp
 
         if tree[1].node_type == :colon2
-          code = "
+          code = proc{"
             {
               // set constant #{tree[1].to_s}
               #{to_c tree[2], result_var};
@@ -119,25 +119,25 @@ module FastRuby
               #{to_c tree[1][1], "klass"};
               rb_const_set(klass, #{intern_num tree[1][2]}, #{result_var});
             }
-            "
+            "}
         elsif tree[1].node_type == :colon3
-          code = "
+          code = proc{"
             {
             // set constant #{tree[1].to_s}
             #{to_c tree[2], result_var};
             rb_const_set(rb_cObject, #{intern_num tree[1][1]}, #{result_var});
             }
-            "
+            "}
         end
-        
+      end
+
         if result_var_
-          code
+          code.call
         else
-           inline_block "VALUE #{result_var} = Qnil;\n" + code + "
+           inline_block{"VALUE #{result_var} = Qnil;\n" + code.call + "
             return #{result_var};
-           "
+           "}
         end
-      end
     end
 
     define_translator_for(:colon3, :method => :to_c_colon3, :arity => 1)
@@ -147,7 +147,7 @@ module FastRuby
    
     define_translator_for(:colon2, :method => :to_c_colon2) 
     def to_c_colon2(tree, result_var = nil)
-      code = "
+      code = proc{ "
         {
         VALUE klass = Qnil;
         
@@ -191,12 +191,12 @@ module FastRuby
             end
             }
         }
-      "
+      "}
       
       if result_var
-        code
+        code.call
       else
-        inline_block code
+        inline_block &code
       end
     end
 

data/lib/fastruby/translator/translator.rb

@@ -96,10 +96,21 @@ module FastRuby
         require path
       end
     end
+    
+    def catch_block(*catchs)
+        old_catch_blocks = @catch_blocks.dup
+      begin
+        catchs.each &@catch_blocks.method(:<<)
+        return yield
+      ensure
+        @catch_blocks = old_catch_blocks
+      end
+    end
 
     def initialize(common_func = true)
       initialize_to_c
       
+      @catch_blocks = []
       @infer_lvar_map = Hash.new
       @no_cache = false
       @extra_code = ""
@@ -149,7 +160,9 @@ module FastRuby
       "
 
       ruby_code = "
-        $LOAD_PATH << #{FastRuby.fastruby_load_path.inspect}
+        unless $LOAD_PATH.include? #{FastRuby.fastruby_load_path.inspect}
+          $LOAD_PATH << #{FastRuby.fastruby_load_path.inspect}
+        end
         require #{FastRuby.fastruby_script_path.inspect}
       "
 
@@ -855,7 +868,32 @@ end
       }
     end
 
-    def inline_block(code, repass_var = nil, nolocals = false)
+    def catch_on_throw
+      old_catch_jmp_on_throw = @catch_jmp_on_throw || false
+      @catch_jmp_on_throw = true
+      begin
+        ret = yield
+      ensure
+        @catch_jmp_on_throw = old_catch_jmp_on_throw
+      end
+      
+      ret
+    end
+
+    def inline_block(*args)
+      
+      unless block_given?
+        code = args.first
+        return inline_block(*args[1..-1]) {
+            code
+          }
+      end
+      
+      repass_var = args[0]
+      nolocals = args[1] || false
+      
+      code = catch_on_throw{ yield }
+
       anonymous_function{ |name| "
         static VALUE #{name}(VALUE param#{repass_var ? ",void* " + repass_var : "" }) {
           #{@frame_struct} * volatile pframe = (void*)param;
@@ -866,6 +904,24 @@ end
           #{code}
           return Qnil;
 
+
+#{@catch_blocks.map { |cb|
+  "#{cb.to_s}_end:
+
+   plocals->return_value = last_expression;
+   plocals->targetted = 1;
+   longjmp(pframe->jmp, #{intern_num( cb.to_s + "_end")});
+    
+   #{cb.to_s}_start:
+  
+   plocals->return_value = last_expression;
+   plocals->targetted = 1;
+   longjmp(pframe->jmp, #{intern_num( cb.to_s + "_start")});
+  
+  "
+
+}.join("\n")
+}
           #{unless nolocals
           "
 local_return:
@@ -893,7 +949,23 @@ fastruby_local_next:
       "rb_funcall(#{proced.__id__}, #{intern_num :call}, 1, #{parameter})"
     end
 
-    def protected_block(inner_code, always_rescue = false,repass_var = nil, nolocals = false)
+    def protected_block(*args)
+      unless block_given?
+        inner_code = args.first
+        return protected_block(*args[1..-1]) {
+          inner_code
+        }
+      end
+      
+      repass_var = args[1]
+      nolocals = args[2] || false
+      
+      inline_block(repass_var, nolocals) do
+        generate_protected_block(yield, *args)
+      end
+    end
+    
+    def generate_protected_block(inner_code, always_rescue = false,repass_var = nil, nolocals = false)
       body = nil
       rescue_args = nil
 
@@ -993,7 +1065,7 @@ fastruby_local_next:
       rescue_code = "rb_rescue2(#{body}, #{rescue_args}, #{rescue_body}, (VALUE)&str, rb_eException, (VALUE)0)"
 
       if always_rescue
-        inline_block "
+        "
           #{return_err_struct} str;
           
           str.state = 0;
@@ -1005,9 +1077,9 @@ fastruby_local_next:
           #{wrapper_code}
 
           return result;
-        ", repass_var, nolocals
+        "
       else
-        inline_block "
+        "
           VALUE result;
           #{return_err_struct} str;
           
@@ -1026,7 +1098,7 @@ fastruby_local_next:
           }
 
           return result;
-        ", repass_var, nolocals
+        "
       end
     end
 
@@ -1289,6 +1361,73 @@ fastruby_local_next:
         "
       }
 
+      update_cfunc_method = anonymous_function{ |funcname| "
+          static VALUE #{funcname}(){
+                void** default_address = (void**)#{cfunc_address_name};
+                ID default_id = rb_intern(\"default\");
+                VALUE recvtype = #{recvdump};
+
+                if (1) {
+                  *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}) {
+                        *default_address = #{cfunc_wrapper};
+                        #{cfunc_real_address_name} = (void*)body->nd_cfnc;
+                      } else if (body->nd_argc == -1) {
+                        *default_address = #{cfunc_wrapper_1};
+                        #{cfunc_real_address_name} = (void*)body->nd_cfnc;
+                      } else if (body->nd_argc == -2) {
+                        *default_address = #{cfunc_wrapper_2};
+                        #{cfunc_real_address_name} = (void*)body->nd_cfnc;
+                      }
+                    }
+                  }
+    #endif
+    #ifdef RUBY_1_9
+                  rb_method_entry_t* me = rb_method_entry(recvtype,#{intern_num mname});
+                  if (me != 0) {
+                    rb_method_definition_t* def = me->def;
+                    
+                    if (def->type == VM_METHOD_TYPE_CFUNC) {
+                      if (def->body.cfunc.argc == #{args_tree.size-1}) {
+                        *default_address = #{cfunc_wrapper};
+                        #{cfunc_real_address_name} = (void*)def->body.cfunc.func;
+                      } else if (def->body.cfunc.argc == -1) {
+                        *default_address = #{cfunc_wrapper_1};
+                        #{cfunc_real_address_name} = (void*)def->body.cfunc.func;
+                      } else if (def->body.cfunc.argc == -2) {
+                        *default_address = #{cfunc_wrapper_2};
+                        #{cfunc_real_address_name} = (void*)def->body.cfunc.func;
+                      }
+                    }
+                  }
+    #endif
+    
+                  if (recvtype != Qnil) { 
+                    rb_funcall(
+                        recvtype,
+                        #{intern_num :register_method_value}, 
+                        3,
+                        #{literal_value mname},
+                        PTR2NUM(default_id),
+                        PTR2NUM(default_address)
+                        );
+                  }
+                }
+              return Qnil;
+          }
+        "
+      }
+        
+        
+
       if recvdump and recvtype
         init_extra << "
           {
@@ -1332,58 +1471,16 @@ fastruby_local_next:
             if (default_address==0) {
               default_address = malloc(sizeof(void*));
               *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}) {
-                    *default_address = #{cfunc_wrapper};
-                    #{cfunc_real_address_name} = (void*)body->nd_cfnc;
-                  } else if (body->nd_argc == -1) {
-                    *default_address = #{cfunc_wrapper_1};
-                    #{cfunc_real_address_name} = (void*)body->nd_cfnc;
-                  } else if (body->nd_argc == -2) {
-                    *default_address = #{cfunc_wrapper_2};
-                    #{cfunc_real_address_name} = (void*)body->nd_cfnc;
-                  }
-                }
-              }
-#endif
-#ifdef RUBY_1_9
-              rb_method_entry_t* me = rb_method_entry(recvtype,#{intern_num mname});
-              if (me != 0) {
-                rb_method_definition_t* def = me->def;
-                
-                if (def->type == VM_METHOD_TYPE_CFUNC) {
-                  if (def->body.cfunc.argc == #{args_tree.size-1}) {
-                    *default_address = #{cfunc_wrapper};
-                    #{cfunc_real_address_name} = (void*)def->body.cfunc.func;
-                  } else if (def->body.cfunc.argc == -1) {
-                    *default_address = #{cfunc_wrapper_1};
-                    #{cfunc_real_address_name} = (void*)def->body.cfunc.func;
-                  } else if (def->body.cfunc.argc == -2) {
-                    *default_address = #{cfunc_wrapper_2};
-                    #{cfunc_real_address_name} = (void*)def->body.cfunc.func;
-                  }
-                }
-              }
-#endif
-
-              if (recvtype != Qnil) { 
-                rb_funcall(
-                    recvtype,
-                    #{intern_num :register_method_value}, 
-                    3,
-                    #{literal_value mname},
-                    PTR2NUM(default_id),
-                    PTR2NUM(default_address)
-                    );
-              }
             }
+            #{cfunc_address_name} = default_address;
+            
+            #{update_cfunc_method}();
+            rb_iterate(#{anonymous_function{|funcname|
+              "static VALUE #{funcname}(VALUE recv) {
+                return rb_funcall(recv, #{intern_num :observe}, 1, #{literal_value(alt_method_name + "#" + cfunc_address_name)});
+              }
+              "
+            }},fastruby_method,#{update_cfunc_method},Qnil);
 
             if (address==0) {
               address = malloc(sizeof(void*));
@@ -1403,7 +1500,6 @@ fastruby_local_next:
             }
             
             #{address_name} = address;
-            #{cfunc_address_name} = default_address;
             #{name} = (void*)#{generic_wrapper};
           }
         "
@@ -1418,6 +1514,7 @@ fastruby_local_next:
     end
 
     def intern_num(symbol)
+      symbol = symbol.to_sym
       @intern_num_hash = Hash.new unless @intern_num_hash
       return @intern_num_hash[symbol] if @intern_num_hash[symbol]
 

data/lib/fastruby.rb

@@ -32,5 +32,5 @@ class Object
 end
 
 module FastRuby
-  VERSION = "0.0.18" unless defined? FastRuby::VERSION
+  VERSION = "0.0.19" unless defined? FastRuby::VERSION
 end

data/lib/fastruby.rb~

@@ -0,0 +1,36 @@
+=begin
+
+This file is part of the fastruby project, http://github.com/tario/fastruby
+
+Copyright (c) 2011 Roberto Dario Seminara <robertodarioseminara@gmail.com>
+
+fastruby is free software: you can redistribute it and/or modify
+it under the terms of the gnu general public license as published by
+the free software foundation, either version 3 of the license, or
+(at your option) any later version.
+
+fastruby is distributed in the hope that it will be useful,
+but without any warranty; without even the implied warranty of
+merchantability or fitness for a particular purpose.  see the
+gnu general public license for more details.
+
+you should have received a copy of the gnu general public license
+along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
+
+=end
+require "fastruby/exceptions"
+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.18" unless defined? FastRuby::VERSION
+end

data/spec/ruby/base_spec.rb~

@@ -204,13 +204,13 @@ describe FastRuby, "fastruby" do
      "
 
     fastruby "
-      def foo(xz,a,b)
+      def foo(x,a,b)
         bar(
-          if (xz)
-            xz.to_s
+          if (x)
+            x.to_s
             a
           else
-            xz.to_s
+            x.to_s
             b
           end
         ) {
@@ -391,4 +391,4 @@ describe FastRuby, "fastruby" do
     ::J57.new.bar.should be == 43
   end
 
-end
+end