Merge remote-tracking branch 'origin/upgrade-to-v8-4.5' into coordinate-isolate-teardown

Author: cowboyd

.travis.yml

@@ -1,14 +1,34 @@
-cache: bundler
+#cache: bundler
 rvm:
   - 2.1.0
   - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7
   - rbx-2.2.3
+matrix:
+  allow_failures:
+    - rvm: 1.9.3
+    - rvm: 1.9.2
+    - rvm: 1.8.7
+    - rvm: rbx-2.2.3
+env:
+  - CXX=g++-4.8
+  - CXX=clang++
 notifications:
   recipients:
     - cowboyd@thefrontside.net
 before_install:
   - gem update --system 2.1.11
-script: bundle exec rake compile spec
+script:
+  - bundle exec rake compile
+  - bundle exec rspec spec/c
+sudo: false
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.8
+    - g++-4.8
+    - clang

ext/v8/extconf.rb

@@ -1,4 +1,5 @@
 require 'mkmf'
+cxx = RbConfig::MAKEFILE_CONFIG['CXX'] = ENV['CXX'] if ENV['CXX']
 
 have_library('pthread')
 have_library('objc') if RUBY_PLATFORM =~ /darwin/
@@ -9,7 +10,9 @@
 $CPPFLAGS += " -fPIC" unless $CPPFLAGS.split.include? "-rdynamic" or RUBY_PLATFORM =~ /darwin/
 $CPPFLAGS += " -std=c++11"
 
-$LDFLAGS += " -stdlib=libstdc++"
+if cxx =~ /clang/
+   $LDFLAGS += " -stdlib=libstdc++"
+end
 
 CONFIG['LDSHARED'] = '$(CXX) -shared' unless RUBY_PLATFORM =~ /darwin/
 if CONFIG['warnflags']

ext/v8/init.cc

@@ -16,7 +16,9 @@ extern "C" {
     Value::Init();
     Object::Init();
     Primitive::Init();
+    Name::Init();
     String::Init();
+    Symbol::Init();
     Function::Init();
     Script::Init();
     ScriptOrigin::Init();

ext/v8/name.cc

@@ -0,0 +1,16 @@
+#include "rr.h"
+
+namespace rr {
+  void Name::Init() {
+    ClassBuilder("Name", Primitive::Class).
+      defineMethod("GetIdentityHash", &GetIdentityHash).
+
+      store(&Class);
+  }
+  VALUE Name::GetIdentityHash(VALUE self) {
+    Name name(self);
+    Locker lock(name.getIsolate());
+
+    return INT2FIX(name->GetIdentityHash());
+  }
+}

ext/v8/name.h

@@ -0,0 +1,15 @@
+//mode -*- c++ -*-
+#ifndef NAME_H
+#define NAME_H
+
+namespace rr {
+  class Name : public Ref<v8::Name> {
+  public:
+    static void Init();
+    static VALUE GetIdentityHash(VALUE self);
+
+    Name(VALUE self) : Ref<v8::Name>(self) {}
+  };
+}
+
+#endif /* NAME_H */

ext/v8/rr.h

@@ -39,7 +39,9 @@ inline VALUE not_implemented(const char* message) {
 #include "primitive.h"
 #include "external.h"
 // This one is named v8_string to avoid name collisions with C's string.h
+#include "name.h"
 #include "rr_string.h"
+#include "symbol.h"
 
 #include "script.h"
 #include "script-origin.h"

ext/v8/rr_string.cc

@@ -3,7 +3,7 @@
 namespace rr {
 
   void String::Init() {
-    ClassBuilder("String", Primitive::Class).
+    ClassBuilder("String", Name::Class).
       defineSingletonMethod("NewFromUtf8", &NewFromUtf8).
       defineSingletonMethod("Concat", &Concat).
 

ext/v8/symbol.cc

@@ -0,0 +1,74 @@
+#include "rr.h"
+
+namespace rr {
+  void Symbol::Init() {
+    ClassBuilder("Symbol", Name::Class).
+      defineSingletonMethod("New", &New).
+      defineSingletonMethod("For", &For).
+      defineSingletonMethod("ForApi", &ForApi).
+      defineSingletonMethod("GetIterator", &GetIterator).
+      defineSingletonMethod("GetUnscopables", &GetUnscopables).
+      defineSingletonMethod("GetToStringTag", &GetToStringTag).
+      defineMethod("Name", &Name).
+
+      store(&Class);
+  }
+
+  VALUE Symbol::New(int argc, VALUE argv[], VALUE self) {
+    VALUE rb_isolate, rb_name;
+    rb_scan_args(argc, argv, "11", &rb_isolate, &rb_name);
+
+    Isolate isolate(rb_isolate);
+    Locker lock(isolate);
+    v8::HandleScope handle_scope(isolate);
+
+    if (RTEST(rb_name)) {
+      return Symbol(isolate, v8::Symbol::New(isolate, String(rb_name)));
+    } else {
+      return Symbol(isolate, v8::Symbol::New(isolate));
+    }
+  }
+
+  VALUE Symbol::For(VALUE self, VALUE rb_isolate, VALUE name) {
+    Isolate isolate(rb_isolate);
+    Locker lock(isolate);
+
+    return Symbol(isolate, v8::Symbol::For(isolate, String(name)));
+  }
+
+  VALUE Symbol::ForApi(VALUE self, VALUE rb_isolate, VALUE name) {
+    Isolate isolate(rb_isolate);
+    Locker lock(isolate);
+
+    return Symbol(isolate, v8::Symbol::ForApi(isolate, String(name)));
+  }
+
+  VALUE Symbol::GetIterator(VALUE self, VALUE rb_isolate) {
+    Isolate isolate(rb_isolate);
+    Locker lock(isolate);
+
+    return Symbol(isolate, v8::Symbol::GetIterator(isolate));
+  }
+
+  VALUE Symbol::GetUnscopables(VALUE self, VALUE rb_isolate) {
+    Isolate isolate(rb_isolate);
+    Locker lock(isolate);
+
+    return Symbol(isolate, v8::Symbol::GetUnscopables(isolate));
+  }
+
+  VALUE Symbol::GetToStringTag(VALUE self, VALUE rb_isolate) {
+    Isolate isolate(rb_isolate);
+    Locker lock(isolate);
+
+    return Symbol(isolate, v8::Symbol::GetToStringTag(isolate));
+  }
+
+  VALUE Symbol::Name(VALUE self) {
+    Symbol symbol(self);
+    Isolate isolate(symbol.getIsolate());
+    Locker lock(isolate);
+
+    return Value::handleToRubyObject(isolate, symbol->Name());
+  }
+}

ext/v8/symbol.h

@@ -0,0 +1,26 @@
+// -*- mode: c++ -*-
+#ifndef SYMBOL_H
+#define SYMBOL_H
+
+#include "rr.h"
+
+namespace rr {
+  class Symbol : public Ref<v8::Symbol> {
+  public:
+    static void Init();
+
+    static VALUE Name(VALUE self);
+    static VALUE New(int argc, VALUE argv[], VALUE self);
+    static VALUE For(VALUE self, VALUE isolate, VALUE name);
+    static VALUE ForApi(VALUE self, VALUE isolate, VALUE name);
+    static VALUE GetIterator(VALUE self, VALUE isolate);
+    static VALUE GetUnscopables(VALUE self, VALUE isolate);
+    static VALUE GetToStringTag(VALUE self, VALUE isolate);
+
+    Symbol(VALUE self) : Ref<v8::Symbol>(self) {}
+    Symbol(v8::Isolate* isolate, v8::Local<v8::Symbol> symbol) :
+      Ref<v8::Symbol>(isolate, symbol) {}
+  };
+}
+
+#endif /* SYMBOL_H */

spec/c/symbol_spec.rb

@@ -0,0 +1,53 @@
+require 'c_spec_helper'
+
+describe V8::C::Symbol do
+  requires_v8_context
+
+  describe "without a description" do
+    let(:symbol) { V8::C::Symbol::New(@isolate)}
+
+    it "exists" do
+      expect(symbol).to be
+    end
+
+    it "has an identity hash" do
+      expect(symbol.GetIdentityHash()).to be
+    end
+  end
+
+  describe "with a description" do
+    let(:description) { V8::C::String::NewFromUtf8(@isolate, "bob") }
+    let(:symbol) { V8::C::Symbol::New(@isolate, description) }
+
+    it "has a name" do
+      expect(symbol.Name().Utf8Value()).to eql "bob"
+    end
+  end
+
+  describe "from symbol registries" do
+    let(:key) { V8::C::String::NewFromUtf8(@isolate, "mysym") }
+    let(:global) { V8::C::Symbol::For(@isolate, key) }
+    let(:api) { V8::C::Symbol::ForApi(@isolate, key) }
+
+    it "always retrieves the same value for a given key" do
+      expect(V8::C::Symbol::For(@isolate, key).StrictEquals(global)).to be true
+      expect(V8::C::Symbol::ForApi(@isolate, key).StrictEquals(api)).to be true
+    end
+
+    it "returns different symbols for different registries" do
+      expect(global.StrictEquals(api)).to be false
+    end
+  end
+
+  describe "well-known symbols" do
+    it "GetIterator" do
+      expect(V8::C::Symbol::GetIterator(@isolate)).to be_kind_of V8::C::Symbol
+    end
+    it "GetUnscopables" do
+      expect(V8::C::Symbol::GetUnscopables(@isolate)).to be_kind_of V8::C::Symbol
+    end
+    it "GetToStringTag" do
+      expect(V8::C::Symbol::GetToStringTag(@isolate)).to be_kind_of V8::C::Symbol
+    end
+  end
+end