therubyracer 0.11.0beta5-x86-linux → 0.11.0beta6-x86-linux

data/benchmarks.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'bundler/setup'
 require 'v8'
 require 'benchmark'

data/ext/v8/accessor.cc

@@ -12,7 +12,7 @@ namespace rr {
       store(&Info::Class);
   }
 
-  Accessor::Accessor(VALUE getter, VALUE setter, VALUE data_) : get(getter), set(setter), data(data_) {}
+  Accessor::Accessor(VALUE getter, VALUE setter, VALUE data_) : get(getter), set(setter), query(Qnil), deleter(Qnil), enumerator(Qnil), data(data_) {}
 
   Accessor::Accessor(VALUE get, VALUE set, VALUE query, VALUE deleter, VALUE enumerator, VALUE data) {
     this->get = get;
@@ -31,7 +31,7 @@ namespace rr {
     this->deleter = unwrap(wrapper, 3);
     this->enumerator = unwrap(wrapper, 4);
     v8::Handle<v8::Value> data = wrapper->Get(5);
-    if (!data.IsEmpty()) {
+    if (!data.IsEmpty() && !data->IsNull() && !data->IsUndefined()) {
       this->data = Value(data);
     }
   }
@@ -57,7 +57,7 @@ namespace rr {
 
   VALUE Accessor::unwrap(v8::Handle<v8::Object> wrapper, int index) {
     v8::Handle<v8::Value> value = wrapper->Get(index);
-    if (value.IsEmpty()) {
+    if (value.IsEmpty() || !value->IsExternal()) {
       return Qnil;
     } else {
       v8::Handle<v8::External> external(v8::External::Cast(*value));

data/ext/v8/backref.cc

@@ -15,8 +15,6 @@ namespace rr {
 
   Backref::Backref(VALUE initial) {
     allocate(initial);
-    this->storage = rb_funcall(Storage, _new, 1, initial);
-    rb_gc_register_address(&storage);
   }
 
   Backref::~Backref() {

data/ext/v8/extconf.rb

@@ -13,7 +13,9 @@ if CONFIG['warnflags']
   CONFIG['warnflags'].gsub!('-Wdeclaration-after-statement', '')
   CONFIG['warnflags'].gsub!('-Wimplicit-function-declaration', '')
 end
-
+if enable_config('debug')
+  $CFLAGS += " -O0 -ggdb3"
+end
 if have_rubygem_libv8?
   build_with_rubygem_libv8
 else

data/ext/v8/rr.h

@@ -726,9 +726,8 @@ public:
 class TryCatch {
 public:
   static void Init();
-  TryCatch();
+  TryCatch(v8::TryCatch*);
   TryCatch(VALUE value);
-  ~TryCatch();
   operator VALUE();
   inline v8::TryCatch* operator->() {return this->impl;}
   static VALUE HasCaught(VALUE self);
@@ -746,7 +745,6 @@ private:
   static VALUE doCall(VALUE code);
   static VALUE Class;
   v8::TryCatch* impl;
-  bool allocated;
 };
 
 class Locker {

data/ext/v8/trycatch.cc

@@ -20,15 +20,13 @@ namespace rr {
     rb_define_singleton_method(c, "TryCatch", (VALUE (*)(...))&doTryCatch, -1);
   }
 
-  TryCatch::TryCatch() : impl(new v8::TryCatch()), allocated(true) {}
-  TryCatch::TryCatch(VALUE value) : allocated(false) {
-    Data_Get_Struct(value, class v8::TryCatch, impl);
+  TryCatch::TryCatch(v8::TryCatch* impl) {
+    this->impl = impl;
   }
-  TryCatch::~TryCatch() {
-    if (this->allocated) {
-      delete this->impl;
-    }
+  TryCatch::TryCatch(VALUE value) {
+    Data_Get_Struct(value, class v8::TryCatch, impl);
   }
+
   TryCatch::operator VALUE() {
     return Data_Wrap_Struct(Class, 0, 0, impl);
   }
@@ -80,7 +78,7 @@ namespace rr {
   }
 
   VALUE TryCatch::doCall(VALUE code) {
-    TryCatch trycatch;
-    return rb_funcall(code, rb_intern("call"), 1, (VALUE)trycatch);
+    v8::TryCatch trycatch;
+    return rb_funcall(code, rb_intern("call"), 1, (VALUE)TryCatch(&trycatch));
   }
 }

data/lib/v8/conversion.rb

@@ -20,9 +20,10 @@ end
 
 for type in [Class, Object, Array, Hash, String, Symbol, Time, Proc, Method] do
   type.class_eval do
-    include V8::Conversion.const_get(name)
+    include V8::Conversion.const_get(type.name)
   end
 end
+
 class UnboundMethod
   include V8::Conversion::Method
 end

data/lib/v8/conversion/class.rb

@@ -4,117 +4,116 @@ class V8::Conversion
 
     def to_template
       weakcell(:constructor) do
-        template = V8::C::FunctionTemplate::New(Constructor.new(self))
+        template = V8::C::FunctionTemplate::New(V8::Conversion::Constructor.new(self))
         prototype = template.InstanceTemplate()
-        prototype.SetNamedPropertyHandler(Get, Set)
-        prototype.SetIndexedPropertyHandler(IGet, ISet)
+        prototype.SetNamedPropertyHandler(V8::Conversion::Get, V8::Conversion::Set)
+        prototype.SetIndexedPropertyHandler(V8::Conversion::IGet, V8::Conversion::ISet)
         if self != ::Object && superclass != ::Object && superclass != ::Class
           template.Inherit(superclass.to_template)
         end
         template
       end
     end
+  end
 
-    class Constructor
-      include V8::Error::Protect
+  class Constructor
+    include V8::Error::Protect
 
-      def initialize(cls)
-        @class = cls
-      end
+    def initialize(cls)
+      @class = cls
+    end
 
-      def call(arguments)
-        arguments.extend Args
-        protect do
-          if arguments.linkage_call?
-            arguments.link
-          else
-            arguments.construct @class
-          end
+    def call(arguments)
+      arguments.extend Args
+      protect do
+        if arguments.linkage_call?
+          arguments.link
+        else
+          arguments.construct @class
         end
-        return arguments.This()
       end
+      return arguments.This()
+    end
 
-      module Args
-        def linkage_call?
-          self.Length() == 1 && self[0].IsExternal()
-        end
+    module Args
+      def linkage_call?
+        self.Length() == 1 && self[0].IsExternal()
+      end
 
-        def link
-          external = self[0]
-          This().SetHiddenValue("rr::implementation", external)
-          context.link external.Value(), This()
-        end
+      def link
+        external = self[0]
+        This().SetHiddenValue("rr::implementation", external)
+        context.link external.Value(), This()
+      end
 
-        def construct(cls)
-          context.link cls.new(*to_args), This()
-        end
+      def construct(cls)
+        context.link cls.new(*to_args), This()
+      end
 
-        def context
-          V8::Context.current
-        end
+      def context
+        V8::Context.current
+      end
 
-        def to_args
-          args = ::Array.new(Length())
-          0.upto(args.length - 1) do |i|
-            args[i] = self[i]
-          end
-          return args
+      def to_args
+        args = ::Array.new(Length())
+        0.upto(args.length - 1) do |i|
+          args[i] = self[i]
         end
+        return args
       end
     end
+  end
 
-    module Accessor
-      include V8::Error::Protect
-      def intercept(info, key, &block)
-        context = V8::Context.current
-        access = context.access
-        object = context.to_ruby(info.This())
-        handles_property = true
-        dontintercept = proc do
-          handles_property = false
-        end
-        protect do
-          result = block.call(context, access, object, context.to_ruby(key), dontintercept)
-          handles_property ? context.to_v8(result) : V8::C::Value::Empty
-        end
+  module Accessor
+    include V8::Error::Protect
+    def intercept(info, key, &block)
+      context = V8::Context.current
+      access = context.access
+      object = context.to_ruby(info.This())
+      handles_property = true
+      dontintercept = proc do
+        handles_property = false
+      end
+      protect do
+        result = block.call(context, access, object, context.to_ruby(key), dontintercept)
+        handles_property ? context.to_v8(result) : V8::C::Value::Empty
       end
     end
+  end
 
-    class Get
-      extend Accessor
-      def self.call(property, info)
-        intercept(info, property) do |context, access, object, key, dontintercept|
-          access.get(object, key, &dontintercept)
-        end
+  class Get
+    extend Accessor
+    def self.call(property, info)
+      intercept(info, property) do |context, access, object, key, dontintercept|
+        access.get(object, key, &dontintercept)
       end
     end
+  end
 
-    class Set
-      extend Accessor
-      def self.call(property, value, info)
-        intercept(info, property) do |context, access, object, key, dontintercept|
-          access.set(object, key, context.to_ruby(value), &dontintercept)
-        end
+  class Set
+    extend Accessor
+    def self.call(property, value, info)
+      intercept(info, property) do |context, access, object, key, dontintercept|
+        access.set(object, key, context.to_ruby(value), &dontintercept)
       end
     end
+  end
 
-    class IGet
-      extend Accessor
-      def self.call(property, info)
-        intercept(info, property) do |context, access, object, key, dontintercept|
-          access.iget(object, key, &dontintercept)
-        end
+  class IGet
+    extend Accessor
+    def self.call(property, info)
+      intercept(info, property) do |context, access, object, key, dontintercept|
+        access.iget(object, key, &dontintercept)
       end
     end
+  end
 
-    class ISet
-      extend Accessor
-      def self.call(property, value, info)
-        intercept(info, property) do |context, access, object, key, dontintercept|
-          access.iset(object, key, context.to_ruby(value), &dontintercept)
-        end
+  class ISet
+    extend Accessor
+    def self.call(property, value, info)
+      intercept(info, property) do |context, access, object, key, dontintercept|
+        access.iset(object, key, context.to_ruby(value), &dontintercept)
       end
     end
-
   end
 end

data/lib/v8/version.rb

@@ -1,3 +1,3 @@
 module V8
-  VERSION = "0.11.0beta5"
+  VERSION = "0.11.0beta6"
 end

data/spec/v8/conversion_spec.rb

@@ -6,4 +6,16 @@ describe V8::Conversion do
     cxt['big'] = BigDecimal.new('1.1')
     cxt['big'].should eql BigDecimal.new('1.1')
   end
+
+  it "doesn't try to use V8::Conversion::Class::* as root objects" do
+    klass = Class.new do
+      class << self
+        def test
+          Set.new
+        end
+      end
+    end
+
+    klass.test.should be_instance_of(::Set)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: therubyracer
 version: !ruby/object:Gem::Version
-  version: 0.11.0beta5
+  version: 0.11.0beta6
   segments: 
   hash: 
 platform: x86-linux
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ref