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

Fix %javaconst(1)/%csconst(1) for static const member variables to use the actual constant value if available

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11758 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2009-11-26 19:20:31 +00:00
commit 1dd50f5ea8
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CHANGES.current
View file

@ -1,6 +1,17 @@
Version 1.3.41 (in progress)
============================
2009-11-26: wsfulton
[Java, C#] Fix %javaconst(1)/%csconst(1) for static const member variables to
use the actual constant value if it is specified, rather than the C++ code to
access the member.
%javaconst(1) EN;
%csconst(1) EN;
struct X {
static const int EN = 2;
};
2009-11-23: wsfulton
C++ nested typedef classes can now be handled too, for example:
struct Outer {

6
Examples/test-suite/static_const_member.i
View file

@ -5,6 +5,12 @@
%module static_const_member
#if SWIGJAVA
%javaconst(1) EN;
#elif SWIGCSHARP
%csconst(1) EN;
#endif
%inline %{
class X {

2
Source/Modules/csharp.cxx
View file

@ -1394,7 +1394,7 @@ public:
enum_constant_flag = false;
} else {
// Alternative constant handling will use the C syntax to make a true C# constant and hope that it compiles as C# code
Printf(constants_code, "%s;\n", Getattr(n, "value"));
Printf(constants_code, "%s;\n", Getattr(n, "wrappedasconstant") ? Getattr(n, "staticmembervariableHandler:value") : Getattr(n, "value"));
}
// Emit the generated code to appropriate place

2
Source/Modules/java.cxx
View file

@ -1426,7 +1426,7 @@ public:
enum_constant_flag = false;
} else {
// Alternative constant handling will use the C syntax to make a true Java constant and hope that it compiles as Java code
Printf(constants_code, "%s;\n", Getattr(n, "value"));
Printf(constants_code, "%s;\n", Getattr(n, "wrappedasconstant") ? Getattr(n, "staticmembervariableHandler:value") : Getattr(n, "value"));
}
// Emit the generated code to appropriate place