fastruby 0.0.21 → 0.0.22

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

@@ -106,7 +106,14 @@ module FastRuby
       end
     end
 
-    define_translator_for(:self, :arity => 1){|*x| tree = x.first; locals_accessor + "self"}
+    define_translator_for(:self, :arity => 1){|*x| tree = x.first; 
+      if @has_inline_block
+        locals_accessor + "self"
+      else
+        "self"
+      end
+    }
+
     define_translator_for(:false, :arity => 1){|*x| "Qfalse"}
     define_translator_for(:true, :arity => 1){|*x| "Qtrue"}
 

data/lib/fastruby/modules/translator/literal.rb~

@@ -0,0 +1,157 @@
+=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
+module FastRuby
+  class Context
+    
+    define_translator_for(:lit, :arity => 1){|*x| tree = x.first; literal_value tree[1]}
+    define_translator_for(:nil, :arity => 1){|*x| tree = x.first; "Qnil"}
+    define_translator_for(:str, :arity => 1){|*x| tree = x.first; literal_value tree[1]}
+
+    define_translator_for(:hash, :method => :to_c_hash)
+    def to_c_hash(tree, result_var = nil)
+      
+      hash_tmp_var = "_hash_"+rand(1000000).to_s
+      key_tmp_var = "_key_"+rand(1000000).to_s
+      value_tmp_var = "_value_"+rand(1000000).to_s
+
+      code = proc{ 
+      hash_aset_code = ""
+      (0..(tree.size-3)/2).each do |i|
+        strkey = to_c tree[1 + i * 2]
+        strvalue = to_c tree[2 + i * 2]
+        hash_aset_code << "
+          {
+            VALUE #{key_tmp_var} = Qnil;
+            VALUE #{value_tmp_var} = Qnil;
+            
+            #{to_c tree[1 + i * 2], key_tmp_var};
+            #{to_c tree[2 + i * 2], value_tmp_var};
+            
+            rb_hash_aset(#{hash_tmp_var}, #{key_tmp_var}, #{value_tmp_var});
+          }
+        "
+      end
+      
+          "
+          {
+          VALUE #{hash_tmp_var} = rb_hash_new();
+          #{hash_aset_code};
+          #{
+          if result_var
+            "#{result_var} = #{hash_tmp_var}"
+          else
+            "return #{hash_tmp_var}"
+          end
+          };
+          }
+        "}
+        
+      if result_var
+        code.call
+      else
+        inline_block &code
+      end
+    end
+
+    define_translator_for(:array, :method => :to_c_array)
+    def to_c_array(tree, result_var = nil)
+      if tree.size > 1
+        if result_var
+          prefix = "_array_element_" + rand(10000000).to_s + "_"
+          "
+          {
+            #{ 
+              (0..tree.size-2).map{|x|
+                "VALUE #{prefix}#{x};"
+              }.join("\n");
+            }
+            
+            #{
+              (0..tree.size-2).map{|x|
+                to_c(tree[x+1], prefix+x.to_s)
+              }.join("\n");
+            }
+            
+            #{result_var} = rb_ary_new3(#{tree.size-1}, #{(0..tree.size-2).map{|x| prefix+x.to_s}.join(",")} );
+          }
+          "
+        else
+          strargs = tree[1..-1].map{|subtree| to_c subtree}.join(",")
+          "rb_ary_new3(#{tree.size-1}, #{strargs})"
+        end
+      else
+        if result_var
+        "#{result_var} = rb_ary_new3(0);"
+        else
+        "rb_ary_new3(0)"
+        end
+      end
+    end
+
+    define_translator_for(:self, :arity => 1){|*x| tree = x.first; 
+      if @has_inline_block
+        locals_accessor + "self"
+      else
+
+      end
+    }
+
+    define_translator_for(:false, :arity => 1){|*x| "Qfalse"}
+    define_translator_for(:true, :arity => 1){|*x| "Qtrue"}
+
+    define_translator_for(:dot2, :method => :to_c_dot2)
+    def to_c_dot2(tree, result_var = nil)
+      
+      begin_var = "_begin"+rand(10000000).to_s
+      end_var = "_end"+rand(10000000).to_s
+      
+      if result_var
+        "
+        {
+          VALUE #{begin_var} = Qnil;
+          VALUE #{end_var} = Qnil;
+          
+          #{to_c tree[1], begin_var};
+          #{to_c tree[2], end_var};
+          
+          #{result_var} = rb_range_new(#{begin_var}, #{end_var},0);
+        }
+        "
+      else
+        if result_var
+        "
+          {
+          VALUE #{begin_var} = Qnil;
+          VALUE #{end_var} = Qnil;
+          #{to_c tree[1], begin_var};
+          #{to_c tree[2], end_var};
+          
+          #{result_var} = rb_range_new(#{begin_var}, #{end_var},0)
+          }
+        "
+        else
+        "rb_range_new(#{to_c tree[1]}, #{to_c tree[2]},0)"
+        end
+      end
+    end
+    
+  end
+end

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

@@ -23,6 +23,7 @@ module FastRuby
     
     define_translator_for(:return, :method => :to_c_return)
     def to_c_return(tree, return_variable = nil)
+      @has_nonlocal_goto = true
       code = proc{"
         #{to_c(tree[1],"last_expression")};
         goto local_return;
@@ -38,6 +39,7 @@ module FastRuby
 
     define_translator_for(:break, :method => :to_c_break)
     def to_c_break(tree, result_var = nil)
+      @has_nonlocal_goto = true
       
         value_tmp_var = "value_" + rand(10000000).to_s
       
@@ -77,6 +79,7 @@ module FastRuby
 
     define_translator_for(:retry, :method => :to_c_retry)
     def to_c_retry(tree, result_var = nil)
+      @has_nonlocal_goto = true
         code = "
           {
          typeof(pframe) target_frame_;
@@ -99,6 +102,7 @@ module FastRuby
 
     define_translator_for(:redo, :method => :to_c_redo)
     def to_c_redo(tree, result_var = nil)
+      @has_nonlocal_goto = true
       if @on_block
          code = "
             goto fastruby_local_redo;
@@ -116,6 +120,7 @@ module FastRuby
 
     define_translator_for(:next, :method => :to_c_next)
     def to_c_next(tree, result_var = nil)
+      @has_nonlocal_goto = true
       tmp_varname = "_acc_" + rand(10000000).to_s
       if @on_block
        code =proc {"
@@ -249,6 +254,7 @@ module FastRuby
     }
 
     define_method_handler(:to_c, :priority => 100) { |*x|
+      @has_nonlocal_goto = true
       tree, result_var  = x
 
       code = ""
@@ -275,6 +281,7 @@ module FastRuby
     }
     
     define_method_handler(:to_c, :priority => 100) { |*x|
+      @has_nonlocal_goto = true
       tree, result_var  = x
 
       code = ""

data/lib/fastruby/modules/translator/nonlocal.rb~

@@ -0,0 +1,304 @@
+=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
+module FastRuby
+  class Context
+    
+    define_translator_for(:return, :method => :to_c_return)
+    def to_c_return(tree, return_variable = nil)
+      @has_nonlocal_goto = true
+      code = proc{"
+        #{to_c(tree[1],"last_expression")};
+        goto local_return;
+        return Qnil;
+        "}
+        
+      if return_variable
+        code.call
+      else
+        inline_block &code
+      end
+    end
+
+    define_translator_for(:break, :method => :to_c_break)
+    def to_c_break(tree, result_var = nil)
+      @has_nonlocal_goto = true
+      
+        value_tmp_var = "value_" + rand(10000000).to_s
+      
+        code = proc{"
+
+          {
+         VALUE #{value_tmp_var} = Qnil; 
+         #{
+         if tree[1]
+           to_c(tree[1], value_tmp_var)
+         end
+         };
+
+         typeof(pframe) target_frame_;
+         target_frame_ = (void*)plocals->call_frame;
+
+         if (target_frame_ == 0) {
+            #{_raise("rb_eLocalJumpError","illegal break")};
+         }
+
+         plocals->call_frame = 0;
+
+         target_frame_->return_value = #{value_tmp_var};
+         target_frame_->targetted = 1;
+         pframe->thread_data->exception = Qnil;
+         longjmp(pframe->jmp,FASTRUBY_TAG_BREAK);
+         
+         }
+         "}
+         
+         if result_var
+           code.call
+         else
+           inline_block code
+         end
+    end
+
+    define_translator_for(:retry, :method => :to_c_retry)
+    def to_c_retry(tree, result_var = nil)
+      @has_nonlocal_goto = true
+        code = "
+          {
+         typeof(pframe) target_frame_;
+         target_frame_ = (void*)plocals->call_frame;
+
+         if (target_frame_ == 0) {
+            #{_raise("rb_eLocalJumpError","illegal retry")};
+         }
+
+         target_frame_->targetted = 1;
+         longjmp(pframe->jmp,FASTRUBY_TAG_RETRY);
+         }
+         "
+       if result_var
+         code
+       else
+         inline_block code
+       end
+    end
+
+    define_translator_for(:redo, :method => :to_c_redo)
+    def to_c_redo(tree, result_var = nil)
+      has_nonlocal_goto = true
+      if @on_block
+         code = "
+            goto fastruby_local_redo;
+          "
+          
+          if result_var
+            code
+          else
+            inline_block code
+          end
+      else
+          _raise("rb_eLocalJumpError","illegal redo");
+      end
+    end
+
+    define_translator_for(:next, :method => :to_c_next)
+    def to_c_next(tree, result_var = nil)
+      has_nonlocal_goto = true
+      tmp_varname = "_acc_" + rand(10000000).to_s
+      if @on_block
+       code =proc {"
+        {
+          last_expression = Qnil;
+          
+          #{
+          if tree[1]
+            to_c(tree[1],"last_expression")
+          end
+          }
+        pframe->thread_data->accumulator = last_expression;
+        goto fastruby_local_next;
+        }
+        "}
+        
+        if result_var
+          code.call
+        else
+          inline_block &code
+        end
+      else
+        _raise("rb_eLocalJumpError","illegal next");
+      end
+    end
+    
+    define_method_handler(:to_c, :priority => 100) { |*x|
+      tree, result_var  = x
+
+
+      call_tree = tree[1]
+      catch_tag_id = call_tree[3][1][1]
+      included_catch_jmp = false
+
+      @catch_jmp = @catch_jmp || Set.new
+      
+      begin
+        inner_code = catch_block(catch_tag_id) do
+          to_c(tree[3],result_var)
+        end
+        
+        included_catch_jmp = true if @catch_jmp.include?(catch_tag_id) 
+      ensure
+        @catch_jmp.delete(catch_tag_id)
+      end
+      
+      if included_catch_jmp
+        new_frame = anonymous_function{ |name| "
+          static VALUE #{name}(VALUE param) {
+            volatile VALUE last_expression = Qnil;
+            #{@frame_struct} frame;
+  
+            typeof(frame)* volatile pframe;
+            typeof(frame)* volatile parent_frame;
+            #{@locals_struct}* volatile plocals;
+  
+            parent_frame = (void*)param;
+  
+            frame.parent_frame = (void*)param;
+            frame.plocals = parent_frame->plocals;
+            frame.rescue = parent_frame->rescue;
+            frame.targetted = 0;
+            frame.thread_data = parent_frame->thread_data;
+            frame.return_value = Qnil;
+            frame.thread_data->accumulator = Qnil;
+            if (frame.thread_data == 0) frame.thread_data = rb_current_thread_data();
+  
+            plocals = frame.plocals;
+            pframe = &frame;
+  
+            volatile int aux = setjmp(frame.jmp);
+            if (aux != 0) {
+              // restore previous frame
+              typeof(pframe) original_frame = pframe;
+              pframe = parent_frame;
+
+              if (aux == (int)#{intern_num catch_tag_id.to_s + "_end"}) {
+                return frame.thread_data->accumulator;
+              } else if (aux == (int)#{intern_num catch_tag_id.to_s + "_start"}) {
+              } else {
+                longjmp(pframe->jmp,aux);
+              }
+  
+              return last_expression;
+            }
+            
+         #{catch_tag_id.to_s}_start:
+                #{inner_code};
+          #{catch_tag_id.to_s}_end:
+            return last_expression;
+#{@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")
+}
+  
+            }
+          "
+        } + "((VALUE)pframe)"
+        
+        if result_var
+          "#{result_var} = #{new_frame};"
+        else
+          new_frame
+        end
+      else
+          "
+         #{catch_tag_id.to_s}_start:
+                #{inner_code};
+          #{catch_tag_id.to_s}_end:
+          
+          "
+      end
+
+    }.condition{|*x|
+      tree, result_var  = x
+ 
+      tree.node_type == :iter && tree[1][2] == :_catch
+    }
+
+    define_method_handler(:to_c, :priority => 100) { |*x|
+      @has_nonlocal_goto = true
+      tree, result_var  = x
+
+      code = ""
+      
+      catch_tag_id = tree[3][1][1]
+      
+      if @catch_jmp_on_throw
+        @catch_jmp << catch_tag_id
+      end
+      
+      code << to_c(tree[3][2] || fs(:nil), "last_expression")
+      code << "pframe->thread_data->accumulator = last_expression;"
+      code << "goto #{catch_tag_id.to_s}_end;"
+      
+      if result_var
+        code
+      else
+        inline_block code
+      end
+    }.condition{|*x|
+      tree, result_var  = x
+ 
+      tree.node_type == :call && tree[2] == :_throw
+    }
+    
+    define_method_handler(:to_c, :priority => 100) { |*x|
+      @has_nonlocal_goto = true
+      tree, result_var  = x
+
+      code = ""
+      
+      catch_tag_id = tree[3][1][1]
+      code << "goto #{catch_tag_id.to_s}_start;"
+      
+      if result_var
+        code
+      else
+        inline_block code
+      end
+    }.condition{|*x|
+      tree, result_var  = x
+ 
+      tree.node_type == :call && tree[2] == :_loop
+    }
+
+  end
+end