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

Fix handling of overloaded ctors in v8 emitter.

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

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

@ -3,6 +3,7 @@ v8::Handle<v8::Value> $jswrapper(const v8::Arguments& args) {
v8::HandleScope scope; v8::HandleScope scope;
v8::Handle<v8::Object> self = args.Holder(); v8::Handle<v8::Object> self = args.Holder();
$jslocals $jslocals
if(args.Length() != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
$jscode $jscode
SWIGV8_SetPrivateData(self, result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN); SWIGV8_SetPrivateData(self, result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN);
@ -23,11 +24,30 @@ v8::Handle<v8::Value> $jswrapper(const v8::Arguments& args) {
} }
%} %}
%fragment("js_overloaded_ctor", "templates") %{ %fragment ("js_ctor_dispatcher", "templates")
%{
v8::Handle<v8::Value> $jswrapper(const v8::Arguments& args) { v8::Handle<v8::Value> $jswrapper(const v8::Arguments& args) {
v8::HandleScope scope;
OverloadErrorHandler errorHandler;
v8::Handle<v8::Value> self;
// switch all cases by means of series of if-returns.
$jsdispatchcases
// default:
SWIG_exception_fail(SWIG_ERROR, "Illegal arguments for contruction of $jsmangledname");
fail:
scope.Close(v8::Undefined());
}
%}
%fragment("js_overloaded_ctor", "templates") %{
v8::Handle<v8::Value> $jswrapper(const v8::Arguments& args, V8ErrorHandler& SWIGV8_ErrorHandler) {
v8::HandleScope scope; v8::HandleScope scope;
v8::Handle<v8::Object> self = args.Holder(); v8::Handle<v8::Object> self = args.Holder();
$jslocals $jslocals
if(args.Length() != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
$jscode $jscode
SWIGV8_SetPrivateData(self, result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN); SWIGV8_SetPrivateData(self, result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN);
@ -39,27 +59,12 @@ fail:
} }
%} %}
%fragment ("js_ctor_dispatcher", "templates")
%{
v8::Handle<v8::Value> $jswrapper(const v8::Arguments& args) {
v8::HandleScope scope;
// switch all cases by means of series of if-returns.
$jsdispatchcases
// default:
SWIG_exception_fail(SWIG_ERROR, "Illegal arguments for contruction of $jsmangledname");
fail:
scope.Close(v8::Undefined());
}
%}
%fragment ("js_ctor_dispatch_case", "templates") %fragment ("js_ctor_dispatch_case", "templates")
%{ %{
if(args.Length() == $jsargcount) { if(args.Length() == $jsargcount) {
v8::Handle<v8::Value> self = $jswrapper(args); errorHandler.err.Clear();
if(!self->IsUndefined()) { self = $jswrapper(args, errorHandler);
if(errorHandler.err.IsEmpty()) {
return scope.Close(self); return scope.Close(self);
} }
} }
@ -110,6 +115,8 @@ v8::Handle<v8::Value> $jswrapper(const v8::Arguments &args) {
v8::HandleScope scope; v8::HandleScope scope;
v8::Handle<v8::Value> jsresult; v8::Handle<v8::Value> jsresult;
$jslocals $jslocals
if(args.Length() != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
$jscode $jscode
return scope.Close(jsresult); return scope.Close(jsresult);
goto fail; goto fail;
@ -138,11 +145,9 @@ fail:
%{ %{
v8::Handle<v8::Value> $jswrapper(const v8::Arguments &args, V8ErrorHandler& SWIGV8_ErrorHandler) v8::Handle<v8::Value> $jswrapper(const v8::Arguments &args, V8ErrorHandler& SWIGV8_ErrorHandler)
{ {
v8::HandleScope scope; v8::HandleScope scope;
v8::Handle<v8::Value> jsresult; v8::Handle<v8::Value> jsresult;
$jslocals $jslocals
if(args.Length() != $jsargcount) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for $jswrapper.");
$jscode $jscode
return scope.Close(jsresult); return scope.Close(jsresult);
goto fail; goto fail;

6
Source/Modules/javascript.cxx
View file

@ -815,6 +815,7 @@ int JSEmitter::emitCtor(Node *n) {
//String *mangled_name = SwigType_manglestr(Getattr(n, "name")); //String *mangled_name = SwigType_manglestr(Getattr(n, "name"));
String *wrap_name = Swig_name_wrapper(Getattr(n, "sym:name")); String *wrap_name = Swig_name_wrapper(Getattr(n, "sym:name"));
if(is_overloaded) { if(is_overloaded) {
t_ctor = getTemplate("js_overloaded_ctor");
Append(wrap_name, Getattr(n, "sym:overname")); Append(wrap_name, Getattr(n, "sym:overname"));
} }
Setattr(n, "wrap:name", wrap_name); Setattr(n, "wrap:name", wrap_name);
@ -1909,12 +1910,12 @@ void V8Emitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, Mar
Parm *p; Parm *p;
int startIdx = 0; int startIdx = 0;
if (is_member && !is_static) { if (is_member && !is_static && mode!=Ctor) {
startIdx = 1; startIdx = 1;
} }
// store number of arguments for argument checks // store number of arguments for argument checks
int num_args = emit_num_arguments(parms); int num_args = emit_num_arguments(parms) - startIdx;
String *argcount = NewString(""); String *argcount = NewString("");
Printf(argcount, "%d", num_args); Printf(argcount, "%d", num_args);
Setattr(n, ARGCOUNT, argcount); Setattr(n, ARGCOUNT, argcount);
@ -1922,7 +1923,6 @@ void V8Emitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, Mar
int i = 0; int i = 0;
for (p = parms; p; p = nextSibling(p), i++) { for (p = parms; p; p = nextSibling(p), i++) {
String *arg = NewString(""); String *arg = NewString("");
switch (mode) { switch (mode) {
case Getter: case Getter:
if (is_member && !is_static && i == 0) { if (is_member && !is_static && i == 0) {