Merge remote-tracking branch 'origin/master' into gsoc2012-scilab

Conflicts:
	Examples/Makefile.in

Examples/test-suite/java/Makefile.in

@@ -3,8 +3,8 @@
 #######################################################################
 
 LANGUAGE     = java
-JAVA         = java
-JAVAC        = javac
+JAVA         = @JAVA@
+JAVAC        = @JAVAC@
 JAVAFLAGS    = -Xcheck:jni
 SCRIPTSUFFIX = _runme.java
 srcdir       = @srcdir@
@@ -23,10 +23,12 @@ CPP_TEST_CASES = \
 	intermediary_classname \
 	java_constants \
 	java_director \
+	java_director_assumeoverride \
 	java_enums \
+	java_jnitypes \
 	java_lib_arrays_dimensionless \
 	java_lib_various \
-	java_jnitypes \
+	java_nspacewithoutpackage \
 	java_pgcpp \
 	java_pragmas \
 	java_prepost \
@@ -39,12 +41,15 @@ include $(srcdir)/../common.mk
 
 # Overridden variables here
 JAVA_PACKAGE = $*
-SWIGOPT += -package $(JAVA_PACKAGE)
+JAVA_PACKAGEOPT = -package $(JAVA_PACKAGE)
+SWIGOPT += $(JAVA_PACKAGEOPT)
 
 # Custom tests - tests with additional commandline options
+java_nspacewithoutpackage.%: JAVA_PACKAGEOPT =
 nspace.%: JAVA_PACKAGE = $*Package
 nspace_extend.%: JAVA_PACKAGE = $*Package
 director_nspace.%: JAVA_PACKAGE = $*Package
+director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package
 
 # Rules for the different types of tests
 %.cpptest: 

Examples/test-suite/java/curiously_recurring_template_pattern_runme.java

@@ -0,0 +1,29 @@
+
+import curiously_recurring_template_pattern.*;
+
+public class curiously_recurring_template_pattern_runme {
+
+  static {
+    try {
+	System.loadLibrary("curiously_recurring_template_pattern");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    Derived d = new Derived();
+    d.setBase1Param(1).setDerived1Param(10).setDerived2Param(20).setBase2Param(2);
+
+    if (d.getBase1Param() != 1)
+      throw new RuntimeException("fail");
+    if (d.getDerived1Param() != 10)
+      throw new RuntimeException("fail");
+    if (d.getBase2Param() != 2)
+      throw new RuntimeException("fail");
+    if (d.getDerived2Param() != 20)
+      throw new RuntimeException("fail");
+  }
+}
+

Examples/test-suite/java/director_binary_string_runme.java

@@ -21,6 +21,11 @@ public class director_binary_string_runme {
 
     if (sum != 9*2*8 + 13*3*5)
       throw new RuntimeException("Unexpected sum: " + sum);
+
+    new Callback().run(null, null);
+    callback = new DirectorBinaryStringCallback();
+    caller.setCallback(callback);
+    caller.call_null();
   }
 }
 
@@ -32,11 +37,13 @@ class DirectorBinaryStringCallback extends Callback {
   @Override
   public void run(byte[] dataBufferAA, byte[] dataBufferBB)
   {
-    for (int i = 0; i < dataBufferAA.length; i++)
-      dataBufferAA[i] = (byte)(dataBufferAA[i] * 2);
+    if (dataBufferAA != null)
+      for (int i = 0; i < dataBufferAA.length; i++)
+        dataBufferAA[i] = (byte)(dataBufferAA[i] * 2);
 
-    for (int i = 0; i < dataBufferBB.length; i++)
-      dataBufferBB[i] = (byte)(dataBufferBB[i] * 3);
+    if (dataBufferBB != null)
+      for (int i = 0; i < dataBufferBB.length; i++)
+        dataBufferBB[i] = (byte)(dataBufferBB[i] * 3);
   }
 }
 

Examples/test-suite/java/director_nspace_runme.java

@@ -19,7 +19,7 @@ public class director_nspace_runme {
 
 }
 
-class director_nspace_MyBarFoo extends director_nspacePackage.Bar.Foo {
+class director_nspace_MyBarFoo extends director_nspacePackage.TopLevel.Bar.Foo {
 
   @Override
   public String ping() {
@@ -32,17 +32,17 @@ class director_nspace_MyBarFoo extends director_nspacePackage.Bar.Foo {
   }
 
   @Override
-  public String fooBar(director_nspacePackage.Bar.FooBar fooBar) {
+  public String fooBar(director_nspacePackage.TopLevel.Bar.FooBar fooBar) {
     return fooBar.FooBarDo();
   }
 
   @Override
-  public director_nspacePackage.Bar.Foo makeFoo() {
-    return new director_nspacePackage.Bar.Foo();
+  public director_nspacePackage.TopLevel.Bar.Foo makeFoo() {
+    return new director_nspacePackage.TopLevel.Bar.Foo();
   }
 
   @Override
-  public director_nspacePackage.Bar.FooBar makeFooBar() {
-    return new director_nspacePackage.Bar.FooBar();
+  public director_nspacePackage.TopLevel.Bar.FooBar makeFooBar() {
+    return new director_nspacePackage.TopLevel.Bar.FooBar();
   }
 }

Examples/test-suite/java/director_smartptr_runme.java

@@ -0,0 +1,48 @@
+// Make sure that directors are connected and disconnected when used inconjunction with
+// being a smart pointer
+
+public class director_smartptr_runme {
+
+  static {
+    try {
+      System.loadLibrary("director_smartptr");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    director_smartptr_MyBarFoo myBarFoo =
+      new director_smartptr_MyBarFoo();
+  }
+
+}
+
+class director_smartptr_MyBarFoo extends director_smartptr.Foo {
+
+  @Override
+  public String ping() {
+    return "director_smartptr_MyBarFoo.ping();";
+  }
+
+  @Override
+  public String pong() {
+    return "director_smartptr_MyBarFoo.pong();" + ping();
+  }
+
+  @Override
+  public String fooBar(director_smartptr.FooBar fooBar) {
+    return fooBar.FooBarDo();
+  }
+
+  @Override
+  public director_smartptr.Foo makeFoo() {
+    return new director_smartptr.Foo();
+  }
+
+  @Override
+  public director_smartptr.FooBar makeFooBar() {
+    return new director_smartptr.FooBar();
+  }
+}

Examples/test-suite/java/enum_forward_runme.java

@@ -0,0 +1,33 @@
+
+import enum_forward.*;
+
+public class enum_forward_runme {
+
+  static {
+    try {
+        System.loadLibrary("enum_forward");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) 
+  {
+    try {
+      ForwardEnum1 f1 = enum_forward.get_enum1();
+      f1 = enum_forward.test_function1(f1);
+    } catch (IllegalArgumentException e) {
+    }
+
+    try {
+      ForwardEnum2 f2 = enum_forward.get_enum2();
+      f2 = enum_forward.test_function2(f2);
+    } catch (IllegalArgumentException e) {
+    }
+
+    ForwardEnum3 f3 = enum_forward.get_enum3();
+    f3 = enum_forward.test_function3(f3);
+  }
+}
+

Examples/test-suite/java/enum_macro_runme.java

@@ -0,0 +1,93 @@
+
+import enum_macro.*;
+
+public class enum_macro_runme {
+
+  static {
+    try {
+        System.loadLibrary("enum_macro");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) 
+  {
+    {
+      Greeks1 a = Greeks1.alpha1;
+      a = Greeks1.beta1;
+      a = Greeks1.theta1;
+      if (a.swigValue() != 3)
+        throw new RuntimeException("Greeks1");
+    }
+    {
+      Greeks2 a = Greeks2.alpha2;
+      a = Greeks2.beta2;
+      a = Greeks2.theta2;
+      if (a.swigValue() != 4)
+        throw new RuntimeException("Greeks2");
+    }
+    {
+      Greeks3 a = Greeks3.alpha3;
+      a = Greeks3.beta3;
+      a = Greeks3.theta3;
+      if (a.swigValue() != 2)
+        throw new RuntimeException("Greeks3");
+    }
+    {
+      Greeks4 a = Greeks4.alpha4;
+      a = Greeks4.beta4;
+      a = Greeks4.theta4;
+      if (a.swigValue() != 6)
+        throw new RuntimeException("Greeks4");
+    }
+    {
+      Greeks5 a = Greeks5.alpha5;
+      a = Greeks5.beta5;
+      if (a.swigValue() != 1)
+        throw new RuntimeException("Greeks5");
+    }
+    {
+      Greeks6 a = Greeks6.alpha6;
+      a = Greeks6.beta6;
+      if (a.swigValue() != 1)
+        throw new RuntimeException("Greeks6");
+    }
+    {
+      Greeks7 a = Greeks7.alpha7;
+      a = Greeks7.beta7;
+      if (a.swigValue() != 1)
+        throw new RuntimeException("Greeks7");
+    }
+    {
+      Greeks8 a = Greeks8.theta8;
+      if (a.swigValue() != 0)
+        throw new RuntimeException("Greeks8");
+    }
+    {
+      Greeks9 a = Greeks9.theta9;
+      if (a.swigValue() != 0)
+        throw new RuntimeException("Greeks9");
+    }
+    {
+      Greeks10 a = Greeks10.theta10;
+      if (a.swigValue() != 0)
+        throw new RuntimeException("Greeks10");
+    }
+    {
+      Greeks11 a = Greeks11.theta11;
+      if (a.swigValue() != 0)
+        throw new RuntimeException("Greeks11");
+    }
+    {
+      Greeks12 a = Greeks12.theta12;
+      if (a.swigValue() != 0)
+        throw new RuntimeException("Greeks12");
+    }
+    {
+      Greeks13 a = null;
+    }
+  }
+}
+

Examples/test-suite/java/extend_special_variables_runme.java

@@ -0,0 +1,25 @@
+
+import extend_special_variables.*;
+
+public class extend_special_variables_runme {
+
+  static {
+    try {
+        System.loadLibrary("extend_special_variables");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) 
+  {
+    ForExtensionNewName f = new ForExtensionNewName();
+    verify(f.extended_renamed(), "name:extended symname:extended_renamed wrapname: overname:__SWIG_0 decl:ForExtension::extended() fulldecl:char const * ForExtension::extended() parentclasssymname:ForExtensionNewName parentclassname:ForExtension");
+    verify(f.extended_renamed(10), "name:extended symname:extended_renamed wrapname: overname:__SWIG_1 decl:ForExtension::extended(int) fulldecl:char const * ForExtension::extended(int) parentclasssymname:ForExtensionNewName parentclassname:ForExtension");
+  }
+  static void verify(String received, String expected) {
+    if (!received.equals(expected))
+      throw new RuntimeException("Incorrect, received: " + received);
+  }
+}

Examples/test-suite/java/java_director_assumeoverride_runme.java

@@ -0,0 +1,27 @@
+
+import java_director_assumeoverride.*;
+
+public class java_director_assumeoverride_runme {
+
+  static {
+    try {
+      System.loadLibrary("java_director_assumeoverride");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  static class MyOverrideMe extends OverrideMe {
+  }
+
+  public static void main(String argv[]) {
+    OverrideMe overrideMe = new MyOverrideMe();
+
+    // MyOverrideMe doesn't actually override func(), but because assumeoverride
+    // was set to true, the C++ side will believe it was overridden.
+    if (!java_director_assumeoverride.isFuncOverridden(overrideMe)) {
+      throw new RuntimeException ( "isFuncOverridden()" );
+    }
+  }
+}

Examples/test-suite/java/java_prepost_runme.java

@@ -16,7 +16,7 @@ public class java_prepost_runme {
   {
     // ensure checked exception is generated
     try {
-      PrePostThrows ppt = new PrePostThrows(null);
+      PrePostThrows ppt = new PrePostThrows(null, true);
     } catch (InstantiationException e) {
     }
   }

Examples/test-suite/java/namespace_forward_declaration_runme.java

@@ -0,0 +1,26 @@
+
+import namespace_forward_declaration.*;
+
+public class namespace_forward_declaration_runme {
+
+  static {
+    try {
+	System.loadLibrary("namespace_forward_declaration");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    XXX xxx = new XXX();
+    namespace_forward_declaration.testXXX1(xxx);
+    namespace_forward_declaration.testXXX2(xxx);
+    namespace_forward_declaration.testXXX3(xxx);
+    YYY yyy = new YYY();
+    namespace_forward_declaration.testYYY1(yyy);
+    namespace_forward_declaration.testYYY2(yyy);
+    namespace_forward_declaration.testYYY3(yyy);
+  }
+}
+

Examples/test-suite/java/special_variable_macros_runme.java

@@ -22,6 +22,8 @@ public class special_variable_macros_runme {
       throw new RuntimeException("test failed");
     if (!special_variable_macros.testMary(name).equals("SWIGTYPE_p_NameWrap"))
       throw new RuntimeException("test failed");
+    if (!special_variable_macros.testJames(name).equals("SWIGTYPE_Name"))
+      throw new RuntimeException("test failed");
     if (!special_variable_macros.testJim(name).equals("multiname num"))
       throw new RuntimeException("test failed");
     NewName newName = NewName.factory("factoryname");

Examples/test-suite/java/special_variables_runme.java

@@ -15,13 +15,13 @@ public class special_variables_runme {
   public static void main(String argv[]) 
   {
     verify(special_variables.ExceptionVars(1.0, 2.0),
-           "result = Space::exceptionvars(arg1,arg2);  Space::exceptionvars  ExceptionVars   Java_special_1variables_special_1variablesJNI_ExceptionVars");
+           "result = Space::exceptionvars(arg1,arg2);  Space::exceptionvars  ExceptionVars   Java_special_1variables_special_1variablesJNI_ExceptionVars  ");
 
     verify(special_variables.overloadedmethod(),
-           "result = Space::overloadedmethod();  Space::overloadedmethod  overloadedmethod  __SWIG_1 Java_special_1variables_special_1variablesJNI_overloadedmethod_1_1SWIG_11");
+           "result = Space::overloadedmethod();  Space::overloadedmethod  overloadedmethod  __SWIG_1 Java_special_1variables_special_1variablesJNI_overloadedmethod_1_1SWIG_11  ");
 
     verify(special_variables.overloadedmethod(10.0),
-          "result = Space::overloadedmethod(arg1);  Space::overloadedmethod  overloadedmethod  __SWIG_0 Java_special_1variables_special_1variablesJNI_overloadedmethod_1_1SWIG_10");
+          "result = Space::overloadedmethod(arg1);  Space::overloadedmethod  overloadedmethod  __SWIG_0 Java_special_1variables_special_1variablesJNI_overloadedmethod_1_1SWIG_10  ");
 
     ABC a = new ABC(0, 0.0);
     verify(special_variables.getDeclaration(), "SpaceNamespace::ABC::ABC(int,double) SpaceNamespace::ABC::ABC(int,double)");

Examples/test-suite/java/template_namespace_forward_declaration_runme.java

@@ -0,0 +1,26 @@
+
+import template_namespace_forward_declaration.*;
+
+public class template_namespace_forward_declaration_runme {
+
+  static {
+    try {
+	System.loadLibrary("template_namespace_forward_declaration");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    XXXInt xxx = new XXXInt();
+    template_namespace_forward_declaration.testXXX1(xxx);
+    template_namespace_forward_declaration.testXXX2(xxx);
+    template_namespace_forward_declaration.testXXX3(xxx);
+    YYYInt yyy = new YYYInt();
+    template_namespace_forward_declaration.testYYY1(yyy);
+    template_namespace_forward_declaration.testYYY2(yyy);
+    template_namespace_forward_declaration.testYYY3(yyy);
+  }
+}
+

Examples/test-suite/java/template_using_directive_and_declaration_forward_runme.java

@@ -0,0 +1,53 @@
+
+import template_using_directive_and_declaration_forward.*;
+
+public class template_using_directive_and_declaration_forward_runme {
+
+  static {
+    try {
+        System.loadLibrary("template_using_directive_and_declaration_forward");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) 
+  {
+    template_using_directive_and_declaration_forward.useit1(new Thing1Int());
+    template_using_directive_and_declaration_forward.useit1a(new Thing1Int());
+    template_using_directive_and_declaration_forward.useit1b(new Thing1Int());
+    template_using_directive_and_declaration_forward.useit1c(new Thing1Int());
+
+//BROKEN    template_using_directive_and_declaration_forward.useit2(new Thing2Int());
+    template_using_directive_and_declaration_forward.useit2a(new Thing2Int());
+    template_using_directive_and_declaration_forward.useit2b(new Thing2Int());
+    template_using_directive_and_declaration_forward.useit2c(new Thing2Int());
+    template_using_directive_and_declaration_forward.useit2d(new Thing2Int());
+
+//BROKEN    template_using_directive_and_declaration_forward.useit3(new Thing3Int());
+    template_using_directive_and_declaration_forward.useit3a(new Thing3Int());
+    template_using_directive_and_declaration_forward.useit3b(new Thing3Int());
+    template_using_directive_and_declaration_forward.useit3c(new Thing3Int());
+    template_using_directive_and_declaration_forward.useit3d(new Thing3Int());
+
+//BROKEN    template_using_directive_and_declaration_forward.useit4(new Thing4Int());
+    template_using_directive_and_declaration_forward.useit4a(new Thing4Int());
+    template_using_directive_and_declaration_forward.useit4b(new Thing4Int());
+    template_using_directive_and_declaration_forward.useit4c(new Thing4Int());
+    template_using_directive_and_declaration_forward.useit4d(new Thing4Int());
+
+//BROKEN    template_using_directive_and_declaration_forward.useit5(new Thing5Int());
+    template_using_directive_and_declaration_forward.useit5a(new Thing5Int());
+    template_using_directive_and_declaration_forward.useit5b(new Thing5Int());
+    template_using_directive_and_declaration_forward.useit5c(new Thing5Int());
+    template_using_directive_and_declaration_forward.useit5d(new Thing5Int());
+
+
+//BROKEN    template_using_directive_and_declaration_forward.useit7(new Thing7Int());
+    template_using_directive_and_declaration_forward.useit7a(new Thing7Int());
+    template_using_directive_and_declaration_forward.useit7b(new Thing7Int());
+    template_using_directive_and_declaration_forward.useit7c(new Thing7Int());
+    template_using_directive_and_declaration_forward.useit7d(new Thing7Int());
+  }
+}

Examples/test-suite/java/using_directive_and_declaration_forward_runme.java

@@ -0,0 +1,53 @@
+
+import using_directive_and_declaration_forward.*;
+
+public class using_directive_and_declaration_forward_runme {
+
+  static {
+    try {
+        System.loadLibrary("using_directive_and_declaration_forward");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) 
+  {
+    using_directive_and_declaration_forward.useit1(new Thing1());
+    using_directive_and_declaration_forward.useit1a(new Thing1());
+    using_directive_and_declaration_forward.useit1b(new Thing1());
+    using_directive_and_declaration_forward.useit1c(new Thing1());
+
+    using_directive_and_declaration_forward.useit2(new Thing2());
+    using_directive_and_declaration_forward.useit2a(new Thing2());
+    using_directive_and_declaration_forward.useit2b(new Thing2());
+    using_directive_and_declaration_forward.useit2c(new Thing2());
+    using_directive_and_declaration_forward.useit2d(new Thing2());
+
+    using_directive_and_declaration_forward.useit3(new Thing3());
+    using_directive_and_declaration_forward.useit3a(new Thing3());
+    using_directive_and_declaration_forward.useit3b(new Thing3());
+    using_directive_and_declaration_forward.useit3c(new Thing3());
+    using_directive_and_declaration_forward.useit3d(new Thing3());
+
+    using_directive_and_declaration_forward.useit4(new Thing4());
+    using_directive_and_declaration_forward.useit4a(new Thing4());
+    using_directive_and_declaration_forward.useit4b(new Thing4());
+    using_directive_and_declaration_forward.useit4c(new Thing4());
+    using_directive_and_declaration_forward.useit4d(new Thing4());
+
+    using_directive_and_declaration_forward.useit5(new Thing5());
+    using_directive_and_declaration_forward.useit5a(new Thing5());
+    using_directive_and_declaration_forward.useit5b(new Thing5());
+    using_directive_and_declaration_forward.useit5c(new Thing5());
+    using_directive_and_declaration_forward.useit5d(new Thing5());
+
+
+    using_directive_and_declaration_forward.useit7(new Thing7());
+    using_directive_and_declaration_forward.useit7a(new Thing7());
+    using_directive_and_declaration_forward.useit7b(new Thing7());
+    using_directive_and_declaration_forward.useit7c(new Thing7());
+    using_directive_and_declaration_forward.useit7d(new Thing7());
+  }
+}

Examples/test-suite/java/using_directive_and_declaration_runme.java

@@ -0,0 +1,29 @@
+
+import using_directive_and_declaration.*;
+
+public class using_directive_and_declaration_runme {
+
+  static {
+    try {
+        System.loadLibrary("using_directive_and_declaration");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) 
+  {
+    using_directive_and_declaration.useit1(new Thing1());
+    using_directive_and_declaration.useit2(new Thing2());
+    using_directive_and_declaration.useit3(new Thing3());
+    using_directive_and_declaration.useit4(new Thing4());
+    using_directive_and_declaration.useit5(new Thing5());
+    Thing6a t6a = new Thing6a();
+    t6a.a();
+    Thing6 t6b = new Thing6();
+    t6b.b();
+    using_directive_and_declaration.useit6(t6a, t6b);
+    using_directive_and_declaration.useit7(new Thing7());
+  }
+}