fastruby 0.0.17 → 0.0.18

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

@@ -19,30 +19,12 @@ along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
 module FastRuby
-  module CallTranslator
-    
-    register_translator_module self
+  class Context
 
+    define_translator_for(:call, :method => :to_c_call)
     def to_c_call(tree, result_var = nil)
-      directive_code = directive(tree)
       repass_var = @repass_var
 
-      if directive_code
-        if result_var
-          return "#{result_var} = #{directive_code};\n"
-        else
-          return directive_code
-        end
-      end
-      
-      if tree[2] == :require
-        tree[2] = :fastruby_require
-      elsif tree[2] == :raise
-        # raise code
-        args = tree[3]
-        return _raise(args[1],args[2])
-      end
-
       recv = tree[1]
       mname = tree[2]
       args = tree[3]
@@ -221,11 +203,11 @@ module FastRuby
 
                 #{if result_var
                 "
-                #{result_var} = ((VALUE(*)(#{value_cast}))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(recv, (VALUE)pblock, (VALUE)pframe);
+                #{result_var} = ((VALUE(*)(VALUE,VALUE,VALUE,int,VALUE*))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(recv, (VALUE)pblock, (VALUE)pframe, 0, (VALUE[]){});
                 "
                 else
                 "
-                ((VALUE(*)(#{value_cast}))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(recv, (VALUE)pblock, (VALUE)pframe);
+                ((VALUE(*)(VALUE,VALUE,VALUE,int,VALUE*))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(recv, (VALUE)pblock, (VALUE)pframe, 0, (VALUE[]){});
                 "
                 end
                 }
@@ -234,7 +216,7 @@ module FastRuby
               
                 result_var ? code : inline_block(code)
               else
-                 "((VALUE(*)(#{value_cast}))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(#{to_c recv}, Qfalse, (VALUE)pframe)"               
+                 "((VALUE(*)(VALUE,VALUE,VALUE,int,VALUE*))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(#{to_c recv}, Qfalse, (VALUE)pframe, 0, (VALUE[]){})"               
               end          
 
           else
@@ -287,11 +269,11 @@ module FastRuby
 
                 #{if result_var
                 "
-                #{result_var} = ((VALUE(*)(#{value_cast}))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(recv, (VALUE)pblock, (VALUE)pframe, #{strargs});
+                #{result_var} = ((VALUE(*)(VALUE,VALUE,VALUE,int,VALUE*))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(recv, (VALUE)pblock, (VALUE)pframe, #{args.size-1}, (VALUE[]){#{strargs}});
                 "
                 else
                 "
-                ((VALUE(*)(#{value_cast}))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(recv, (VALUE)pblock, (VALUE)pframe, #{strargs});
+                ((VALUE(*)(VALUE,VALUE,VALUE,int,VALUE*))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(recv, (VALUE)pblock, (VALUE)pframe, #{args.size-1}, (VALUE[]){#{strargs}});
                 "
                 end
                 }
@@ -302,7 +284,7 @@ module FastRuby
                 result_var ? code : inline_block(code)
               else
                 strargs = args[1..-1].map{|arg| to_c arg}.join(",")
-                "((VALUE(*)(#{value_cast}))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(#{to_c recv}, Qfalse, (VALUE)pframe, #{strargs})"
+                "((VALUE(*)(VALUE,VALUE,VALUE,int,VALUE*))#{encode_address(recvtype,signature,mname,tree,inference_complete)})(#{to_c recv}, Qfalse, (VALUE)pframe, #{args.size-1}, (VALUE[]){#{strargs}})"
               end
           end
 
@@ -330,6 +312,7 @@ module FastRuby
       end # if recvtype
     end
 
+    define_translator_for(:call, :method => :to_c_attrasgn, :arity => 1)
     def to_c_attrasgn(tree)
       to_c_call(tree)
     end

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

@@ -19,9 +19,9 @@ along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
 module FastRuby
-  module DefnTranslator
-    register_translator_module self
-
+  class Context
+    
+    define_translator_for(:defn, :method => :to_c_defn)
     def to_c_defn(tree, result_var = nil)
 
       method_name = tree[1]
@@ -82,6 +82,7 @@ module FastRuby
       end
     end
 
+    define_translator_for(:defs, :method => :to_c_defs)
     def to_c_defs(tree, result_var = nil)
       method_name = tree[2]
       args_tree = tree[3].select{|x| x.to_s[0] != ?&}
@@ -127,6 +128,7 @@ module FastRuby
         
     end
 
+    define_translator_for(:scope, :method => :to_c_scope)
     def to_c_scope(tree, result_var = nil)
       if tree[1]
         if result_var

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

@@ -0,0 +1,42 @@
+=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(:call, :priority => 100){ |tree, result_var=nil|
+      directive_code = directive(tree)
+
+      if result_var
+        return "#{result_var} = #{directive_code};\n"
+      else
+        return directive_code
+      end
+      
+    }.condition{|*x|
+      tree = x.first; tree.node_type == :call && directive(tree)
+    }
+
+    define_translator_for(:call, :method => :to_c_attrasgn, :arity => 1)
+    def to_c_attrasgn(tree)
+      to_c_call(tree)
+    end
+  end
+end

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

@@ -19,10 +19,9 @@ along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
 module FastRuby
-  module ExceptionsTranslator
-    register_translator_module self
-
-
+  class Context
+    
+    define_translator_for(:rescue, :method => :to_c_rescue, :arity => 1)
     def to_c_rescue(tree)
       if tree[1][0] == :resbody
         else_tree = tree[2]
@@ -51,7 +50,7 @@ module FastRuby
           next if resbody_tree[0] != :resbody
 
           if resbody_tree[1].size == 1
-            resbody_tree[1][1] = [:const, :Exception]
+            resbody_tree[1][1] = s(:const, :Exception)
           end
 
           if resbody_tree[1].last[0] == :lasgn
@@ -94,6 +93,7 @@ module FastRuby
       end
     end
 
+    define_translator_for(:ensure, :method => :to_c_ensure, :arity => 1)
     def to_c_ensure(tree)
       if tree.size == 2
         to_c tree[1]
@@ -105,30 +105,12 @@ 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
-    
+    define_translator_for(:call, :priority => 100){ |tree, result_var=nil|
+      # raise code
+      args = tree[3]
+      _raise(args[1],args[2])
+    }.condition{|*x|
+      tree = x.first; tree.node_type == :call && tree[2] == :raise
+    }
   end
 end

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

@@ -19,66 +19,8 @@ along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
 module FastRuby
-  module FlowControlTranslator
-    
-    register_translator_module self
-    
-    def to_c_case(tree, result_var = nil)
-
-      tmpvarname = "tmp" + rand(1000000).to_s;
-      @repass_var = tmpvarname
-      outputvar = result_var || ("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)})) {
-                  #{to_c(subtree[2],outputvar)};
-               }
-              "
-        }.join(" else ")
-
-      }.join(" else ") + "else {
-        #{
-        if tree[-1] 
-         to_c tree[-1],outputvar
-        end
-        };
-      }
-      "
-      
-      ret_code = "
-        {
-          #{
-          unless result_var
-          VALUE #{outputvar} = Qnil;
-          end
-          }
-          
-          VALUE #{tmpvarname} = Qnil;
-          #{to_c tree[1], tmpvarname};
-          
-          // case
-          #{code}
-          #{
-          unless result_var
-            "return #{outputvar};"
-          end
-          }
-        }
-      "
-
-      if result_var
-        ret_code
-      else
-        inline_block ret_code
-      end
-    end
-
+  class Context
+    define_translator_for(:if, :method => :to_c_if)
     def to_c_if(tree, result_variable_ = nil)
       condition_tree = tree[1]
       impl_tree = tree[2]
@@ -86,35 +28,43 @@ module FastRuby
       
       result_variable = result_variable_ || "last_expression"
       
-      code = "
-        {
-          VALUE condition_result;
-          #{to_c condition_tree, "condition_result"};
-          if (RTEST(condition_result)) {
-            #{to_c impl_tree, result_variable};
-          }#{else_tree ?
-            " else {
-            #{to_c else_tree, result_variable};
+      infered_value = infer_value(condition_tree)
+      unless infered_value
+        
+        code = "
+          {
+            VALUE condition_result;
+            #{to_c condition_tree, "condition_result"};
+            if (RTEST(condition_result)) {
+              #{to_c impl_tree, result_variable};
+            }#{else_tree ?
+              " else {
+              #{to_c else_tree, result_variable};
+              }
+              " : ""
             }
-            " : ""
           }
-        }
-      "
-
-      if result_variable_
-        code
+        "
+  
+        if result_variable_
+          code
+        else
+          inline_block code + "; return last_expression;"
+        end
       else
-        inline_block code + "; return last_expression;"
+        if infered_value.value
+          to_c(impl_tree, result_variable_)
+        else
+          if else_tree
+            to_c(else_tree, result_variable_)
+          else
+            to_c(s(:nil), result_variable_)
+          end
+        end
       end
     end
 
-    def to_c_for(tree)
-      alter_tree = tree.dup
-      alter_tree[0] = :iter
-      alter_tree[1] = [:call, alter_tree[1], :each, [:arglist]]
-      to_c alter_tree
-    end
-
+    define_translator_for(:while, :method => :to_c_while)
     def to_c_while(tree, result_var = nil)
       
       begin_while = "begin_while_"+rand(10000000).to_s

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

@@ -19,10 +19,9 @@ along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
 module FastRuby
-  module IterTranslator
+  class Context
     
-    register_translator_module IterTranslator
-
+    define_translator_for(:iter, :method => :to_c_iter)
     def to_c_iter(tree, result_var = nil)
 
       call_tree = tree[1]
@@ -629,10 +628,8 @@ fastruby_local_next:
         encoded_address = encode_address(recvtype,signature,mname,call_tree,inference_complete,convention_global_name)
 
         if call_args_tree.size > 1
-          value_cast = ( ["VALUE"]*(call_tree[3].size) ).join(",") + ", VALUE, VALUE"
-          strargs = "," + (0..call_args_tree.size-2).map{|i| "arg#{i}"}.join(",")
+          strargs = (0..call_args_tree.size-2).map{|i| "arg#{i}"}.join(",")
         else
-          value_cast = "VALUE,VALUE,VALUE"
           strargs = ""
         end
 
@@ -652,7 +649,7 @@ fastruby_local_next:
                 end
                 } 
 
-                ret = ((VALUE(*)(#{value_cast}))#{encoded_address})(recv, (VALUE)&block, (VALUE)&call_frame #{strargs});
+                ret = ((VALUE(*)(VALUE,VALUE,VALUE,int,VALUE*))#{encoded_address})(recv, (VALUE)&block, (VALUE)&call_frame, #{call_args_tree.size-1}, (VALUE[]){#{strargs}});
             "
         
         code = "

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

@@ -19,21 +19,13 @@ along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
 module FastRuby
-  module LiteralTranslator
-    register_translator_module self
-
-    def to_c_lit(tree)
-      literal_value tree[1]
-    end
-
-    def to_c_nil(tree)
-      "Qnil"
-    end
-
-    def to_c_str(tree)
-      literal_value tree[1]
-    end
+  class Context
+    
+    define_translator_for(:lit, :arity => 1){|tree| literal_value tree[1]}
+    define_translator_for(:nil, :arity => 1){|tree| "Qnil"}
+    define_translator_for(:str, :arity => 1){|tree| 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
@@ -78,6 +70,7 @@ module FastRuby
       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
@@ -112,18 +105,11 @@ module FastRuby
       end
     end
 
-    def to_c_self(tree)
-      locals_accessor + "self"
-    end
-
-    def to_c_false(tree)
-      "Qfalse"
-    end
-
-    def to_c_true(tree)
-      "Qtrue"
-    end
+    define_translator_for(:self, :arity => 1){|tree| locals_accessor + "self"}
+    define_translator_for(:false, :arity => 1){|tree| "Qfalse"}
+    define_translator_for(:true, :arity => 1){|tree| "Qtrue"}
 
+    define_translator_for(:dot2, :method => :to_c_dot2)
     def to_c_dot2(tree, result_var = nil)
       
       begin_var = "_begin"+rand(10000000).to_s

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

@@ -19,9 +19,9 @@ along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
 module FastRuby
-  module LogicalOperatorTranslator
-    register_translator_module self
-
+  class Context
+    
+    define_translator_for(:and, :method => :to_c_and)
     def to_c_and(tree, return_var = nil)
       if return_var
         "
@@ -39,6 +39,7 @@ module FastRuby
       
     end
 
+    define_translator_for(:or, :method => :to_c_or)
     def to_c_or(tree, return_var = nil)
       if return_var
         "
@@ -55,6 +56,7 @@ module FastRuby
       end
     end
 
+    define_translator_for(:not, :method => :to_c_not)
     def to_c_not(tree, return_var = nil)
       if return_var
         "

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

@@ -19,9 +19,9 @@ along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
 module FastRuby
-  module BlockTranslator
-    register_translator_module self
-    
+  class Context
+
+    define_translator_for(:class, :method => :to_c_class)
     def to_c_class(tree, result_var = nil)
       str_class_name = get_class_name(tree[1])
       container_tree = get_container_tree(tree[1])
@@ -60,6 +60,7 @@ module FastRuby
       end
     end
 
+    define_translator_for(:module, :method => :to_c_module)
     def to_c_module(tree, result_var = nil)
       str_class_name = get_class_name(tree[1])
       container_tree = get_container_tree(tree[1])

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

@@ -19,9 +19,9 @@ along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
 module FastRuby
-  module NonLocalTranslator
-    register_translator_module self
-
+  class Context
+    
+    define_translator_for(:return, :method => :to_c_return)
     def to_c_return(tree, return_variable = nil)
       code = "
         #{to_c(tree[1],"last_expression")};
@@ -35,6 +35,7 @@ module FastRuby
       end
     end
 
+    define_translator_for(:break, :method => :to_c_break)
     def to_c_break(tree, result_var = nil)
       
         value_tmp_var = "value_" + rand(10000000).to_s
@@ -73,6 +74,7 @@ module FastRuby
          end
     end
 
+    define_translator_for(:retry, :method => :to_c_retry)
     def to_c_retry(tree, result_var = nil)
         code = "
           {
@@ -94,6 +96,7 @@ module FastRuby
        end
     end
 
+    define_translator_for(:redo, :method => :to_c_redo)
     def to_c_redo(tree, result_var = nil)
       if @on_block
          code = "
@@ -110,6 +113,7 @@ module FastRuby
       end
     end
 
+    define_translator_for(:next, :method => :to_c_next)
     def to_c_next(tree, result_var = nil)
       tmp_varname = "_acc_" + rand(10000000).to_s
       if @on_block
@@ -135,7 +139,5 @@ module FastRuby
         _raise("rb_eLocalJumpError","illegal next");
       end
     end
-
-    
   end
 end