jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve v8 generator regarding registration of function wrappers.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13751 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Oliver Buchtala 2012-09-08 00:49:32 +00:00
commit 285badb95b
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/javascript/v8/javascriptcode.swg
View file

@ -68,7 +68,7 @@ void ${NAME_MANGLED}_set(v8::Local<v8::String> property, v8::Local<v8::Value> va
%} %}
%fragment("v8_function", "templates") %{ %fragment("v8_function", "templates") %{
v8::Handle<v8::Value> ${NAME_MANGLED}(const Arguments &args) { v8::Handle<v8::Value> wrap_${NAME_MANGLED}(const Arguments &args) {
v8::HandleScope scope; v8::HandleScope scope;
v8::Handle<v8::Object> ret; v8::Handle<v8::Object> ret;
${LOCALS} ${LOCALS}
@ -79,11 +79,14 @@ v8::Handle<v8::Value> ${NAME_MANGLED}(const Arguments &args) {
} }
%} %}
%fragment("v8_register_member_function", "templates") %{
SWIGV8_AddClassMethod(SWIGV8_${CLASSNAME_MANGLED}, "${NAME_UNQUALIFIED}", ${WRAPPER});%}
%fragment("v8_create_namespace", "templates") %{ %fragment("v8_create_namespace", "templates") %{
v8::Handle<v8::ObjectTemplate> ${NAME_MANGLED} = v8::ObjectTemplate::New();%} v8::Handle<v8::ObjectTemplate> ${NAME_MANGLED} = v8::ObjectTemplate::New();%}
%fragment("v8_register_member_function", "templates") %{
SWIGV8_AddClassMethod(SWIGV8_${CLASSNAME_MANGLED}, "${NAME_UNQUALIFIED}", wrap_${NAME_MANGLED});%}
%fragment("v8_register_global_function", "templates") %{
${CONTEXT}->Set(v8::String::NewSymbol("${NAME_UNQUALIFIED}"), v8::FunctionTemplate::New(wrap_${NAME_MANGLED})->GetFunction());%}
%fragment("v8_register_namespace", "templates") %{ %fragment("v8_register_namespace", "templates") %{
${CONTEXT}->Set(v8::String::NewSymbol("${NAME_UNQUALIFIED}", ${NAME_MANGLED}->NewInstance()));%} ${CONTEXT}->Set(v8::String::NewSymbol("${NAME_UNQUALIFIED}", ${NAME_MANGLED}->NewInstance()));%}

15
Source/Modules/javascript_v8.cxx
View file

@ -17,6 +17,7 @@
#define V8_FUNCTION "v8_function" #define V8_FUNCTION "v8_function"
#define V8_RETRIEVE_THIS "v8_retrieve_this" #define V8_RETRIEVE_THIS "v8_retrieve_this"
#define V8_REGISTER_MEMBER_FUNCTION "v8_register_member_function" #define V8_REGISTER_MEMBER_FUNCTION "v8_register_member_function"
#define V8_REGISTER_GLOBAL_FUNCTION "v8_register_global_function"
#define V8_CREATE_NAMESPACE "v8_create_namespace" #define V8_CREATE_NAMESPACE "v8_create_namespace"
#define V8_REGISTER_NAMESPACE "v8_register_namespace" #define V8_REGISTER_NAMESPACE "v8_register_namespace"
@ -247,6 +248,7 @@ int V8Emitter::ExitVariable(Node* n)
{ {
// TODO: Register variable in context // TODO: Register variable in context
Swig_print_node(n);
Delete(current_variable_mangled); Delete(current_variable_mangled);
Delete(current_variable_unqualified); Delete(current_variable_unqualified);
@ -271,9 +273,7 @@ int V8Emitter::EnterFunction(Node* n)
} }
int V8Emitter::ExitFunction(Node* n) int V8Emitter::ExitFunction(Node* n)
{ {
// TODO: Register function in context
Delete(current_function_mangled); Delete(current_function_mangled);
Delete(current_function_unqualified); Delete(current_function_unqualified);
current_function_mangled = 0; current_function_mangled = 0;
@ -385,18 +385,21 @@ int V8Emitter::EmitFunction(Node* n, bool is_member)
.Replace(KW_ACTION, action) .Replace(KW_ACTION, action)
.Replace(KW_MARSHAL_INPUT, input) .Replace(KW_MARSHAL_INPUT, input)
.Replace(KW_MARSHAL_OUTPUT, output); .Replace(KW_MARSHAL_OUTPUT, output);
Wrapper_pretty_print(t_function.str(), f_wrapper); Wrapper_pretty_print(t_function.str(), f_wrapper);
// register the function at the specific context // register the function at the specific context
if (is_member) { if (is_member) {
Template t_register(GetTemplate(V8_REGISTER_MEMBER_FUNCTION)); Template t_register(GetTemplate(V8_REGISTER_MEMBER_FUNCTION));
t_register.Replace(KW_UNQUALIFIED_NAME, current_function_unqualified) t_register.Replace(KW_UNQUALIFIED_NAME, current_function_unqualified)
.Replace(KW_WRAPPER, wrap_name) .Replace(KW_MANGLED_NAME, wrap_name)
.Replace(KW_CLASSNAME_MANGLED, current_classname_mangled); .Replace(KW_CLASSNAME_MANGLED, current_classname_mangled);
Printv(f_init_wrappers, t_register.str(), "\n", 0); Printv(f_init_wrappers, t_register.str(), "\n", 0);
} else { } else {
// TODO Template t_register(GetTemplate(V8_REGISTER_GLOBAL_FUNCTION));
t_register.Replace(KW_CONTEXT, current_context)
.Replace(KW_UNQUALIFIED_NAME, current_function_unqualified)
.Replace(KW_MANGLED_NAME, wrap_name);
Printv(f_init_wrappers, t_register.str(), 0);
} }
// clean up // clean up