fastruby 0.0.21 → 0.0.22

data/spec/ruby/defn/replacement_spec.rb

@@ -160,5 +160,33 @@ describe FastRuby, "fastruby" do
         alias round original_round
       end
     end
-  end 
+  end
+
+  it "should allow replace methods when receiver types are not inferenced" do
+    fastruby "
+      class ::JU7
+        def foo
+          77
+        end
+      end
+    "
+
+    fastruby "
+      class ::JU8
+        def bar(l)
+          l.call.foo
+        end
+      end
+    "
+
+    ::JU8.new.bar(lambda{::JU7.new}).should be == 77
+
+      class ::JU7
+        def foo
+          99
+        end
+     end
+    
+    ::JU8.new.bar(lambda{::JU7.new}).should be == 99
+  end
 end

data/spec/ruby/defn/replacement_spec.rb~

@@ -131,32 +131,63 @@ describe FastRuby, "fastruby" do
   end
 
   it "should allow replace CFUNC methods using ruby after they are called and compiled at runtime (through other method)" do
-    class Fixnum
-      alias original_round round
+    begin
+
+      class Fixnum
+        alias original_round round
+      end
+      
+      fastruby "
+        class ::JU6
+          def foo(a)
+            a.round
+          end
+        end
+      "
+      
+      ::JU6.new.foo(0)
+      
+        class Fixnum
+          def round
+            86
+          end
+        end
+      
+      ::JU6.new.foo(0).should be == 86 
+
+    ensure
+      class Fixnum
+        alias round original_round
+      end
     end
-    
+  end
+
+  it "should allow replace methods when receiver types are not inferenced" do
+      class ::JU7
+        def foo
+          77
+        end
+      end
+
     fastruby "
-      class ::JU6
-        def foo(a)
-          a.round
+      class ::JU8
+        def bar(l)
+          l.call.foo
         end
       end
     "
-    
-    ::JU6.new.foo(0)
-    
-      class Fixnum
-        def round
-          86
+
+    ::JU8.new.bar(lambda{::JU7.new}).should be == 77
+
+    fastruby "
+      class ::JU7
+        def foo
+          99
         end
-      end
+   
+   end
+    "
     
-    ::JU6.new.foo(0).should be == 86 
-
-  ensure
-     class Fixnum
-      alias round original_round
-    end
- 
-  end 
+    ::JU8.new.bar(lambda{::JU7.new}).should be == 99
+  end
 end

data/spec/ruby/exception/internal_ex_spec.rb~

@@ -40,7 +40,7 @@ describe FastRuby, "fastruby" do
 
         def foo
           bar # this will raise TypeError
-        ensure
+        #ensure
           @a = 1
         end
       end
@@ -83,4 +83,4 @@ describe FastRuby, "fastruby" do
     llj3.a.should be == 1
   end
 
-end
+end

data/spec/ruby/variable_spec.rb~

@@ -2,30 +2,53 @@ require "fastruby"
 
 describe FastRuby, "fastruby" do
 
-  $u_class_number = 30
-  def self.test_defined(code,title,defined_name)
-    it "should call defined? to defined #{title} and return '#{defined_name}" do
-      classname = "::U"+$u_class_number.to_s
-
-      $u_class_number = $u_class_number + 1
-      code = "def foo; #{code}; end"
-      eval("class #{classname}
-        fastruby #{code.inspect}
-      end")
-      eval(classname).new.foo.should be == defined_name
+  class ::U8
+    class U81
+      fastruby "
+        def foo
+          U8C
+        end
+      "
     end
   end
-  test_defined "@a =17; defined? @a", "instance variable", "instance-variable"
-
-  $a = 9
-  test_defined "defined? $a", "global variable", "global-variable"
-  test_defined "a = 17; defined? a", "local variable", "local-variable"
-  test_defined "defined? Fixnum", "constant", "constant"
-  test_defined "defined? true", "true", "true"
-  test_defined "defined? false", "false", "false"
-  test_defined "defined? nil", "nil", "nil"
-  test_defined "defined? self", "self", "self"
-  test_defined "defined? print", "method", "method"
-  test_defined "defined?(if 0; 4; end)", "expression", "expression"
+  it "should read  nested constants" do
+    ::U8::U81::U8C = 11
+    ::U8::U81.new.foo.should be == 11
+  end
+
+  it "should read class variable" do
+    class ::U17
+
+      def self.foo(a)
+        @@a = a
+      end
+
+      fastruby "
+        def foo
+          @@a
+        end
+      "
+    end
+    ::U17.foo(31)
+    ::U17.new.foo.should be === 31
+  end
+
+  it "should write class variable" do
+    class ::U18
+
+      def self.foo
+        @@a
+      end
+
+      fastruby "
+        def foo(a)
+          @@a = a
+        end
+      "
+    end
+    ::U18.new.foo(71)
+    ::U18.foo.should be == 71
+  end
+
 
 end

data/spec/static/flow_spec.rb~

@@ -0,0 +1,48 @@
+require "fastruby"
+
+describe FastRuby::FastRubySexp, "FastRubySexp" do
+    fastruby "
+      class STATICFLOW1
+        def foo(a)
+          _static do
+            if (FIX2INT(a))
+              INT2FIX(20)
+            else
+              INT2FIX(40)
+            end
+          end
+        end
+      end
+    "
+    
+    
+  def self.test_static_if(*args)
+    args.each do |arg|
+      it "should should evaluate #{arg} as #{arg != 0} on static if" do
+        STATICFLOW1.new.foo(arg).should be == (arg == 0 ? 40 : 20)
+      end
+    end
+  end
+
+  test_static_if false.__id__, true.__id__, nil.__id__, 10, 11
+  
+  it "should allow static while" do
+    fastruby "
+      class STATICFLOW2
+        def foo(a)
+          ret = 0
+          _static do
+            while (FIX2INT(a) > 0)
+              a = INT2FIX(FIX2INT(a) - 1)
+              ret = INT2FIX(FIX2INT(ret) + 1)
+            end
+          end
+          ret
+        end
+      end
+    "
+    
+    STATICFLOW2.new.foo(7).should be == 7
+    STATICFLOW2.new.foo(0).should be == 0
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastruby
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000Z
+date: 2012-08-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RubyInline
-  requirement: &73515840 !ruby/object:Gem::Requirement
+  requirement: &79352690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *73515840
+  version_requirements: *79352690
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &73515590 !ruby/object:Gem::Requirement
+  requirement: &79352440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *73515590
+  version_requirements: *79352440
 - !ruby/object:Gem::Dependency
   name: define_method_handler
-  requirement: &73515350 !ruby/object:Gem::Requirement
+  requirement: &79352200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *73515350
+  version_requirements: *79352200
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &73515110 !ruby/object:Gem::Requirement
+  requirement: &79351960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *73515110
+  version_requirements: *79351960
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
-  requirement: &73514880 !ruby/object:Gem::Requirement
+  requirement: &79351730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *73514880
+  version_requirements: *79351730
 description: 
 email: robertodarioseminara@gmail.com
 executables: []
@@ -87,7 +87,9 @@ files:
 - benchmarks/benchmark3.rb
 - benchmarks/benchmark7.rb
 - benchmarks/benchmark6.rb~
+- benchmarks/benchmark8.rb
 - benchmarks/benchmark4.rb
+- benchmarks/benchmark8.rb~
 - examples/example2.rb
 - examples/example3.rb
 - examples/example4.rb
@@ -104,14 +106,22 @@ files:
 - lib/fastruby/builder/reductor.rb
 - lib/fastruby/builder.rb~
 - lib/fastruby/modules/translator/defn.rb
+- lib/fastruby/modules/translator/block.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
@@ -122,6 +132,7 @@ files:
 - 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/inliner/recursive.rb
 - lib/fastruby/modules/inliner/defn.rb
@@ -141,6 +152,7 @@ files:
 - lib/fastruby/translator/scope_mode_helper.rb
 - lib/fastruby/translator/translator.rb
 - lib/fastruby/translator/translator_modules.rb
+- lib/fastruby/translator/translator.rb~
 - lib/fastruby/set_tree.rb
 - lib/fastruby/object.rb~
 - lib/fastruby/cache/cache.rb
@@ -168,16 +180,22 @@ files:
 - spec/sexp2graph/exception_spec.rb
 - spec/sexp2graph/flow_spec.rb
 - spec/sexp2graph/logical_spec.rb
+- spec/ruby/block/callcc_spec.rb~
 - spec/ruby/block/retry_spec.rb
 - spec/ruby/block/arguments_spec.rb
 - spec/ruby/block/proc_spec.rb
 - spec/ruby/block/break_spec.rb
+- spec/ruby/block/break_spec.rb~
+- spec/ruby/block/redo_spec.rb~
 - spec/ruby/block/proc_as_block_spec.rb
+- spec/ruby/block/proc_spec.rb~
 - spec/ruby/block/next_spec.rb
 - spec/ruby/block/lambda_spec.rb
 - spec/ruby/block/lambda_spec.rb~
 - spec/ruby/block/redo_spec.rb
 - spec/ruby/block/block_as_proc_spec.rb
+- spec/ruby/block/retry_spec.rb~
+- spec/ruby/block/next_spec.rb~
 - spec/ruby/block/proc_as_block_spec.rb~
 - spec/ruby/block/callcc_spec.rb
 - spec/ruby/base_spec.rb~
@@ -211,7 +229,9 @@ files:
 - spec/ruby/defn/default_args_spec.rb
 - spec/ruby/defn/single_function_spec.rb
 - spec/ruby/defn/replacement_spec.rb
+- spec/ruby/defn/multiple_args_spec.rb~
 - spec/ruby/defn/replacement_spec.rb~
+- spec/ruby/defn/default_args_spec.rb~
 - spec/ruby/expression_spec.rb
 - spec/ruby/control_spec.rb
 - spec/sugar/base_spec.rb~
@@ -222,10 +242,12 @@ files:
 - spec/graph/vertex_spec.rb
 - spec/graph/path_spec.rb
 - spec/graph/vertex_spec.rb~
+- spec/fastruby_only/base_spec.rb~
 - spec/fastruby_only/base_spec.rb
 - spec/static/operator_spec.rb
 - spec/static/base_spec.rb
 - spec/static/flow_spec.rb
+- spec/static/flow_spec.rb~
 - spec/corelib/numeric/fixnum_spec.rb~
 - spec/corelib/numeric/integer_spec.rb
 - spec/corelib/numeric/integer_spec.rb~