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

Fix the documentation strings of functions with anonymous arguments.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5779 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Matthias Köppe 2004-03-21 11:49:44 +00:00
commit e6d686e16f
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
SWIG/Source/Modules/guile.cxx
View file

@ -652,7 +652,8 @@ public:
const String *maybe_delimiter, const String *maybe_delimiter,
Parm *p, Parm *p,
const String *typemap, const String *typemap,
const String *default_doc) const String *default_doc,
const String *name = NULL)
{ {
String *tmp = NewString(""); String *tmp = NewString("");
String *tm; String *tm;
@ -664,7 +665,7 @@ public:
if (maybe_delimiter && Len(output) > 0 && Len(tm) > 0) { if (maybe_delimiter && Len(output) > 0 && Len(tm) > 0) {
Printv(output, maybe_delimiter, NIL); Printv(output, maybe_delimiter, NIL);
} }
String *pn = Getattr(p,"name"); String *pn = (name == NULL) ? Getattr(p,"name") : name;
String *pt = Getattr(p,"type"); String *pt = Getattr(p,"type");
Replaceall(tm, "$name", pn); // legacy for $parmname Replaceall(tm, "$name", pn); // legacy for $parmname
Replaceall(tm, "$type", SwigType_str(pt,0)); Replaceall(tm, "$type", SwigType_str(pt,0));
@ -801,6 +802,17 @@ public:
Replaceall(tm,"$input",source); Replaceall(tm,"$input",source);
Setattr(p,"emit:input", source); Setattr(p,"emit:input", source);
Printv(f->code,tm,"\n",NIL); Printv(f->code,tm,"\n",NIL);
SwigType *pb = SwigType_typedef_resolve_all(SwigType_base(pt));
SwigType *pn = Getattr(p,"name");
String *argname;
scheme_argnum++;
if (pn && !Getattr(scheme_arg_names, pn))
argname = pn;
else {
/* Anonymous arg or re-used argument name -- choose a name that cannot clash */
argname = NewStringf("%%arg%d", scheme_argnum);
}
if (procdoc) { if (procdoc) {
if (i == numreq) { if (i == numreq) {
@ -809,24 +821,14 @@ public:
} }
/* Add to signature (arglist) */ /* Add to signature (arglist) */
handle_documentation_typemap(signature, " ", p, "tmap:in:arglist", handle_documentation_typemap(signature, " ", p, "tmap:in:arglist",
"$name"); "$name", argname);
/* Document the type of the arg in the documentation body */ /* Document the type of the arg in the documentation body */
handle_documentation_typemap(doc_body, ", ", p, "tmap:in:doc", handle_documentation_typemap(doc_body, ", ", p, "tmap:in:doc",
"$NAME is of type <$type>"); "$NAME is of type <$type>", argname);
} }
if (goops) { if (goops) {
if (i < numreq) { if (i < numreq) {
SwigType *pb = SwigType_typedef_resolve_all(SwigType_base(pt));
SwigType *pn = Getattr(p,"name");
String *argname;
scheme_argnum++;
if (pn && !Getattr(scheme_arg_names, pn))
argname = pn;
else {
/* Anonymous arg or re-used argument name -- choose a name that cannot clash */
argname = NewStringf("%%arg%d", scheme_argnum);
}
if (strcmp("void", Char(pt)) != 0) { if (strcmp("void", Char(pt)) != 0) {
Node *class_node = Swig_symbol_clookup(pb, Getattr(n, "sym:symtab")); Node *class_node = Swig_symbol_clookup(pb, Getattr(n, "sym:symtab"));
String *goopsclassname = (class_node == NULL) ? NULL : String *goopsclassname = (class_node == NULL) ? NULL :
@ -840,11 +842,12 @@ public:
Printv(primitive_args, " ", argname, NIL); Printv(primitive_args, " ", argname, NIL);
Setattr(scheme_arg_names, argname, p); Setattr(scheme_arg_names, argname, p);
} }
if (!pn) {
Delete(argname);
}
} }
} }
if (!pn) {
Delete(argname);
}
p = Getattr(p,"tmap:in:next"); p = Getattr(p,"tmap:in:next");
} else { } else {
throw_unhandled_guile_type_error (pt); throw_unhandled_guile_type_error (pt);