fastruby 0.0.6 → 0.0.7

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.0.7	Normalized random class names on specs to maximize the profit of the cache when running specs
+
+		Implemented dump of classes into literals using rb_define_class. This improves the cache loads
+
+		Added fastruby VERSION to cache hash
+
+		Support for class variables
+
 0.0.6	Implemented cache of native libraries to speedup init, see README for more info
 
 0.0.5	Support for case..when..end

data/README

@@ -58,6 +58,8 @@ I will stabilize the API and document it for next releases. I promise
 == Known Limitations & Issues
 
 * monkey patching does not work with fastruby methods
+* callcc is not supported, it works but using it may result in unexpected behaviour
+* recursive methods will be slow since the optimization of method calls only works with already defined methods
 * calls with blocks to ruby or cruby methods are almost as slow as normal ruby (if the called method is defined by fastruby, the call it's pretty fast)
 * does not support methods with variable number of arguments
 

data/Rakefile

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

data/lib/fastruby/builder.rb

@@ -134,7 +134,7 @@ module FastRuby
       c_code = context.to_c_method(tree)
 
       unless options[:main]
-         context.define_method_at_init(@method_name, args_tree.size+1, signature)
+         context.define_method_at_init(@owner,@method_name, args_tree.size+1, signature)
       end
 
       so_name = nil

data/lib/fastruby/object.rb

@@ -22,6 +22,7 @@ require "fastruby/builder"
 require "fastruby/getlocals"
 require "fastruby/method_extension"
 require "fastruby/cache/cache"
+require "fastruby"
 
 # clean rubyinline cache
 system("rm -fr #{ENV["HOME"]}/.ruby_inline/*")
@@ -58,7 +59,7 @@ class Object
     objs = Array.new
 
     unless options_hash[:no_cache]
-      snippet_hash = FastRuby.cache.hash_snippet(argument,options_hash[:validate_lvar_types].to_s)
+      snippet_hash = FastRuby.cache.hash_snippet(argument,options_hash[:validate_lvar_types].to_s + "^" + FastRuby::VERSION)
       objs = FastRuby.cache.retrieve(snippet_hash)
     end
 
@@ -95,7 +96,8 @@ class Object
             FastRuby.cache.register_proc(obj, $last_obj_proc)
           end
           FastRuby.cache.execute(obj, self)
-        rescue
+        rescue Exception => e
+          p e
         end
       end
     end

data/lib/fastruby/translator.rb

@@ -91,6 +91,12 @@ module FastRuby
         }
         "
 
+        extra_code << "static VALUE __rb_cvar_set(VALUE recv,ID idvar, VALUE value, int warn) {
+          rb_cvar_set(recv,idvar,value,warn);
+          return value;
+        }
+        "
+
         extra_code << "static VALUE _lvar_assing(VALUE* destination,VALUE value) {
           *destination = value;
           return value;
@@ -505,6 +511,14 @@ module FastRuby
       inline_block str
     end
 
+    def to_c_cvar(tree)
+      "rb_cvar_get(CLASS_OF(plocals->self) != rb_cClass ? CLASS_OF(plocals->self) : plocals->self,#{intern_num tree[1]})"
+    end
+
+    def to_c_cvasgn(tree)
+      "__rb_cvar_set(CLASS_OF(plocals->self) != rb_cClass ? CLASS_OF(plocals->self) : plocals->self,#{intern_num tree[1]},#{to_c tree[2]},Qfalse)"
+    end
+
     def to_c_return(tree)
       "pframe->target_frame = ((typeof(pframe))plocals->pframe); plocals->return_value = #{to_c(tree[1])}; longjmp(pframe->jmp, 1); return Qnil;\n"
     end
@@ -1011,7 +1025,7 @@ module FastRuby
       end
     end
 
-    def define_method_at_init(method_name, size, signature)
+    def define_method_at_init(klass,method_name, size, signature)
       init_extra << "
         {
           VALUE method_name = rb_funcall(
@@ -1022,7 +1036,7 @@ module FastRuby
                 #{literal_value signature}
                 );
 
-          rb_define_method(#{to_c s(:gvar, :$class_self)}, RSTRING(method_name)->ptr, #{alt_method_name}, #{size});
+          rb_define_method(#{literal_value klass}, RSTRING(method_name)->ptr, #{alt_method_name}, #{size});
         }
       "
     end
@@ -1758,14 +1772,46 @@ module FastRuby
       name = self.add_global_name("VALUE", "Qnil");
 
       begin
+
         str = Marshal.dump(value)
 
-        init_extra << "
-          #{name} = rb_marshal_load(rb_str_new(#{c_escape str}, #{str.size}));
-          rb_funcall(#{name},#{intern_num :gc_register_object},0);
 
-        "
-      rescue TypeError
+        if value.instance_of? Module
+
+          container_str = value.to_s.split("::")[0..-2].join("::")
+
+          init_extra << "
+            #{name} = rb_define_module_under(
+                    #{container_str == "" ? "rb_cObject" : literal_value(eval(container_str))}
+                    ,\"#{value.to_s.split("::").last}\");
+
+            rb_funcall(#{name},#{intern_num :gc_register_object},0);
+          "
+        elsif value.instance_of? Class
+          container_str = value.to_s.split("::")[0..-2].join("::")
+
+          init_extra << "
+            #{name} = rb_define_class_under(
+                    #{container_str == "" ? "rb_cObject" : literal_value(eval(container_str))}
+                    ,\"#{value.to_s.split("::").last}\"
+                    ,#{value.superclass == Object ? "rb_cObject" : literal_value(value.superclass)});
+
+            rb_funcall(#{name},#{intern_num :gc_register_object},0);
+          "
+        elsif value.instance_of? Array
+          init_extra << "
+            #{name} = rb_ary_new3(#{value.size}, #{value.map{|x| literal_value x}.join(",")} );
+            rb_funcall(#{name},#{intern_num :gc_register_object},0);
+          "
+        else
+
+          init_extra << "
+            #{name} = rb_marshal_load(rb_str_new(#{c_escape str}, #{str.size}));
+            rb_funcall(#{name},#{intern_num :gc_register_object},0);
+
+          "
+        end
+      rescue TypeError => e
         @no_cache = true
         FastRuby.logger.info "#{value} disabling cache for extension"
         init_extra << "

data/lib/fastruby.rb

@@ -33,6 +33,6 @@ module FastRuby
   FastRuby.fastruby_script_path = File.expand_path(__FILE__)
   FastRuby.fastruby_load_path = File.expand_path(File.dirname(__FILE__))
 
-  VERSION = "0.0.6" unless defined? VERSION
+  VERSION = "0.0.7" unless defined? FastRuby::VERSION
 end
 

data/spec/exception_spec.rb

@@ -87,12 +87,12 @@ describe FastRuby, "fastruby" do
   class BahException < Exception
   end
 
-  def self.basic_unhandled_exception(*exception_names)
+  def self.basic_unhandled_exception(class_name_suffix, *exception_names)
 
     exception_names.each do |exception_name|
       it "should raise basic exception #{exception_name}" do
 
-        random_name = "::L5_" + rand(10000).to_s
+        random_name = "::L5_" + class_name_suffix
 
         fastruby "
           class #{random_name}
@@ -111,7 +111,7 @@ describe FastRuby, "fastruby" do
 
       it "should not raise basic exception #{exception_name} if rescued" do
 
-        random_name = "::L6_" + rand(10000).to_s
+        random_name = "::L6_" + class_name_suffix
 
         fastruby "
           class #{random_name}
@@ -133,7 +133,7 @@ describe FastRuby, "fastruby" do
 
       it "should raise basic exception #{exception_name} even if rescued when the rescue is for another exception" do
 
-        random_name = "::L7_" + rand(10000).to_s
+        random_name = "::L7_" + class_name_suffix
 
         fastruby "
           class #{random_name}
@@ -155,8 +155,8 @@ describe FastRuby, "fastruby" do
 
       it "should rescue basic exception #{exception_name} when raised from rubycode called from fastruby code" do
 
-        random_name = "::L8_" + rand(10000).to_s
-        random_name_2 = "::L8_" + rand(10000).to_s
+        random_name = "::L8_" + class_name_suffix
+        random_name_2 = "::L8_" + class_name_suffix + "_"
 
         eval "
           class #{random_name_2}
@@ -183,8 +183,8 @@ describe FastRuby, "fastruby" do
 
       it "should rescue basic exception #{exception_name} from fastruby code when raised from rubycode" do
 
-        random_name = "::L9_" + rand(10000).to_s
-        random_name_2 = "::L9_" + rand(10000).to_s
+        random_name = "::L9_" + class_name_suffix
+        random_name_2 = "::L9_" + class_name_suffix + "_"
 
         eval "
           class #{random_name_2}
@@ -217,7 +217,7 @@ describe FastRuby, "fastruby" do
 
       it "should raise basic exception #{exception_name} from singleton method" do
 
-        random_name = "::L5_" + rand(10000).to_s
+        random_name = "::L10_" + class_name_suffix
 
         fastruby "
           class #{random_name}
@@ -240,7 +240,7 @@ describe FastRuby, "fastruby" do
 
       it "should not raise basic exception #{exception_name} if rescued from singleton method" do
 
-        random_name = "::L6_" + rand(10000).to_s
+        random_name = "::L11_" + class_name_suffix
 
         fastruby "
           class #{random_name}
@@ -266,7 +266,7 @@ describe FastRuby, "fastruby" do
 
       it "should raise basic exception #{exception_name} even if rescued when the rescue is for another exception from singleton method" do
 
-        random_name = "::L7_" + rand(10000).to_s
+        random_name = "::L12_" + class_name_suffix
 
         fastruby "
           class #{random_name}
@@ -292,8 +292,8 @@ describe FastRuby, "fastruby" do
 
       it "should rescue basic exception #{exception_name} when raised from rubycode called from fastruby code from singleton method" do
 
-        random_name = "::L8_" + rand(10000).to_s
-        random_name_2 = "::L8_" + rand(10000).to_s
+        random_name = "::L13_" + class_name_suffix
+        random_name_2 = "::L13_" + class_name_suffix + "_"
 
         eval "
           class #{random_name_2}
@@ -324,8 +324,8 @@ describe FastRuby, "fastruby" do
 
       it "should rescue basic exception #{exception_name} from fastruby code when raised from rubycode from singleton methods" do
 
-        random_name = "::L9_" + rand(10000).to_s
-        random_name_2 = "::L9_" + rand(10000).to_s
+        random_name = "::L14_" + class_name_suffix
+        random_name_2 = "::L14_" + class_name_suffix + "_"
 
         eval "
           class #{random_name_2}
@@ -370,14 +370,14 @@ describe FastRuby, "fastruby" do
     end
   end
 
-  basic_unhandled_exception("Exception")
-  basic_unhandled_exception("RuntimeError")
-  basic_unhandled_exception("StandardError")
-  basic_unhandled_exception("Errno::ENOENT")
+  basic_unhandled_exception("2", "Exception")
+  basic_unhandled_exception("3", "RuntimeError")
+  basic_unhandled_exception("4", "StandardError")
+  basic_unhandled_exception("5", "Errno::ENOENT")
 
   it "should accept else with rescue" do
 
-    random_name = "::L11_" + rand(10000).to_s
+    random_name = "::L11_1"
     fastruby "
           class #{random_name}
               def foo
@@ -398,7 +398,7 @@ describe FastRuby, "fastruby" do
 
   it "should accept else with rescue, when no exception is raised" do
 
-    random_name = "::L12_" + rand(10000).to_s
+    random_name = "::L12_1"
     fastruby "
           class #{random_name}
               def foo
@@ -418,7 +418,7 @@ describe FastRuby, "fastruby" do
 
   it "should accept else with rescue, when no exception is raised and begin has body" do
 
-    random_name = "::L13_" + rand(10000).to_s
+    random_name = "::L13_1"
     fastruby "
           class #{random_name}
               def foo

data/spec/variable_spec.rb

@@ -191,10 +191,12 @@ describe FastRuby, "fastruby" do
     ::U16.new.foo.should be == nil
   end
 
+  $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"+rand(1000000).to_s
+      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}
@@ -205,8 +207,9 @@ describe FastRuby, "fastruby" do
 
   def self.test_defined_block(code,title,defined_name)
     it "should call defined? to defined #{title} and return '#{defined_name}'" do
-      classname = "::U"+rand(1000000).to_s
+      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}
@@ -233,4 +236,39 @@ describe FastRuby, "fastruby" do
      test_defined "defined? #{var}=0", "#{var} assignment", "assignment"
    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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fastruby
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Dario Seminara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-27 00:00:00 -03:00
+date: 2011-09-02 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency