fastruby 0.0.16 → 0.0.17

data/spec/sexp2graph/flow_spec.rb

@@ -0,0 +1,67 @@
+require "fastruby"
+require "fastruby/sexp_extension"
+require "sexp"
+require "ruby_parser"
+require "edges_helper"
+
+describe FastRuby::FastRubySexp, "FastRubySexp" do
+  include EdgesHelper
+
+  assert_graph("should have two edges for if","if a; b; else; c; end",4) do |sexp, edges|
+    {:a => [:b,:c], :b => sexp, :c => sexp}
+  end
+
+  assert_graph("should have only one edge for if without else","if a; b; end",3) do |sexp, edges|
+    {:a => [:b,sexp], :b => sexp}      
+  end
+
+  assert_graph("should have only one edge for unless","unless a; b; end",3) do |sexp, edges|
+   {:a => [:b,sexp], :b => sexp}
+  end
+
+  assert_graph("should connect with the first node","if a; b.foo(x); end") do |sexp, edges|
+    if_body = sexp.find_tree(:if)[2]
+    {:a => :b, :b => :x, :x => if_body, if_body => sexp }
+  end
+
+  assert_graph("should connect previous call on block with condition of next if","foo; if a; b; end") do |sexp, edges|
+    {:foo => :a }
+  end
+
+  assert_graph("should create circular connection from while nodes",
+              "while(a); foo; bar; end",5) do |sexp, edges|
+    { :a => :foo, sexp.find_tree(:block) => :a, :a => sexp}
+  end
+
+  assert_graph("should connect break inside while nodes with while", "while(a); foo; break; bar; end", 7) do |sexp,edges|
+    {:a => [:foo,sexp], sexp.find_tree(:break) => sexp, sexp.find_tree(:block) => :a}
+  end
+
+  assert_graph("should connect previous call on block with condition of next while",
+      "foo; while(a); b; end") do |sexp,edges|
+      {:foo => :a }
+    
+  end
+
+  assert_graph("should create circular connection from until nodes",
+              "until(a); foo; bar; end",5) do |sexp, edges|
+    { :a => :foo, sexp.find_tree(:block) => :a, :a => sexp}
+  end
+
+  assert_graph("should connect break inside until nodes with until", "until(a); foo; break; bar; end", 7) do |sexp,edges|
+    {:a => [:foo,sexp], sexp.find_tree(:break) => sexp, sexp.find_tree(:block) => :a}
+  end
+
+  assert_graph("should connect previous call on block with condition of next until",
+      "foo; until(a); b; end") do |sexp,edges|
+      {:foo => :a }
+    
+  end
+
+  assert_graph("literals, literals everywhere","
+      1; 2; 3; 4
+      ") do |sexp, edges|
+
+    {}
+  end
+end

data/spec/sexp2graph/logical_spec.rb

@@ -0,0 +1,21 @@
+require "fastruby"
+require "fastruby/sexp_extension"
+require "sexp"
+require "ruby_parser"
+require "edges_helper"
+
+describe FastRuby::FastRubySexp, "FastRubySexp" do
+  include EdgesHelper
+
+  assert_graph("should generate edges for or","a or b",2) do |sexp, edges|
+    {:a => :b, :b => sexp}
+  end
+
+  assert_graph("should generate edges for and","a and b",2) do |sexp, edges|
+    {:a => :b, :b => sexp}
+  end
+
+  assert_graph("should generate edges for if with or condition","if (a or b); c; else; d; end",6) do |sexp, edges|
+    {:a => :b, :b => sexp.find_tree(:or), sexp.find_tree(:or) => [:c,:d], :c => sexp, :d => sexp }
+  end
+end

data/spec/sexp2graph/variable_spec.rb

@@ -0,0 +1,26 @@
+require "fastruby"
+require "fastruby/sexp_extension"
+require "sexp"
+require "ruby_parser"
+require "edges_helper"
+
+describe FastRuby::FastRubySexp, "FastRubySexp" do
+  include EdgesHelper
+
+  assert_graph("should generate edges for local assignment","a = b",1) do |sexp, edges|
+    {:b => sexp}
+  end
+
+  assert_graph("should generate edges for global assignment","$a = b",1) do |sexp, edges|
+    {:b => sexp}
+  end
+
+  assert_graph("should generate edges for instance assignment","@a = b",1) do |sexp, edges|
+    {:b => sexp}
+  end
+
+  assert_graph("should generate edges for const assignment","A = b",1) do |sexp, edges|
+    {:b => sexp}
+  end
+
+end

metadata

@@ -1,137 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fastruby
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.0.17
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 16
-  version: 0.0.16
 platform: ruby
-authors: 
+authors:
 - Dario Seminara
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: RubyInline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &73589340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 3
-        - 11
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.11.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby_parser
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *73589340
+- !ruby/object:Gem::Dependency
+  name: ruby_parser
+  requirement: &73588480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        - 6
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.0.6
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *73588480
 description: 
 email: robertodarioseminara@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/fastruby_base/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
-- benchmarks/benchmark7.rb
+files:
 - benchmarks/benchmark5.rb
 - benchmarks/benchmark2.rb
-- benchmarks/benchmark4.rb
+- benchmarks/benchmark.rb
 - benchmarks/benchmark6.rb
 - benchmarks/benchmark3.rb
-- benchmarks/benchmark.rb
-- examples/example1.rb
+- benchmarks/benchmark7.rb
+- benchmarks/benchmark4.rb
+- examples/example2.rb
 - examples/example3.rb
 - examples/example4.rb
-- examples/example2.rb
-- lib/fastruby_load_path.rb
-- lib/fastruby/inline_extension.rb
-- lib/fastruby/set_tree.rb
+- examples/example1.rb
+- lib/fastruby/sexp_extension.rb
+- lib/fastruby/object.rb
 - lib/fastruby/builder.rb
-- lib/fastruby/custom_require.rb
+- lib/fastruby/inline_extension.rb
 - lib/fastruby/logging.rb
+- lib/fastruby/sexp_extension_edges.rb
 - lib/fastruby/exceptions.rb
-- lib/fastruby/getlocals.rb
-- lib/fastruby/sexp_extension.rb
-- lib/fastruby/object.rb
-- lib/fastruby/translator/translator_modules.rb
-- lib/fastruby/translator/modules/logical.rb
-- lib/fastruby/translator/modules/flow.rb
-- lib/fastruby/translator/modules/variable.rb
-- lib/fastruby/translator/modules/exceptions.rb
+- lib/fastruby/translator/scope_mode_helper.rb
+- lib/fastruby/translator/translator.rb
 - lib/fastruby/translator/modules/defn.rb
-- lib/fastruby/translator/modules/method_group.rb
 - lib/fastruby/translator/modules/iter.rb
+- lib/fastruby/translator/modules/exceptions.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/nonlocal.rb
+- lib/fastruby/translator/modules/flow.rb
+- lib/fastruby/translator/modules/logical.rb
 - lib/fastruby/translator/modules/literal.rb
-- lib/fastruby/translator/translator.rb
-- lib/fastruby/fastruby_sexp.rb
-- lib/fastruby/method_extension.rb
-- lib/fastruby/self
+- lib/fastruby/translator/translator_modules.rb
+- lib/fastruby/set_tree.rb
 - lib/fastruby/cache/cache.rb
+- lib/fastruby/method_extension.rb
+- lib/fastruby/custom_require.rb
+- lib/fastruby/getlocals.rb
+- lib/fastruby/fastruby_sexp.rb
+- lib/fastruby.rb~
+- lib/fastruby_load_path.rb
 - lib/fastruby.rb
-- lib/len
-- spec/variable_spec.rb
-- spec/control_spec.rb
-- spec/return_spec.rb
-- spec/expression_spec.rb
-- spec/defn/replacement_spec.rb
-- spec/defn/multiple_args_spec.rb
-- spec/defn/default_args_spec.rb
-- spec/module_spec.rb
-- spec/jump/next_spec.rb
-- spec/base_spec.rb
-- spec/block/redo_spec.rb
-- spec/block/retry_spec.rb
-- spec/block/lambda_spec.rb
-- spec/block/next_spec.rb
-- spec/block/break_spec.rb
-- spec/block/callcc_spec.rb
-- spec/block/block_as_proc_spec.rb
-- spec/block/arguments_spec.rb
-- spec/block/proc_spec.rb
-- spec/block/proc_as_block_spec.rb
-- spec/exception/exc_trap_spec.rb
-- spec/exception/syntaxis_spec.rb
-- spec/exception/base_spec.rb
-- spec/exception/ensure_spec.rb
-- spec/exception/internal_ex_spec.rb
-- spec/block_spec.rb
-- spec/flow_control/case_spec.rb
-- spec/flow_control/for_spec.rb
-- spec/sugar_spec.rb
-- spec/literal_spec.rb
-- spec/singleton_spec.rb
-- spec/integrity_spec.rb
-- spec/call/base_call_spec.rb
-- spec/call/multiple_args_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/block_spec.rb
+- spec/scope_mode/optimization_spec.rb
+- spec/scope_mode/call_spec.rb
+- spec/sexp2graph/base_spec.rb
+- spec/sexp2graph/variable_spec.rb
+- spec/sexp2graph/exception_spec.rb
+- 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/proc_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/redo_spec.rb
+- spec/ruby/block/block_as_proc_spec.rb
+- spec/ruby/block/callcc_spec.rb
+- spec/ruby/literal_spec.rb
+- spec/ruby/exception/internal_ex_spec.rb
+- spec/ruby/exception/base_spec.rb
+- spec/ruby/exception/exc_trap_spec.rb
+- spec/ruby/exception/ensure_spec.rb
+- spec/ruby/exception/syntaxis_spec.rb
+- spec/ruby/base_spec.rb
+- spec/ruby/singleton_spec.rb
+- spec/ruby/variable_spec.rb
+- spec/ruby/module_spec.rb
+- spec/ruby/jump/next_spec.rb
+- spec/ruby/sugar_spec.rb
+- spec/ruby/return_spec.rb
+- spec/ruby/flow_control/for_spec.rb
+- spec/ruby/flow_control/case_spec.rb
+- spec/ruby/call/base_call_spec.rb
+- spec/ruby/call/multiple_args_spec.rb
+- spec/ruby/integrity_spec.rb
+- spec/ruby/block_spec.rb
+- spec/ruby/defn/multiple_args_spec.rb
+- spec/ruby/defn/default_args_spec.rb
+- spec/ruby/defn/single_function_spec.rb
+- spec/ruby/defn/replacement_spec.rb
+- spec/ruby/expression_spec.rb
+- spec/ruby/control_spec.rb
+- spec/graph/base_spec.rb
+- spec/graph/vertex_spec.rb
+- spec/graph/path_spec.rb
 - ext/fastruby_base/fastruby_base.inl
 - ext/fastruby_base/fastruby_base.c
 - ext/fastruby_base/extconf.rb
@@ -143,36 +143,26 @@ files:
 - CHANGELOG
 homepage: http://github.com/tario/fastruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: fast execution of ruby code
 test_files: []
-

data/lib/fastruby/self

@@ -1,82 +0,0 @@
-translator/modules/variable.rb   27|      "rb_cvar_get(CLASS_OF(plocals->self) != rb_cClass ? CLASS_OF(plocals->self) : plocals->self,#{intern_num tree[1]})"
-translator/modules/variable.rb   31|      "__rb_cvar_set(CLASS_OF(plocals->self) != rb_cClass ? CLASS_OF(plocals->self) : plocals->self,#{intern_num tree[1]},#{to_c tree[2]},Qfalse)"
-translator/modules/variable.rb   55|      "rb_const_get(CLASS_OF(plocals->self), #{intern_num(tree[1])})"
-translator/modules/variable.rb  170|      "rb_ivar_defined(plocals->self,#{intern_num tree[1][1]}) ? #{literal_value "instance-variable"} : Qnil"
-translator/modules/defn.rb   46|        rb_define_method(plocals->self, #{method_name.to_s.inspect}, #{anonymous_method_name}, -1);
-translator/modules/defn.rb   48|        #{global_klass_variable} = plocals->self;
-translator/modules/method_group.rb  115|            plocals->parent_locals = LONG2FIX(frame.thread_data->last_plocals);
-translator/modules/method_group.rb  120|            plocals->active = Qtrue;
-translator/modules/method_group.rb  121|            plocals->self = self;
-translator/modules/method_group.rb  122|            plocals->targetted = Qfalse;
-translator/modules/method_group.rb  123|            plocals->call_frame = LONG2FIX(0);
-translator/modules/method_group.rb  134|            plocals->active = Qfalse;
-translator/modules/iter.rb  107|            str_arg_initialization << "plocals->#{args_tree[1]} = arg;"
-translator/modules/iter.rb  111|                plocals->#{args_tree[1]} = arg;
-translator/modules/iter.rb  113|                plocals->#{args_tree[1]} = rb_ary_entry(arg,0);
-translator/modules/iter.rb  138|              str_arg_initialization << "plocals->#{arguments[i].last} = rb_ary_entry(arg,#{i});\n"
-translator/modules/iter.rb  140|              str_arg_initialization << "plocals->#{arg.last.last} = rb_ary_new2(_RARRAY_LEN(arg)-#{i});\n
-translator/modules/iter.rb  144|                  rb_ary_store(plocals->#{arg.last.last},i-#{i},rb_ary_entry(arg,i));
-translator/modules/iter.rb  156|          str_recv = "plocals->self" unless recv_tree
-translator/modules/iter.rb  209|          str_recv = "plocals->self" unless recv_tree
-translator/modules/iter.rb  286|                    if (plocals->targetted == 1) {
-translator/modules/iter.rb  341|                      if (plocals->targetted == 1) {
-translator/modules/iter.rb  342|                        if (plocals->active == Qfalse) {
-translator/modules/iter.rb  451|          fastruby_str_arg_initialization = "plocals->#{args_tree[1]} = argv[0];"
-translator/modules/iter.rb  458|              fastruby_str_arg_initialization << "plocals->#{arg.last} = #{i} < argc ? argv[#{i}] : Qnil;\n"
-translator/modules/iter.rb  460|              fastruby_str_arg_initialization << "plocals->#{arg.last.last} = rb_ary_new2(#{arguments.size-1-i});\n
-translator/modules/iter.rb  464|                  rb_ary_store(plocals->#{arg.last.last},i-#{i},argv[i]);
-translator/modules/iter.rb  513|        str_recv = "plocals->self"
-translator/modules/iter.rb  537|                VALUE old_call_frame = plocals->call_frame;
-translator/modules/iter.rb  538|                plocals->call_frame = LONG2FIX(&call_frame);
-translator/modules/iter.rb  551|                    plocals->call_frame = old_call_frame;
-translator/modules/iter.rb  561|              pframe->next_recv = #{recv_tree ? to_c(recv_tree) : "plocals->self"};
-translator/modules/iter.rb  646|                  current_plocals->active = Qfalse;
-translator/modules/iter.rb  647|                  current_plocals = (typeof(current_plocals))FIX2LONG(current_plocals->parent_locals); 
-translator/modules/iter.rb  657|                  current_plocals->active = Qtrue;
-translator/modules/iter.rb  658|                  current_plocals = (typeof(current_plocals))FIX2LONG(current_plocals->parent_locals); 
-translator/modules/iter.rb  684|                plocals->call_frame = old_call_frame;
-translator/modules/iter.rb  693|                plocals->call_frame = old_call_frame;
-translator/modules/block.rb   36|          if (FIX2LONG(plocals->block_function_address) == 0) {
-translator/modules/block.rb   39|            return ((VALUE(*)(int,VALUE*,VALUE,VALUE))FIX2LONG(plocals->block_function_address))(size, block_args, FIX2LONG(plocals->block_function_param), (VALUE)pframe);
-translator/modules/nonlocal.rb   27|        plocals->return_value = #{to_c(tree[1])};
-translator/modules/nonlocal.rb   28|        plocals->targetted = 1;
-translator/modules/nonlocal.rb   41|         target_frame_ = (void*)FIX2LONG(plocals->call_frame);
-translator/modules/nonlocal.rb   47|         plocals->call_frame = LONG2FIX(0);
-translator/modules/nonlocal.rb   60|         target_frame_ = (void*)FIX2LONG(plocals->call_frame);
-translator/translator.rb  213|        VALUE old_call_frame = plocals->call_frame;
-translator/translator.rb  214|        plocals->call_frame = LONG2FIX(&call_frame);
-translator/translator.rb  226|                    plocals->call_frame = old_call_frame;
-translator/translator.rb  232|                    plocals->call_frame = old_call_frame;
-translator/translator.rb  243|        plocals->call_frame = old_call_frame;
-translator/translator.rb  398|          plocals->parent_locals = LONG2FIX(frame.thread_data->last_plocals);
-translator/translator.rb  402|          plocals->active = Qtrue;
-translator/translator.rb  403|          plocals->targetted = Qfalse;
-translator/translator.rb  404|          plocals->pframe = LONG2FIX(&frame);
-translator/translator.rb  420|            plocals->active = Qfalse;
-translator/translator.rb  422|            return plocals->return_value;
-translator/translator.rb  425|          plocals->self = self;
-translator/translator.rb  430|            "plocals->#{arg} = #{arg};\n"
-translator/translator.rb  433|          plocals->block_function_address = LONG2FIX(0);
-translator/translator.rb  434|          plocals->block_function_param = LONG2FIX(Qnil);
-translator/translator.rb  435|          plocals->call_frame = LONG2FIX(0);
-translator/translator.rb  445|          plocals->active = Qfalse;
-translator/translator.rb  525|                    "plocals->#{arg} = argv[#{i}];\n"
-translator/translator.rb  547|                      plocals->#{splat_arg.to_s.gsub("*","")} = rb_ary_new3(0);
-translator/translator.rb  551|                      plocals->#{splat_arg.to_s.gsub("*","")} = rb_ary_new4(
-translator/translator.rb  570|            plocals->#{block_argument.to_s.gsub("&","")} = #{to_c FastRuby::FastRubySexp.from_sexp(proc_reyield_block_tree)};
-translator/translator.rb  616|          plocals->parent_locals = LONG2FIX(frame.thread_data->last_plocals);
-translator/translator.rb  621|          plocals->active = Qtrue;
-translator/translator.rb  622|          plocals->targetted = Qfalse;
-translator/translator.rb  623|          plocals->pframe = LONG2FIX(&frame);
-translator/translator.rb  624|          plocals->call_frame = LONG2FIX(0);
-translator/translator.rb  633|            plocals->active = Qfalse;
-translator/translator.rb  642|            if (plocals->targetted == Qfalse || aux != FASTRUBY_TAG_RETURN) {
-translator/translator.rb  650|            return plocals->return_value;
-translator/translator.rb  653|          plocals->self = self;
-translator/translator.rb  659|            plocals->block_function_address = LONG2FIX(pblock->block_function_address);
-translator/translator.rb  660|            plocals->block_function_param = LONG2FIX(pblock->block_function_param);
-translator/translator.rb  662|            plocals->block_function_address = LONG2FIX(0);
-translator/translator.rb  663|            plocals->block_function_param = LONG2FIX(Qnil);
-translator/translator.rb  674|          plocals->active = Qfalse;
-translator/translator.rb  693|      "plocals->"
-translator/translator.rb  759|        return "FIX2LONG(plocals->block_function_address) == 0 ? Qfalse : Qtrue"