[Plplot-cvs] SF.net SVN: plplot:[11699] trunk/bindings/java/plplotjavac.i

[<ai...@us...>]

Revision: 11699
          http://plplot.svn.sourceforge.net/plplot/?rev=11699&view=rev
Author:   airwin
Date:     2011-04-13 05:05:20 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
Complete the change to use standard code delimiters "%{" and "%}" inside %define ...
%enddef swig directives.  Also, correct what appears to be a
parentheses error.  That unbalanced parentheses issue also appears in
/usr/share/swig1.3/java/typemaps.i for the

%typemap(directorin,descriptor=JNIDESC) TYPE &OUTPUT

typemap, but not for other related typemaps so I may be misunderstanding
something.  But when I provide balanced parentheses as for the
other cases, the result continues to work (see below).

Also change to form of warning message in
/usr/share/swig1.3/java/typemaps.i for the 

%typemap(directorin .....) TYPE *OUTPUT

typemap.

These changes appear to make no difference to build and test results,
but there is a good possibility they will improve uncrustify styling
results.

Modified Paths:
--------------
    trunk/bindings/java/plplotjavac.i

Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i	2011-04-13 04:19:03 UTC (rev 11698)
+++ trunk/bindings/java/plplotjavac.i	2011-04-13 05:05:20 UTC (rev 11699)
@@ -102,7 +102,7 @@
 %typemap(javadirectorout) TYPE *OUTPUT, TYPE &OUTPUT "$javacall"
 
 %typemap(in) TYPE *OUTPUT($*1_ltype temp), TYPE &OUTPUT($*1_ltype temp)
-{
+%{
   if (!$input) {
     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null");
     return $null;
@@ -112,14 +112,13 @@
     return $null;
   }
   $1 = &temp; 
-}
+%}
 
 %typemap(directorin,descriptor=JNIDESC) TYPE &OUTPUT
-%{ *(($&1_ltype) $input = &$1; %}
+%{ *(($&1_ltype) $input) = &$1; %}
 
-%typemap(directorin,descriptor=JNIDESC) TYPE *OUTPUT
+%typemap(directorin,descriptor=JNIDESC,warning="Need to provide TYPE *OUTPUT directorin typemap, TYPE array length is unknown") TYPE *OUTPUT
 %{
-#error "Need to provide OUT directorin typemap, TYPE array length is unknown"
 %}
 
 %typemap(freearg) TYPE *OUTPUT, TYPE &OUTPUT ""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.