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

Bugfix in argument marshalling.

Browse source
This commit is contained in:
Oliver Buchtala 2013-09-16 21:56:52 +02:00
commit b99e8613ad
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/Modules/javascript.cxx
View file

@ -235,7 +235,7 @@ protected:
virtual void marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static) = 0; virtual void marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static) = 0;
virtual void emitInputTypemap(Node *n, Parm *params, Wrapper *wrapper, String *arg); virtual String *emitInputTypemap(Node *n, Parm *params, Wrapper *wrapper, String *arg);
virtual void marshalOutput(Node *n, ParmList *params, Wrapper *wrapper, String *actioncode, const String *cresult=0, bool emitReturnVariable = true); virtual void marshalOutput(Node *n, ParmList *params, Wrapper *wrapper, String *actioncode, const String *cresult=0, bool emitReturnVariable = true);
@ -1179,7 +1179,7 @@ int JSEmitter::emitFunctionDispatcher(Node *n, bool /*is_member */ ) {
return SWIG_OK; return SWIG_OK;
} }
void JSEmitter::emitInputTypemap(Node *n, Parm *p, Wrapper *wrapper, String *arg) { String *JSEmitter::emitInputTypemap(Node *n, Parm *p, Wrapper *wrapper, String *arg) {
// Get input typemap for current param // Get input typemap for current param
String *tm = Getattr(p, "tmap:in"); String *tm = Getattr(p, "tmap:in");
SwigType *type = Getattr(p, "type"); SwigType *type = Getattr(p, "type");
@ -1197,7 +1197,10 @@ void JSEmitter::emitInputTypemap(Node *n, Parm *p, Wrapper *wrapper, String *arg
Printf(wrapper->code, "%s\n", tm); Printf(wrapper->code, "%s\n", tm);
} else { } else {
Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0)); Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(type, 0));
Swig_print(p);
} }
return tm;
} }
void JSEmitter::marshalOutput(Node *n, ParmList *params, Wrapper *wrapper, String *actioncode, const String *cresult, bool emitReturnVariable) { void JSEmitter::marshalOutput(Node *n, ParmList *params, Wrapper *wrapper, String *actioncode, const String *cresult, bool emitReturnVariable) {
@ -1413,6 +1416,7 @@ JSCEmitter::~JSCEmitter() {
void JSCEmitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static) { void JSCEmitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static) {
Parm *p; Parm *p;
String *tm;
// determine an offset index, as members have an extra 'this' argument // determine an offset index, as members have an extra 'this' argument
// except: static members and ctors. // except: static members and ctors.
@ -1429,7 +1433,7 @@ void JSCEmitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, Ma
// process arguments // process arguments
int i = 0; int i = 0;
for (p = parms; p; p = nextSibling(p), i++) { for (p = parms; p; i++) {
String *arg = NewString(""); String *arg = NewString("");
switch (mode) { switch (mode) {
case Getter: case Getter:
@ -1453,8 +1457,13 @@ void JSCEmitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, Ma
default: default:
throw "Illegal state."; throw "Illegal state.";
} }
emitInputTypemap(n, p, wrapper, arg); tm = emitInputTypemap(n, p, wrapper, arg);
Delete(arg); Delete(arg);
if (tm) {
p = Getattr(p, "tmap:in:next");
} else {
p = nextSibling(p);
}
} }
} }
@ -2066,6 +2075,7 @@ int V8Emitter::exitFunction(Node* n)
void V8Emitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static) { void V8Emitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, MarshallingMode mode, bool is_member, bool is_static) {
Parm *p; Parm *p;
String *tm;
int startIdx = 0; int startIdx = 0;
if (is_member && !is_static && mode!=Ctor) { if (is_member && !is_static && mode!=Ctor) {
@ -2109,8 +2119,14 @@ void V8Emitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, Mar
default: default:
throw "Illegal state."; throw "Illegal state.";
} }
emitInputTypemap(n, p, wrapper, arg);
tm = emitInputTypemap(n, p, wrapper, arg);
Delete(arg); Delete(arg);
if (tm) {
p = Getattr(p, "tmap:in:next");
} else {
p = nextSibling(p);
}
} }
} }