Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Implement methods for Template, FunctionTemplate & ObjectTemplate #385

Open
georgyangelov wants to merge 5 commits into
base: upgrade-to-v8-4.5
Choose a base branch
from
Open

Implement methods for Template, FunctionTemplate & ObjectTemplate #385

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4dc7ce4
Implement methods for Template, FunctionTemplate & ObjectTemplate
georgyangelov Aug 16, 2015
4819b3e
Add tests for SetNamedPropertyHandler, SetIndexedPropertyHandler and …
georgyangelov Aug 16, 2015
6b1460d
Use Int equiv instead of RTEST and NUM2INT
georgyangelov Aug 22, 2015
7f5b890
Use conversion operators for PropertyCallback
georgyangelov Aug 22, 2015
5bd7bc1
Make the PropertyCallback methods explicit
georgyangelov Aug 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ext/v8/accessor-signature.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include "rr.h"

namespace rr {
VALUE AccessorSignature::New(int argc, VALUE argv[], VALUE self) {
VALUE r_isolate;
VALUE r_receiver;
rb_scan_args(argc, argv, "11", &r_isolate, &r_receiver);

Isolate isolate(r_isolate);
Locker lock(isolate);
return AccessorSignature(isolate, v8::AccessorSignature::New(isolate, FunctionTemplate(r_receiver)));
}
}
22 changes: 22 additions & 0 deletions ext/v8/accessor-signature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// -*- mode: c++ -*-
#ifndef RR_ACCESSOR_SIGNATURE_H
#define RR_ACCESSOR_SIGNATURE_H

namespace rr {
class AccessorSignature : public Ref<v8::AccessorSignature> {
public:
AccessorSignature(VALUE self) : Ref<v8::AccessorSignature>(self) {}
AccessorSignature(v8::Isolate* i, v8::Local<v8::AccessorSignature> s) :
Ref<v8::AccessorSignature>(i, s) {}

static void Init() {
ClassBuilder("AccessorSignature").
defineSingletonMethod("New", &New).
store(&Class);
}

static VALUE New(int argc, VALUE argv[], VALUE self);
};
}

#endif /* RR_ACCESSOR_SIGNATURE_H */
106 changes: 106 additions & 0 deletions ext/v8/function-template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,21 @@ namespace rr {
FunctionTemplate(VALUE self) : Ref<v8::FunctionTemplate>(self) {}
FunctionTemplate(v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> t) :
Ref<v8::FunctionTemplate>(isolate, t) {}

static inline void Init() {
ClassBuilder("FunctionTemplate", Template::Class).
defineSingletonMethod("New", &New).
defineMethod("GetFunction", &GetFunction).
defineMethod("SetCallHandler", &SetCallHandler).
defineMethod("SetLength", &SetLength).
defineMethod("InstanceTemplate", &InstanceTemplate).
defineMethod("PrototypeTemplate", &PrototypeTemplate).
defineMethod("SetClassName", &SetClassName).
defineMethod("SetAcceptAnyReceiver", &SetAcceptAnyReceiver).
defineMethod("SetHiddenPrototype", &SetHiddenPrototype).
defineMethod("ReadOnlyPrototype", &ReadOnlyPrototype).
defineMethod("RemovePrototype", &RemovePrototype).
defineMethod("HasInstance", &HasInstance).
store(&Class);
}

Expand All @@ -38,6 +49,101 @@ namespace rr {

return Function::Maybe(isolate, t->GetFunction(Context(context)));
}

static VALUE SetCallHandler(VALUE self, VALUE r_callback, VALUE r_data) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);
FunctionCallback callback(isolate, r_callback, r_data);

t->SetCallHandler(callback, callback);

return Qnil;
}

static VALUE SetLength(VALUE self, VALUE r_length) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

t->SetLength(RTEST(r_length) ? NUM2INT(r_length) : 0);
Copy link
Copy Markdown
Collaborator

@cowboyd cowboyd Aug 20, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could probably use the Int equiv here.


return Qnil;
}

static VALUE InstanceTemplate(VALUE self) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

return ObjectTemplate(isolate, t->InstanceTemplate());
}

static VALUE PrototypeTemplate(VALUE self) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

return ObjectTemplate(isolate, t->PrototypeTemplate());
}

static VALUE SetClassName(VALUE self, VALUE name) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

t->SetClassName(String(name));

return Qnil;
}

static VALUE SetAcceptAnyReceiver(VALUE self, VALUE value) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

t->SetAcceptAnyReceiver(Bool(value));

return Qnil;
}

static VALUE SetHiddenPrototype(VALUE self, VALUE value) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

t->SetHiddenPrototype(Bool(value));

return Qnil;
}

static VALUE ReadOnlyPrototype(VALUE self) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

t->ReadOnlyPrototype();

return Qnil;
}

static VALUE RemovePrototype(VALUE self) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

t->ReadOnlyPrototype();

return Qnil;
}

static VALUE HasInstance(VALUE self, VALUE object) {
FunctionTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

return Bool(t->HasInstance(Value(object)));
}
};
}

Expand Down
1 change: 1 addition & 0 deletions ext/v8/init.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ extern "C" {
ScriptOrigin::Init();
Array::Init();
External::Init();
AccessorSignature::Init();
Template::Init();
ObjectTemplate::Init();
FunctionTemplate::Init();
Expand Down
96 changes: 95 additions & 1 deletion ext/v8/object-template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define RR_OBJECT_TEMPLATE_H

namespace rr {
class ObjectTemplate : Ref<v8::ObjectTemplate> {
class ObjectTemplate : public Ref<v8::ObjectTemplate> {
public:
ObjectTemplate(VALUE self) : Ref<v8::ObjectTemplate>(self) {}
ObjectTemplate(v8::Isolate* isolate, v8::Handle<v8::ObjectTemplate> tmpl) :
Expand All @@ -13,6 +13,11 @@ namespace rr {
ClassBuilder("ObjectTemplate", Template::Class).
defineSingletonMethod("New", &New).
defineMethod("NewInstance", &NewInstance).
defineMethod("SetAccessor", &SetAccessor).
defineMethod("SetNamedPropertyHandler", &SetNamedPropertyHandler).
defineMethod("SetIndexedPropertyHandler", &SetIndexedPropertyHandler).
defineMethod("SetCallAsFunctionHandler", &SetCallAsFunctionHandler).
defineMethod("InternalFieldCount", &InternalFieldCount).
defineMethod("SetInternalFieldCount", &SetInternalFieldCount).
store(&Class);
}
Expand All @@ -35,6 +40,13 @@ namespace rr {
return Object::Maybe(isolate, t->NewInstance(context));
}

static VALUE InternalFieldCount(VALUE self) {
ObjectTemplate t(self);
Locker lock(t);

return INT2NUM(t->InternalFieldCount());
}

static VALUE SetInternalFieldCount(VALUE self, VALUE value) {
ObjectTemplate t(self);
Locker lock(t);
Expand All @@ -43,6 +55,88 @@ namespace rr {

return Qnil;
}

static VALUE SetAccessor(int argc, VALUE argv[], VALUE self) {
Copy link
Copy Markdown
Collaborator

@cowboyd cowboyd Aug 20, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit confused about which method we're going to call here and why. The way it is written it looks like it will invoke the C++ method that takes Local<Name> instead of Local<String> This seems fair since string is always a name, but will it make a difference at runtime? I.e. is there a different codepath that V8 is executing?

Copy link
Copy Markdown
Collaborator Author

@georgyangelov georgyangelov Aug 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, The "Name" one seemed like a better choice because we already have these types of accessor callbacks implemented and it is more generic. The documentation doesn't seem to suggest they have different codepaths and I think the String one may be the older of the two.

VALUE r_name, r_getter, r_setter, r_data, r_settings, r_attribute, r_signature;
rb_scan_args(
argc, argv, "25",
&r_name, &r_getter, &r_setter, &r_data, &r_settings, &r_attribute, &r_signature
);

ObjectTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

t->SetAccessor(
*Name(r_name),
&PropertyCallback::invokeGetter,
RTEST(r_setter) ? &PropertyCallback::invokeSetter : 0,
PropertyCallback::wrapData(isolate, r_getter, r_setter, r_data),
Enum<v8::AccessControl>(r_settings, v8::DEFAULT),
Enum<v8::PropertyAttribute>(r_attribute, v8::None),
AccessorSignature(r_signature)
);

return Qnil;
}

static VALUE SetNamedPropertyHandler(int argc, VALUE argv[], VALUE self) {
VALUE r_getter, r_setter, r_query, r_deleter, r_enumerator, r_data;
rb_scan_args(
argc, argv, "15",
&r_getter, &r_setter, &r_query, &r_deleter, &r_enumerator, &r_data
);

ObjectTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

t->SetNamedPropertyHandler(
&PropertyCallback::invokeNamedPropertyGetter,
RTEST(r_setter) ? &PropertyCallback::invokeNamedPropertySetter : 0,
RTEST(r_query) ? &PropertyCallback::invokeNamedPropertyQuery : 0,
RTEST(r_deleter) ? &PropertyCallback::invokeNamedPropertyDeleter : 0,
RTEST(r_enumerator) ? &PropertyCallback::invokeNamedPropertyEnumerator : 0,
PropertyCallback::wrapData(isolate, r_getter, r_setter, r_query, r_deleter, r_enumerator, r_data)
);

return Qnil;
}

static VALUE SetIndexedPropertyHandler(int argc, VALUE argv[], VALUE self) {
VALUE r_getter, r_setter, r_query, r_deleter, r_enumerator, r_data;
rb_scan_args(
argc, argv, "15",
&r_getter, &r_setter, &r_query, &r_deleter, &r_enumerator, &r_data
);

ObjectTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

t->SetIndexedPropertyHandler(
&PropertyCallback::invokeIndexedPropertyGetter,
RTEST(r_setter) ? &PropertyCallback::invokeIndexedPropertySetter : 0,
RTEST(r_query) ? &PropertyCallback::invokeIndexedPropertyQuery : 0,
RTEST(r_deleter) ? &PropertyCallback::invokeIndexedPropertyDeleter : 0,
RTEST(r_enumerator) ? &PropertyCallback::invokeIndexedPropertyEnumerator : 0,
PropertyCallback::wrapData(isolate, r_getter, r_setter, r_query, r_deleter, r_enumerator, r_data)
);

return Qnil;
}

static VALUE SetCallAsFunctionHandler(VALUE self, VALUE r_callback, VALUE r_data) {
ObjectTemplate t(self);
Isolate isolate(t.getIsolate());
Locker lock(isolate);

FunctionCallback callback(isolate, r_callback, r_data);

t->SetCallAsFunctionHandler(callback, callback);

return Qnil;
}
};
}

Expand Down
78 changes: 78 additions & 0 deletions ext/v8/property-callback-info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,81 @@ namespace rr {

};

class Integer : public Base<v8::Integer> {
public:

inline Integer(v8::PropertyCallbackInfo<v8::Integer> info) :
Base<v8::Integer>(info) {}

inline Integer(VALUE self) : Base<v8::Integer>(self) {}

static VALUE GetReturnValue(VALUE self) {
Integer info(self);
Locker lock(info->GetIsolate());
return ReturnValue::Integer(info->GetReturnValue());
}

static inline void Init() {
ClassBuilder("Integer", PropertyCallbackInfo::Class, PropertyCallbackInfo::Class).
defineMethod("This", &This).
defineMethod("Data", &Data).
defineMethod("GetIsolate", &GetIsolate).
defineMethod("GetReturnValue", &GetReturnValue).
store(&Class);
}

};

class Array : public Base<v8::Array> {
public:

inline Array(v8::PropertyCallbackInfo<v8::Array> info) :
Base<v8::Array>(info) {}

inline Array(VALUE self) : Base<v8::Array>(self) {}

static VALUE GetReturnValue(VALUE self) {
Array info(self);
Locker lock(info->GetIsolate());
return ReturnValue::Array(info->GetReturnValue());
}

static inline void Init() {
ClassBuilder("Array", PropertyCallbackInfo::Class, PropertyCallbackInfo::Class).
defineMethod("This", &This).
defineMethod("Data", &Data).
defineMethod("GetIsolate", &GetIsolate).
defineMethod("GetReturnValue", &GetReturnValue).
store(&Class);
}

};

class Boolean : public Base<v8::Boolean> {
public:

inline Boolean(v8::PropertyCallbackInfo<v8::Boolean> info) :
Base<v8::Boolean>(info) {}

inline Boolean(VALUE self) : Base<v8::Boolean>(self) {}

static VALUE GetReturnValue(VALUE self) {
Boolean info(self);
Locker lock(info->GetIsolate());
return ReturnValue::Boolean(info->GetReturnValue());
}

static inline void Init() {
ClassBuilder("Boolean", PropertyCallbackInfo::Class, PropertyCallbackInfo::Class).
defineMethod("This", &This).
defineMethod("Data", &Data).
defineMethod("GetIsolate", &GetIsolate).
Copy link
Copy Markdown
Collaborator

@cowboyd cowboyd Aug 20, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This(), Data(), and GetIsolate() are in all classes, maybe move them into PropertyCallbackInfo::Class?

Copy link
Copy Markdown
Collaborator Author

@georgyangelov georgyangelov Aug 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, will do that.

Copy link
Copy Markdown
Collaborator Author

@georgyangelov georgyangelov Aug 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, actually, is it safe to do that? Since outside of C++ these are all different classes and depending on the template parameter, they wrap different types and pointers.

Copy link
Copy Markdown
Collaborator

@cowboyd cowboyd Aug 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, you're totally right, they share no common ancestor in c++ land.

defineMethod("GetReturnValue", &GetReturnValue).
store(&Class);
}

};

class Void : public Base<void> {
public:

Expand Down Expand Up @@ -94,6 +169,9 @@ namespace rr {
store(&Class);

Value::Init();
Integer::Init();
Array::Init();
Boolean::Init();
Void::Init();
}

Expand Down
Loading