Fix using declarations combined with using directives with forward class

references.

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

Examples/test-suite/common.mk

@@ -257,6 +257,7 @@ CPP_TEST_CASES += \
 	namespace_class \
 	namespace_enum \
 	namespace_extend \
+	namespace_forward_declaration \
 	namespace_nested \
 	namespace_spaces \
 	namespace_template \
@@ -443,6 +444,7 @@ CPP_TEST_CASES += \
 	using2 \
 	using_composition \
 	using_directive_and_declaration \
+	using_directive_and_declaration_forward \
 	using_extend \
 	using_inherit \
 	using_namespace \

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

@@ -24,5 +24,6 @@ public class using_directive_and_declaration_runme {
     Thing6 t6b = new Thing6();
     t6b.b();
     using_directive_and_declaration.useit6(t6a, t6b);
+    using_directive_and_declaration.useit7(new Thing7());
   }
 }

Examples/test-suite/namespace_forward_declaration.i

@@ -0,0 +1,35 @@
+%module namespace_forward_declaration
+
+%inline %{
+  namespace Space1 {
+    namespace Space2 {
+      struct XXX;
+      struct YYY;
+    }
+
+    struct Space2::YYY {
+      int yyy(int h) {
+	return h;
+      }    
+    };
+    struct Space1::Space2::XXX {
+      int xxx(int h) {
+	return h;
+      }    
+    };
+
+    void testXXX1(Space1::Space2::XXX xx) {
+    }
+    void testXXX2(Space2::XXX xx) {
+    }
+    void testXXX3(::Space1::Space2::XXX xx) {
+    }
+    void testYYY1(Space1::Space2::YYY yy) {
+    }
+    void testYYY2(Space2::YYY yy) {
+    }
+    void testYYY3(::Space1::Space2::YYY yy) {
+    }
+  }
+%}
+

Examples/test-suite/using_directive_and_declaration.i

@@ -81,5 +81,26 @@ namespace Outer6 {
 }
 using namespace Outer6::Space6b;
 void useit6(Outer6::Space6a::Thing6 ta, Thing6 tb) {}
+
+namespace Outer7 {
+  namespace Space7 {
+    namespace Middle7 {
+      class Thing7;
+    }
+  }
+}
+using namespace Outer7::Space7;
+class Middle7::Thing7 {};
+using Middle7::Thing7;
+void useit7(Thing7 t) {}
+void useit7a(Outer7::Space7::Middle7::Thing7 t) {}
+void useit7b(::Outer7::Space7::Middle7::Thing7 t) {}
+void useit7c(Middle7::Thing7 t) {}
+namespace Outer7 {
+  namespace Space7 {
+    void useit7d(Middle7::Thing7 t) {}
+  }
+}
+
 %}
 

Examples/test-suite/using_directive_and_declaration_forward.i

@@ -0,0 +1,124 @@
+%module using_directive_and_declaration_forward
+// Test using directives combined with using declarations and forward declarations
+
+%inline %{
+namespace Outer1 {
+  namespace Space1 {
+    class Thing1;
+  }
+}
+using namespace Outer1::Space1;
+using Outer1::Space1::Thing1;
+class Thing1 {};
+void useit1(Thing1 t) {}
+void useit1a(Outer1::Space1::Thing1 t) {}
+void useit1b(::Outer1::Space1::Thing1 t) {}
+namespace Outer1 {
+  void useit1c(Space1::Thing1 t) {}
+}
+
+
+namespace Outer2 {
+  namespace Space2 {
+    class Thing2;
+  }
+}
+using namespace Outer2;
+using Space2::Thing2;
+class Thing2 {};
+void useit2(Thing2 t) {}
+void useit2a(Outer2::Space2::Thing2 t) {}
+void useit2b(::Outer2::Space2::Thing2 t) {}
+void useit2c(Space2::Thing2 t) {}
+namespace Outer2 {
+  void useit2d(Space2::Thing2 t) {}
+}
+
+
+namespace Outer3 {
+  namespace Space3 {
+    namespace Middle3 {
+      class Thing3;
+    }
+  }
+}
+using namespace Outer3;
+using namespace Space3;
+using Middle3::Thing3;
+class Thing3 {};
+void useit3(Thing3 t) {}
+void useit3a(Outer3::Space3::Middle3::Thing3 t) {}
+void useit3b(::Outer3::Space3::Middle3::Thing3 t) {}
+void useit3c(Middle3::Thing3 t) {}
+namespace Outer3 {
+  namespace Space3 {
+    void useit3d(Middle3::Thing3 t) {}
+  }
+}
+
+
+namespace Outer4 {
+  namespace Space4 {
+    namespace Middle4 {
+      class Thing4;
+    }
+  }
+}
+using namespace Outer4::Space4;
+using Middle4::Thing4;
+class Thing4 {};
+void useit4(Thing4 t) {}
+void useit4a(Outer4::Space4::Middle4::Thing4 t) {}
+void useit4b(::Outer4::Space4::Middle4::Thing4 t) {}
+void useit4c(Middle4::Thing4 t) {}
+namespace Outer4 {
+  namespace Space4 {
+    void useit4d(Middle4::Thing4 t) {}
+  }
+}
+
+
+namespace Outer5 {
+  namespace Space5 {
+    namespace Middle5 {
+      namespace More5 {
+        class Thing5;
+      }
+    }
+  }
+}
+using namespace ::Outer5::Space5;
+using namespace Middle5;
+using More5::Thing5;
+class Thing5 {};
+void useit5(Thing5 t) {}
+void useit5a(Outer5::Space5::Middle5::More5::Thing5 t) {}
+void useit5b(::Outer5::Space5::Middle5::More5::Thing5 t) {}
+void useit5c(Middle5::More5::Thing5 t) {}
+namespace Outer5 {
+  namespace Space5 {
+    void useit5d(Middle5::More5::Thing5 t) {}
+  }
+}
+
+namespace Outer7 {
+  namespace Space7 {
+    namespace Middle7 {
+      class Thing7;
+    }
+  }
+}
+using namespace Outer7::Space7;
+class Middle7::Thing7 {};
+using Middle7::Thing7;
+void useit7(Thing7 t) {}
+void useit7a(Outer7::Space7::Middle7::Thing7 t) {}
+void useit7b(::Outer7::Space7::Middle7::Thing7 t) {}
+void useit7c(Middle7::Thing7 t) {}
+namespace Outer7 {
+  namespace Space7 {
+    void useit7d(Middle7::Thing7 t) {}
+  }
+}
+
+%}