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

Get rid of an unnecessary intermediate string

Browse source 
Write the wrapper types and declarations directly to f_wrappers_h,
without passing by an intermediate f_wrappers_h_body which just
complicated things unnecessarily.

This means that "extern "C" { ... }" is now around the functions
declarations only, and not around the types and the declarations, but
this seems like a desirable side effect.

No real changes.
This commit is contained in:
Vadim Zeitlin 2021-11-10 19:35:42 +01:00
commit 55d7db6b27
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Modules/c.cxx
View file

@ -566,28 +566,24 @@ public:
include_guard_wrappers_h(f_wrappers_h, include_guard_begin, include_guard_end);
// All the struct types used by the functions go to f_wrappers_types so that they're certain to be defined before they're used by any functions. All the
// functions declarations go directly to f_wrappers_decl and f_wrappers_h_body combines both of them.
const scoped_dohptr f_wrappers_h_body(NewStringEmpty());
// functions declarations go directly to f_wrappers_decl we write both of them to f_wrappers_h at the end.
f_wrappers_types = NewString("");
f_wrappers_decl = NewString("");
{
cplusplus_output_guard
cplusplus_guard_wrappers(f_wrappers),
cplusplus_guard_wrappers_h(f_wrappers_h_body);
cplusplus_guard_wrappers_h(f_wrappers_decl);
// emit code for children
Language::top(n);
Dump(f_wrappers_types, f_wrappers_h_body);
Delete(f_wrappers_types);
Dump(f_wrappers_decl, f_wrappers_h_body);
Delete(f_wrappers_decl);
} // close extern "C" guards
Dump(f_wrappers_h_body, f_wrappers_h);
Dump(f_wrappers_types, f_wrappers_h);
Delete(f_wrappers_types);
Dump(f_wrappers_decl, f_wrappers_h);
Delete(f_wrappers_decl);
} // close wrapper header guard
// write all to the file