Index: Source/Modules/python.cxx
===================================================================
RCS file: /cvsroot/SWIG/Source/Modules/python.cxx,v
-retrieving revision 1.28
-diff -u -r1.28 python.cxx
---- Source/Modules/python.cxx 18 Nov 2003 20:19:15 -0000 1.28
-+++ Source/Modules/python.cxx 19 Nov 2003 17:34:55 -0000
-@@ -68,6 +68,17 @@
- -noexcept - No automatic exception handling\n\
- -noproxy - Don't generate proxy classes \n\n";
+retrieving revision 1.39
+diff -u -4 -r1.39 python.cxx
+--- Source/Modules/python.cxx 22 Jan 2004 22:42:17 -0000 1.39
++++ Source/Modules/python.cxx 22 Jan 2004 23:39:03 -0000
+@@ -50,8 +50,17 @@
+ static int have_constructor;
+ static int have_repr;
+ static String *real_classname;
-+
+/* flags for the make_autodoc function */
+enum autodoc_t {
+ AUTODOC_CLASS,
+ AUTODOC_FUNC
+};
+
-+
- class PYTHON : public Language {
- public:
-
-@@ -415,15 +426,21 @@
+ static const char *usage = (char *)"\
+ Python Options (available with -python)\n\
+ -ldflags - Print runtime libraries to link with\n\
+ -globals <name> - Set <name> used to access C global variable [default: 'cvar']\n\
+@@ -417,17 +426,23 @@
+ * functions.
* ------------------------------------------------------------ */
void emitFunctionShadowHelper(Node *n, File *f_dest, String *name, int kw) {
- if ( ! have_addtofunc(n) ) {
+- /* If there is no addtofunc directive then just assign from the extension module */
+ if ( ! have_addtofunc(n) && ! have_docstring(n) ) {
- /* If there is no addtofunc directive then just assign from the extension module */
++ /* If there is no addtofunc or docstring directive then just assign from the extension module */
Printv(f_dest, "\n", name, " = ", module, ".", name, "\n", NIL);
} else {
/* Otherwise make a wrapper function to insert the code into */
- Printv(f_dest, tab4, addtofunc(n), "\n", NIL);
- Printv(f_dest, tab4, "return val\n", NIL);
+ if ( have_docstring(n) )
-+ Printv(f_dest, tab4, docstring(n, AUTODOC_FUNC), "\n", NIL);
++ Printv(f_dest, tab4, docstring(n, AUTODOC_FUNC, tab4), "\n", NIL);
+ if ( have_addtofunc(n) ) {
+ Printv(f_dest, tab4, "val = ", funcCallHelper(name, kw), "\n", NIL);
+ Printv(f_dest, tab4, addtofunc(n), "\n", NIL);
}
}
-@@ -439,6 +456,193 @@
+
+@@ -441,8 +456,256 @@
+ }
/* ------------------------------------------------------------
+ /* ------------------------------------------------------------
+ * docstring()
+ * Get the docstring text, stripping off {} if neccessary,
-+ * and enclose in triple-double quotes. If autodoc is also
++ * and enclose in triple double quotes. If autodoc is also
+ * set then it will build a combined docstring.
+ * ------------------------------------------------------------ */
+
-+ String *docstring(Node *n, autodoc_t ad_type) {
++ String *docstring(Node *n, autodoc_t ad_type, const String* indent) {
+ String* str = Getattr(n, "feature:docstring");
+ bool have_ds = (str != NULL && Len(str) > 0);
+ bool have_auto = (Getattr(n,"feature:autodoc") && !Getattr(n, "feature:noautodoc"));
+ char* triple_double = "\"\"\"";
-+ String* autodoc;
-+ String* doc;
++ String* autodoc = NULL;
++ String* doc = NULL;
+
+ if ( have_ds ) {
+ char* t = Char(str);
+ have_auto = (autodoc != NULL && Len(autodoc) > 0);
+ }
+
-+ if ( have_auto && have_ds )
-+ doc = NewStringf("%s%s\n\n%s%s", triple_double, autodoc, str, triple_double);
-+ else if ( !have_auto && have_ds )
-+ doc = NewStringf("%s%s%s", triple_double, str, triple_double);
++// if ( have_auto && have_ds )
++// doc = NewStringf("%s%s\n\n%s%s", triple_double, autodoc, str, triple_double);
++// else if ( !have_auto && have_ds )
++// doc = NewStringf("%s%s%s", triple_double, str, triple_double);
++// else
++// doc = NewStringf("%s%s%s", triple_double, autodoc, triple_double);
++
++
++ // If there is more than one line then make docstrings like this:
++ //
++ // """
++ // This is line1
++ // And here is line2 followed by the rest of them
++ // """
++ //
++ // otherwise, put it all on a single line
++ //
++ if ( have_auto && have_ds ) { // Both autodoc and docstring are present
++ doc = NewString("");
++ Printv(doc, triple_double, "\n",
++ pythoncode(autodoc, indent), "\n",
++ pythoncode(str, indent),
++ indent, triple_double, NIL);
++ }
++ else if ( !have_auto && have_ds ) { // only docstring
++ if (Strchr(str, '\n') == NULL) {
++ doc = NewStringf("%s%s%s", triple_double, str, triple_double);
++ }
++ else {
++ doc = NewString("");
++ Printv(doc, triple_double, "\n",
++ pythoncode(str, indent),
++ indent, triple_double, NIL);
++ }
++ }
++ else if ( have_auto && !have_ds ) { // only autodoc
++ if (Strchr(autodoc, '\n') == NULL) {
++ doc = NewStringf("%s%s%s", triple_double, autodoc, triple_double);
++ }
++ else {
++ doc = NewString("");
++ Printv(doc, triple_double, "\n",
++ pythoncode(autodoc, indent),
++ indent, triple_double, NIL);
++ }
++ }
+ else
-+ doc = NewStringf("%s%s%s", triple_double, autodoc, triple_double);
++ doc = NewString("");
+
++ // Save the generated strings in the parse tree in case they are used later
++ // by post processing tools
+ Setattr(n, "python:docstring", doc);
+ Setattr(n, "python:autodoc", autodoc);
+ return doc;
+ String* make_autodoc(Node *n, autodoc_t ad_type) {
+
+ if (ad_type == AUTODOC_CLASS)
-+ return NULL; // No function call do document in this case
++ return NULL; // No function call to document in this case
+
-+ // check how should the parameters be rendered?
-+ String* autodoc = Getattr(n, "feature:autodoc");
-+ bool showTypes;
-+ if (Strcmp(autodoc, "0") == 0)
-+ showTypes = false;
-+ else if (Strcmp(autodoc, "1") == 0)
-+ showTypes = true;
-+ else
-+ return autodoc;
-+
+ // If the function is overloaded then this funciton is called
+ // for the last one. Rewind to the first so the docstrings are
+ // in order.
+
+ String* doc = NewString("");
+ while (n) {
++ bool showTypes = false;
++ bool skipAuto = false;
++
++ // check how should the parameters be rendered?
++ String* autodoc = Getattr(n, "feature:autodoc");
++ if (Strcmp(autodoc, "0") == 0)
++ showTypes = false;
++ else if (Strcmp(autodoc, "1") == 0)
++ showTypes = true;
++ else {
++ // if not "0" or "1" then autodoc is already the string that should be used
++ Printf(doc, "%s", autodoc);
++ skipAuto = true;
++ }
++
++ if (!skipAuto) {
+ String* symname = Getattr(n, "sym:name");
+ SwigType* type = Getattr(n, "type");
+
+ if (Strcmp(type, "void") == 0)
+ type = NULL;
+ else {
-+ type = SwigType_base(type);
-+ Node* lookup = Swig_symbol_clookup(type, 0);
-+ if (lookup)
-+ type = Getattr(lookup, "sym:name");
-+ }
++ SwigType* qt = SwigType_typedef_resolve_all(type);
++ if (SwigType_isenum(qt))
++ type = NewString("int");
++ else {
++ type = SwigType_base(type);
++ Node* lookup = Swig_symbol_clookup(type, 0);
++ if (lookup)
++ type = Getattr(lookup, "sym:name");
++ }
++ }
+ }
+
+ switch ( ad_type ) {
+ case AUTODOC_DTOR:
+ Printf(doc, "__del__()");
+ break;
-+
++
+ case AUTODOC_STATICFUNC:
-+ Printf(doc, "%s.%s(%s)", class_name, symname, make_autodocParmList(n, showTypes));
++ Printf(doc, "%s(%s)", symname, make_autodocParmList(n, showTypes));
+ if (type) Printf(doc, " -> %s", type);
+ break;
+
+ if (type) Printf(doc, " -> %s", type);
+ break;
+ }
-+
-+ // if it's overloaded then get the next decl and loop around again
-+ n = Getattr(n, "sym:nextSibling");
-+ if (n)
-+ Printf(doc, "\n");
++ }
++
++ // if it's overloaded then get the next decl and loop around again
++ n = Getattr(n, "sym:nextSibling");
++ if (n)
++ Printf(doc, "\n");
+ }
+
+ return doc;
+
+ // Do we need to wrap a long line?
+ if ((Len(doc) - lines*maxwidth) > maxwidth) {
-+ Printf(doc, "\n ");
++ Printf(doc, "\n%s", tab4);
+ lines += 1;
+ }
+ }
+ // Do the param type too?
+ if (showTypes) {
+ SwigType* type = SwigType_base(Getattr(p, "type"));
-+ lookup = Swig_symbol_clookup(type, 0);
-+ if (lookup)
-+ type = Getattr(lookup, "sym:name");
++ SwigType* qt = SwigType_typedef_resolve_all(type);
++ if (SwigType_isenum(qt))
++ type = NewString("int");
++ else {
++ lookup = Swig_symbol_clookup(type, 0);
++ if (lookup)
++ type = Getattr(lookup, "sym:name");
++ }
+ Printf(doc, "%s ", type);
+ }
+
* have_addtofunc()
* Check if there is a %addtofunc directive and it has text
* ------------------------------------------------------------ */
-@@ -1661,7 +1865,9 @@
+
+@@ -1698,9 +1961,11 @@
+ Printf(f_shadow, modern ? "(object)" : "(_object)");
}
}
Printf(f_shadow,":\n");
-
-+ if ( have_docstring(n) )
-+ Printv(f_shadow, tab4, docstring(n, AUTODOC_CLASS), "\n", NIL);
++ if ( Getattr(n, "feature:docstring") ) // don't use have_docstring in this case because autodoc doesn't apply
++ Printv(f_shadow, tab4, docstring(n, AUTODOC_CLASS, tab4), "\n", NIL);
+
if (!modern) {
Printv(f_shadow,tab4,"__swig_setmethods__ = {}\n",NIL);
if (Len(base_class)) {
-@@ -1796,14 +2002,20 @@
+ Printf(f_shadow,"%sfor _s in [%s]: __swig_setmethods__.update(_s.__swig_setmethods__)\n",tab4,base_class);
+@@ -1833,16 +2098,22 @@
+ Delete(pyaction);
Printv(f_shadow,pycode,"\n",NIL);
} else {
- Printv(f_shadow, "return ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL);
+ Printv(f_shadow, "\n", NIL);
+ if ( have_docstring(n) )
-+ Printv(f_shadow, tab8, docstring(n, AUTODOC_FUNC), "\n", NIL);
++ Printv(f_shadow, tab8, docstring(n, AUTODOC_FUNC, tab8), "\n", NIL);
+ if ( have_addtofunc(n) ) {
+ Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL);
+ Printv(f_shadow, tab8, addtofunc(n), "\n", NIL);
}
}
-@@ -1820,12 +2032,18 @@
+ }
+@@ -1857,14 +2128,20 @@
+ virtual int staticmemberfunctionHandler(Node *n) {
String *symname = Getattr(n,"sym:name");
Language::staticmemberfunctionHandler(n);
if (shadow) {
- Printv(f_shadow, tab8, addtofunc(n), "\n", NIL);
- Printv(f_shadow, tab8, "return val\n", NIL);
+ if ( have_docstring(n) )
-+ Printv(f_shadow, tab8, docstring(n, AUTODOC_STATICFUNC), "\n", NIL);
++ Printv(f_shadow, tab8, docstring(n, AUTODOC_STATICFUNC, tab8), "\n", NIL);
+ if ( have_addtofunc(n) ) {
+ Printv(f_shadow, tab8, "val = ", funcCallHelper(Swig_name_member(class_name, symname), kw), "\n", NIL);
+ Printv(f_shadow, tab8, addtofunc(n), "\n", NIL);
Printv(f_shadow, tab4, modern ? "" : "if _newclass:", symname,
" = staticmethod(", symname, ")\n", NIL);
-@@ -1912,6 +2130,8 @@
+ if (!modern) {
+@@ -1949,8 +2226,10 @@
+ }
Printv(f_shadow, tab4, "def __init__(self, *args",
(allow_kwargs ? ", **kwargs" : ""), "):\n", NIL);
+ if ( have_docstring(n) )
-+ Printv(f_shadow, tab8, docstring(n, AUTODOC_CTOR), "\n", NIL);
++ Printv(f_shadow, tab8, docstring(n, AUTODOC_CTOR, tab8), "\n", NIL);
Printv(f_shadow, pass_self, NIL);
if (!modern) {
Printv(f_shadow, tab8, "_swig_setattr(self, ", rclassname, ", 'this', ",
-@@ -1927,7 +2147,7 @@
+ funcCallHelper(Swig_name_construct(symname), allow_kwargs), ")\n", NIL);
+@@ -1964,9 +2243,9 @@
+ Printv(f_shadow, tab8, "self.thisown = 1\n", NIL);
Printv(f_shadow, tab8, "del newobj.thisown\n", NIL);
}
if ( have_addtofunc(n) )
Delete(pass_self);
}
have_constructor = 1;
-@@ -1945,6 +2165,8 @@
+ } else {
+@@ -1982,8 +2261,10 @@
+ } else {
Printv(f_shadow_stubs, "\ndef ", symname, "(*args",
(allow_kwargs ? ", **kwargs" : ""), "):\n", NIL);
+ if ( have_docstring(n) )
-+ Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR), "\n", NIL);
++ Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL);
Printv(f_shadow_stubs, tab4, "val = ",
funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", NIL);
Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL);
-@@ -1978,11 +2200,13 @@
+ if ( have_addtofunc(n) )
+@@ -2015,13 +2296,15 @@
+ Delete(pyaction);
Printv(f_shadow,pycode,"\n", NIL);
} else {
Printv(f_shadow, tab4, "def __del__(self, destroy=", module, ".", Swig_name_destroy(symname), "):\n", NIL);
+ if ( have_docstring(n) )
-+ Printv(f_shadow, tab8, docstring(n, AUTODOC_DTOR), "\n", NIL);
++ Printv(f_shadow, tab8, docstring(n, AUTODOC_DTOR, tab8), "\n", NIL);
if ( have_addtofunc(n) )
Printv(f_shadow, tab8, addtofunc(n), "\n", NIL);
Printv(f_shadow, tab8, "try:\n", NIL);
- Printv(f_shadow, tab4, tab8, "if self.thisown: destroy(self)\n", NIL);
+- Printv(f_shadow, tab4, tab8, "if self.thisown: destroy(self)\n", NIL);
- Printv(f_shadow, tab8, "except: pass\n", NIL);
++ Printv(f_shadow, tab8, tab4, "if self.thisown: destroy(self)\n", NIL);
+ Printv(f_shadow, tab8, "except: pass\n\n", NIL);
}
}
return SWIG_OK;
+ }
projects / wxWidgets.git / blobdiff