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

Minor fix to Octave autodoc generation for functions returning structs

Browse source 
Patch #27

- see also git commit 72ffdb930d
This commit is contained in:
Karl Wette 2013-02-17 15:56:25 +01:00 • committed by William S Fulton
commit 52c754a22d
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -56,6 +56,9 @@ Version 2.0.10 (in progress)
When generating functions provided by %extend, use "(void)" for no-argument functions When generating functions provided by %extend, use "(void)" for no-argument functions
instead of "()". This prevents warnings when compiling with "gcc -Wstrict-prototypes". instead of "()". This prevents warnings when compiling with "gcc -Wstrict-prototypes".
2013-02-17: kwwette
[Octave] Minor fix to autodoc generation: get the right type for functions returning structs.
2013-02-15: wsfulton 2013-02-15: wsfulton
Deprecate typedef names used in %extend that are not the real class/struct name. For example: Deprecate typedef names used in %extend that are not the real class/struct name. For example:

10
Source/Modules/octave.cxx
View file

@ -355,14 +355,10 @@ public:
SwigType *type = Getattr(n, "type"); SwigType *type = Getattr(n, "type");
if (type && Strcmp(type, "void")) { if (type && Strcmp(type, "void")) {
type = SwigType_base(type); Node *nn = classLookup(Getattr(n, "type"));
Node *lookup = Swig_symbol_clookup(type, 0); String *type_str = nn ? Copy(Getattr(nn, "sym:name")) : SwigType_str(type, 0);
if (lookup)
type = Getattr(lookup, "sym:name");
Append(decl_info, "@var{retval} = "); Append(decl_info, "@var{retval} = ");
String *type_str = NewString(""); Printf(args_str, "%s@var{retval} is of type %s. ", args_str, type_str);
Printf(type_str, "@var{retval} is of type %s. ", type);
Append(args_str, type_str);
Delete(type_str); Delete(type_str);
} }