more test cases, less cast operations

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

Examples/test-suite/array_member.i

@@ -33,11 +33,13 @@ int get_value(int *x, int i) {
 
   class RayPacketData {
   public:
-  enum {
+    enum {
-    Size = 32
+      Size = 32
-  };
+    };
-
+    
-    Material const* hitMatl[Size];
+    const Material * chitMat[Size];
+    Material hitMat_val[Size];
+    Material *hitMat[Size];
   };
 }
 

Examples/test-suite/arrays_global.i

@@ -73,3 +73,23 @@ int test_b(int a)  {
 #endif
 %}
 
+
+
+#ifdef __cplusplus
+%inline 
+{
+
+  struct Material
+  {
+  };
+
+  enum {
+    Size = 32
+  };
+  
+  const Material * chitMat[Size];
+  Material hitMat_val[Size];
+  Material *hitMat[Size];
+}
+
+#endif

Lib/typemaps/swigtype.swg

@@ -129,7 +129,7 @@
 }
 
 %typemap(globalin) SWIGTYPE [ANY] {
-  if (inp) {
+  if ($input) {
     size_t ii = 0;
     for (; ii < (size_t)$dim0; ++ii) $1[ii] = $input[ii];
   } else {
@@ -144,8 +144,7 @@
     %variable_fail(SWIG_TypeError, "$type", "$name");
   } else if (inp) {
     size_t ii = 0;
-    $basetype *dest = %static_cast($1, $basetype *);
+    for (; ii < (size_t)$dim0; ++ii) $1[ii] = inp[ii];
-    for (; ii < (size_t)$dim0; ++ii) dest[ii] = inp[ii];
   } else {
     %variable_nullref("$type", "$name");
   }