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

add fail: label for the get methods always, just in case someone write a 'varout' typemap that need it

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8682 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-02 22:56:15 +00:00
commit 41beef4aba
4 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Modules/perl5.cxx
View file

@ -850,7 +850,6 @@ public:
tab4, "MAGIC_PPERL\n",
NIL);
int addfail = 0;
if ((tm = Swig_typemap_lookup_new("varout",n,name,0))) {
Replaceall(tm,"$target","sv");
Replaceall(tm,"$result","sv");
@ -861,17 +860,15 @@ public:
Replaceall(tm, "$shadow", "0");
}
/* Printf(getf->code,"%s\n", tm);*/
addfail = emit_action_code(n, getf, tm);
emit_action_code(n, getf, tm);
} else {
Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number,
"Unable to read variable of type %s\n", SwigType_str(t,0));
return SWIG_NOWRAP;
}
Printf(getf->code," return 1;\n");
if (addfail) {
Append(getf->code,"fail:\n");
Append(getf->code," return 0;\n");
}
Append(getf->code,"fail:\n");
Append(getf->code," return 0;\n");
Append(getf->code,"}\n");

9
Source/Modules/python.cxx
View file

@ -2164,12 +2164,11 @@ public:
/* Create a function for getting the value of a variable */
Printf(getf->def,"SWIGINTERN PyObject *%s(void) {", getnamef);
Wrapper_add_local(getf,"pyobj", "PyObject *pyobj = 0");
int addfail = 0;
if ((tm = Swig_typemap_lookup_new("varout",n,name,0))) {
Replaceall(tm,"$source",name);
Replaceall(tm,"$target","pyobj");
Replaceall(tm,"$result","pyobj");
addfail = emit_action_code(n, getf, tm);
emit_action_code(n, getf, tm);
Delete(tm);
} else {
Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number,
@ -2177,10 +2176,8 @@ public:
}
Append(getf->code," return pyobj;\n");
if (addfail) {
Append(getf->code,"fail:\n");
Append(getf->code," return NULL;\n");
}
Append(getf->code,"fail:\n");
Append(getf->code," return NULL;\n");
Append(getf->code,"}\n");
Wrapper_print(getf,f_wrappers);

9
Source/Modules/ruby.cxx
View file

@ -1433,22 +1433,19 @@ public:
Wrapper_add_local(getf,"_val","VALUE _val");
tm = Swig_typemap_lookup_new("varout",n, name, 0);
int addfail = 0;
if (tm) {
Replaceall(tm,"$result","_val");
Replaceall(tm,"$target","_val");
Replaceall(tm,"$source",name);
/* Printv(getf->code,tm, NIL); */
addfail = emit_action_code(n, getf, tm);
emit_action_code(n, getf, tm);
} else {
Swig_warning(WARN_TYPEMAP_VAROUT_UNDEF, input_file, line_number,
"Unable to read variable of type %s\n", SwigType_str(t,0));
}
Printv(getf->code, tab4, "return _val;\n", NIL);
if (addfail) {
Append(getf->code,"fail:\n");
Append(getf->code," return Qnil;\n");
}
Append(getf->code,"fail:\n");
Append(getf->code," return Qnil;\n");
Append(getf->code,"}\n");
Wrapper_print(getf,f_wrappers);

9
Source/Modules/tcl8.cxx
View file

@ -578,22 +578,19 @@ public:
getname = Swig_name_get(iname);
Printv(getf->def,"SWIGINTERN char *",getname,"(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, char *name1, char *name2, int flags) {",NIL);
Wrapper_add_local(getf,"value", "Tcl_Obj *value = 0");
int addfail = 0;
if ((tm = Swig_typemap_lookup_new("varout",n,name,0))) {
Replaceall(tm,"$source", name);
Replaceall(tm,"$target","value");
Replaceall(tm,"$result", "value");
/* Printf(getf->code, "%s\n",tm); */
addfail = emit_action_code(n, getf, tm);
emit_action_code(n, getf, tm);
Printf(getf->code, "if (value) {\n");
Printf(getf->code, "Tcl_SetVar2(interp,name1,name2,Tcl_GetStringFromObj(value,NULL), flags);\n");
Printf(getf->code, "Tcl_DecrRefCount(value);\n");
Printf(getf->code, "}\n");
Printf(getf->code, "return NULL;\n");
if (addfail) {
Append(getf->code,"fail:\n");
Printf(getf->code,"return \"%s\";\n", iname);
}
Append(getf->code,"fail:\n");
Printf(getf->code,"return \"%s\";\n", iname);
Printf(getf->code,"}\n");
Wrapper_print(getf,f_wrappers);
} else {