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

Remove code setting unused "c:retval" attribute

Browse source 
This became unused after the changes of fd3e76365 (Streamline and fix
returning objects by value, 2019-08-06) and allows to simplify code
further as we don't need to override static and non-static member
function handlers at all any more now.
This commit is contained in:
Vadim Zeitlin 2021-11-03 16:30:40 +01:00
commit 81d1fec13c
1 changed files with 0 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Source/Modules/c.cxx
View file

@ -606,13 +606,8 @@ public:
* ------------------------------------------------------------------------ */ * ------------------------------------------------------------------------ */
virtual int globalfunctionHandler(Node *n) { virtual int globalfunctionHandler(Node *n) {
SwigType *type = Getattr(n, "type");
Setattr(n, "c:globalfun", "1"); Setattr(n, "c:globalfun", "1");
if (!SwigType_ispointer(type) && !SwigType_isreference(type))
Setattr(n, "c:retval", "1");
return Language::globalfunctionHandler(n); return Language::globalfunctionHandler(n);
} }
@ -1369,40 +1364,6 @@ public:
return SWIG_OK; return SWIG_OK;
} }
/* ---------------------------------------------------------------------
* staticmemberfunctionHandler()
* --------------------------------------------------------------------- */
virtual int staticmemberfunctionHandler(Node *n) {
SwigType *type = Getattr(n, "type");
SwigType *tdtype;
tdtype = SwigType_typedef_resolve_all(type);
if (tdtype)
type = tdtype;
if (type) {
if (!SwigType_ispointer(type) && !SwigType_isreference(type))
Setattr(n, "c:retval", "1");
}
return Language::staticmemberfunctionHandler(n);
}
/* ---------------------------------------------------------------------
* memberfunctionHandler()
* --------------------------------------------------------------------- */
virtual int memberfunctionHandler(Node *n) {
SwigType *type = Getattr(n, "type");
SwigType *tdtype;
tdtype = SwigType_typedef_resolve_all(type);
if (tdtype)
type = tdtype;
if (type) {
if (!SwigType_ispointer(type) && !SwigType_isreference(type))
Setattr(n, "c:retval", "1");
}
return Language::memberfunctionHandler(n);
}
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------
* staticmembervariableHandler() * staticmembervariableHandler()
* --------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
@ -1421,10 +1382,6 @@ public:
SwigType_add_array(btype, NewStringf("%s", SwigType_array_getdim(type, 0))); SwigType_add_array(btype, NewStringf("%s", SwigType_array_getdim(type, 0)));
Setattr(n, "type", btype); Setattr(n, "type", btype);
} }
if (type) {
if (!SwigType_ispointer(type) && !SwigType_isreference(type))
Setattr(n, "c:retval", "1");
}
Delete(type); Delete(type);
Delete(btype); Delete(btype);
return Language::staticmembervariableHandler(n); return Language::staticmembervariableHandler(n);
@ -1448,10 +1405,6 @@ public:
SwigType_add_array(btype, NewStringf("%s", SwigType_array_getdim(type, 0))); SwigType_add_array(btype, NewStringf("%s", SwigType_array_getdim(type, 0)));
Setattr(n, "type", btype); Setattr(n, "type", btype);
} }
if (type) {
if (!SwigType_ispointer(type) && !SwigType_isreference(type))
Setattr(n, "c:retval", "1");
}
Delete(type); Delete(type);
Delete(btype); Delete(btype);
return Language::membervariableHandler(n); return Language::membervariableHandler(n);