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

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11758 626c5289-ae23-0410-ae9c-e8d60b6d4f22

CHANGES.current

@@ -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 {

Examples/test-suite/static_const_member.i

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

Source/Modules/csharp.cxx

@@ -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

Source/Modules/java.cxx

@@ -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