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

Renames performed by %namewarn with rename= are printed in warning message

Browse source 
This is necessary for regex-like renames (where you can't use the #define trick
as is done in many of the %keywordwarn directives). It's now unnecessary to print
the "renaming to '`x`'" code explicitly by the kw.swg files.
This commit is contained in:
Seth R Johnson 2018-02-22 10:10:12 -05:00
commit de78b80de9
13 changed files with 41 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/errors/c_class.stderr
View file

@ -1,2 +1,2 @@
c_class.i:3: Warning 301: class keyword used, but not in C++ mode.
c_class.i:3: Warning 314: 'class' is a python keyword, renaming to '_class'
c_class.i:3: Warning 314: 'class' is a python keyword: renaming 'class' to '_class'

10
Examples/test-suite/errors/cpp_namewarn.i
View file

@ -1,10 +1,10 @@
%module xxx
%namewarn("314:'key1' is a keyword, renaming to '_key1'", rename="_%s") "key1";
%namewarn("314:'key2' is a keyword, renaming to '_key2'", rename="_%s") "key2";
%namewarn("314:'key3' is a keyword, renaming to '_key3'", rename="_%s") "key3";
%namewarn("314:'key4' is a keyword, renaming to '_key4'", rename="_%s") "key4";
%namewarn("314:'key5' is a keyword, renaming to '_key5'", rename="_%s") "key5";
%namewarn("314:'key1' is a keyword", rename="_%s") "key1";
%namewarn("314:'key2' is a keyword", rename="_%s") "key2";
%namewarn("314:'key3' is a keyword", rename="_%s") "key3";
%namewarn("314:'key4' is a keyword", rename="_%s") "key4";
%namewarn("314:'key5' is a keyword", rename="_%s") "key5";
// Non-templated
%ignore KlassA::key1;

20
Examples/test-suite/errors/cpp_namewarn.stderr
View file

@ -1,10 +1,10 @@
cpp_namewarn.i:58: Warning 314: 'key1' is a keyword, renaming to '_key1'
cpp_namewarn.i:59: Warning 314: 'key2' is a keyword, renaming to '_key2'
cpp_namewarn.i:60: Warning 314: 'key3' is a keyword, renaming to '_key3'
cpp_namewarn.i:65: Warning 314: 'key1' is a keyword, renaming to '_key1'
cpp_namewarn.i:66: Warning 314: 'key2' is a keyword, renaming to '_key2'
cpp_namewarn.i:67: Warning 314: 'key3' is a keyword, renaming to '_key3'
cpp_namewarn.i:72: Warning 314: 'key1' is a keyword, renaming to '_key1'
cpp_namewarn.i:73: Warning 314: 'key2' is a keyword, renaming to '_key2'
cpp_namewarn.i:74: Warning 314: 'key3' is a keyword, renaming to '_key3'
cpp_namewarn.i:80: Warning 314: 'key5' is a keyword, renaming to '_key5'
cpp_namewarn.i:58: Warning 314: 'key1' is a keyword: renaming 'key1' to '_key1'
cpp_namewarn.i:59: Warning 314: 'key2' is a keyword: renaming 'key2' to '_key2'
cpp_namewarn.i:60: Warning 314: 'key3' is a keyword: renaming 'key3' to '_key3'
cpp_namewarn.i:65: Warning 314: 'key1' is a keyword: renaming 'key1' to '_key1'
cpp_namewarn.i:66: Warning 314: 'key2' is a keyword: renaming 'key2' to '_key2'
cpp_namewarn.i:67: Warning 314: 'key3' is a keyword: renaming 'key3' to '_key3'
cpp_namewarn.i:72: Warning 314: 'key1' is a keyword: renaming 'key1' to '_key1'
cpp_namewarn.i:73: Warning 314: 'key2' is a keyword: renaming 'key2' to '_key2'
cpp_namewarn.i:74: Warning 314: 'key3' is a keyword: renaming 'key3' to '_key3'
cpp_namewarn.i:80: Warning 314: 'key5' is a keyword