Improved C++ nested class support - nested typedef'd classes now parsed and treated as forward class declaration

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11756 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2009-11-23 23:02:01 +00:00 · 2009-11-23 23:02:01 +00:00 · 2a59a2e6a9
commit 2a59a2e6a9
parent 43b6292681
6 changed files with 324 additions and 99 deletions
--- a/Examples/test-suite/java/nested_class_runme.java
+++ b/Examples/test-suite/java/nested_class_runme.java
@ -0,0 +1,72 @@
+
+import nested_class.*;
+
+public class nested_class_runme {
+
+  static {
+    try {
+	System.loadLibrary("nested_class");
+    } 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[]) {
+    Outer outer = new Outer();
+    SWIGTYPE_p_Outer__InnerStruct1 is1 = outer.makeInnerStruct1();
+    SWIGTYPE_p_Outer__InnerClass1 ic1 = outer.makeInnerClass1();
+    SWIGTYPE_p_Outer__InnerUnion1 iu1 = outer.makeInnerUnion1();
+
+    SWIGTYPE_p_Outer__InnerStruct2 is2 = outer.makeInnerStruct2();
+    SWIGTYPE_p_Outer__InnerClass2 ic2 = outer.makeInnerClass2();
+    SWIGTYPE_p_Outer__InnerUnion2 iu2 = outer.makeInnerUnion2();
+
+    SWIGTYPE_p_Outer__InnerClass4Typedef ic4 = outer.makeInnerClass4Typedef();
+    SWIGTYPE_p_Outer__InnerStruct4Typedef is4 = outer.makeInnerStruct4Typedef();
+    SWIGTYPE_p_Outer__InnerUnion4Typedef iu4 = outer.makeInnerUnion4Typedef();
+
+    SWIGTYPE_p_Outer__InnerClass5 ic5 = outer.makeInnerClass5();
+    SWIGTYPE_p_Outer__InnerStruct5 is5 = outer.makeInnerStruct5();
+    SWIGTYPE_p_Outer__InnerUnion5 iu5 = outer.makeInnerUnion5();
+
+    ic5 = outer.makeInnerClass5Typedef();
+    is5 = outer.makeInnerStruct5Typedef();
+    iu5 = outer.makeInnerUnion5Typedef();
+
+    {
+      SWIGTYPE_p_Outer__InnerMultiple im1 = outer.getMultipleInstance1();
+      SWIGTYPE_p_Outer__InnerMultiple im2 = outer.getMultipleInstance2();
+      SWIGTYPE_p_Outer__InnerMultiple im3 = outer.getMultipleInstance3();
+      SWIGTYPE_p_Outer__InnerMultiple im4 = outer.getMultipleInstance4();
+    }
+
+    {
+      SWIGTYPE_p_Outer__InnerMultipleDerived im1 = outer.getMultipleDerivedInstance1();
+      SWIGTYPE_p_Outer__InnerMultipleDerived im2 = outer.getMultipleDerivedInstance2();
+      SWIGTYPE_p_Outer__InnerMultipleDerived im3 = outer.getMultipleDerivedInstance3();
+      SWIGTYPE_p_Outer__InnerMultipleDerived im4 = outer.getMultipleDerivedInstance4();
+    }
+
+    {
+      SWIGTYPE_p_Outer__InnerMultipleDerived im1 = outer.getMultipleDerivedInstance1();
+      SWIGTYPE_p_Outer__InnerMultipleDerived im2 = outer.getMultipleDerivedInstance2();
+      SWIGTYPE_p_Outer__InnerMultipleDerived im3 = outer.getMultipleDerivedInstance3();
+      SWIGTYPE_p_Outer__InnerMultipleDerived im4 = outer.getMultipleDerivedInstance4();
+    }
+
+    {
+      SWIGTYPE_p_Outer__InnerMultipleAnonTypedef1 mat1 = outer.makeInnerMultipleAnonTypedef1();
+      SWIGTYPE_p_Outer__InnerMultipleAnonTypedef2 mat2 = outer.makeInnerMultipleAnonTypedef2();
+      SWIGTYPE_p_Outer__InnerMultipleAnonTypedef3 mat3 = outer.makeInnerMultipleAnonTypedef3();
+
+      SWIGTYPE_p_Outer__InnerMultipleNamedTypedef mnt = outer.makeInnerMultipleNamedTypedef();
+      SWIGTYPE_p_Outer__InnerMultipleNamedTypedef mnt1 = outer.makeInnerMultipleNamedTypedef1();
+      SWIGTYPE_p_Outer__InnerMultipleNamedTypedef mnt2 = outer.makeInnerMultipleNamedTypedef2();
+      SWIGTYPE_p_p_Outer__InnerMultipleNamedTypedef mnt3 = outer.makeInnerMultipleNamedTypedef3();
+    }
+    {
+      SWIGTYPE_p_Outer__InnerSameName isn = outer.makeInnerSameName();
+    }
+  }
+}
--- a/Examples/test-suite/namespace_union.i
+++ b/Examples/test-suite/namespace_union.i
@ -1,6 +1,6 @@
 %module namespace_union

-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) SpatialIndex::Variant::val;
+#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS

 %inline %{
 namespace SpatialIndex 
--- a/Examples/test-suite/nested_class.i
+++ b/Examples/test-suite/nested_class.i
@ -7,12 +7,18 @@
 %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass2;
 %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct2;
 %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion2;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass3Name;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct3Name;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion3Name;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass4;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct4;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion4;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass4Typedef;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct4Typedef;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion4Typedef;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass5;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct5;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion5;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerMultiple;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerMultipleDerived;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerMultipleAnonTypedef1;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerMultipleNamedTypedef;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerSameName;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer2::IgnoreMe;

 %inline %{
 struct Outer {
@ -51,64 +57,150 @@ struct Outer {
  class InnerClass2 {
  public:
    Integer x;
-  } InnerClass2Name;
+  } InnerClass2Instance;

  struct InnerStruct2 {
    Integer x;
-  } InnerStruct2Name;
+  } InnerStruct2Instance;

  union InnerUnion2 {
    Integer x;
    double y;
-  } InnerUnion2Name;
+  } InnerUnion2Instance;

  ///////////////////////////////////////////
  class {
  public:
    Integer x;
-  } InnerClass3Name;
+  } InnerClass3Instance;

  struct {
    Integer x;
-  } InnerStruct3Name;
+  } InnerStruct3Instance;

  union {
    Integer x;
    double y;
-  } InnerUnion3Name;
+  } InnerUnion3Instance;

  ///////////////////////////////////////////
  typedef class {
  public:
    Integer x;
-  } InnerClass4;
+  } InnerClass4Typedef;

  typedef struct {
    Integer x;
-  } InnerStruct4;
+  } InnerStruct4Typedef;

  typedef union {
    Integer x;
    double y;
-  } InnerUnion4;
+  } InnerUnion4Typedef;
+
+  ///////////////////////////////////////////
+  typedef class InnerClass5 {
+  public:
+    Integer x;
+  } InnerClass5Typedef;
+
+  typedef struct InnerStruct5 {
+    Integer x;
+  } InnerStruct5Typedef;
+
+  typedef union InnerUnion5 {
+    Integer x;
+    double y;
+  } InnerUnion5Typedef;

  // bug #909387 - inner declared types are treated as forward declarations
-  InnerStruct1* getInnerStruct1() { return 0; }
-  InnerClass1* getInnerClass1() { return 0; }
-  InnerUnion1* getInnerUnion1() { return 0; }
+  InnerStruct1* makeInnerStruct1() { return 0; }
+  InnerClass1* makeInnerClass1() { return 0; }
+  InnerUnion1* makeInnerUnion1() { return 0; }

-  InnerStruct2* getInnerStruct2() { return 0; }
-  InnerClass2* getInnerClass2() { return 0; }
-  InnerUnion2* getInnerUnion2() { return 0; }
+  InnerStruct2* makeInnerStruct2() { return 0; }
+  InnerClass2* makeInnerClass2() { return 0; }
+  InnerUnion2* makeInnerUnion2() { return 0; }

-  InnerStruct4* getInnerStruct4() { return 0; }
-  InnerClass4* getInnerClass4() { return 0; }
-  InnerUnion4* getInnerUnion4() { return 0; }
+  InnerStruct4Typedef* makeInnerStruct4Typedef() { return 0; }
+  InnerClass4Typedef* makeInnerClass4Typedef() { return 0; }
+  InnerUnion4Typedef* makeInnerUnion4Typedef() { return 0; }
+
+  InnerStruct5* makeInnerStruct5() { return 0; }
+  InnerClass5* makeInnerClass5() { return 0; }
+  InnerUnion5* makeInnerUnion5() { return 0; }
+
+  InnerStruct5Typedef* makeInnerStruct5Typedef() { return 0; }
+  InnerClass5Typedef* makeInnerClass5Typedef() { return 0; }
+  InnerUnion5Typedef* makeInnerUnion5Typedef() { return 0; }

  ///////////////////////////////////////////
  struct InnerMultiple {
    Integer x;
-  } MultipleInstance1, MultipleInstance2;
+  } MultipleInstance1, MultipleInstance2, *MultipleInstance3, MultipleInstance4[2];
+
+  struct InnerMultipleDerived : public InnerMultiple {
+    Integer xx;
+  } MultipleDerivedInstance1, MultipleDerivedInstance2, *MultipleDerivedInstance3, MultipleDerivedInstance4[2];
+
+  struct {
+    Integer x;
+  } MultipleInstanceAnon1, MultipleInstanceAnon2, *MultipleInstanceAnon3, MultipleInstanceAnon4[2];
+
+  struct : public InnerMultiple {
+    Integer xx;
+  } MultipleInstanceAnonDerived1, MultipleInstanceAnonDerived2, *MultipleInstanceAnonDerived3, MultipleInstanceAnonDerived4[2];
+
+  struct : public InnerMultiple {
+    Integer xx;
+  };
+
+  class : public InnerMultiple {
+  public:
+    Integer yy;
+  };
+
+  ///////////////////////////////////////////
+  typedef struct {
+    Integer x;
+  } InnerMultipleAnonTypedef1, InnerMultipleAnonTypedef2, *InnerMultipleAnonTypedef3;
+
+  InnerMultipleAnonTypedef1* makeInnerMultipleAnonTypedef1() { return 0; }
+  InnerMultipleAnonTypedef2* makeInnerMultipleAnonTypedef2() { return 0; }
+  InnerMultipleAnonTypedef3* makeInnerMultipleAnonTypedef3() { return 0; }
+
+  typedef struct InnerMultipleNamedTypedef {
+    Integer x;
+  } InnerMultipleNamedTypedef1, InnerMultipleNamedTypedef2, *InnerMultipleNamedTypedef3;
+
+  InnerMultipleNamedTypedef* makeInnerMultipleNamedTypedef() { return 0; }
+  InnerMultipleNamedTypedef1* makeInnerMultipleNamedTypedef1() { return 0; }
+  InnerMultipleNamedTypedef2* makeInnerMultipleNamedTypedef2() { return 0; }
+  InnerMultipleNamedTypedef3* makeInnerMultipleNamedTypedef3() { return 0; }
+
+  ///////////////////////////////////////////
+  typedef struct InnerSameName {
+    Integer x;
+  } InnerSameName;
+
+  InnerSameName* makeInnerSameName() { return 0; }
+};
+%}
+
+// Ignore nested struct instance
+%ignore Outer2::IgnoreMeInstance;
+%{
+struct Outer2 {
+  struct IgnoreMe {
+    int xx;
+  };
+};
+%}
+
+struct Outer2 {
+  struct IgnoreMe {
+    int xx;
+  } IgnoreMeInstance;
 };

-%}
+
--- a/Examples/test-suite/nested_comment.i
+++ b/Examples/test-suite/nested_comment.i
@ -1,26 +1,25 @@
 %module nested_comment

-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) s1::n;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) a::d;
+#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS

 // this example shows a problem with 'dump_nested' (parser.y).

 // bug #949654
 %inline %{
-typedef struct s1 {
-union {
-int fsc; /* genie structure hiding - Conductor
-*/
-int fso; /* genie structure hiding - FSOptions
-*/
-struct {
-double *vals;
-int size;
-} vector_val; /* matrix values are mainly used
-in rlgc models */
-char *name;
-} n ;
-} s2; 
+  typedef struct s1 {
+    union {
+      int fsc; /* genie structure hiding - Conductor
+                */
+      int fso; /* genie structure hiding - FSOptions
+                */
+      struct {
+        double *vals;
+        int size;
+      } vector_val; /* matrix values are mainly used
+                       in rlgc models */
+      char *name;
+    } n ;
+  } s2; 
 %}

 // comment in nested struct