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

Minor refactoring of Python autodoc related code

Browse source
This commit is contained in:
William S Fulton 2019-02-02 21:42:47 +00:00
commit fddaf3f814
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Source/Modules/python.cxx
View file

@ -1848,7 +1848,7 @@ public:
if (!skipAuto) { if (!skipAuto) {
/* Check if a documentation name was given for either the low-level C API or high-level Python shadow API */ /* Check if a documentation name was given for either the low-level C API or high-level Python shadow API */
String *symname = Getattr(n, low_level? "doc:low:name" : "doc:high:name"); String *symname = Getattr(n, low_level ? "doc:low:name" : "doc:high:name");
if (!symname) { if (!symname) {
symname = Getattr(n, "sym:name"); symname = Getattr(n, "sym:name");
} }
@ -1862,7 +1862,7 @@ public:
continue; continue;
} }
if (! first_func) if (!first_func)
Append(doc, "\n"); Append(doc, "\n");
if (type) { if (type) {
@ -1967,9 +1967,9 @@ public:
Printf(doc, "%s", symname); Printf(doc, "%s", symname);
if (showTypes) { if (showTypes) {
String *type = Getattr(n, "tmap:doc:type"); String *type = Getattr(n, "tmap:doc:type");
if (! type) if (!type)
type = Getattr(n, "membervariableHandler:type"); type = Getattr(n, "membervariableHandler:type");
if (! type) if (!type)
type = Getattr(n, "type"); type = Getattr(n, "type");
Printf(doc, " : %s", type); Printf(doc, " : %s", type);
} }
@ -3317,7 +3317,7 @@ public:
Delete(h); Delete(h);
} }
Setattr(h, "getter", "SwigPyObject_get___dict__"); Setattr(h, "getter", "SwigPyObject_get___dict__");
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)); Setattr(h, "doc", cdocstring(n, AUTODOC_VAR));
} }
@ -3335,7 +3335,7 @@ public:
} }
Setattr(h, "getter", wrapper_name); Setattr(h, "getter", wrapper_name);
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)); Setattr(h, "doc", cdocstring(n, AUTODOC_VAR));
} }
@ -3352,7 +3352,7 @@ public:
} }
Setattr(h, "setter", wrapper_name); Setattr(h, "setter", wrapper_name);
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)); Setattr(h, "doc", cdocstring(n, AUTODOC_VAR));
} }
@ -4030,12 +4030,9 @@ public:
const char *setter_closure = setter ? funpack ? "SwigPyBuiltin_FunpackSetterClosure" : "SwigPyBuiltin_SetterClosure" : "0"; const char *setter_closure = setter ? funpack ? "SwigPyBuiltin_FunpackSetterClosure" : "SwigPyBuiltin_SetterClosure" : "0";
String *gspair = NewStringf("%s_%s_getset", symname, memname); String *gspair = NewStringf("%s_%s_getset", symname, memname);
Printf(f, "static SwigPyGetSet %s = { %s, %s };\n", gspair, getter ? getter : "0", setter ? setter : "0"); Printf(f, "static SwigPyGetSet %s = { %s, %s };\n", gspair, getter ? getter : "0", setter ? setter : "0");
String *doc; String *doc = Getattr(mgetset, "doc");
if (Getattr(mgetset, "doc")) { if (!doc)
doc = Getattr(mgetset, "doc");
} else {
doc = NewStringf("%s.%s", name, memname); doc = NewStringf("%s.%s", name, memname);
}
String *entry = String *entry =
NewStringf("{ (char *)\"%s\", (getter)%s, (setter)%s, (char *)\"%s\", (void *)&%s }\n", memname, getter_closure, NewStringf("{ (char *)\"%s\", (getter)%s, (setter)%s, (char *)\"%s\", (void *)&%s }\n", memname, getter_closure,
setter_closure, doc, gspair); setter_closure, doc, gspair);