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

Python docstring - add in missing Delete calls

Browse source
This commit is contained in:
William S Fulton 2019-02-03 00:11:10 +00:00
commit b50e5fac8e
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Modules/python.cxx
View file

@ -1637,8 +1637,7 @@ public:
* source code (but without quotes around it). * source code (but without quotes around it).
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
String *cdocstring(Node *n, autodoc_t ad_type, bool low_level = false) String *cdocstring(Node *n, autodoc_t ad_type, bool low_level = false) {
{
String *ds = build_combined_docstring(n, ad_type, "", low_level); String *ds = build_combined_docstring(n, ad_type, "", low_level);
Replaceall(ds, "\\", "\\\\"); Replaceall(ds, "\\", "\\\\");
Replaceall(ds, "\"", "\\\""); Replaceall(ds, "\"", "\\\"");
@ -2478,6 +2477,7 @@ public:
Printf(methods, "\"%s\"", ds); Printf(methods, "\"%s\"", ds);
if (fastproxy) { if (fastproxy) {
/* In the fastproxy case, we must also record the high-level docstring for use in the Python shadow API */ /* In the fastproxy case, we must also record the high-level docstring for use in the Python shadow API */
Delete(ds);
ds = cdocstring(n, Getattr(n, "memberfunction") ? AUTODOC_METHOD : AUTODOC_FUNC); ds = cdocstring(n, Getattr(n, "memberfunction") ? AUTODOC_METHOD : AUTODOC_FUNC);
Printf(methods_proxydocs, "\"%s\"", ds); Printf(methods_proxydocs, "\"%s\"", ds);
} }
@ -3333,7 +3333,9 @@ public:
Delattr(n, "memberget"); Delattr(n, "memberget");
if (!Getattr(h, "doc")) { if (!Getattr(h, "doc")) {
Setattr(n, "doc:high:name", Getattr(n, "name")); Setattr(n, "doc:high:name", Getattr(n, "name"));
Setattr(h, "doc", cdocstring(n, AUTODOC_VAR)); String *ds = cdocstring(n, AUTODOC_VAR);
Setattr(h, "doc", ds);
Delete(ds);
} }
} }
if (builtin_setter) { if (builtin_setter) {
@ -3350,7 +3352,9 @@ public:
Delattr(n, "memberset"); Delattr(n, "memberset");
if (!Getattr(h, "doc")) { if (!Getattr(h, "doc")) {
Setattr(n, "doc:high:name", Getattr(n, "name")); Setattr(n, "doc:high:name", Getattr(n, "name"));
Setattr(h, "doc", cdocstring(n, AUTODOC_VAR)); String *ds = cdocstring(n, AUTODOC_VAR);
Setattr(h, "doc", ds);
Delete(ds);
} }
} }
@ -4448,9 +4452,9 @@ public:
if (builtin) { if (builtin) {
if (have_docstring(n)) { if (have_docstring(n)) {
String *str = cdocstring(n, AUTODOC_CLASS); String *ds = cdocstring(n, AUTODOC_CLASS);
Setattr(n, "feature:python:tp_doc", str); Setattr(n, "feature:python:tp_doc", ds);
Delete(str); Delete(ds);
} else { } else {
String *name = Getattr(n, "name"); String *name = Getattr(n, "name");
String *rname = add_explicit_scope(SwigType_namestr(name)); String *rname = add_explicit_scope(SwigType_namestr(name));