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

Minor refactor of marshalInputArgs for generalization.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13792 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Oliver Buchtala 2012-09-08 01:06:39 +00:00
commit 0cae8fccd0
1 changed files with 32 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

71
Source/Modules/javascript.cxx
View file

@ -262,6 +262,8 @@ 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 *p, Wrapper *wrapper, String *arg);
virtual void marshalOutput(Node *n, String *actioncode, Wrapper *wrapper); virtual void marshalOutput(Node *n, String *actioncode, Wrapper *wrapper);
/** /**
@ -931,7 +933,6 @@ 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) {
String *tm;
Parm *p; Parm *p;
// determine an offset index, as members have an extra 'this' argument // determine an offset index, as members have an extra 'this' argument
@ -950,9 +951,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; p = nextSibling(p), i++) {
SwigType *pt = Getattr(p, "type");
String *arg = NewString(""); String *arg = NewString("");
switch (mode) { switch (mode) {
case Getter: case Getter:
case Function: case Function:
@ -975,23 +974,7 @@ void JSCEmitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, Ma
default: default:
throw "Illegal state."; throw "Illegal state.";
} }
emitInputTypemap(n, p, wrapper, arg);
tm = Getattr(p, "tmap:in"); // Get typemap for this argument
if (tm != NULL) {
Replaceall(tm, "$input", arg);
Setattr(p, "emit:input", arg);
if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
} else {
Replaceall(tm, "$disown", "0");
}
Replaceall(tm, "$symname", Getattr(n, "sym:name"));
Printf(wrapper->code, "%s\n", tm);
} else {
Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
}
Delete(arg); Delete(arg);
} }
} }
@ -1464,6 +1447,28 @@ 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) {
// Get input typemap for current param
String *tm = Getattr(p, "tmap:in");
SwigType *pt = Getattr(p, "type");
if (tm != NULL) {
Replaceall(tm, "$input", arg);
Setattr(p, "emit:input", arg);
// do replacements for built-in variables
if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
} else {
Replaceall(tm, "$disown", "0");
}
Replaceall(tm, "$symname", Getattr(n, "sym:name"));
Printf(wrapper->code, "%s\n", tm);
} else {
Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
}
}
void JSEmitter::marshalOutput(Node *n, String *actioncode, Wrapper *wrapper) { void JSEmitter::marshalOutput(Node *n, String *actioncode, Wrapper *wrapper) {
SwigType *type = Getattr(n, "type"); SwigType *type = Getattr(n, "type");
Setattr(n, "type", type); Setattr(n, "type", type);
@ -1825,7 +1830,6 @@ 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) {
String *tm;
Parm *p; Parm *p;
int startIdx = 0; int startIdx = 0;
@ -1833,9 +1837,14 @@ void V8Emitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, Mar
startIdx = 1; startIdx = 1;
} }
// store number of arguments for argument checks
int num_args = emit_num_arguments(parms) - startIdx;
String *argcount = NewString("");
Printf(argcount, "%d", num_args);
Setattr(n, ARGCOUNT, argcount);
int i = 0; int i = 0;
for (p = parms; p; p = nextSibling(p), i++) { for (p = parms; p; p = nextSibling(p), i++) {
SwigType *pt = Getattr(p, "type");
String *arg = NewString(""); String *arg = NewString("");
switch (mode) { switch (mode) {
@ -1866,23 +1875,7 @@ void V8Emitter::marshalInputArgs(Node *n, ParmList *parms, Wrapper *wrapper, Mar
default: default:
throw "Illegal state."; throw "Illegal state.";
} }
emitInputTypemap(n, p, wrapper, arg);
tm = Getattr(p, "tmap:in"); // Get typemap for this argument
if (tm != NULL) {
Replaceall(tm, "$input", arg);
Setattr(p, "emit:input", arg);
if (Getattr(p, "wrap:disown") || (Getattr(p, "tmap:in:disown"))) {
Replaceall(tm, "$disown", "SWIG_POINTER_DISOWN");
} else {
Replaceall(tm, "$disown", "0");
}
Replaceall(tm, "$symname", Getattr(n, "sym:name"));
Printf(wrapper->code, "%s\n", tm);
} else {
Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "Unable to use type %s as a function argument.\n", SwigType_str(pt, 0));
}
Delete(arg); Delete(arg);
} }
} }