fastruby 0.0.20 → 0.0.21

data/Rakefile

@@ -7,7 +7,7 @@ require "rspec/core/rake_task"
 
 spec = Gem::Specification.new do |s|
   s.name = 'fastruby'
-  s.version = '0.0.20'
+  s.version = '0.0.21'
   s.author = 'Dario Seminara'
   s.email = 'robertodarioseminara@gmail.com'
   s.platform = Gem::Platform::RUBY

data/lib/fastruby/builder.rb~

@@ -159,7 +159,7 @@ module FastRuby
       alt_options = options.dup
       alt_options.delete(:self)
       
-      require "pry"; binding.pry
+      #require "pry"; binding.pry
       code_sha1 = FastRuby.cache.hash_snippet(inlined_tree.inspect, FastRuby::VERSION + signature.map(&:to_s).join('-') + alt_options.inspect)
       
       paths = FastRuby.cache.retrieve(code_sha1)
@@ -181,6 +181,10 @@ module FastRuby
         context.locals = FastRuby::GetLocalsProcessor.get_locals(inlined_tree)
       
         FastRuby.logger.info "Compiling #{@owner}::#{@method_name} for signature #{signature.inspect}"
+
+if @method_name == :bar
+  print inlined_tree.to_ruby
+end
         c_code = context.to_c_method(inlined_tree,signature)
    
         unless options[:main]

data/lib/fastruby/corelib/fixnum.rb

@@ -22,7 +22,7 @@ require "fastruby/sexp_extension"
 
 class Fixnum
   fastruby(:fastruby_only => true, :skip_reduce => true) do
-    if RUBY_VERSION =~ /^1\\.9/
+    if RUBY_VERSION =~ /^1\.9/
       def +(b)
         if b._class == Fixnum
           _static{LONG2NUM(FIX2LONG(self)+FIX2LONG(b))}

data/lib/fastruby/corelib/fixnum.rb~

@@ -22,77 +22,6 @@ require "fastruby/sexp_extension"
 
 class Fixnum
   fastruby(:fastruby_only => true, :skip_reduce => true) do
-    def times
-      unless block_given?
-        return _static{rb_enumeratorize(self, _dynamic{:times}, inline_c("0"), inline_c("0") ) }
-      end
-      
-      if self._class == Fixnum
-        i = 0
-        while _static{FIX2LONG(i) < FIX2LONG(self)}
-          yield(i)
-          i = _static{LONG2FIX(FIX2LONG(i)+1)}
-        end
-      else
-        i = 0
-        while i < self
-          yield(i)
-          i = i + 1
-        end
-      end
-    end
-    
-    def upto(x)
-      unless block_given?
-        return _static{rb_enumeratorize(self, _dynamic{:upto}, inline_c("1"), c_address_of(x)) }
-      end
-      if self._class == Fixnum
-        if x._class == Fixnum
-          i = self
-          while _static{FIX2LONG(i) <= FIX2LONG(x)}
-            yield(i)
-            i = _static{LONG2FIX(FIX2LONG(i)+1)}
-          end
-      
-          return self  
-        end
-      end
-      
-      i = self
-      while i <= x
-        yield(i)
-        i = i + 1
-      end
-      
-      self
-    end
-
-    def downto(x)
-      unless block_given?
-        return _static{rb_enumeratorize(self, _dynamic{:downto}, inline_c("1"), c_address_of(x)) }
-      end
-      
-      if self._class == Fixnum
-        if x._class == Fixnum
-          i = self
-          while _static{FIX2LONG(i) >= FIX2LONG(x)}
-            yield(i)
-            i = _static{LONG2FIX(FIX2LONG(i)-1)}
-          end
-      
-          return self  
-        end
-      end
-      
-      i = self
-      while i >= x
-        yield(i)
-        i = i - 1
-      end
-      
-      self
-    end
-
     if RUBY_VERSION =~ /^1\\.9/
       def +(b)
         if b._class == Fixnum

data/lib/fastruby/corelib.rb~

@@ -18,6 +18,6 @@ you should have received a copy of the gnu general public license
 along with fastruby.  if not, see <http://www.gnu.org/licenses/>.
 
 =end
-Dir.glob(FastRuby.fastruby_load_path + "/fastruby/stdlib/**/*.rb").each do |path|
+Dir.glob(FastRuby.fastruby_load_path + "/fastruby/corelib/**/*.rb").each do |path|
   require path
 end

data/lib/fastruby/modules/inliner/call.rb~

@@ -154,7 +154,7 @@ module FastRuby
           if subtree.node_type == :call
             if subtree[1] == nil
               if subtree[2] == :block_given?
-                subtree[0..-1] = fs(:false)
+                subtree[0..-1] = block_tree ? fs(:true) : fs(:false)
               else
                 subtree[1] = recv_tree.duplicate
               end
@@ -282,6 +282,8 @@ module FastRuby
       recv_tree = tree[1] || fs(:self)
       method_name = tree[2]
       args_tree = tree[3]
+
+      p method_name
       
       if method_name == :lvar_type
         next tree

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

@@ -79,7 +79,7 @@ module FastRuby
       recvtype = infer_type(recv)
       
       if args.size > 1
-        if (not recvtype) or args.last[0] == :splat or (not RUBY_VERSION =~ /^1\\.9/)
+        if (not recvtype) or args.last[0] == :splat or (not RUBY_VERSION =~ /^1\.9/)
           if block_pass_arg
             call_tree = tree.dup
             call_tree[3] = args.select{|arg| if arg == :arglist 

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

@@ -79,7 +79,7 @@ module FastRuby
       recvtype = infer_type(recv)
       
       if args.size > 1
-        if (not recvtype) or args.last[0] == :splat or true
+        if (not recvtype) or args.last[0] == :splat or (not RUBY_VERSION =~ /^1\\.9/)
           if block_pass_arg
             call_tree = tree.dup
             call_tree[3] = args.select{|arg| if arg == :arglist 

data/lib/fastruby/object.rb~

@@ -83,12 +83,6 @@ class Object
         m = instance_method(mname)
         if fastruby_options[:fastruby_only]
           tree = FastRuby::FastRubySexp.parse m.source
-
-          unless FastRuby.acceptable_tree?(tree)
-            _self.class_eval(m.source)
-            return
-          end
-
           FastRuby.set_tree(_self, tree[1], tree, fastruby_options)
         else
           @_self.fastruby m.source, fastruby_options

data/lib/fastruby.rb

@@ -32,7 +32,7 @@ class Object
 end
 
 module FastRuby
-  VERSION = "0.0.20" unless defined? FastRuby::VERSION
+  VERSION = "0.0.21" unless defined? FastRuby::VERSION
 end
 
 require "fastruby/corelib"

data/lib/fastruby.rb~

@@ -32,7 +32,7 @@ class Object
 end
 
 module FastRuby
-  VERSION = "0.0.19" unless defined? FastRuby::VERSION
+  VERSION = "0.0.20" unless defined? FastRuby::VERSION
 end
 
 require "fastruby/corelib"

data/spec/corelib/numeric/fixnum_spec.rb

@@ -82,7 +82,7 @@ describe FastRuby, "fastruby fixnum corelib" do
   
 
   test_methods = [:-@, :abs, :to_f, :size, :zero?, :odd?, :even?, :succ]
-  if RUBY_VERSION =~ /^1\\.9/
+  if RUBY_VERSION =~ /^1\.9/
     test_methods << :magnitude
   end  
 

data/spec/corelib/numeric/fixnum_spec.rb~

@@ -80,7 +80,13 @@ describe FastRuby, "fastruby fixnum corelib" do
     end
   end
   
-  [:-@, :abs, :magnitude, :to_f, :size, :zero?, :odd?, :even?, :succ].each do |op|
+
+  test_methods = [:-@, :abs, :to_f, :size, :zero?, :odd?, :even?, :succ]
+  if RUBY_VERSION =~ /^1\\.9/
+    test_methods << :magnitude
+  end  
+
+  test_methods.each do |op|
     test_unary_op(31,op)
     test_unary_op(-31,op)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastruby
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000Z
+date: 2012-04-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RubyInline
-  requirement: &72410660 !ruby/object:Gem::Requirement
+  requirement: &73515840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *72410660
+  version_requirements: *73515840
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &72401420 !ruby/object:Gem::Requirement
+  requirement: &73515590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *72401420
+  version_requirements: *73515590
 - !ruby/object:Gem::Dependency
   name: define_method_handler
-  requirement: &72401170 !ruby/object:Gem::Requirement
+  requirement: &73515350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *72401170
+  version_requirements: *73515350
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &72400940 !ruby/object:Gem::Requirement
+  requirement: &73515110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *72400940
+  version_requirements: *73515110
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
-  requirement: &72400710 !ruby/object:Gem::Requirement
+  requirement: &73514880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *72400710
+  version_requirements: *73514880
 description: 
 email: robertodarioseminara@gmail.com
 executables: []
@@ -92,67 +92,45 @@ files:
 - examples/example3.rb
 - examples/example4.rb
 - examples/example1.rb
-- lib/fastruby/sexp_extension.rb~
 - lib/fastruby/corelib.rb
 - lib/fastruby/sexp_extension.rb
 - lib/fastruby/object.rb
 - lib/fastruby/builder/inliner.rb
 - lib/fastruby/builder/lvar_type.rb
 - lib/fastruby/builder/pipeline.rb
-- lib/fastruby/builder/pipeline.rb~
-- lib/fastruby/builder/inliner.rb~
-- lib/fastruby/builder/lvar_type.rb~
 - lib/fastruby/builder/locals_inference.rb
 - lib/fastruby/builder/inference_updater.rb
-- lib/fastruby/builder/inference_updater.rb~
 - lib/fastruby/builder/inferencer.rb
-- lib/fastruby/builder/reductor.rb~
 - lib/fastruby/builder/reductor.rb
 - lib/fastruby/builder.rb~
 - lib/fastruby/modules/translator/defn.rb
-- lib/fastruby/modules/translator/iter.rb~
-- lib/fastruby/modules/translator/literal.rb~
-- lib/fastruby/modules/translator/nonlocal.rb~
 - lib/fastruby/modules/translator/iter.rb
 - lib/fastruby/modules/translator/directive.rb
 - lib/fastruby/modules/translator/exceptions.rb
 - lib/fastruby/modules/translator/static.rb
-- lib/fastruby/modules/translator/static.rb~
 - lib/fastruby/modules/translator/method_group.rb
-- lib/fastruby/modules/translator/exceptions.rb~
 - lib/fastruby/modules/translator/nonlocal.rb
-- lib/fastruby/modules/translator/variable.rb~
 - lib/fastruby/modules/translator/variable.rb
 - lib/fastruby/modules/translator/call.rb
-- lib/fastruby/modules/translator/defn.rb~
 - lib/fastruby/modules/translator/block.rb
 - lib/fastruby/modules/translator/call.rb~
 - lib/fastruby/modules/translator/flow.rb
 - lib/fastruby/modules/translator/logical.rb
-- lib/fastruby/modules/translator/directive.rb~
 - lib/fastruby/modules/translator/literal.rb
 - lib/fastruby/modules/inferencer/infer.rb
 - lib/fastruby/modules/inferencer/literal.rb
 - lib/fastruby/modules/lvar_type/recursive.rb
-- lib/fastruby/modules/lvar_type/recursive.rb~
 - lib/fastruby/modules/lvar_type/defn.rb
 - lib/fastruby/modules/lvar_type/lasgn.rb
-- lib/fastruby/modules/lvar_type/lasgn.rb~
 - lib/fastruby/modules/lvar_type/call.rb
-- lib/fastruby/modules/lvar_type/defn.rb~
-- lib/fastruby/modules/lvar_type/call.rb~
 - lib/fastruby/modules/inliner/recursive.rb
-- lib/fastruby/modules/inliner/recursive.rb~
 - lib/fastruby/modules/inliner/defn.rb
 - lib/fastruby/modules/inliner/call.rb
-- lib/fastruby/modules/inliner/defn.rb~
 - lib/fastruby/modules/inliner/call.rb~
 - lib/fastruby/modules/reductor/for.rb
 - lib/fastruby/modules/reductor/recursive.rb
-- lib/fastruby/modules/reductor/recursive.rb~
 - lib/fastruby/modules/reductor/nontree.rb
 - lib/fastruby/modules/reductor/fastruby_flag.rb
-- lib/fastruby/modules/reductor/nontree.rb~
 - lib/fastruby/modules/reductor/case.rb
 - lib/fastruby/builder.rb
 - lib/fastruby/inline_extension.rb
@@ -162,25 +140,19 @@ files:
 - lib/fastruby/exceptions.rb
 - lib/fastruby/translator/scope_mode_helper.rb
 - lib/fastruby/translator/translator.rb
-- lib/fastruby/translator/translator_modules.rb~
 - lib/fastruby/translator/translator_modules.rb
-- lib/fastruby/translator/translator.rb~
-- lib/fastruby/translator/scope_mode_helper.rb~
 - lib/fastruby/set_tree.rb
 - lib/fastruby/object.rb~
 - lib/fastruby/cache/cache.rb
 - lib/fastruby/modules.rb
 - lib/fastruby/method_extension.rb
 - lib/fastruby/custom_require.rb
-- lib/fastruby/set_tree.rb~
 - lib/fastruby/getlocals.rb
 - lib/fastruby/corelib/fixnum.rb~
 - lib/fastruby/corelib/integer.rb
-- lib/fastruby/corelib/integer.rb~
 - lib/fastruby/corelib/fixnum.rb
 - lib/fastruby/fastruby_sexp.rb
 - lib/fastruby.rb~
-- lib/fastruby_only/base.rb
 - lib/fastruby_load_path.rb
 - lib/fastruby.rb
 - spec/edges_helper.rb

data/lib/fastruby/builder/inference_updater.rb~

@@ -1,76 +0,0 @@
-=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 InferenceUpdater
-    class AddInfer
-      attr_accessor :variable_hash
-      
-      define_method_handler(:process, :priority => 1) {|tree|
-          tree        
-        }.condition{|tree| (tree.node_type == :iter and tree[1][2] == :_static) or (tree.node_type == :call and tree[2] == :infer) }
-        
-      define_method_handler(:process, :priority => -1) {|tree|
-          tree.map &method(:process)
-        }.condition{|tree| tree.respond_to?(:node_type) }
-
-      define_method_handler(:process, :priority => 1) {|tree|
-          tree
-        }.condition{|tree| not tree.respond_to?(:node_type) }
-
-      define_method_handler(:process) {|tree|
-          fs(:call, tree, :infer, fs(:arglist, fs(:const, variable_hash[tree[1]].to_s.to_sym)))
-        }.condition{|tree| tree.node_type == :lvar and variable_hash[tree[1]] and variable_hash[tree[1]] != :dynamic}
-
-    end
-    
-    def initialize(inferencer)
-      @inferencer = inferencer
-    end
-    
-    def call(tree)
-      variable_hash = Hash.new
-      
-      # search variable assignments
-      tree.walk_tree do |subtree|
-        if subtree.node_type == :lasgn and subtree[2]
-          types = @inferencer.infer(subtree[2])
-          lname = subtree[1]
-          if types.size == 1
-            if variable_hash[lname]
-              if variable_hash[lname] != types.first
-                variable_hash[lname] = :dynamic
-              end
-            else
-              variable_hash[lname] = types.first
-            end
-          elsif types.size == 0
-            variable_hash[lname] = :dynamic
-          end 
-        end
-      end
-      
-      add_infer = AddInfer.new
-      add_infer.variable_hash = variable_hash
-      
-      add_infer.process(tree)
-    end
-  end
-end

data/lib/fastruby/builder/inliner.rb~

@@ -1,60 +0,0 @@
-=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 "define_method_handler"
-require "fastruby/modules"
-
-module FastRuby
-  class Inliner
-    attr_reader :inlined_methods
-
-    def initialize(inferencer)
-      @inlined_methods = Array.new
-      @inferencer = inferencer
-    end
-    
-    define_method_handler(:inline, :priority => -1000) do |tree|
-      FastRubySexp.from_sexp(tree)
-    end
-    
-    def call(*args)
-
-      return args.first
-
-      if args.first.find_tree{|tree| tree.node_type == :call && tree[2] != :infer && infer_type(tree[1] || fs(:self))}
-        inline *args
-      else
-        args.first
-      end
-    end
-    
-    FastRuby::Modules.load_all("inliner")
-
-    def infer_type(recv)
-      array = @inferencer.infer(recv).to_a
-      
-      if array.size == 1
-        array[0]
-      else
-        nil
-      end
-    end
-  end
-end

data/lib/fastruby/builder/lvar_type.rb~

@@ -1,44 +0,0 @@
-=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 "set"
-require "sexp"
-require "define_method_handler"
-require "fastruby/modules"
-
-module FastRuby
-  class LvarType
-    def initialize(inferencer)
-      @infer_lvar_map = Hash.new
-      @inferencer = inferencer
-    end
-
-    def call(*args)
-        p args.first
-     # if args.first.find_tree{|tree| tree.node_type == :call && tree[2] == :lvar_type}
-     #   process *args
-     # else
-        args.first
-     # end
-    end
-    
-    FastRuby::Modules.load_all("lvar_type")
-  end
-end

data/lib/fastruby/builder/pipeline.rb~

@@ -1,43 +0,0 @@
-=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 "define_method_handler"
-
-module FastRuby
-  class Pipeline
-    def initialize
-      @array = Array.new
-    end
-    
-    def << (object)
-      @array << object
-    end
-    
-    def call(arg)
-      
-      last_result = arg 
-      @array.each do |processor|
-        last_result = processor.call(last_result)
-      end
-      
-      last_result
-    end
-  end
-end

data/lib/fastruby/builder/reductor.rb~

@@ -1,42 +0,0 @@
-=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 "set"
-require "sexp"
-require "define_method_handler"
-require "fastruby/modules"
-
-module FastRuby
-  class Reductor
-    def self.reduce_for(ntype, options = {}, &blk)
-      define_method_handler(:reduce, options, &blk).condition{|*x| tree = x.first;  tree.respond_to?(:node_type) && tree.node_type == ntype}
-    end
-    
-    def call(*args)
-      reduce args.first
-    end
-    
-    define_method_handler(:reduce, :priority => -1000) do |*x| tree = x.first; 
-      FastRubySexp.from_sexp(tree)
-    end
-    
-    FastRuby::Modules.load_all("reductor")
-  end
-end