From: <wsf...@us...> - 2007-03-18 14:33:47
|
Revision: 9652 http://swig.svn.sourceforge.net/swig/?rev=9652&view=rev Author: wsfulton Date: 2007-03-16 16:37:15 -0700 (Fri, 16 Mar 2007) Log Message: ----------- ARRAYSOFCLASSES and ARRAYSOFENUMS fix so that they can be applied to pointers Modified Paths: -------------- trunk/CHANGES.current trunk/Lib/java/arrays_java.i Modified: trunk/CHANGES.current =================================================================== --- trunk/CHANGES.current 2007-03-03 15:38:52 UTC (rev 9651) +++ trunk/CHANGES.current 2007-03-16 23:37:15 UTC (rev 9652) @@ -1,6 +1,10 @@ Version 1.3.32 (in progress) ============================ +03/16/2007: wsfulton + [Java] Fixes so that ARRAYSOFCLASSES and ARRAYSOFENUMS in arrays_java.i can be applied + to pointer types. + 03/03/2007: olly [PHP5] When we know the literal numeric value for a constant, use that to initialise the const member in the PHP wrapper class. Modified: trunk/Lib/java/arrays_java.i =================================================================== --- trunk/Lib/java/arrays_java.i 2007-03-03 15:38:52 UTC (rev 9651) +++ trunk/Lib/java/arrays_java.i 2007-03-16 23:37:15 UTC (rev 9652) @@ -235,12 +235,12 @@ * JAVA_ARRAYSOFCLASSES(name) */ %define JAVA_ARRAYSOFCLASSES(ARRAYSOFCLASSES) -%typemap(jni) ARRAYSOFCLASSES[ANY] "jlongArray" -%typemap(jtype) ARRAYSOFCLASSES[ANY] "long[]" -%typemap(jstype) ARRAYSOFCLASSES[ANY] "$javaclassname[]" +%typemap(jni) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] "jlongArray" +%typemap(jtype) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] "long[]" +%typemap(jstype) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] "$javaclassname[]" -%typemap(javain) ARRAYSOFCLASSES[ANY] "$javaclassname.cArrayUnwrap($javainput)" -%typemap(javaout) ARRAYSOFCLASSES[ANY] { +%typemap(javain) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] "$javaclassname.cArrayUnwrap($javainput)" +%typemap(javaout) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] { return $javaclassname.cArrayWrap($jnicall, $owner); } @@ -300,7 +300,7 @@ } } -%typemap(argout) ARRAYSOFCLASSES[ANY] +%typemap(argout) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] { int i; for (i=0; i<sz$argnum; i++) { @@ -329,7 +329,7 @@ JCALL3(ReleaseLongArrayElements, jenv, $result, arr, 0); } -%typemap(freearg) ARRAYSOFCLASSES[ANY] +%typemap(freearg) ARRAYSOFCLASSES[ANY], ARRAYSOFCLASSES[] #ifdef __cplusplus %{ delete [] $1; %} #else @@ -360,12 +360,12 @@ /* Arrays of enums. * Use the following to use these typemaps for an array of enums called name: * %apply ARRAYSOFENUMS[ANY] { name[ANY] }; */ -%typemap(jni) ARRAYSOFENUMS[ANY] "jintArray" -%typemap(jtype) ARRAYSOFENUMS[ANY] "int[]" -%typemap(jstype) ARRAYSOFENUMS[ANY] "int[]" +%typemap(jni) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] "jintArray" +%typemap(jtype) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] "int[]" +%typemap(jstype) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] "int[]" -%typemap(javain) ARRAYSOFENUMS[ANY] "$javainput" -%typemap(javaout) ARRAYSOFENUMS[ANY] { +%typemap(javain) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] "$javainput" +%typemap(javaout) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] { return $jnicall; } @@ -378,11 +378,11 @@ } if (!SWIG_JavaArrayInInt(jenv, &jarr, (int **)&$1, $input)) return $null; } -%typemap(argout) ARRAYSOFENUMS[ANY] +%typemap(argout) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] %{ SWIG_JavaArrayArgoutInt(jenv, jarr$argnum, (int *)$1, $input); %} %typemap(out) ARRAYSOFENUMS[ANY] %{$result = SWIG_JavaArrayOutInt(jenv, (int *)$1, $1_dim0); %} -%typemap(freearg) ARRAYSOFENUMS[ANY] +%typemap(freearg) ARRAYSOFENUMS[ANY], ARRAYSOFENUMS[] #ifdef __cplusplus %{ delete [] $1; %} #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |