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

Move void check and error reporting to lookup_cxx_ret_type()

Browse source 
This code doesn't belong to emit_member_function() as it's relevant for
all functions, not just the member ones.

No real changes.
This commit is contained in:
Vadim Zeitlin 2021-12-07 00:10:44 +01:00
commit 9f80bc8113
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/Modules/c.cxx
View file

@ -600,16 +600,8 @@ public:
// Deal with the return type: it may be different from the type of the C wrapper function if it involves objects, and so we may need to add a cast. // Deal with the return type: it may be different from the type of the C wrapper function if it involves objects, and so we may need to add a cast.
cxx_rtype_desc rtype_desc; cxx_rtype_desc rtype_desc;
if (SwigType_type(Getattr(n, "type")) != T_VOID) { if (!lookup_cxx_ret_type(rtype_desc, n))
if (!lookup_cxx_ret_type(rtype_desc, n)) {
Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n),
"No ctype typemap defined for the return type \"%s\" of %s\n",
SwigType_str(Getattr(n, "type"), NULL),
Getattr(n, "sym:name")
);
return; return;
}
}
// We also need the list of parameters to take in the C++ function being generated and the list of them to pass to the C wrapper. // We also need the list of parameters to take in the C++ function being generated and the list of them to pass to the C wrapper.
scoped_dohptr parms_cxx(NewStringEmpty()); scoped_dohptr parms_cxx(NewStringEmpty());
@ -1238,6 +1230,12 @@ private:
} }
bool lookup_cxx_ret_type(cxx_rtype_desc& rtype_desc, Node* n) { bool lookup_cxx_ret_type(cxx_rtype_desc& rtype_desc, Node* n) {
String* const func_type = Getattr(n, "type");
if (SwigType_type(func_type) == T_VOID) {
// Nothing to do, rtype_desc is void by default.
return true;
}
// As above, ensure our replaceSpecialVariables() is used. // As above, ensure our replaceSpecialVariables() is used.
temp_ptr_setter<cxx_rtype_desc*> set(&rtype_desc_, &rtype_desc); temp_ptr_setter<cxx_rtype_desc*> set(&rtype_desc_, &rtype_desc);
@ -1248,11 +1246,17 @@ private:
type = Swig_typemap_lookup("ctype", n, "", NULL); type = Swig_typemap_lookup("ctype", n, "", NULL);
} }
if (!type) if (!type) {
Swig_warning(WARN_C_TYPEMAP_CTYPE_UNDEF, Getfile(n), Getline(n),
"No ctype typemap defined for the return type \"%s\" of %s\n",
SwigType_str(func_type, NULL),
Getattr(n, "sym:name")
);
return false; return false;
}
rtype_desc.set_type(type); rtype_desc.set_type(type);
do_resolve_type(n, Getattr(n, "type"), rtype_desc.type(), NULL, &rtype_desc); do_resolve_type(n, func_type, rtype_desc.type(), NULL, &rtype_desc);
if (use_cxxout) { if (use_cxxout) {
if (String* out_tm = Swig_typemap_lookup("cxxout", n, "", NULL)) if (String* out_tm = Swig_typemap_lookup("cxxout", n, "", NULL))