fastruby 0.0.19 → 0.0.20

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

@@ -0,0 +1,86 @@
+require "fastruby"
+
+describe FastRuby, "fastruby" do
+
+  it "should trap 'no block given" do
+    fastruby "
+      class LLJ1
+        attr_accessor :a
+
+        def bar
+          yield
+        end
+
+        def foo
+          bar # this will raise LocalJumpError
+        ensure
+          @a = 1
+        end
+      end
+    "
+
+    llj1 = LLJ1.new
+
+    lambda {
+      llj1.foo
+    }.should raise_error(LocalJumpError)
+
+    llj1.a.should be == 1
+  end
+
+
+  it "should trap 'TypeError" do
+    fastruby "
+      class LLJ2
+        attr_accessor :a
+
+        def bar
+          4::X
+        end
+
+        def foo
+          bar # this will raise TypeError
+        ensure
+          @a = 1
+        end
+      end
+    "
+
+    llj2 = LLJ2.new
+
+    lambda {
+      llj2.foo
+    }.should raise_error(TypeError)
+
+    llj2.a.should be == 1
+  end
+
+  it "should trap FastRuby::TypeMismatchAssignmentException" do
+    fastruby "
+      class LLJ3
+        attr_accessor :a
+
+        def bar
+          a = 0
+          lvar_type(a,Fixnum)
+          a = 'wrong value'
+        end
+
+        def foo
+          bar # this will raise FastRuby::TypeMismatchAssignmentException
+        ensure
+          @a = 1
+        end
+      end
+    ", :validate_lvar_types => true
+
+    llj3 = LLJ3.new
+
+    lambda {
+      llj3.foo
+    }.should raise_error(FastRuby::TypeMismatchAssignmentException)
+
+    llj3.a.should be == 1
+  end
+
+end

data/spec/ruby/integrity_spec.rb~

@@ -2,6 +2,22 @@ require "fastruby"
 
 describe FastRuby, "fastruby" do
 
+  class ::Y1
+    fastruby "
+      def foo(x)
+        i = 0
+        lvar_type(i,Fixnum)
+        i = x
+        0
+      end
+    "
+  end
+
+  it "should deny wrong type assignments at runtime by default" do
+    lambda {
+    ::Y1.new.foo("test string")
+    }.should raise_error(FastRuby::TypeMismatchAssignmentException)
+  end
 
   class ::Y2
     fastruby "
@@ -37,4 +53,22 @@ describe FastRuby, "fastruby" do
     }.should_not raise_error
   end
 
-end
+
+  class ::Y4
+    fastruby "
+      def foo(x)
+		x+1
+      end
+    "
+  end
+
+  it "should builds be re-entrants, multiple calls should not produce any error if the first call works" do
+    lambda {
+	::Y4.build([Y4,Fixnum],:foo)
+	::Y4.build([Y4,Fixnum],:foo)
+	::Y4.build([Y4,Fixnum],:foo)
+	
+	::Y4.new.foo(1).should be ==2
+    }.should_not raise_error
+  end
+end

data/spec/ruby/variable_spec.rb~

@@ -0,0 +1,31 @@
+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
+    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"
+
+end

data/spec/scope_mode/flow_spec.rb

@@ -2,7 +2,7 @@ require "fastruby"
 require "sexp"
 require "ruby_parser"
 require "fastruby/translator/scope_mode_helper"
-require "fastruby/reductor/reductor"
+require "fastruby/builder/reductor"
 
 $parser = RubyParser.new
 

data/spec/scope_mode/flow_spec.rb~

@@ -0,0 +1,109 @@
+require "fastruby"
+require "sexp"
+require "ruby_parser"
+require "fastruby/translator/scope_mode_helper"
+require "fastruby/reductor/reductor"
+
+$parser = RubyParser.new
+
+describe FastRuby::ScopeModeHelper, "scope mode helper" do
+  
+  def get_scope_mode(tree)
+    FastRuby::ScopeModeHelper.get_scope_mode(
+      FastRuby::Reductor.new.reduce(
+        FastRuby::FastRubySexp.from_sexp(tree)
+        )
+        )
+  end
+  
+  it "possible read on if after call should return :dag scope mode" do
+    get_scope_mode(
+      $parser.parse "def foo(a,b,c)
+        if (a > 0)
+          c
+        end
+      end"
+    ).should be == :dag
+  end
+
+  it "possible read on case after call should return :dag scope mode" do
+    get_scope_mode(
+      $parser.parse "def foo(a,b,c)
+        case (a > 0)
+          when 0
+            c
+        end
+      end"
+    ).should be == :dag
+  end
+
+  it "possible read on case (on enum) after call should return :dag scope mode" do
+    get_scope_mode(
+      $parser.parse "def foo(a,b,c)
+        case (a > 0)
+          when c
+            0
+        end
+      end"
+    ).should be == :dag
+  end
+
+  it "for with local read and call should return :dag scope mode" do
+    get_scope_mode(
+      $parser.parse "def foo(a,b,c)
+        for a in b
+          foo
+          c
+        end
+      end"
+    ).should be == :dag
+  end
+
+  it "empty for with local read should return :dag scope mode (because for is a iter call to each with one argument)" do
+    get_scope_mode(
+      $parser.parse "def foo(a,b,c)
+        for a in b
+        end
+    end"
+    ).should be == :dag
+  end
+
+  it "case with a when should act as call and local read after case when should return :dag" do
+    get_scope_mode(
+      $parser.parse "def foo(a,b,c)
+        case b
+          when c
+        end
+        a
+    end"
+    ).should be == :dag
+  end
+  
+  it "case with a when should act as call and local read after case when should return :dag" do
+    get_scope_mode(
+      $parser.parse "def foo(a,b,c)
+        case b
+          when c
+            a
+          else
+            c
+        end
+    end"
+    ).should be == :dag
+  end  
+
+  it "case with two call (when) after read should return :dag scope" do
+    get_scope_mode(
+      $parser.parse "def foo(a,b,c)
+        case a
+          when b # call to a.===(b)
+            43
+          when c # read of variable c
+            439
+        end
+      end"
+    ).should be == :dag
+  end
+
+
+end

data/spec/sugar/base_spec.rb

@@ -0,0 +1,29 @@
+require "fastruby"
+
+describe FastRuby, "fastruby sexp graph" do
+  it "should allow define fastruby method using fastruby block" do
+    class FRBSUGAR1
+      fastruby do
+        def frbsugar1_foo(a)
+          _static{INT2FIX(FIX2INT(a)+1)}
+        end
+      end
+    end
+
+    FRBSUGAR1.new.frbsugar1_foo(100).should be == 101
+  end
+
+  it "should allow define fastruby method using fastruby block with fastruby_only" do
+    class FRBSUGAR2
+      fastruby(:fastruby_only => true) do
+        def frbsugar2_foo(a)
+          _static{INT2FIX(FIX2INT(a)+1)}
+        end
+      end
+    end
+
+    lambda {
+      FRBSUGAR2.new.frbsugar2_foo(100)
+    }.should raise_error(NoMethodError)
+  end
+end

data/spec/sugar/base_spec.rb~

@@ -0,0 +1,16 @@
+require "fastruby"
+
+describe FastRuby, "fastruby sexp graph" do
+  it "should allow define fastruby method using fastruby block" do
+    class FRBSUGAR1
+      fastruby do
+        def frbsugar1_foo(a)
+          _static{INT2FIX(FIX2INT(a)+1)}
+        end
+      end
+    end
+
+    FRBSUGAR1.new.frbsugar1_foo(100).should be == 101
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastruby
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000Z
+date: 2012-04-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RubyInline
-  requirement: &77624300 !ruby/object:Gem::Requirement
+  requirement: &72410660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *77624300
+  version_requirements: *72410660
 - !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: &77624040 !ruby/object:Gem::Requirement
+  requirement: &72401420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *77624040
+  version_requirements: *72401420
 - !ruby/object:Gem::Dependency
   name: define_method_handler
-  requirement: &77623780 !ruby/object:Gem::Requirement
+  requirement: &72401170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *77623780
+  version_requirements: *72401170
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &77613160 !ruby/object:Gem::Requirement
+  requirement: &72400940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *77613160
+  version_requirements: *72400940
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
-  requirement: &77612930 !ruby/object:Gem::Requirement
+  requirement: &72400710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,14 +65,14 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *77612930
+  version_requirements: *72400710
 description: 
 email: robertodarioseminara@gmail.com
 executables: []
 extensions:
 - ext/fastruby_base/extconf.rb
 extra_rdoc_files:
-- README
+- README.rdoc
 files:
 - benchmarks/benchmark5.rb
 - benchmarks/benchmark2.rb
@@ -92,53 +92,102 @@ 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
+- lib/fastruby/corelib.rb~
 - lib/fastruby/logging.rb
 - lib/fastruby/sexp_extension_edges.rb
 - lib/fastruby/exceptions.rb
 - lib/fastruby/translator/scope_mode_helper.rb
 - lib/fastruby/translator/translator.rb
-- lib/fastruby/translator/modules/defn.rb
-- lib/fastruby/translator/modules/iter.rb
-- lib/fastruby/translator/modules/directive.rb
-- lib/fastruby/translator/modules/exceptions.rb
-- lib/fastruby/translator/modules/static.rb
-- lib/fastruby/translator/modules/method_group.rb
-- lib/fastruby/translator/modules/nonlocal.rb
-- lib/fastruby/translator/modules/variable.rb
-- lib/fastruby/translator/modules/call.rb
-- lib/fastruby/translator/modules/block.rb
-- lib/fastruby/translator/modules/flow.rb
-- lib/fastruby/translator/modules/logical.rb
-- lib/fastruby/translator/modules/literal.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/inliner/inliner.rb
-- lib/fastruby/inliner/modules/recursive.rb
-- lib/fastruby/inliner/modules/call.rb
-- lib/fastruby/reductor/modules/for.rb
-- lib/fastruby/reductor/modules/recursive.rb
-- lib/fastruby/reductor/modules/nontree.rb
-- lib/fastruby/reductor/modules/case.rb
-- lib/fastruby/reductor/reductor.rb
 - lib/fastruby.rb~
+- lib/fastruby_only/base.rb
 - lib/fastruby_load_path.rb
 - lib/fastruby.rb
-- spec/fastruby/translator/modules/nonlocal_spec.rb
-- spec/fastruby/translator/translator_spec.rb
-- spec/fastruby/inliner/modules/call_spec.rb
 - spec/edges_helper.rb
 - spec/scope_mode/base_spec.rb
 - spec/scope_mode/exception_spec.rb
 - spec/scope_mode/flow_spec.rb
+- spec/scope_mode/flow_spec.rb~
 - spec/scope_mode/block_spec.rb
 - spec/scope_mode/optimization_spec.rb
 - spec/scope_mode/call_spec.rb
@@ -148,19 +197,15 @@ files:
 - spec/sexp2graph/flow_spec.rb
 - spec/sexp2graph/logical_spec.rb
 - spec/ruby/block/retry_spec.rb
-- spec/ruby/block/arguments_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/proc_as_block_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~
@@ -171,6 +216,7 @@ files:
 - spec/ruby/exception/exc_trap_spec.rb
 - spec/ruby/exception/ensure_spec.rb
 - spec/ruby/exception/syntaxis_spec.rb
+- spec/ruby/exception/internal_ex_spec.rb~
 - spec/ruby/base_spec.rb
 - spec/ruby/singleton_spec.rb
 - spec/ruby/variable_spec.rb
@@ -181,6 +227,7 @@ files:
 - spec/ruby/singleton_spec.rb~
 - spec/ruby/sugar_spec.rb
 - spec/ruby/return_spec.rb
+- spec/ruby/variable_spec.rb~
 - spec/ruby/flow_control/for_spec.rb
 - spec/ruby/flow_control/case_spec.rb
 - spec/ruby/call/base_call_spec.rb
@@ -195,19 +242,29 @@ files:
 - spec/ruby/defn/replacement_spec.rb~
 - spec/ruby/expression_spec.rb
 - spec/ruby/control_spec.rb
+- spec/sugar/base_spec.rb~
+- spec/sugar/base_spec.rb
+- spec/graph/path_spec.rb~
+- spec/graph/base_spec.rb~
 - spec/graph/base_spec.rb
 - spec/graph/vertex_spec.rb
 - spec/graph/path_spec.rb
+- spec/graph/vertex_spec.rb~
+- spec/fastruby_only/base_spec.rb
 - spec/static/operator_spec.rb
 - spec/static/base_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~
+- spec/corelib/numeric/fixnum_spec.rb
 - spec/reductor/base_spec.rb
 - ext/fastruby_base/fastruby_base.inl
 - ext/fastruby_base/fastruby_base.c
 - ext/fastruby_base/extconf.rb
 - LICENSE
 - AUTHORS
-- README
+- README.rdoc
 - Rakefile
 - TODO
 - CHANGELOG