Nested classes support

Closes #89
Squash merge branch 'master' of https://github.com/wkalinin/swig into wkalinin-nested

By Vladimir Kalinin
* 'master' of https://github.com/wkalinin/swig:
  CPlusPlusOut mode for Octave
  nested class illustration
  fixed "Abstract" flag for nested classes added an example enabled anonymous nested structs runtime test
  porting
  warnings disabled
  porting fixes
  java runtime tests ported
  nested class closing bracket offset fixed
  removed double nested template (not supported by %template parsing)
  template_nested test extended
  parent field made public
  property access fixed
  replaced tabs with spaces
  warning W-reorder
  deprecated warnings removed, derived_nested runtime test added
  optimized string indenting
  Nested classes indenting
  nested classes docs
  fixed the order in which flattened inner classes are added after the outer
  Private nested classes were getting into the type table.
  Java getProxyName() fix for nested classes fixes the case when nested classes is forward declared
  Fix for a case when a nested class inherits from the same base as the outer. (Base class constructor declaration is found first in this case)
  merge fix
  nested C struct first immediate declaration incorrectly renamed sample fixed
  tests updated to reflect nested classes support
  Java nested classes support (1)
  flattening should remove the link to the outer class
  access mode correctly set/restored for nested classes
  nested templates should be skipped while flattening (template nodes themselves, not expanded versions) also non-public nested classes should be ignored
  If nested classes are not supported, default behaviour is flattening, not ignoring flag "nested" is preserved, so, the nested classes can be ignored by user
  nested workaround test updated
  template instantiated within a class is marked as nested for ignoring purposes
  %ignore not applied to the nested classed, because "nested" flag is set too late
  typedef name takes precedence over the real name (reason?)
  unnamed structs should be processed for all the languages
  nested C struct instances are wrapped as "immutable"
  tree building
  typedef declaration for unnamed C structures fixed
  nested classes "flattening"
  fixed %ignoring nested classes
  renamed "nested" attribute to "nested:outer" added "nested" flag, to be used with $ignore (it is not removed while flattening) added nestedClassesSupported() function to the Language interface
  renamed "nested" attribute to "nested:outer" added "nested" flag, to be used with $ignore (it is not removed while flattening) added nestedClassesSupported() function to the Language interface
  tree iteration fix
  dirclassname variable names unified memory issue fixed
  merge error
  ignore unnamed structs for C++
  unnamed nested C structs naming & unnesting
  class added to classes hash under typedef name
  private nested classes skipped
  test updated due to nested templates support
  anonymous structs with inheritance fixed nested_class test to allow anonymous structs w/o declarator
  tests updated: nested workaround removed from namespace_class.i propagated nested template declaration to the C++ file
  injected members scope
  nested tempplates fixes, nested structures in "C" mode parsing added utility function "appendSibling" (like "appendChild")
  nested unnamed structures parsing fixes, access mode restored on nested class end, tdname is properly patched with outer class name prefix
  memory management fixes
  nested templates (1)
  Nested unnamed structs
  Nested class support (1)
  Nested class support (1)

Doc/Manual/SWIGPlus.html

@@ -185,7 +185,6 @@ The following C++ features are not currently supported:</p>
 
 <ul>
 <li>Overloaded versions of certain operators (new, delete, etc.)
-<li>Nested classes, see <a href="#SWIGPlus_nested_classes">Nested classes</a> for workarounds.
 </ul>
 
 <p>
@@ -4965,143 +4964,40 @@ public:
 
 <H2><a name="SWIGPlus_nested_classes"></a>6.27 Nested classes</H2>
 
-
 <p>
-There is some support for nested structs and unions when wrapping C code, 
+If the target language supports the nested classes concept (like Java), the nested C++ classes
-see <a href="SWIG.html#SWIG_nested_structs">Nested structures</a> for further details.
+are wrapped as nested target language proxy classes. (In case of Java - "static" nested classes.)
-The added complexity of C++ compared to C means this approach does not work well for
+Only public nested classes are wrapped. Otherwise there is little difference between nested and
-C++ code (when using the -c++ command line option).
+normal classes.
-For C++, a nested class is treated much like an opaque pointer, so anything useful within the nested class, such as its
-methods and variables, are not accessible from the target language.
-True nested class support may be added to SWIG in the future, however, 
-until then some of the following workarounds can be applied to improve the situation.
 </p>
-
 <p>
-It might be possible to use partial class information as often you can accept that the nested class is not needed,
+If the target language doesn't support nested classes directly, or the support is not implemented in the
-especially if it is not actually used in any methods you need from the target language.
+language module (like for python currently), then the visible nested classes are moved to the same name
-Imagine you are wrapping the following <tt>Outer</tt> class which contains a nested class <tt>Inner</tt>.
+space as the containing class (nesting hierarchy is "flattened"). The same behaviour may be turned on for
-The easiest thing to do is turn a blind eye to the warning that SWIG generates, or simply suppress it:
+C# and Java by the %feature ("flatnested"); If there is a class with the same name in the outer namespace
+the inner class (or the global one) may be renamed or ignored:
 </p>
 
 <div class="code">
 <pre>
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::Inner;
+%rename (Bar_Foo) Bar::Foo;
-
+class Foo {};
-class Outer {
+class Bar {
-public:
-  class Inner {
-    public:
-      ...
-  };
-  Inner getInner();
-  void useInner(const Inner&amp; inner);
-  ...
-};
-</pre>
-</div>
-
-<p>
-Note that if <tt>Inner</tt> can be used as an opaque type, the default wrapping approach suffices.
-For example, if the nested class does not need to be created from the target language, but can be obtained via a method
-call, such as the <tt>getInner()</tt> method above, the returned value can then be passed around, such as passed into the
-<tt>useInner()</tt> method.
-</p>
-
-<p>
-With some more effort the above situation can be improved somewhat and a nested class can be constructed and used
-from the target language much like any other non-nested class. Assuming we have the <tt>Outer</tt> class in a header file:
-</p>
-
-<div class="code">
-<pre>
-// File outer.h
-class Outer {
-public:
-  class Inner {
-    public:
-      int var;
-      Inner(int v = 0) : var(v) {}
-  };
-  Inner getInner();
-  void useInner(const Inner&amp; inner);
-};
-</pre>
-</div>
-
-<p>
-The following interface file works around the nested class limitations by redefining the nested class as a global class.
-A typedef for the compiler and the <tt>nestedworkaround</tt> 
-<a href="Customization.html#Customization_feature_flags">feature flag</a> is also required in 
-order for the generated wrappers to compile. This flag simply removes all the type information from SWIG, so SWIG treats
-the nested class as if it had not been parsed at all.
-</p>
-
-<div class="code">
-<pre>
-// File : example.i
-%module example
-
-// Redefine nested class in global scope in order for SWIG to generate
-// a proxy class. Only SWIG parses this definition.
-class Inner {
   public:
-    int var;
+  class Foo {};
-    Inner(int v = 0) : var(v) {}
-};
-
-%nestedworkaround Outer::Inner;
-
-%{
-#include "outer.h"
-%}
-%include "outer.h"
-
-// We've fooled SWIG into thinking that Inner is a global class, so now we need
-// to trick the C++ compiler into understanding this apparent global type.
-%{
-typedef Outer::Inner Inner;
-%}
-</pre>
-</div>
-
-<p>
-The downside to this approach is a more complex interface file and having to maintain two definitions of <tt>Inner</tt>, 
-the real one and the one in the interface file that SWIG parses.
-However, the upside is that all the methods/variables in the nested class are available from the target language
-as a proxy class is generated instead of treating the nested class as an opaque type.
-The proxy class can be constructed from the target language and passed into any methods accepting the nested class.
-Also note that the original header file is parsed unmodified.
-</p>
-
-<p>
-Finally, conditional compilation can be used as a workaround to comment out nested class definitions in the actual headers,
-assuming you are able to modify them.
-</p>
-
-<div class="code">
-<pre>
-// File outer.h
-class Outer {
-public:
-#ifndef SWIG
-  class Inner {
-    public:
-      ...
-  };
-#endif
-  ...
 };
 </pre>
 </div>
 
-<p>
-This workaround used to be common when SWIG could not deal with nested classes particulary well.
-This should just be a last resort for unusual corner cases now as SWIG can parse nested classes and even handle nested template classes fairly well.
-</p>
 
 <p>
-<b>Compatibility Note:</b> SWIG-1.3.40 and earlier versions did not have the <tt>nestedworkaround</tt> feature
+<b>Compatibility Note:</b>
+In SWIG 2.0 and earlier, nested classes were treated as opaque pointers.
+Also there was a workaround, implementing approximately the same behaviour as the
+%feature ("flatnested") with an additional help from the user:
+nested class had to be manually redeclared in the global scope, typedef name and %feature nestedworkaround
+added for the inner class.
+SWIG-1.3.40 and earlier versions did not have the <tt>nestedworkaround</tt> feature
 and the generated code resulting from parsing nested classes did not always compile.
 Nested class warnings could also not be suppressed using %warnfilter.
 </p>

Examples/csharp/class/example.cxx

@@ -9,7 +9,7 @@ void Shape::move(double dx, double dy) {
   y += dy;
 }
 
-int Shape::nshapes = 0;
+int Shape::Counter::nshapes = 0;
 
 double Circle::area(void) {
   return M_PI*radius*radius;

Examples/csharp/class/example.h

@@ -2,17 +2,19 @@
 
 class Shape {
 public:
+  struct Counter{
+		static int nshapes;
+  };
   Shape() {
-    nshapes++;
+    Counter::nshapes++;
   }
   virtual ~Shape() {
-    nshapes--;
+    Counter::nshapes--;
   };
   double  x, y;   
   void    move(double dx, double dy);
   virtual double area(void) = 0;
   virtual double perimeter(void) = 0;
-  static  int nshapes;
 };
 
 class Circle : public Shape {

Examples/csharp/class/runme.cs

@@ -17,9 +17,9 @@ public class runme
             Console.WriteLine( "    Created circle " + c );
             Console.WriteLine( "    Created square " + s );
 
-            // ----- Access a static member -----
+            // ----- Access a static member of a nested class -----
 
-            Console.WriteLine( "\nA total of " + Shape.nshapes + " shapes were created" );
+            Console.WriteLine( "\nA total of " + Shape.Counter.nshapes + " shapes were created" );
 
             // ----- Member data access -----
 
@@ -60,7 +60,7 @@ public class runme
         // Note: when this using scope is exited the C# Dispose() methods 
         // are called which in turn call the C++ destructors
 
-        Console.WriteLine( Shape.nshapes + " shapes remain" );
+        Console.WriteLine( Shape.Counter.nshapes + " shapes remain" );
         Console.WriteLine( "Goodbye" );
     }
 }

Examples/java/class/example.cxx

@@ -9,7 +9,7 @@ void Shape::move(double dx, double dy) {
   y += dy;
 }
 
-int Shape::nshapes = 0;
+int Shape::Counter::nshapes = 0;
 
 double Circle::area(void) {
   return M_PI*radius*radius;

Examples/java/class/example.h

@@ -2,17 +2,19 @@
 
 class Shape {
 public:
+  struct Counter{
+		static int nshapes;
+  };
   Shape() {
-    nshapes++;
+    Counter::nshapes++;
   }
   virtual ~Shape() {
-    nshapes--;
+    Counter::nshapes--;
   };
   double  x, y;   
   void    move(double dx, double dy);
   virtual double area(void) = 0;
   virtual double perimeter(void) = 0;
-  static  int nshapes;
 };
 
 class Circle : public Shape {

Examples/java/class/runme.java

@@ -21,9 +21,9 @@ public class runme {
     Square s = new Square(10);
     System.out.println( "    Created square " + s );
     
-    // ----- Access a static member -----
+    // ----- Access a static member of a nested class -----
     
-    System.out.println( "\nA total of " + Shape.getNshapes() + " shapes were created" );
+    System.out.println( "\nA total of " + Shape.Counter.getNshapes() + " shapes were created" );
     
     // ----- Member data access -----
     
@@ -64,7 +64,7 @@ public class runme {
     c.delete();
     s.delete();
     
-    System.out.println( Shape.getNshapes() + " shapes remain" );
+    System.out.println( Shape.Counter.getNshapes() + " shapes remain" );
     System.out.println( "Goodbye" );
   }
 }

Examples/test-suite/derived_nested.i

@@ -3,14 +3,12 @@ This was reported in bug #909389 */
 
 %module derived_nested
 
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) BB::CC;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) BB::DD;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) BB::EE;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) BB::FF;
-
 %inline %{
 
-class A { int x; };
+class A {
+public:
+  int x;
+};
 class B {
   class C { int y; }; //generates a warning
   class D : public A { int z; }; //ok

Examples/test-suite/java/nested_class_runme.java

@@ -14,59 +14,59 @@ public class nested_class_runme {
 
   public static void main(String argv[]) {
     Outer outer = new Outer();
-    SWIGTYPE_p_Outer__InnerStruct1 is1 = outer.makeInnerStruct1();
+    Outer.InnerStruct1 is1 = outer.makeInnerStruct1();
-    SWIGTYPE_p_Outer__InnerClass1 ic1 = outer.makeInnerClass1();
+    Outer.InnerClass1 ic1 = outer.makeInnerClass1();
-    SWIGTYPE_p_Outer__InnerUnion1 iu1 = outer.makeInnerUnion1();
+    Outer.InnerUnion1 iu1 = outer.makeInnerUnion1();
 
-    SWIGTYPE_p_Outer__InnerStruct2 is2 = outer.makeInnerStruct2();
+    Outer.InnerStruct2 is2 = outer.makeInnerStruct2();
-    SWIGTYPE_p_Outer__InnerClass2 ic2 = outer.makeInnerClass2();
+    Outer.InnerClass2 ic2 = outer.makeInnerClass2();
-    SWIGTYPE_p_Outer__InnerUnion2 iu2 = outer.makeInnerUnion2();
+    Outer.InnerUnion2 iu2 = outer.makeInnerUnion2();
 
-    SWIGTYPE_p_Outer__InnerClass4Typedef ic4 = outer.makeInnerClass4Typedef();
+    Outer.InnerClass4Typedef ic4 = outer.makeInnerClass4Typedef();
-    SWIGTYPE_p_Outer__InnerStruct4Typedef is4 = outer.makeInnerStruct4Typedef();
+    Outer.InnerStruct4Typedef is4 = outer.makeInnerStruct4Typedef();
-    SWIGTYPE_p_Outer__InnerUnion4Typedef iu4 = outer.makeInnerUnion4Typedef();
+    Outer.InnerUnion4Typedef iu4 = outer.makeInnerUnion4Typedef();
 
-    SWIGTYPE_p_Outer__InnerClass5 ic5 = outer.makeInnerClass5();
+    Outer.InnerClass5Typedef ic5 = outer.makeInnerClass5();
-    SWIGTYPE_p_Outer__InnerStruct5 is5 = outer.makeInnerStruct5();
+    Outer.InnerStruct5Typedef is5 = outer.makeInnerStruct5();
-    SWIGTYPE_p_Outer__InnerUnion5 iu5 = outer.makeInnerUnion5();
+    Outer.InnerUnion5Typedef iu5 = outer.makeInnerUnion5();
 
     ic5 = outer.makeInnerClass5Typedef();
     is5 = outer.makeInnerStruct5Typedef();
     iu5 = outer.makeInnerUnion5Typedef();
 
     {
-      SWIGTYPE_p_Outer__InnerMultiple im1 = outer.getMultipleInstance1();
+      Outer.InnerMultiple im1 = outer.getMultipleInstance1();
-      SWIGTYPE_p_Outer__InnerMultiple im2 = outer.getMultipleInstance2();
+      Outer.InnerMultiple im2 = outer.getMultipleInstance2();
-      SWIGTYPE_p_Outer__InnerMultiple im3 = outer.getMultipleInstance3();
+      Outer.InnerMultiple im3 = outer.getMultipleInstance3();
-      SWIGTYPE_p_Outer__InnerMultiple im4 = outer.getMultipleInstance4();
+      Outer.InnerMultiple im4 = outer.getMultipleInstance4();
     }
 
     {
-      SWIGTYPE_p_Outer__InnerMultipleDerived im1 = outer.getMultipleDerivedInstance1();
+      Outer.InnerMultipleDerived im1 = outer.getMultipleDerivedInstance1();
-      SWIGTYPE_p_Outer__InnerMultipleDerived im2 = outer.getMultipleDerivedInstance2();
+      Outer.InnerMultipleDerived im2 = outer.getMultipleDerivedInstance2();
-      SWIGTYPE_p_Outer__InnerMultipleDerived im3 = outer.getMultipleDerivedInstance3();
+      Outer.InnerMultipleDerived im3 = outer.getMultipleDerivedInstance3();
-      SWIGTYPE_p_Outer__InnerMultipleDerived im4 = outer.getMultipleDerivedInstance4();
+      Outer.InnerMultipleDerived im4 = outer.getMultipleDerivedInstance4();
     }
 
     {
-      SWIGTYPE_p_Outer__InnerMultipleDerived im1 = outer.getMultipleDerivedInstance1();
+      Outer.InnerMultipleDerived im1 = outer.getMultipleDerivedInstance1();
-      SWIGTYPE_p_Outer__InnerMultipleDerived im2 = outer.getMultipleDerivedInstance2();
+      Outer.InnerMultipleDerived im2 = outer.getMultipleDerivedInstance2();
-      SWIGTYPE_p_Outer__InnerMultipleDerived im3 = outer.getMultipleDerivedInstance3();
+      Outer.InnerMultipleDerived im3 = outer.getMultipleDerivedInstance3();
-      SWIGTYPE_p_Outer__InnerMultipleDerived im4 = outer.getMultipleDerivedInstance4();
+      Outer.InnerMultipleDerived im4 = outer.getMultipleDerivedInstance4();
     }
 
     {
-      SWIGTYPE_p_Outer__InnerMultipleAnonTypedef1 mat1 = outer.makeInnerMultipleAnonTypedef1();
+      Outer.InnerMultipleAnonTypedef1 mat1 = outer.makeInnerMultipleAnonTypedef1();
-      SWIGTYPE_p_Outer__InnerMultipleAnonTypedef2 mat2 = outer.makeInnerMultipleAnonTypedef2();
+      Outer.InnerMultipleAnonTypedef1 mat2 = outer.makeInnerMultipleAnonTypedef2();
-      SWIGTYPE_p_Outer__InnerMultipleAnonTypedef3 mat3 = outer.makeInnerMultipleAnonTypedef3();
+      SWIGTYPE_p_p_Outer__InnerMultipleAnonTypedef1 mat3 = outer.makeInnerMultipleAnonTypedef3();
 
-      SWIGTYPE_p_Outer__InnerMultipleNamedTypedef mnt = outer.makeInnerMultipleNamedTypedef();
+      Outer.InnerMultipleNamedTypedef1 mnt = outer.makeInnerMultipleNamedTypedef();
-      SWIGTYPE_p_Outer__InnerMultipleNamedTypedef mnt1 = outer.makeInnerMultipleNamedTypedef1();
+      Outer.InnerMultipleNamedTypedef1 mnt1 = outer.makeInnerMultipleNamedTypedef1();
-      SWIGTYPE_p_Outer__InnerMultipleNamedTypedef mnt2 = outer.makeInnerMultipleNamedTypedef2();
+      Outer.InnerMultipleNamedTypedef1 mnt2 = outer.makeInnerMultipleNamedTypedef2();
       SWIGTYPE_p_p_Outer__InnerMultipleNamedTypedef mnt3 = outer.makeInnerMultipleNamedTypedef3();
     }
     {
-      SWIGTYPE_p_Outer__InnerSameName isn = outer.makeInnerSameName();
+      Outer.InnerSameName isn = outer.makeInnerSameName();
     }
   }
 }

Examples/test-suite/java/nested_structs_runme.java

@@ -17,18 +17,18 @@ public class nested_structs_runme {
     nested_structs.setValues(outer, 10);
 
     Outer_inner1 inner1 = outer.getInner1();
-    Outer_inner2 inner2 = outer.getInner2();
+    Outer_inner1 inner2 = outer.getInner2();
-    Outer_inner3 inner3 = outer.getInner3();
+    Outer_inner1 inner3 = outer.getInner3();
-    Outer_inner4 inner4 = outer.getInner4();
+    Outer_inner1 inner4 = outer.getInner4();
     if (inner1.getVal() != 10) throw new RuntimeException("failed inner1");
     if (inner2.getVal() != 20) throw new RuntimeException("failed inner2");
     if (inner3.getVal() != 20) throw new RuntimeException("failed inner3");
     if (inner4.getVal() != 40) throw new RuntimeException("failed inner4");
 
-    Outer_inside1 inside1 = outer.getInside1();
+    Named inside1 = outer.getInside1();
-    Outer_inside2 inside2 = outer.getInside2();
+    Named inside2 = outer.getInside2();
-    Outer_inside3 inside3 = outer.getInside3();
+    Named inside3 = outer.getInside3();
-    Outer_inside4 inside4 = outer.getInside4();
+    Named inside4 = outer.getInside4();
     if (inside1.getVal() != 100) throw new RuntimeException("failed inside1");
     if (inside2.getVal() != 200) throw new RuntimeException("failed inside2");
     if (inside3.getVal() != 200) throw new RuntimeException("failed inside3");

Examples/test-suite/java/template_nested_runme.java

@@ -25,6 +25,10 @@ public class template_nested_runme {
     T_NestedOuterTemplateDouble tn = new T_NestedOuterTemplateDouble();
     if (tn.hohum(-12.3) != -12.3)
       throw new RuntimeException("it failed");
+    OuterClass.T_OuterClassInner1Int inner1 = new OuterClass().useInner1(new OuterClass.T_OuterClassInner1Int());
+    OuterClass.T_OuterClassInner2NormalClass inner2 = new OuterClass.T_OuterClassInner2NormalClass();
+    inner2.setEmbeddedVar(2);
+    OuterClass.T_OuterClassInner2NormalClass inner22 = new OuterClass().useInner2Again(inner2);
   }
 }
 

Examples/test-suite/namespace_class.i

@@ -1,6 +1,5 @@
 %module namespace_class
 
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Ala::Ola;
 
 #ifdef SWIGD
 %warnfilter(SWIGWARN_IGNORE_OPERATOR_LT);
@@ -216,9 +215,6 @@ namespace a
  
 %}
 
-// %copyctor doesn't work with nested class workaround
-%nocopyctor;
-
 %inline %{
   class Ala {
   public : 
@@ -236,12 +232,6 @@ namespace a
   };
 %}
 
-%rename(Ala__Ola) Ala::Ola;
-class Ala::Ola {
-public:
-  Ola() {}
-  void eek() {}
-};
 
 %template(hi) Ala::hi<int>;
 

Examples/test-suite/namespace_union.i

@@ -1,7 +1,5 @@
 %module namespace_union
 
-#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS
-
 %inline %{
 namespace SpatialIndex 
 { 

Examples/test-suite/nested_class.i

@@ -1,25 +1,5 @@
 %module nested_class
 
-#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerStruct1;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerClass1;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerUnion1;
-%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::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 {
   typedef int Integer;
@@ -39,7 +19,7 @@ struct Outer {
   };
 
   ///////////////////////////////////////////
-#ifdef SWIG
+#if defined(__GNUC__) || defined(_MSC_VER) || defined(SWIG)
 /* some compilers do not accept these */
   class {
   public:
@@ -154,7 +134,7 @@ struct Outer {
     Integer xx;
   } MultipleInstanceAnonDerived1, MultipleInstanceAnonDerived2, *MultipleInstanceAnonDerived3, MultipleInstanceAnonDerived4[2];
 
-#ifdef SWIG
+#if defined(__GNUC__) || defined(_MSC_VER) || defined(SWIG)
 /* some compilers do not accept these */
   struct : public InnerMultiple {
     Integer xx;

Examples/test-suite/nested_comment.i

@@ -1,7 +1,5 @@
 %module nested_comment
 
-#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS
-
 // this example shows a problem with 'dump_nested' (parser.y).
 
 // bug #949654

Examples/test-suite/nested_workaround.i

@@ -1,14 +1,6 @@
 %module nested_workaround
-// Similar to "Nested classes" documentation example.
+// "flatnested" emulates deprecated feature "nested_workaround" for the languages not supporting nested classes
-
+%feature ("flatnested");
-class Inner {
-    int val;
-  public:
-    Inner(int v = 0) : val(v) {}
-    void setValue(int v) { val = v; }
-    int getValue() const { return val; }
-};
-%nestedworkaround Outer::Inner;
 
 %inline %{
 class Outer {
@@ -28,11 +20,3 @@ public:
   }
 };
 %}
-
-// We've fooled SWIG into thinking that Inner is a global class, so now we need
-// to trick the C++ compiler into understanding this apparent global type.
-%{
-typedef Outer::Inner Inner;
-%}
-
-

Examples/test-suite/template_nested.i

@@ -2,13 +2,6 @@
 
 // Test nested templates - that is template classes and template methods within a class.
 
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) ns::OuterClass::Inner1;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) ns::OuterClass::Inner2;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) ns::OuterTemplate::NestedInnerTemplate1;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) ns::OuterTemplate::NestedInnerTemplate2;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) ns::OuterTemplate::NestedInnerTemplate3;
-%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) ns::OuterTemplate::NestedStruct;
-
 namespace ns {
 template <class T> struct ForwardTemplate;
 }
@@ -33,7 +26,13 @@ namespace ns {
   template <class T> struct NormalTemplate {
     void tmethod(T t) {}
   };
+}
+%}
+%template(T_NormalTemplateNormalClass) ns::NormalTemplate<ns::NormalClass>;
+%template(T_NormalTemplateInt) ns::NormalTemplate<int>;
 
+%inline %{
+namespace ns {
   class OuterClass {
   public:
     template <class T> struct Inner1 {
@@ -70,6 +69,7 @@ namespace ns {
       };
     };
     Inner2<int> useInner2(const Inner2<int>& inner) { return inner; }
+    Inner2<NormalClass> useInner2Again(const Inner2<NormalClass>& inner) { return inner; }
     int iii;
   };
   struct ABC {
@@ -108,9 +108,10 @@ namespace ns {
 
 %}
 
-%template(T_NormalTemplateNormalClass) ns::NormalTemplate<ns::NormalClass>;
 %template(T_OuterTMethodNormalClass) ns::OuterClass::InnerTMethod<ns::NormalClass>;
 %template(T_TemplateFuncs1Int) ns::TemplateFuncs::templateMethod1<int>;
 %template(T_TemplateFuncs2Double) ns::TemplateFuncs::templateMethod2<double>;
 %template(T_NestedOuterTemplateDouble) ns::OuterTemplate<double>;
-
+%template(T_OuterClassInner1Int) ns::OuterClass::Inner1<int>;
+%template(T_OuterClassInner2NormalClass) ns::OuterClass::Inner2<ns::NormalClass>;
+%template(T_OuterClassInner2Int) ns::OuterClass::Inner2<int>;

Examples/test-suite/template_nested_typemaps.i

@@ -4,18 +4,22 @@
 
 // Testing that the typemaps invoked within a class via %template are picked up by appropriate methods
 
+%inline %{
 template <typename T> struct Typemap {
+#ifdef SWIG
   %typemap(in) T {
     $1 = -99;
   }
+#endif
 };
 template <> struct Typemap<short> { // Note explicit specialization
+#ifdef SWIG
   %typemap(in) short {
     $1 = -77;
   }
+#endif
 };
 
-%inline %{
 int globalInt1(int s) { return s; }
 short globalShort1(short s) { return s; }
 

Examples/test-suite/union_scope.i

@@ -2,7 +2,6 @@
 
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME) nRState;		// Ruby, wrong class name
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME) nRState_rstate;	// Ruby, wrong class name
-#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS
 
 %inline %{
 class nRState { 

Lib/swig.swg

@@ -302,7 +302,7 @@ static int NAME(TYPE x) {
 %define %$ismemberset    "match$memberset"="1"  %enddef
 
 %define %$classname      %$ismember,"match$parentNode$name"  %enddef
-
+%define %$isnested       "match$nested"="1"  %enddef
 /* -----------------------------------------------------------------------------
  * Include all the warnings labels and macros 
  * ----------------------------------------------------------------------------- */

Source/CParse/cparse.h

@@ -31,6 +31,7 @@ extern "C" {
   extern void scanner_file(File *);
   extern void scanner_next_token(int);
   extern void skip_balanced(int startchar, int endchar);
+  extern String *get_raw_text_balanced(int startchar, int endchar);
   extern void skip_decl(void);
   extern void scanner_check_typedef(void);
   extern void scanner_ignore_typedef(void);

Source/CParse/cscanner.c

@@ -118,6 +118,10 @@ void skip_balanced(int startchar, int endchar) {
   return;
 }
 
+String* get_raw_text_balanced(int startchar, int endchar) {
+  return Scanner_get_raw_text_balanced(scan, startchar, endchar);
+}
+
 /* ----------------------------------------------------------------------------
  * void skip_decl(void)
  *

Source/Include/swigwarn.h

@@ -75,7 +75,6 @@
 #define WARN_PARSE_PRIVATE_INHERIT    309
 #define WARN_PARSE_TEMPLATE_REPEAT    310
 #define WARN_PARSE_TEMPLATE_PARTIAL   311
-#define WARN_PARSE_UNNAMED_NESTED_CLASS 312
 #define WARN_PARSE_UNDEFINED_EXTERN   313
 #define WARN_PARSE_KEYWORD            314
 #define WARN_PARSE_USING_UNDEF        315
@@ -88,7 +87,6 @@
 #define WARN_PARSE_REDUNDANT          322
 #define WARN_PARSE_REC_INHERITANCE    323
 #define WARN_PARSE_NESTED_TEMPLATE    324
-#define WARN_PARSE_NAMED_NESTED_CLASS 325
 #define WARN_PARSE_EXTEND_NAME        326
 
 #define WARN_CPP11_LAMBDA             340

Source/Modules/allocate.cxx

@@ -559,6 +559,8 @@ Allocate():
   virtual int classDeclaration(Node *n) {
     Symtab *symtab = Swig_symbol_current();
     Swig_symbol_setscope(Getattr(n, "symtab"));
+    Node* oldInclass = inclass;
+    AccessMode oldAcessMode = cplus_mode;
 
     if (!CPlusPlus) {
       /* Always have default constructors/destructors in C */
@@ -580,7 +582,6 @@ Allocate():
 	}
       }
     }
-
     inclass = n;
     String *kind = Getattr(n, "kind");
     if (Strcmp(kind, "class") == 0) {
@@ -728,7 +729,8 @@ Allocate():
 
     /* Only care about default behavior.  Remove temporary values */
     Setattr(n, "allocate:visit", "1");
-    inclass = 0;
+    inclass = oldInclass;
+    cplus_mode = oldAcessMode;
     Swig_symbol_setscope(symtab);
     return SWIG_OK;
   }

Source/Modules/contract.cxx

@@ -342,11 +342,13 @@ int Contracts::namespaceDeclaration(Node *n) {
 
 int Contracts::classDeclaration(Node *n) {
   int ret = SWIG_OK;
+  int oldInClass = InClass;
+  Node* oldClass = CurrentClass;
   InClass = 1;
   CurrentClass = n;
   emit_children(n);
-  InClass = 0;
+  InClass = oldInClass;
-  CurrentClass = 0;
+  CurrentClass = oldClass;
   return ret;
 }
 

Source/Modules/csharp.cxx

@@ -18,6 +18,8 @@
 
 /* Hash type used for upcalls from C/C++ */
 typedef DOH UpcallData;
+// insert N tabs before each new line in s
+void Swig_offset_string(String* s, int N);
 
 class CSHARP:public Language {
   static const char *usage;
@@ -53,7 +55,6 @@ class CSHARP:public Language {
   String *proxy_class_code;
   String *module_class_code;
   String *proxy_class_name;	// proxy class name
-  String *full_proxy_class_name;// fully qualified proxy class name when using nspace feature, otherwise same as proxy_class_name
   String *full_imclass_name;	// fully qualified intermediary class name when using nspace feature, otherwise same as imclass_name
   String *variable_name;	//Name of a variable being wrapped
   String *proxy_class_constants_code;
@@ -87,6 +88,7 @@ class CSHARP:public Language {
   int n_directors;
   int first_class_dmethod;
   int curr_class_dmethod;
+  int nesting_depth;
 
   enum EnumFeature { SimpleEnum, TypeunsafeEnum, TypesafeEnum, ProperEnum };
 
@@ -125,7 +127,6 @@ public:
       proxy_class_code(NULL),
       module_class_code(NULL),
       proxy_class_name(NULL),
-      full_proxy_class_name(NULL),
       full_imclass_name(NULL),
       variable_name(NULL),
       proxy_class_constants_code(NULL),
@@ -156,7 +157,8 @@ public:
       n_dmethods(0),
       n_directors(0),
       first_class_dmethod(0),
-      curr_class_dmethod(0) {
+      curr_class_dmethod(0),
+      nesting_depth(0){
     /* for now, multiple inheritance in directors is disabled, this
        should be easy to implement though */
     director_multiple_inheritance = 0;
@@ -179,7 +181,13 @@ public:
 	 proxyname = Getattr(n, "proxyname");
 	 if (!proxyname) {
 	   String *nspace = Getattr(n, "sym:nspace");
-	   String *symname = Getattr(n, "sym:name");
+	   String *symname = Copy(Getattr(n, "sym:name"));
+	   if (!GetFlag(n, "feature:flatnested")) {
+	     for (Node* outer_class = Getattr(n, "nested:outer");outer_class;outer_class = Getattr(outer_class, "nested:outer")) {
+	       Push(symname, ".");
+	       Push(symname, Getattr(outer_class, "sym:name"));
+	     }
+	   }
 	   if (nspace) {
 	     if (namespce)
 	       proxyname = NewStringf("%s.%s.%s", namespce, nspace, symname);
@@ -190,12 +198,33 @@ public:
 	   }
 	   Setattr(n, "proxyname", proxyname);
 	   Delete(proxyname);
+	   Delete(symname);
 	 }
        }
      }
      return proxyname;
    }
 
+  /* -----------------------------------------------------------------------------
+   * directorClassName()
+   * ----------------------------------------------------------------------------- */
+
+  String *directorClassName(Node *n) {
+    String *dirclassname;
+    const char *attrib = "director:classname";
+
+    if (!(dirclassname = Getattr(n, attrib))) {
+      String *classname = getClassPrefix();
+
+      dirclassname = NewStringf("SwigDirector_%s", classname);
+      Setattr(n, attrib, dirclassname);
+    }
+    else
+      dirclassname = Copy(dirclassname);
+
+    return dirclassname;
+  }
+
   /* ------------------------------------------------------------
    * main()
    * ------------------------------------------------------------ */
@@ -1025,7 +1054,7 @@ public:
      */
     if (proxy_flag && wrapping_member_flag && !enum_constant_flag) {
       // Capitalize the first letter in the variable in the getter/setter function name
-      bool getter_flag = Cmp(symname, Swig_name_set(getNSpace(), Swig_name_member(0, proxy_class_name, variable_name))) != 0;
+      bool getter_flag = Cmp(symname, Swig_name_set(getNSpace(), Swig_name_member(0, getClassPrefix(), variable_name))) != 0;
 
       String *getter_setter_name = NewString("");
       if (!getter_flag)
@@ -1589,6 +1618,7 @@ public:
     String *c_baseclassname = NULL;
     SwigType *typemap_lookup_type = Getattr(n, "classtypeobj");
     bool feature_director = Swig_directorclass(n) ? true : false;
+    bool has_outerclass = Getattr(n, "nested:outer") != 0 && !GetFlag(n, "feature:flatnested");
 
     // Inheritance from pure C# classes
     Node *attributes = NewHash();
@@ -1648,7 +1678,8 @@ public:
     // Pure C# interfaces
     const String *pure_interfaces = typemapLookup(n, derived ? "csinterfaces_derived" : "csinterfaces", typemap_lookup_type, WARN_NONE);
     // Start writing the proxy class
-    Printv(proxy_class_def, typemapLookup(n, "csimports", typemap_lookup_type, WARN_NONE),	// Import statements
+    if (!has_outerclass)
+      Printv(proxy_class_def, typemapLookup(n, "csimports", typemap_lookup_type, WARN_NONE),	// Import statements
 	   "\n", NIL);
 
     // Class attributes
@@ -1719,7 +1750,7 @@ public:
 	Printf(proxy_class_code, "    if (SwigDerivedClassHasMethod(\"%s\", swigMethodTypes%s))\n", method, methid);
 	Printf(proxy_class_code, "      swigDelegate%s = new SwigDelegate%s_%s(SwigDirector%s);\n", methid, proxy_class_name, methid, overname);
       }
-      String *director_connect_method_name = Swig_name_member(getNSpace(), proxy_class_name, "director_connect");
+      String *director_connect_method_name = Swig_name_member(getNSpace(), getClassPrefix(), "director_connect");
       Printf(proxy_class_code, "    %s.%s(swigCPtr", imclass_name, director_connect_method_name);
       for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
 	UpcallData *udata = Getitem(dmethods_seq, i);
@@ -1795,7 +1826,7 @@ public:
     // Add code to do C++ casting to base class (only for classes in an inheritance hierarchy)
     if (derived) {
       String *smartptr = Getattr(n, "feature:smartptr");
-      String *upcast_method = Swig_name_member(getNSpace(), proxy_class_name, smartptr != 0 ? "SWIGSmartPtrUpcast" : "SWIGUpcast");
+      String *upcast_method = Swig_name_member(getNSpace(), getClassPrefix(), smartptr != 0 ? "SWIGSmartPtrUpcast" : "SWIGUpcast");
       String *wname = Swig_name_wrapper(upcast_method);
 
       Printv(imclass_cppcasts_code, "\n  [global::System.Runtime.InteropServices.DllImport(\"", dllimport, "\", EntryPoint=\"", wname, "\")]\n", NIL);
@@ -1846,11 +1877,35 @@ public:
 
     String *nspace = getNSpace();
     File *f_proxy = NULL;
+    // save class local variables
+    String* old_proxy_class_name = proxy_class_name;
+    String* old_full_imclass_name = full_imclass_name;
+    String* old_destructor_call = destructor_call;
+    String* old_proxy_class_constants_code = proxy_class_constants_code;
+    String* old_proxy_class_def = proxy_class_def;
+    String* old_proxy_class_code = proxy_class_code;
+
     if (proxy_flag) {
       proxy_class_name = NewString(Getattr(n, "sym:name"));
+      if (Node* outer = Getattr(n, "nested:outer")) {
+	String* outerClassesPrefix = Copy(Getattr(outer, "sym:name"));
+	for (outer = Getattr(outer, "nested:outer"); outer != 0; outer = Getattr(outer, "nested:outer")) {
+	  Push(outerClassesPrefix, "::");
+	  Push(outerClassesPrefix, Getattr(outer, "sym:name"));
+	}
+	String* fnspace = nspace ? NewStringf("%s::%s", nspace, outerClassesPrefix) : outerClassesPrefix;
+	if (!addSymbol(proxy_class_name, n, fnspace))
+	  return SWIG_ERROR;
+	if (nspace)
+	  Delete(fnspace);
+	Delete(outerClassesPrefix);
+      }
+      else {
+	if (!addSymbol(proxy_class_name, n, nspace))
+	  return SWIG_ERROR;
+      }
 
       if (!nspace) {
-	full_proxy_class_name = NewStringf("%s", proxy_class_name);
 	full_imclass_name = NewStringf("%s", imclass_name);
 	if (Cmp(proxy_class_name, imclass_name) == 0) {
 	  Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name);
@@ -1863,36 +1918,34 @@ public:
 	}
       } else {
 	if (namespce) {
-	  full_proxy_class_name = NewStringf("%s.%s.%s", namespce, nspace, proxy_class_name);
 	  full_imclass_name = NewStringf("%s.%s", namespce, imclass_name);
 	} else {
-	  full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name);
 	  full_imclass_name = NewStringf("%s", imclass_name);
 	}
       }
 
-      if (!addSymbol(proxy_class_name, n, nspace))
+      // inner class doesn't need this prologue
-	return SWIG_ERROR;
+      if (!Getattr(n, "nested:outer")) {
+	String *output_directory = outputDirectory(nspace);
+	String *filen = NewStringf("%s%s.cs", output_directory, proxy_class_name);
+	f_proxy = NewFile(filen, "w", SWIG_output_files());
+	if (!f_proxy) {
+	  FileErrorDisplay(filen);
+	  SWIG_exit(EXIT_FAILURE);
+	}
+	Append(filenames_list, Copy(filen));
+	Delete(filen);
+	filen = NULL;
 
-      String *output_directory = outputDirectory(nspace);
+	// Start writing out the proxy class file
-      String *filen = NewStringf("%s%s.cs", output_directory, proxy_class_name);
+	emitBanner(f_proxy);
-      f_proxy = NewFile(filen, "w", SWIG_output_files());
+
-      if (!f_proxy) {
+	addOpenNamespace(nspace, f_proxy);
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
       }
-      Append(filenames_list, Copy(filen));
+      else
-      Delete(filen);
+	++nesting_depth;
-      filen = NULL;
+      proxy_class_def = NewString("");
-
+      proxy_class_code = NewString("");
-      // Start writing out the proxy class file
-      emitBanner(f_proxy);
-
-      addOpenNamespace(nspace, f_proxy);
-
-      Clear(proxy_class_def);
-      Clear(proxy_class_code);
-
       destructor_call = NewString("");
       proxy_class_constants_code = NewString("");
     }
@@ -1903,7 +1956,7 @@ public:
 
       emitProxyClassDefAndCPPCasts(n);
 
-      String *csclazzname = Swig_name_member(getNSpace(), proxy_class_name, ""); // mangled full proxy class name
+      String *csclazzname = Swig_name_member(getNSpace(), getClassPrefix(), ""); // mangled full proxy class name
 
       Replaceall(proxy_class_def, "$csclassname", proxy_class_name);
       Replaceall(proxy_class_code, "$csclassname", proxy_class_name);
@@ -1924,17 +1977,36 @@ public:
       Replaceall(proxy_class_def, "$dllimport", dllimport);
       Replaceall(proxy_class_code, "$dllimport", dllimport);
       Replaceall(proxy_class_constants_code, "$dllimport", dllimport);
-
+      bool has_outerclass = Getattr(n, "nested:outer") != 0 && !GetFlag(n, "feature:flatnested");
-      Printv(f_proxy, proxy_class_def, proxy_class_code, NIL);
+      if (!has_outerclass)
+	Printv(f_proxy, proxy_class_def, proxy_class_code, NIL);
+      else {
+	Swig_offset_string(proxy_class_def, nesting_depth);
+	Append(old_proxy_class_code, proxy_class_def);
+	Swig_offset_string(proxy_class_code, nesting_depth);
+	Append(old_proxy_class_code, proxy_class_code);
+      }
 
       // Write out all the constants
-      if (Len(proxy_class_constants_code) != 0)
+      if (Len(proxy_class_constants_code) != 0) {
-	Printv(f_proxy, proxy_class_constants_code, NIL);
+	if (!has_outerclass)
-
+	  Printv(f_proxy, proxy_class_constants_code, NIL);
-      Printf(f_proxy, "}\n");
+	else {
-      addCloseNamespace(nspace, f_proxy);
+	  Swig_offset_string(proxy_class_constants_code, nesting_depth);
-      Delete(f_proxy);
+	  Append(old_proxy_class_code, proxy_class_constants_code);
-      f_proxy = NULL;
+	}
+      }
+      if (!has_outerclass) {
+	Printf(f_proxy, "}\n");
+	addCloseNamespace(nspace, f_proxy);
+	Delete(f_proxy);
+	f_proxy = NULL;
+      } else {
+	for (int i = 0; i < nesting_depth; ++i)
+	  Append(old_proxy_class_code, "  ");
+	Append(old_proxy_class_code, "}\n");
+	--nesting_depth;
+      }
 
       /* Output the downcast method, if necessary. Note: There's no other really
          good place to put this code, since Abstract Base Classes (ABCs) can and should have 
@@ -1971,17 +2043,18 @@ public:
 
       Delete(csclazzname);
       Delete(proxy_class_name);
-      proxy_class_name = NULL;
+      proxy_class_name = old_proxy_class_name;
-      Delete(full_proxy_class_name);
-      full_proxy_class_name = NULL;
       Delete(full_imclass_name);
-      full_imclass_name = NULL;
+      full_imclass_name = old_full_imclass_name;
       Delete(destructor_call);
-      destructor_call = NULL;
+      destructor_call = old_destructor_call;
       Delete(proxy_class_constants_code);
-      proxy_class_constants_code = NULL;
+      proxy_class_constants_code = old_proxy_class_constants_code;
+      Delete(proxy_class_def);
+      proxy_class_def = old_proxy_class_def;
+      Delete(proxy_class_code);
+      proxy_class_code = old_proxy_class_code;
     }
-
     return SWIG_OK;
   }
 
@@ -1994,7 +2067,7 @@ public:
 
     if (proxy_flag) {
       String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(getNSpace(), proxy_class_name, overloaded_name);
+      String *intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name);
       Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
       Setattr(n, "imfuncname", intermediary_function_name);
       proxyClassFunctionHandler(n);
@@ -2014,7 +2087,7 @@ public:
 
     if (proxy_flag) {
       String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(getNSpace(), proxy_class_name, overloaded_name);
+      String *intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name);
       Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
       Setattr(n, "imfuncname", intermediary_function_name);
       proxyClassFunctionHandler(n);
@@ -2094,7 +2167,7 @@ public:
 
     if (wrapping_member_flag && !enum_constant_flag) {
       // Properties
-      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(getNSpace(), Swig_name_member(0, proxy_class_name, variable_name))) == 0);
+      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(getNSpace(), Swig_name_member(0, getClassPrefix(), variable_name))) == 0);
       if (setter_flag)
         Swig_typemap_attach_parms("csvarin", l, NULL);
     }
@@ -2264,7 +2337,7 @@ public:
       Node *explicit_n = Getattr(n, "explicitcallnode");
       if (explicit_n) {
 	String *ex_overloaded_name = getOverloadedName(explicit_n);
-	String *ex_intermediary_function_name = Swig_name_member(getNSpace(), proxy_class_name, ex_overloaded_name);
+	String *ex_intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), ex_overloaded_name);
 
 	String *ex_imcall = Copy(imcall);
 	Replaceall(ex_imcall, "$imfuncname", ex_intermediary_function_name);
@@ -3376,14 +3449,21 @@ public:
 
     // Output the director connect method:
     String *norm_name = SwigType_namestr(Getattr(n, "name"));
-    String *swig_director_connect = Swig_name_member(getNSpace(), proxy_class_name, "director_connect");
+    String *dirclassname = directorClassName(n);
+    String *swig_director_connect = Swig_name_member(getNSpace(), getClassPrefix(), "director_connect");
     String *wname = Swig_name_wrapper(swig_director_connect);
     String *sym_name = Getattr(n, "sym:name");
     String *qualified_classname = Copy(sym_name);
     String *nspace = getNSpace();
     String *dirClassName = directorClassName(n);
     String *smartptr = Getattr(n, "feature:smartptr");
+    if (!GetFlag(n, "feature:flatnested")) {
+      for (Node* outer_class = Getattr(n, "nested:outer"); outer_class; outer_class = Getattr(outer_class, "nested:outer")) {
 
+	Push(qualified_classname, ".");
+	Push(qualified_classname, Getattr(outer_class, "sym:name"));
+      }
+    }
     if (nspace)
       Insert(qualified_classname, 0, NewStringf("%s.", nspace));
 
@@ -3415,7 +3495,7 @@ public:
       Printf(code_wrap->def, ", ");
       if (i != first_class_dmethod)
 	Printf(code_wrap->code, ", ");
-      Printf(code_wrap->def, "%s::SWIG_Callback%s_t callback%s", dirClassName, methid, methid);
+      Printf(code_wrap->def, "%s::SWIG_Callback%s_t callback%s", dirclassname, methid, methid);
       Printf(code_wrap->code, "callback%s", methid);
       Printf(imclass_class_code, ", %s.SwigDelegate%s_%s delegate%s", qualified_classname, sym_name, methid, methid);
     }
@@ -3432,7 +3512,7 @@ public:
     Delete(wname);
     Delete(swig_director_connect);
     Delete(qualified_classname);
-    Delete(dirClassName);
+    Delete(dirclassname);
   }
 
   /* ---------------------------------------------------------------
@@ -3485,7 +3565,7 @@ public:
     // we're consistent with the sym:overload name in functionWrapper. (?? when
     // does the overloaded method name get set?)
 
-    imclass_dmethod = NewStringf("SwigDirector_%s", Swig_name_member(getNSpace(), classname, overloaded_name));
+    imclass_dmethod = NewStringf("SwigDirector_%s", Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name));
 
     qualified_return = SwigType_rcaststr(returntype, "c_result");
 
@@ -3931,6 +4011,7 @@ public:
     Delete(proxy_method_types);
     Delete(callback_def);
     Delete(callback_code);
+    Delete(dirclassname);
     DelWrapper(w);
 
     return status;
@@ -3970,13 +4051,11 @@ public:
 	String *basetype = Getattr(parent, "classtype");
 	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 0);
 	String *call = Swig_csuperclass_call(0, basetype, superparms);
-	String *classtype = SwigType_namestr(Getattr(n, "name"));
 
 	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
 	Printf(f_directors, "  swig_init_callbacks();\n");
 	Printf(f_directors, "}\n\n");
 
-	Delete(classtype);
 	Delete(target);
 	Delete(call);
       }
@@ -4047,6 +4126,26 @@ public:
     return Language::classDirectorInit(n);
   }
 
+  int classDeclaration(Node *n) {
+    String *old_director_callback_typedefs = director_callback_typedefs;
+    String *old_director_callbacks = director_callbacks;
+    String *old_director_delegate_callback = director_delegate_callback;
+    String *old_director_delegate_definitions = director_delegate_definitions;
+    String *old_director_delegate_instances = director_delegate_instances;
+    String *old_director_method_types = director_method_types;
+    String *old_director_connect_parms = director_connect_parms;
+    int ret = Language::classDeclaration(n);
+    // these variables are deleted in emitProxyClassDefAndCPPCasts, hence no Delete here
+    director_callback_typedefs = old_director_callback_typedefs;
+    director_callbacks = old_director_callbacks;
+    director_delegate_callback = old_director_delegate_callback;
+    director_delegate_definitions = old_director_delegate_definitions;
+    director_delegate_instances = old_director_delegate_instances;
+    director_method_types = old_director_method_types;
+    director_connect_parms = old_director_connect_parms;
+    return ret;
+  }
+
   /* ----------------------------------------------------------------------
    * classDirectorDestructor()
    * ---------------------------------------------------------------------- */
@@ -4079,7 +4178,7 @@ public:
 
   int classDirectorEnd(Node *n) {
     int i;
-    String *director_classname = directorClassName(n);
+    String *dirclassname = directorClassName(n);
 
     Wrapper *w = NewWrapper();
 
@@ -4089,7 +4188,7 @@ public:
 
     Printf(f_directors_h, "    void swig_connect_director(");
 
-    Printf(w->def, "void %s::swig_connect_director(", director_classname);
+    Printf(w->def, "void %s::swig_connect_director(", dirclassname);
 
     for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
       UpcallData *udata = Getitem(dmethods_seq, i);
@@ -4116,7 +4215,7 @@ public:
     Printf(f_directors_h, "};\n\n");
     Printf(w->code, "}\n\n");
 
-    Printf(w->code, "void %s::swig_init_callbacks() {\n", director_classname);
+    Printf(w->code, "void %s::swig_init_callbacks() {\n", dirclassname);
     for (i = first_class_dmethod; i < curr_class_dmethod; ++i) {
       UpcallData *udata = Getitem(dmethods_seq, i);
       String *overname = Getattr(udata, "overname");
@@ -4127,6 +4226,7 @@ public:
     Wrapper_print(w, f_directors);
 
     DelWrapper(w);
+    Delete(dirclassname);
 
     return Language::classDirectorEnd(n);
   }
@@ -4159,8 +4259,8 @@ public:
     String *base = Getattr(n, "classtype");
     String *class_ctor = NewString("Swig::Director()");
 
-    String *directorname = directorClassName(n);
+    String *dirclassname = directorClassName(n);
-    String *declaration = Swig_class_declaration(n, directorname);
+    String *declaration = Swig_class_declaration(n, dirclassname);
 
     Printf(declaration, " : public %s, public Swig::Director", base);
 
@@ -4168,9 +4268,12 @@ public:
     Setattr(n, "director:decl", declaration);
     Setattr(n, "director:ctor", class_ctor);
 
-    Delete(directorname);
+    Delete(dirclassname);
   }
 
+  bool nestedClassesSupported() const {
+    return true;
+  }
 };				/* class CSHARP */
 
 /* -----------------------------------------------------------------------------

Source/Modules/java.cxx

@@ -18,6 +18,8 @@
 
 /* Hash type used for upcalls from C/C++ */
 typedef DOH UpcallData;
+// insert N tabs before each new line in s
+void Swig_offset_string(String* s, int N);
 
 class JAVA:public Language {
   static const char *usage;
@@ -86,6 +88,7 @@ class JAVA:public Language {
   int n_directors;
   int first_class_dmethod;
   int curr_class_dmethod;
+  int nesting_depth;
 
   enum EnumFeature { SimpleEnum, TypeunsafeEnum, TypesafeEnum, ProperEnum };
 
@@ -154,7 +157,8 @@ public:
       n_dmethods(0),
       n_directors(0),
       first_class_dmethod(0),
-      curr_class_dmethod(0) {
+      curr_class_dmethod(0),
+      nesting_depth(0){
     /* for now, multiple inheritance in directors is disabled, this
        should be easy to implement though */
     director_multiple_inheritance = 0;
@@ -204,7 +208,13 @@ public:
 	 proxyname = Getattr(n, "proxyname");
 	 if (!proxyname || jnidescriptor) {
 	   String *nspace = Getattr(n, "sym:nspace");
-	   String *symname = Getattr(n, "sym:name");
+	   String *symname = Copy(Getattr(n, "sym:name"));
+	   if (!GetFlag(n, "feature:flatnested")) {
+	     for (Node* outer_class = Getattr(n, "nested:outer");outer_class;outer_class = Getattr(outer_class, "nested:outer")) {
+	       Push(symname, ".");
+	       Push(symname, Getattr(outer_class, "sym:name"));
+	     }
+	   }
 	   if (nspace) {
 	     if (package && !jnidescriptor)
 	       proxyname = NewStringf("%s.%s.%s", package, nspace, symname);
@@ -217,6 +227,7 @@ public:
 	     Setattr(n, "proxyname", proxyname); // Cache it
 	     Delete(proxyname);
 	   }
+	   Delete(symname);
 	 }
        }
      }
@@ -1134,7 +1145,7 @@ public:
      */
     if (proxy_flag && wrapping_member_flag && !enum_constant_flag) {
       // Capitalize the first letter in the variable to create a JavaBean type getter/setter function name
-      bool getter_flag = Cmp(symname, Swig_name_set(getNSpace(), Swig_name_member(0, proxy_class_name, variable_name))) != 0;
+      bool getter_flag = Cmp(symname, Swig_name_set(getNSpace(), Swig_name_member(0, getClassPrefix(), variable_name))) != 0;
 
       String *getter_setter_name = NewString("");
       if (!getter_flag)
@@ -1713,6 +1724,7 @@ public:
     String *c_baseclassname = NULL;
     SwigType *typemap_lookup_type = Getattr(n, "classtypeobj");
     bool feature_director = Swig_directorclass(n) ? true : false;
+    bool has_outerclass = Getattr(n, "nested:outer") != 0 && !GetFlag(n, "feature:flatnested");
 
     // Inheritance from pure Java classes
     Node *attributes = NewHash();
@@ -1773,8 +1785,11 @@ public:
     const String *pure_interfaces = typemapLookup(n, "javainterfaces", typemap_lookup_type, WARN_NONE);
 
     // Start writing the proxy class
-    Printv(proxy_class_def, typemapLookup(n, "javaimports", typemap_lookup_type, WARN_NONE),	// Import statements
+    if (!has_outerclass) // Import statements
-	   "\n", typemapLookup(n, "javaclassmodifiers", typemap_lookup_type, WARN_JAVA_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers
+      Printv(proxy_class_def, typemapLookup(n, "javaimports", typemap_lookup_type, WARN_NONE),"\n", NIL);
+    else
+      Printv(proxy_class_def, "static ", NIL); // C++ nested classes correspond to static java classes
+    Printv(proxy_class_def, typemapLookup(n, "javaclassmodifiers", typemap_lookup_type, WARN_JAVA_TYPEMAP_CLASSMOD_UNDEF),	// Class modifiers
 	   " $javaclassname",	// Class name and bases
 	   (*Char(wanted_base)) ? " extends " : "", wanted_base, *Char(pure_interfaces) ?	// Pure Java interfaces
 	   " implements " : "", pure_interfaces, " {", derived ? typemapLookup(n, "javabody_derived", typemap_lookup_type, WARN_JAVA_TYPEMAP_JAVABODY_UNDEF) :	// main body of class
@@ -1825,7 +1840,7 @@ public:
     /* Also insert the swigTakeOwnership and swigReleaseOwnership methods */
     if (feature_director) {
       String *destruct_jnicall, *release_jnicall, *take_jnicall;
-      String *changeown_method_name = Swig_name_member(getNSpace(), proxy_class_name, "change_ownership");
+      String *changeown_method_name = Swig_name_member(getNSpace(), getClassPrefix(), "change_ownership");
 
       destruct_jnicall = NewStringf("%s()", destruct_methodname);
       release_jnicall = NewStringf("%s.%s(this, swigCPtr, false)", full_imclass_name, changeown_method_name);
@@ -1851,7 +1866,7 @@ public:
     // Add code to do C++ casting to base class (only for classes in an inheritance hierarchy)
     if (derived) {
       String *smartptr = Getattr(n, "feature:smartptr");
-      String *upcast_method = Swig_name_member(getNSpace(), proxy_class_name, smartptr != 0 ? "SWIGSmartPtrUpcast" : "SWIGUpcast");
+      String *upcast_method = Swig_name_member(getNSpace(), getClassPrefix(), smartptr != 0 ? "SWIGSmartPtrUpcast" : "SWIGUpcast");
       String *jniname = makeValidJniName(upcast_method);
       String *wname = Swig_name_wrapper(jniname);
       Printf(imclass_cppcasts_code, "  public final static native long %s(long jarg1);\n", upcast_method);
@@ -1908,13 +1923,29 @@ public:
   virtual int classHandler(Node *n) {
 
     File *f_proxy = NULL;
+    String* old_proxy_class_name = proxy_class_name;
+    String* old_full_proxy_class_name = full_proxy_class_name;
+    String* old_full_imclass_name = full_imclass_name;
+    String* old_destructor_call = destructor_call;
+    String* old_destructor_throws_clause = destructor_throws_clause;
+    String* old_proxy_class_constants_code = proxy_class_constants_code;
+    String* old_proxy_class_def = proxy_class_def;
+    String* old_proxy_class_code = proxy_class_code;
     if (proxy_flag) {
       proxy_class_name = NewString(Getattr(n, "sym:name"));
       String *nspace = getNSpace();
       constructIntermediateClassName(n);
 
+      String* outerClassesPrefix = 0;
+      if (Node* outer = Getattr(n, "nested:outer")) {
+	outerClassesPrefix = Copy(Getattr(outer, "sym:name"));
+	for (outer = Getattr(outer, "nested:outer"); outer != 0; outer = Getattr(outer, "nested:outer")) {
+	  Push(outerClassesPrefix, ".");
+	  Push(outerClassesPrefix, Getattr(outer, "sym:name"));
+	}
+      }
       if (!nspace) {
-	full_proxy_class_name = NewStringf("%s", proxy_class_name);
+	full_proxy_class_name = outerClassesPrefix ? NewStringf("%s.%s", outerClassesPrefix, proxy_class_name) : NewStringf("%s", proxy_class_name);
 
 	if (Cmp(proxy_class_name, imclass_name) == 0) {
 	  Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name);
@@ -1926,54 +1957,73 @@ public:
 	  SWIG_exit(EXIT_FAILURE);
 	}
       } else {
-	if (package)
+	if (outerClassesPrefix) {
-	  full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name);
+	  if (package)
-	else
+	    full_proxy_class_name = NewStringf("%s.%s.%s.%s", package, nspace, outerClassesPrefix, proxy_class_name);
-	  full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name);
+	  else
+	    full_proxy_class_name = NewStringf("%s.%s.%s", nspace, outerClassesPrefix, proxy_class_name);
+	}else {
+	  if (package)
+	    full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name);
+	  else
+	    full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name);
+	}
       }
 
-      if (!addSymbol(proxy_class_name, n, nspace))
+      if (outerClassesPrefix) {
-	return SWIG_ERROR;
+	Replaceall(outerClassesPrefix, ".", "::");
-
+	String* fnspace = nspace ? NewStringf("%s::%s", nspace, outerClassesPrefix) : outerClassesPrefix;
-      String *output_directory = outputDirectory(nspace);
+	if (!addSymbol(proxy_class_name, n, fnspace))
-      String *filen = NewStringf("%s%s.java", output_directory, proxy_class_name);
+	  return SWIG_ERROR;
-      f_proxy = NewFile(filen, "w", SWIG_output_files());
-      if (!f_proxy) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filen));
-      Delete(filen);
-      filen = NULL;
-
-      // Start writing out the proxy class file
-      emitBanner(f_proxy);
-
-      if (package || nspace) {
-	Printf(f_proxy, "package ");
-	if (package)
-	  Printv(f_proxy, package, nspace ? "." : "", NIL);
 	if (nspace)
-	  Printv(f_proxy, nspace, NIL);
+	  Delete(fnspace);
-	Printf(f_proxy, ";\n");
+	Delete(outerClassesPrefix);
+      }
+      else {
+	if (!addSymbol(proxy_class_name, n, nspace))
+	  return SWIG_ERROR;
       }
 
-      Clear(proxy_class_def);
+      if (!Getattr(n, "nested:outer")) {
-      Clear(proxy_class_code);
+	String *output_directory = outputDirectory(nspace);
+	String *filen = NewStringf("%s%s.java", output_directory, proxy_class_name);
+	f_proxy = NewFile(filen, "w", SWIG_output_files());
+	if (!f_proxy) {
+	  FileErrorDisplay(filen);
+	  SWIG_exit(EXIT_FAILURE);
+	}
+	Append(filenames_list, Copy(filen));
+	Delete(filen);
+	Delete(output_directory);
 
+	// Start writing out the proxy class file
+	emitBanner(f_proxy);
+
+	if (package || nspace) {
+	  Printf(f_proxy, "package ");
+	  if (package)
+	    Printv(f_proxy, package, nspace ? "." : "", NIL);
+	  if (nspace)
+	    Printv(f_proxy, nspace, NIL);
+	  Printf(f_proxy, ";\n");
+	}
+      }
+      else
+	++nesting_depth;
+
+      proxy_class_def = NewString("");
+      proxy_class_code = NewString("");
       destructor_call = NewString("");
       destructor_throws_clause = NewString("");
       proxy_class_constants_code = NewString("");
-      Delete(output_directory);
     }
-
     Language::classHandler(n);
 
     if (proxy_flag) {
 
       emitProxyClassDefAndCPPCasts(n);
 
-      String *javaclazzname = Swig_name_member(getNSpace(), proxy_class_name, ""); // mangled full proxy class name
+      String *javaclazzname = Swig_name_member(getNSpace(), getClassPrefix(), ""); // mangled full proxy class name
 
       Replaceall(proxy_class_def, "$javaclassname", proxy_class_name);
       Replaceall(proxy_class_code, "$javaclassname", proxy_class_name);
@@ -1991,22 +2041,43 @@ public:
       Replaceall(proxy_class_code, "$imclassname", full_imclass_name);
       Replaceall(proxy_class_constants_code, "$imclassname", full_imclass_name);
 
-      Printv(f_proxy, proxy_class_def, proxy_class_code, NIL);
+      bool has_outerclass = Getattr(n, "nested:outer") != 0 && !GetFlag(n, "feature:flatnested");
+      if (!has_outerclass)
+	Printv(f_proxy, proxy_class_def, proxy_class_code, NIL);
+      else {
+	Swig_offset_string(proxy_class_def, nesting_depth);
+	Append(old_proxy_class_code, proxy_class_def);
+	Swig_offset_string(proxy_class_code, nesting_depth);
+	Append(old_proxy_class_code, proxy_class_code);
+      }
 
       // Write out all the constants
-      if (Len(proxy_class_constants_code) != 0)
+      if (Len(proxy_class_constants_code) != 0) {
-	Printv(f_proxy, proxy_class_constants_code, NIL);
+	if (!has_outerclass)
+	  Printv(f_proxy, proxy_class_constants_code, NIL);
+	else {
+	  Swig_offset_string(proxy_class_constants_code, nesting_depth);
+	  Append(old_proxy_class_code, proxy_class_constants_code);
+	}
+      }
 
-      Printf(f_proxy, "}\n");
+      if (!has_outerclass) {
-      Delete(f_proxy);
+	Printf(f_proxy, "}\n");
-      f_proxy = NULL;
+        Delete(f_proxy);
+        f_proxy = NULL;
+      } else {
+	for (int i = 0; i < nesting_depth; ++i)
+	  Append(old_proxy_class_code, "  ");
+	Append(old_proxy_class_code, "}\n");
+	--nesting_depth;
+      }
 
       /* Output the downcast method, if necessary. Note: There's no other really
          good place to put this code, since Abstract Base Classes (ABCs) can and should have 
          downcasts, making the constructorHandler() a bad place (because ABCs don't get to
          have constructors emitted.) */
       if (GetFlag(n, "feature:javadowncast")) {
-	String *downcast_method = Swig_name_member(getNSpace(), proxy_class_name, "SWIGDowncast");
+	String *downcast_method = Swig_name_member(getNSpace(), getClassPrefix(), "SWIGDowncast");
 	String *jniname = makeValidJniName(downcast_method);
 	String *wname = Swig_name_wrapper(jniname);
 
@@ -2038,17 +2109,21 @@ public:
 
       Delete(javaclazzname);
       Delete(proxy_class_name);
-      proxy_class_name = NULL;
+      proxy_class_name = old_proxy_class_name;
       Delete(full_proxy_class_name);
-      full_proxy_class_name = NULL;
+      full_proxy_class_name = old_full_proxy_class_name;
       Delete(full_imclass_name);
-      full_imclass_name = NULL;
+      full_imclass_name = old_full_imclass_name;
       Delete(destructor_call);
-      destructor_call = NULL;
+      destructor_call = old_destructor_call;
       Delete(destructor_throws_clause);
-      destructor_throws_clause = NULL;
+      destructor_throws_clause = old_destructor_throws_clause;
       Delete(proxy_class_constants_code);
-      proxy_class_constants_code = NULL;
+      proxy_class_constants_code = old_proxy_class_constants_code;
+      Delete(proxy_class_def);
+      proxy_class_def = old_proxy_class_def;
+      Delete(proxy_class_code);
+      proxy_class_code = old_proxy_class_code;
     }
 
     return SWIG_OK;
@@ -2064,7 +2139,7 @@ public:
 
     if (proxy_flag) {
       String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(getNSpace(), proxy_class_name, overloaded_name);
+      String *intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name);
       Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
       Setattr(n, "imfuncname", intermediary_function_name);
       proxyClassFunctionHandler(n);
@@ -2086,7 +2161,7 @@ public:
 
     if (proxy_flag) {
       String *overloaded_name = getOverloadedName(n);
-      String *intermediary_function_name = Swig_name_member(getNSpace(), proxy_class_name, overloaded_name);
+      String *intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), overloaded_name);
       Setattr(n, "proxyfuncname", Getattr(n, "sym:name"));
       Setattr(n, "imfuncname", intermediary_function_name);
       proxyClassFunctionHandler(n);
@@ -2162,7 +2237,7 @@ public:
 
     if (wrapping_member_flag && !enum_constant_flag) {
       // For wrapping member variables (Javabean setter)
-      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(getNSpace(), Swig_name_member(0, proxy_class_name, variable_name))) == 0);
+      setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(getNSpace(), Swig_name_member(0, getClassPrefix(), variable_name))) == 0);
     }
 
     /* Start generating the proxy function */
@@ -2316,7 +2391,7 @@ public:
       Node *explicit_n = Getattr(n, "explicitcallnode");
       if (explicit_n) {
 	String *ex_overloaded_name = getOverloadedName(explicit_n);
-	String *ex_intermediary_function_name = Swig_name_member(getNSpace(), proxy_class_name, ex_overloaded_name);
+	String *ex_intermediary_function_name = Swig_name_member(getNSpace(), getClassPrefix(), ex_overloaded_name);
 
 	String *ex_imcall = Copy(imcall);
 	Replaceall(ex_imcall, "$imfuncname", ex_intermediary_function_name);
@@ -3399,7 +3474,7 @@ public:
     // Output the director connect method:
     String *jni_imclass_name = makeValidJniName(imclass_name);
     String *norm_name = SwigType_namestr(Getattr(n, "name"));
-    String *swig_director_connect = Swig_name_member(getNSpace(), proxy_class_name, "director_connect");
+    String *swig_director_connect = Swig_name_member(getNSpace(), getClassPrefix(), "director_connect");
     String *swig_director_connect_jni = makeValidJniName(swig_director_connect);
     String *smartptr = Getattr(n, "feature:smartptr");
     String *dirClassName = directorClassName(n);
@@ -3439,7 +3514,7 @@ public:
     Delete(swig_director_connect);
 
     // Output the swigReleaseOwnership, swigTakeOwnership methods:
-    String *changeown_method_name = Swig_name_member(getNSpace(), proxy_class_name, "change_ownership");
+    String *changeown_method_name = Swig_name_member(getNSpace(), getClassPrefix(), "change_ownership");
     String *changeown_jnimethod_name = makeValidJniName(changeown_method_name);
 
     Printf(imclass_class_code, "  public final static native void %s(%s obj, long cptr, boolean take_or_release);\n", changeown_method_name, full_proxy_class_name);
@@ -4519,6 +4594,9 @@ public:
     Setattr(n, "director:ctor", class_ctor);
   }
 
+  bool nestedClassesSupported() const {
+    return true;
+  }
 };				/* class JAVA */
 
 /* -----------------------------------------------------------------------------

Source/Modules/lang.cxx

@@ -355,7 +355,7 @@ Language::~Language() {
     String *dirclassname;
     String *nspace = NewString(Getattr(n, "sym:nspace"));
     const char *attrib = "director:classname";
-    String *classname = Getattr(n, "sym:name");
+    String *classname = getClassPrefix();
 
     Replace(nspace, NSPACE_SEPARATOR, "_", DOH_REPLACE_ANY);
     if (Len(nspace) > 0)
@@ -1015,8 +1015,6 @@ int Language::cDeclaration(Node *n) {
     /* Some kind of variable declaration */
     String *declaration = Copy(decl);
     Delattr(n, "decl");
-    if (Getattr(n, "nested"))
-      SetFlag(n, "feature:immutable");
     if (!CurrentClass) {
       if (Swig_storage_isextern(n) || ForceExtern) {
 	if (AddExtern) {
@@ -2362,6 +2360,15 @@ int Language::classDeclaration(Node *n) {
     return SWIG_NOWRAP;
   }
 
+  // save class local variables for nested classes support
+  int oldInClass = InClass;
+  String *oldClassType = ClassType;
+  String *oldClassPrefix = ClassPrefix;
+  String *oldClassName = ClassName;
+  String *oldDirectorClassName = DirectorClassName;
+  String *oldNSpace = NSpace;
+  Node* oldCurrentClass = CurrentClass;
+
   String *kind = Getattr(n, "kind");
   String *name = Getattr(n, "name");
   String *tdname = Getattr(n, "tdname");
@@ -2370,6 +2377,8 @@ int Language::classDeclaration(Node *n) {
 
   int strip = CPlusPlus ? 1 : unnamed && tdname;
 
+  if (cplus_mode != PUBLIC)
+    return SWIG_NOWRAP;
   if (!name) {
     Swig_warning(WARN_LANG_CLASS_UNNAMED, input_file, line_number, "Can't generate wrappers for unnamed struct/class.\n");
     return SWIG_NOWRAP;
@@ -2380,15 +2389,21 @@ int Language::classDeclaration(Node *n) {
     Swig_warning(WARN_LANG_IDENTIFIER, input_file, line_number, "Can't wrap class %s unless renamed to a valid identifier.\n", SwigType_namestr(symname));
     return SWIG_NOWRAP;
   }
-
+  AccessMode oldAccessMode = cplus_mode;
+  Node* outerClass = Getattr(n, "nested:outer");
+  if (outerClass && oldAccessMode != Dispatcher::PUBLIC)
+    return SWIG_NOWRAP;
+  ClassName = Copy(name);
+  ClassPrefix = Copy(symname);
   if (Cmp(kind, "class") == 0) {
     cplus_mode = PRIVATE;
   } else {
     cplus_mode = PUBLIC;
   }
-
+  for (; outerClass; outerClass = Getattr(outerClass, "nested:outer")) {
-  ClassName = Copy(name);
+    Push(ClassPrefix, "_");
-  ClassPrefix = Copy(symname);
+    Push(ClassPrefix, Getattr(outerClass, "sym:name"));
+  }
   if (strip) {
     ClassType = Copy(name);
   } else {
@@ -2399,9 +2414,8 @@ int Language::classDeclaration(Node *n) {
 
   InClass = 1;
   CurrentClass = n;
-
-  String *oldNSpace = NSpace;
   NSpace = Getattr(n, "sym:nspace");
+  int oldAbstract = Abstract;
 
   /* Call classHandler() here */
   if (!ImportMode) {
@@ -2443,25 +2457,27 @@ int Language::classDeclaration(Node *n) {
       classDirector(n);
     }
     /* check for abstract after resolving directors */
-    Abstract = abstractClassTest(n);
 
+    Abstract = abstractClassTest(n);
     classHandler(n);
   } else {
     Abstract = abstractClassTest(n);
     Language::classHandler(n);
   }
 
+  Abstract = oldAbstract;
+  cplus_mode = oldAccessMode;
   NSpace = oldNSpace;
-  InClass = 0;
+  InClass = oldInClass;
-  CurrentClass = 0;
+  CurrentClass = oldCurrentClass;
   Delete(ClassType);
-  ClassType = 0;
+  ClassType = oldClassType;
   Delete(ClassPrefix);
-  ClassPrefix = 0;
+  ClassPrefix = oldClassPrefix;
   Delete(ClassName);
-  ClassName = 0;
+  ClassName = oldClassName;
   Delete(DirectorClassName);
-  DirectorClassName = 0;
+  DirectorClassName = oldDirectorClassName;
   return SWIG_OK;
 }
 
@@ -2640,7 +2656,7 @@ int Language::constructorDeclaration(Node *n) {
       String *scope = Swig_scopename_check(ClassName) ? Swig_scopename_prefix(ClassName) : 0;
       String *actual_name = scope ? NewStringf("%s::%s", scope, name) : NewString(name);
       Delete(scope);
-      if (!Equal(actual_name, expected_name) && !(Getattr(n, "template"))) {
+      if (!Equal(actual_name, expected_name) && !SwigType_istemplate(expected_name)) {
 	bool illegal_name = true;
 	if (Extend) {
 	  // Check for typedef names used as a constructor name in %extend. This is deprecated except for anonymous
@@ -3426,6 +3442,9 @@ bool Language::extraDirectorProtectedCPPMethodsRequired() const {
   return true;
 }
 
+bool Language::nestedClassesSupported() const {
+  return false;
+}
 /* -----------------------------------------------------------------------------
  * Language::is_wrapping_class()
  * ----------------------------------------------------------------------------- */
@@ -3612,3 +3631,45 @@ Language *Language::instance() {
 Hash *Language::getClassHash() const {
   return classhash;
 }
+
+// insert N tabs before each new line in s
+void Swig_offset_string(String* s, int N)
+{
+  // count a number of lines in s
+  int lines = 1;
+  int L = Len(s);
+  char* start = strchr(Char(s), '\n');
+  while (start) {
+    ++lines;
+    start = strchr(start + 1, '\n');
+  }
+  // do not count pending new line
+  if ((Char(s))[L-1] == '\n')
+    --lines;
+  // allocate a temporary storage for a padded string
+  char* res = (char*)malloc(L + lines * N * 2 + 1);
+  res[L + lines * N * 2] = 0;
+
+  // copy lines to res, prepending tabs to each line
+  char* p = res; // output pointer
+  start = Char(s); // start of a current line
+  char* end = strchr(start, '\n'); // end of a current line
+  while (end) {
+    memset(p, ' ', N*2);
+    p += N*2;
+    memcpy(p, start, end - start + 1);
+    p += end - start + 1;
+    start = end + 1;
+    end = strchr(start, '\n');
+  }
+  // process the last line
+  if (*start) {
+    memset(p, ' ', N*2);
+    p += N*2;
+    strcpy(p, start);
+  }
+  // replace 's' contents with 'res'
+  Clear(s);
+  Append(s, res);
+  free(res);
+}

Source/Modules/main.cxx

@@ -29,6 +29,10 @@
 
 static Language *lang = 0;	// Language method
 int CPlusPlus = 0;
+extern "C"
+{
+  int CPlusPlusOut = 0;		// generate C++ declarations for C code
+};
 int Extend = 0;			// Extend flag
 int ForceExtern = 0;		// Force extern mode
 int GenerateDefault = 1;	// Generate default constructors
@@ -483,6 +487,9 @@ void SWIG_getoptions(int argc, char *argv[]) {
 	Preprocessor_define((DOH *) "__cplusplus __cplusplus", 0);
 	Swig_cparse_cplusplus(1);
 	Swig_mark_arg(i);
+      } else if (strcmp(argv[i], "-c++out") == 0) {
+	CPlusPlusOut = 1;
+	Swig_mark_arg(i);
       } else if (strcmp(argv[i], "-fcompact") == 0) {
 	Wrapper_compact_print_mode_set(1);
 	Swig_mark_arg(i);
@@ -855,8 +862,27 @@ void SWIG_getoptions(int argc, char *argv[]) {
   }
 }
 
-
+void Swig_flatten_nested() {
-
+  String* name = NewString("");
+  String* fname = NewString("feature:flatnested");
+  String* val = NewString("1");
+  Swig_feature_set(Swig_cparse_features(),name,0,fname, val, 0);
+  Delete(fname);
+  Delete(name);
+  Delete(val);
+    /*
+  String* name = NewStringEmpty();
+  Hash* newname = NewHash();
+  Setattr(newname, "name", "$ignore");
+  Hash* match = NewHash();
+  Setattr(match, "name", "match$nested");
+  Setattr(match, "value", "1");
+  set_nextSibling(newname, match);
+  Swig_name_rename_add(0, name, 0, newname, 0);
+  Delete(name);
+  Delete(match);
+  Delete(newname);*/
+}
 
 
 int SWIG_main(int argc, char *argv[], Language *l) {
@@ -1151,6 +1177,10 @@ int SWIG_main(int argc, char *argv[], Language *l) {
       fflush(stdout);
     }
 
+    // add "ignore" directive if nested classes are not supported
+    if (!lang->nestedClassesSupported())
+      Swig_flatten_nested();
+
     Node *top = Swig_cparse(cpps);
 
     if (dump_top & STAGE1) {
@@ -1161,6 +1191,11 @@ int SWIG_main(int argc, char *argv[], Language *l) {
       Printf(stdout, "debug-module stage 1\n");
       Swig_print_tree(Getattr(top, "module"));
     }
+    if (!CPlusPlus) {
+      if (Verbose)
+	Printf(stdout, "Processing unnamed structs...\n");
+      Swig_name_unnamed_c_structs(top);
+    }
 
     if (Verbose) {
       Printf(stdout, "Processing types...\n");
@@ -1181,6 +1216,12 @@ int SWIG_main(int argc, char *argv[], Language *l) {
     }
     Swig_default_allocators(top);
 
+    if (CPlusPlus) {
+      if (Verbose)
+	Printf(stdout, "Processing nested classes...\n");
+      Swig_process_nested_classes(top);
+    }
+
     if (dump_top & STAGE3) {
       Printf(stdout, "debug-top stage 3\n");
       Swig_print_tree(top);

Source/Modules/octave.cxx

@@ -86,6 +86,7 @@ public:
      director_multiple_inheritance = 1;
      director_language = 1;
      docs = NewHash();
+     CPlusPlusOut = 1;
    }
 
   virtual void main(int argc, char *argv[]) {

Source/Modules/swigmod.h

@@ -32,6 +32,7 @@ extern String *input_file;
 extern int line_number;
 extern int start_line;
 extern int CPlusPlus;		// C++ mode
+extern "C" int CPlusPlusOut;	// generate C++ declarations for C code (currently used for Octave)
 extern int Extend;		// Extend mode
 extern int Verbose;
 extern int IsVirtual;
@@ -297,6 +298,16 @@ protected:
   /* Some language modules require additional wrappers for virtual methods not declared in sub-classes */
   virtual bool extraDirectorProtectedCPPMethodsRequired() const;
 
+public:
+  /* Does target language support nested classes? Default is 'false'. If 'false' is returned, then
+    %rename("$ignore", %$isnested) statement will be issued at the top, and the nested classes
+    will be ignored. Note that even if the target language does not support the notion of class
+    nesting, the language module may nevertheless return true from this function, and use
+    %feature "flatnested" to move nested classes to the global scope, instead of ignoring them.
+  */
+  virtual bool nestedClassesSupported() const;
+
+protected:
   /* Identifies if a protected members that are generated when the allprotected option is used.
      This does not include protected virtual methods as they are turned on with the dirprot option. */
   bool isNonVirtualProtectedAccess(Node *n) const;
@@ -410,5 +421,7 @@ int Swig_contract_mode_get();
 void Swig_browser(Node *n, int);
 void Swig_default_allocators(Node *n);
 void Swig_process_types(Node *n);
+void Swig_process_nested_classes(Node *n);
+void Swig_name_unnamed_c_structs(Node *n);
 
 #endif

Source/Modules/typepass.cxx

@@ -178,6 +178,20 @@ class TypePass:private Dispatcher {
 		    }
 		    continue;
 		  }
+		  // A case when both outer and nested classes inherit from the same parent. Constructor may be found instead of the class itself.
+		} else if (GetFlag(cls, "nested") && checkAttribute(bcls, "nodeType", "constructor")) {
+		  bcls = Getattr(bcls, "parentNode");
+		  if (Getattr(bcls, "typepass:visit")) {
+		    if (!Getattr(bcls, "feature:onlychildren")) {
+		      if (!ilist)
+			ilist = alist = NewList();
+		      Append(ilist, bcls);
+		    } else {
+		      Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bname), Getline(bname), "Base class '%s' has no name as it is an empty template instantiated with '%%template()'. Ignored.\n", SwigType_namestr(bname));
+		      Swig_warning(WARN_TYPE_UNDEFINED_CLASS, Getfile(bcls), Getline(bcls), "The %%template directive must be written before '%s' is used as a base class and be declared with a name.\n", SwigType_namestr(bname));
+		    }
+		  }
+		  break;
 		}
 		if (Strcmp(nodeType(bcls), "classforward") != 0) {
 		  Swig_error(Getfile(bname), Getline(bname), "'%s' is not a valid base class.\n", SwigType_namestr(bname));
@@ -463,6 +477,18 @@ class TypePass:private Dispatcher {
       SwigType_typedef(unnamed, tdname);
     }
 
+    // name of the outer class should already be patched to contain it's outer classes names, but not to contain namespaces
+    // namespace name (if present) is added after processing child nodes
+    if (Getattr(n, "nested:outer") && name) {
+      String* outerName = Getattr(Getattr(n, "nested:outer"), "name");
+      name = NewStringf("%s::%s", outerName, name);
+      Setattr(n, "name", name);
+      if (tdname) {
+	tdname = NewStringf("%s::%s", outerName, tdname);
+	Setattr(n, "tdname", tdname);
+      }
+    }
+
     if (nsname && name) {
       nname = NewStringf("%s::%s", nsname, name);
       String *tdname = Getattr(n, "tdname");
@@ -479,7 +505,7 @@ class TypePass:private Dispatcher {
     SwigType_attach_symtab(Getattr(n, "symtab"));
 
     /* Inherit type definitions into the class */
-    if (name) {
+    if (name && !(GetFlag(n, "nested") && GetFlag(n, "feature:flatnested") && !checkAttribute(n, "access", "public"))) {
       cplus_inherit_types(n, 0, nname ? nname : (fname ? fname : name));
     }
 
@@ -1258,3 +1284,432 @@ void Swig_process_types(Node *n) {
     return;
   TypePass::pass(n);
 }
+
+// Nested classes processing section
+static Hash* classhash = 0;
+
+static String *make_name(Node *n, String *name,SwigType *decl) {
+  int destructor = name && (*(Char(name)) == '~');
+  if (String* yyrename = Getattr(n, "class_rename")) {
+    String *s = NewString(yyrename);
+    Delattr(n, "class_rename");
+    if (destructor  && (*(Char(s)) != '~')) {
+      Insert(s,0,"~");
+    }
+    return s;
+  }
+
+  if (!name) return 0;
+  return Swig_name_make(n,0,name,decl,0);
+}
+
+// C version of add_symbols()
+static void add_symbols_c(Node *n) {
+  String *decl;
+  String *wrn = 0;
+  String *symname = 0;
+  int iscdecl = Cmp(nodeType(n),"cdecl") == 0;
+  Setattr(n,"ismember","1");
+  Setattr(n,"access", "public");
+  if (Getattr(n,"sym:name"))
+    return;
+  decl = Getattr(n,"decl");
+  if (!SwigType_isfunction(decl)) {
+    String *name = Getattr(n,"name");
+    String *makename = Getattr(n,"parser:makename");
+    if (iscdecl) {
+      String *storage = Getattr(n, "storage");
+      if (Cmp(storage,"typedef") == 0) {
+	Setattr(n,"kind","typedef");
+      } else {
+	SwigType *type = Getattr(n,"type");
+	String *value = Getattr(n,"value");
+	Setattr(n,"kind","variable");
+	if (value && Len(value)) {
+	  Setattr(n,"hasvalue","1");
+	}
+	if (type) {
+	  SwigType *ty;
+	  SwigType *tmp = 0;
+	  if (decl) {
+	    ty = tmp = Copy(type);
+	    SwigType_push(ty,decl);
+	  } else {
+	    ty = type;
+	  }
+	  if (!SwigType_ismutable(ty)) {
+	    SetFlag(n,"hasconsttype");
+	    SetFlag(n,"feature:immutable");
+	  }
+	  if (tmp) Delete(tmp);
+	}
+	if (!type) {
+	  Printf(stderr,"notype name %s\n", name);
+	}
+      }
+    }
+    Swig_features_get(Swig_cparse_features(), 0, name, 0, n);
+    if (makename) {
+      symname = make_name(n, makename, 0);
+      Delattr(n,"parser:makename"); /* temporary information, don't leave it hanging around */
+    } else {
+      makename = name;
+      symname = make_name(n, makename, 0);
+    }
+
+    if (!symname) {
+      symname = Copy(Getattr(n,"unnamed"));
+    }
+    if (symname) {
+      wrn = Swig_name_warning(n, 0, symname,0);
+    }
+  } else {
+    String *name = Getattr(n,"name");
+    SwigType *fdecl = Copy(decl);
+    SwigType *fun = SwigType_pop_function(fdecl);
+    if (iscdecl) {
+      Setattr(n,"kind","function");
+    }
+
+    Swig_features_get(Swig_cparse_features(),0,name,fun,n);
+
+    symname = make_name(n, name, fun);
+    wrn = Swig_name_warning(n, 0, symname,fun);
+
+    Delete(fdecl);
+    Delete(fun);
+
+  }
+  if (!symname)
+    return;
+  if (GetFlag(n,"feature:ignore")) {
+    /* Only add to C symbol table and continue */
+    Swig_symbol_add(0, n);
+  } else if (strncmp(Char(symname),"$ignore",7) == 0) {
+    char *c = Char(symname)+7;
+    SetFlag(n,"feature:ignore");
+    if (strlen(c)) {
+      SWIG_WARN_NODE_BEGIN(n);
+      Swig_warning(0,Getfile(n), Getline(n), "%s\n",c+1);
+      SWIG_WARN_NODE_END(n);
+    }
+    Swig_symbol_add(0, n);
+  } else {
+    Node *c;
+    if ((wrn) && (Len(wrn))) {
+      String *metaname = symname;
+      if (!Getmeta(metaname,"already_warned")) {
+	SWIG_WARN_NODE_BEGIN(n);
+	Swig_warning(0,Getfile(n),Getline(n), "%s\n", wrn);
+	SWIG_WARN_NODE_END(n);
+	Setmeta(metaname,"already_warned","1");
+      }
+    }
+    c = Swig_symbol_add(symname,n);
+
+    if (c != n) {
+      /* symbol conflict attempting to add in the new symbol */
+      if (Getattr(n,"sym:weak")) {
+	Setattr(n,"sym:name",symname);
+      } else {
+	String *e = NewStringEmpty();
+	String *en = NewStringEmpty();
+	String *ec = NewStringEmpty();
+	int redefined = Swig_need_redefined_warn(n,c,true);
+	if (redefined) {
+	  Printf(en,"Identifier '%s' redefined (ignored)",symname);
+	  Printf(ec,"previous definition of '%s'",symname);
+	} else {
+	  Printf(en,"Redundant redeclaration of '%s'",symname);
+	  Printf(ec,"previous declaration of '%s'",symname);
+	}
+	if (Cmp(symname,Getattr(n,"name"))) {
+	  Printf(en," (Renamed from '%s')", SwigType_namestr(Getattr(n,"name")));
+	}
+	Printf(en,",");
+	if (Cmp(symname,Getattr(c,"name"))) {
+	  Printf(ec," (Renamed from '%s')", SwigType_namestr(Getattr(c,"name")));
+	}
+	Printf(ec,".");
+	SWIG_WARN_NODE_BEGIN(n);
+	if (redefined) {
+	  Swig_warning(WARN_PARSE_REDEFINED,Getfile(n),Getline(n),"%s\n",en);
+	  Swig_warning(WARN_PARSE_REDEFINED,Getfile(c),Getline(c),"%s\n",ec);
+	} else {
+	  Swig_warning(WARN_PARSE_REDUNDANT,Getfile(n),Getline(n),"%s\n",en);
+	  Swig_warning(WARN_PARSE_REDUNDANT,Getfile(c),Getline(c),"%s\n",ec);
+	}
+	SWIG_WARN_NODE_END(n);
+	Printf(e,"%s:%d:%s\n%s:%d:%s\n",Getfile(n),Getline(n),en,
+	  Getfile(c),Getline(c),ec);
+	Setattr(n,"error",e);
+	Delete(e);
+	Delete(en);
+	Delete(ec);
+      }
+    }
+  }
+  Delete(symname);
+}
+
+/* Strips C-style and C++-style comments from string in-place. */
+static void strip_comments(char *string) {
+  int state = 0; /*
+                  * 0 - not in comment
+                  * 1 - in c-style comment
+                  * 2 - in c++-style comment
+                  * 3 - in string
+                  * 4 - after reading / not in comments
+                  * 5 - after reading * in c-style comments
+                  * 6 - after reading \ in strings
+                  */
+  char * c = string;
+  while (*c) {
+    switch (state) {
+    case 0:
+      if (*c == '\"')
+        state = 3;
+      else if (*c == '/')
+        state = 4;
+      break;
+    case 1:
+      if (*c == '*')
+        state = 5;
+      *c = ' ';
+      break;
+    case 2:
+      if (*c == '\n')
+        state = 0;
+      else
+        *c = ' ';
+      break;
+    case 3:
+      if (*c == '\"')
+        state = 0;
+      else if (*c == '\\')
+        state = 6;
+      break;
+    case 4:
+      if (*c == '/') {
+        *(c-1) = ' ';
+        *c = ' ';
+        state = 2;
+      } else if (*c == '*') {
+        *(c-1) = ' ';
+        *c = ' ';
+        state = 1;
+      } else
+        state = 0;
+      break;
+    case 5:
+      if (*c == '/')
+        state = 0;
+      else
+        state = 1;
+      *c = ' ';
+      break;
+    case 6:
+      state = 3;
+      break;
+    }
+    ++c;
+  }
+}
+
+// Create an %insert with a typedef to make a new name visible to C
+// the code is moved from parser.y, dump_nested() function with minor changes
+static Node* create_insert(Node* n, bool noTypedef = false) {
+  // format a typedef
+  String* ccode = Getattr(n, "code");
+  Push(ccode, " ");
+  if (noTypedef) {
+    Push(ccode, Getattr(n, "name"));
+    Push(ccode, " ");
+    Push(ccode, Getattr(n, "kind"));
+  } else {
+    Push(ccode, Getattr(n, "kind"));
+    Push(ccode, "typedef ");
+    Append(ccode, " ");
+    Append(ccode, Getattr(n, "tdname"));
+  }
+  Append(ccode, ";");
+
+
+  /* Strip comments - further code may break in presence of comments. */
+  strip_comments(Char(ccode));
+
+  /* Make all SWIG created typedef structs/unions/classes unnamed else
+  redefinition errors occur - nasty hack alert.*/
+  if (!noTypedef) {
+    const char* types_array[3] = {"struct", "union", "class"};
+    for (int i = 0; i < 3; i++) {
+      char* code_ptr = Char(ccode);
+      while (code_ptr) {
+	/* Replace struct name (as in 'struct name {...}' ) with whitespace
+	name will be between struct and opening brace */
+
+	code_ptr = strstr(code_ptr, types_array[i]);
+	if (code_ptr) {
+	  char *open_bracket_pos;
+	  code_ptr += strlen(types_array[i]);
+	  open_bracket_pos = strchr(code_ptr, '{');
+	  if (open_bracket_pos) {
+	    /* Make sure we don't have something like struct A a; */
+	    char* semi_colon_pos = strchr(code_ptr, ';');
+	    if (!(semi_colon_pos && (semi_colon_pos < open_bracket_pos)))
+	      while (code_ptr < open_bracket_pos)
+		*code_ptr++ = ' ';
+	  }
+	}
+      }
+    }
+  }
+  {
+    /* Remove SWIG directive %constant which may be left in the SWIG created typedefs */
+    char* code_ptr = Char(ccode);
+    while (code_ptr) {
+      code_ptr = strstr(code_ptr, "%constant");
+      if (code_ptr) {
+	char* directive_end_pos = strchr(code_ptr, ';');
+	if (directive_end_pos) {
+	  while (code_ptr <= directive_end_pos)
+	    *code_ptr++ = ' ';
+	}
+      }
+    }
+  }
+  Node *newnode  = NewHash();
+  set_nodeType(newnode ,"insert");
+  Setfile(newnode ,Getfile(n));
+  Setline(newnode ,Getline(n));
+  String *code = NewStringEmpty();
+  Wrapper_pretty_print(ccode, code);
+  Setattr(newnode, "code", code);
+  Delete(code);
+  Delattr(n, "code");
+  return newnode;
+}
+
+static void insertNodeAfter(Node *n, Node* c)
+{
+  Node* g = parentNode(n);
+  set_parentNode(c, g);
+  Node* ns = nextSibling(n);
+  if (Node* outer = Getattr(c, "nested:outer")) {
+    while (ns && outer == Getattr(ns, "nested:outer")) {
+      n = ns;
+      ns = nextSibling(n);
+    }
+  }
+  if (!ns) {
+    set_lastChild(g, c);
+  }
+  else {
+    set_nextSibling(c, ns);
+    set_previousSibling(ns, c);
+  }
+  set_nextSibling(n, c);
+  set_previousSibling(c, n);
+}
+
+void Swig_name_unnamed_c_structs(Node *n) {
+  if (!classhash)
+    classhash = Getattr(n, "classes");
+  Node* c = firstChild(n);
+  while (c) {
+    Node* next = nextSibling(c);
+    if (String* declName = Getattr(c, "nested:unnamed")) {
+      if (Node* outer = Getattr(c, "nested:outer")) {
+	// generate a name
+	String* name = NewStringf("%s_%s", Getattr(outer, "name"), declName);
+	Delattr(c, "nested:unnamed");
+	// set the name to the class and symbol table
+	Setattr(c, "tdname", name);
+	Setattr(c, "name", name);
+	Swig_symbol_setscope(Getattr(c,"symtab"));
+	Swig_symbol_setscopename(name);
+	// now that we have a name - gather base symbols
+	if (List* publicBases = Getattr(c,"baselist")) {
+	  List* bases = Swig_make_inherit_list(name, publicBases, 0);
+	  Swig_inherit_base_symbols(bases);
+	  Delete(bases);
+	}
+	Setattr(classhash,name,c);
+	Swig_symbol_popscope();
+	// process declarations following this type (assign correct new type)
+	SwigType* ty = Copy(name);
+	Node* decl = nextSibling(c);
+	List* declList = NewList();
+	while (decl && Getattr(decl, "nested:unnamedtype") == c) {
+	  Setattr(decl, "type", ty);
+	  Append(declList, decl);
+	  Delattr(decl, "nested:unnamedtype");
+          SetFlag(decl, "feature:immutable");
+	  add_symbols_c(decl);
+	  decl = nextSibling(decl);
+	}
+	Delete(ty);
+	// Check for extensions
+/*	// TODO: we can save extensions hash like class hash and move check_extensions() after nesting processing
+	if (extendhash) {
+	  if (Node *am = Getattr(extendhash, name)) {
+	    // Merge the extension into the symbol table
+	    merge_extensions(c, am);
+	    append_previous_extension(c, am);
+	    Delattr(extendhash, clsname);
+	  }
+	}*/
+	Swig_symbol_setscope(Swig_symbol_global_scope());
+	add_symbols_c(c);
+
+	Node* ins = create_insert(c);
+	insertNodeAfter(c, ins);
+	removeNode(c);
+	insertNodeAfter(n, c);
+	Delete(ins);
+	Delattr(c, "nested:outer");
+      }else {
+	// global unnamed struct - ignore it
+	c = next;
+	continue;
+      }
+    } else if (CPlusPlusOut) {
+      if (Getattr(c, "nested:outer")) {
+	Node* ins = create_insert(c, true);
+	insertNodeAfter(c, ins);
+	Delete(ins);
+	Delattr(c, "nested:outer");
+      }
+    }
+    // process children
+    Swig_name_unnamed_c_structs(c);
+    c = next;
+  }
+}
+static void remove_outer_class_reference(Node *n)
+{
+  for (Node* c = firstChild(n); c; c = nextSibling(c)) {
+    if (GetFlag(c, "feature:flatnested")) {
+      Delattr(c, "nested:outer");
+      remove_outer_class_reference(c);
+    }
+  }
+}
+void Swig_process_nested_classes(Node *n) {
+  Node* c = firstChild(n);
+  while (c) {
+    Node* next = nextSibling(c);
+    if (!Getattr(c,"templatetype")) {
+      if (GetFlag(c, "nested") && GetFlag(c, "feature:flatnested")) {
+        removeNode(c);
+        if (!checkAttribute(c, "access", "public"))
+	  SetFlag(c, "feature:ignore");
+	else
+	  insertNodeAfter(n, c);
+      }
+      Swig_process_nested_classes(c);
+    }
+    c = next;
+  }
+  remove_outer_class_reference(n);
+}

Source/Swig/naming.c

@@ -1648,6 +1648,71 @@ void Swig_name_inherit(String *base, String *derived) {
   Swig_name_object_inherit(Swig_cparse_features(), base, derived);
 }
 
+void Swig_inherit_base_symbols(List* bases) {
+  if (bases) {
+    Iterator s;
+    for (s = First(bases); s.item; s = Next(s)) {
+      Symtab *st = Getattr(s.item,"symtab");
+      if (st) {
+	Setfile(st,Getfile(s.item));
+	Setline(st,Getline(s.item));
+	Swig_symbol_inherit(st);
+      }
+    }
+    Delete(bases);
+  }
+}
+
+List *Swig_make_inherit_list(String *clsname, List *names, String* Namespaceprefix) {
+  int i, ilen;
+  String *derived;
+  List *bases = NewList();
+
+  if (Namespaceprefix) derived = NewStringf("%s::%s", Namespaceprefix,clsname);
+  else derived = NewString(clsname);
+
+  ilen = Len(names);
+  for (i = 0; i < ilen; i++) {
+    Node *s;
+    String *base;
+    String *n = Getitem(names,i);
+    /* Try to figure out where this symbol is */
+    s = Swig_symbol_clookup(n,0);
+    if (s) {
+      while (s && (Strcmp(nodeType(s),"class") != 0)) {
+	/* Not a class.  Could be a typedef though. */
+	String *storage = Getattr(s,"storage");
+	if (storage && (Strcmp(storage,"typedef") == 0)) {
+	  String *nn = Getattr(s,"type");
+	  s = Swig_symbol_clookup(nn,Getattr(s,"sym:symtab"));
+	} else {
+	  break;
+	}
+      }
+      if (s && ((Strcmp(nodeType(s),"class") == 0) || (Strcmp(nodeType(s),"template") == 0))) {
+	String *q = Swig_symbol_qualified(s);
+	Append(bases,s);
+	if (q) {
+	  base = NewStringf("%s::%s", q, Getattr(s,"name"));
+	  Delete(q);
+	} else {
+	  base = NewString(Getattr(s,"name"));
+	}
+      } else {
+	base = NewString(n);
+      }
+    } else {
+      base = NewString(n);
+    }
+    if (base) {
+      Swig_name_inherit(base,derived);
+      Delete(base);
+    }
+  }
+  return bases;
+}
+
+
 /* -----------------------------------------------------------------------------
  * void Swig_name_str()
  *

Source/Swig/scanner.c

@@ -1545,7 +1545,110 @@ int Scanner_skip_balanced(Scanner * s, int startchar, int endchar) {
   Delete(locator);
   return 0;
 }
+/* returns raw text between 2 braces, does not change scanner state in any way*/
+String* Scanner_get_raw_text_balanced(Scanner* s, int startchar, int endchar)
+{
+  String* result = 0;
+  char c;
+  int old_line = s->line;
+  String* old_text = Copy(s->text);
+  int position = Tell(s->str);
 
+  int num_levels = 1;
+  int state = 0;
+  char temp[2] = { 0, 0 };
+  temp[0] = (char) startchar;
+  Clear(s->text);
+  Setfile(s->text, Getfile(s->str));
+  Setline(s->text, s->line);
+  Append(s->text, temp);
+  while (num_levels > 0) {
+    if ((c = nextchar(s)) == 0) {
+      Clear(s->text);
+      Append(s->text, old_text);
+      Delete(old_text);
+      s->line = old_line;
+      return 0;
+    }
+    switch (state) {
+    case 0:
+      if (c == startchar)
+	num_levels++;
+      else if (c == endchar)
+	num_levels--;
+      else if (c == '/')
+	state = 10;
+      else if (c == '\"')
+	state = 20;
+      else if (c == '\'')
+	state = 30;
+      break;
+    case 10:
+      if (c == '/')
+	state = 11;
+      else if (c == '*')
+	state = 12;
+      else if (c == startchar) {
+	state = 0;
+	num_levels++;
+      }
+      else
+	state = 0;
+      break;
+    case 11:
+      if (c == '\n')
+	state = 0;
+      else
+	state = 11;
+      break;
+    case 12: /* first character inside C comment */
+      if (c == '*')
+	state = 14;
+      else
+	state = 13;
+      break;
+    case 13:
+      if (c == '*')
+	state = 14;
+      break;
+    case 14: /* possible end of C comment */
+      if (c == '*')
+	state = 14;
+      else if (c == '/')
+	state = 0;
+      else
+	state = 13;
+      break;
+    case 20:
+      if (c == '\"')
+	state = 0;
+      else if (c == '\\')
+	state = 21;
+      break;
+    case 21:
+      state = 20;
+      break;
+    case 30:
+      if (c == '\'')
+	state = 0;
+      else if (c == '\\')
+	state = 31;
+      break;
+    case 31:
+      state = 30;
+      break;
+    default:
+      break;
+    }
+  }
+  Seek(s->str, position, SEEK_SET);
+  result = Copy(s->text);
+  Clear(s->text);
+  Append(s->text, old_text);
+  Delete(old_text);
+  s->line = old_line;
+  return result;
+}
 /* -----------------------------------------------------------------------------
  * Scanner_isoperator()
  *

Source/Swig/swig.h

@@ -286,6 +286,8 @@ extern int        ParmList_is_compactdefargs(ParmList *p);
   extern Hash *Swig_name_namewarn_get(Node *n, String *prefix, String *name, SwigType *decl);
   extern void Swig_name_rename_add(String *prefix, String *name, SwigType *decl, Hash *namewrn, ParmList *declaratorparms);
   extern void Swig_name_inherit(String *base, String *derived);
+  extern List *Swig_make_inherit_list(String *clsname, List *names, String* Namespaceprefix);
+  extern void Swig_inherit_base_symbols(List* bases);
   extern int Swig_need_protected(Node *n);
   extern int Swig_need_name_warning(Node *n);
   extern int Swig_need_redefined_warn(Node *a, Node *b, int InClass);

Source/Swig/swigscan.h

@@ -22,6 +22,7 @@ extern int          Scanner_token(Scanner *);
 extern String      *Scanner_text(Scanner *);
 extern void         Scanner_skip_line(Scanner *);
 extern int          Scanner_skip_balanced(Scanner *, int startchar, int endchar);
+extern String      *Scanner_get_raw_text_balanced(Scanner *, int startchar, int endchar);
 extern void         Scanner_set_location(Scanner *, String *file, int line);
 extern String      *Scanner_file(Scanner *);
 extern int          Scanner_line(Scanner *);

Source/Swig/swigtree.h

@@ -38,6 +38,7 @@ extern void   appendChild(Node *node, Node *child);
 extern void   prependChild(Node *node, Node *child);
 extern void   removeNode(Node *node);
 extern Node  *copyNode(Node *node);
+extern void   appendSibling(Node *node, Node *chd);
 
 /* Node restoration/restore functions */
 

Source/Swig/tree.c

@@ -171,6 +171,25 @@ void prependChild(Node *node, Node *chd) {
   }
 }
 
+void appendSibling(Node *node, Node *chd)
+{
+  Node *parent;
+  Node* lc = node;
+  while(nextSibling(lc))
+    lc = nextSibling(lc);
+  set_nextSibling(lc, chd);
+  set_previousSibling(chd, lc);
+  parent = parentNode(node);
+  if (parent) {
+    while (chd) {
+      lc = chd;
+      set_parentNode(chd, parent);
+      chd = nextSibling(chd);
+    }
+    set_lastChild(parent, lc);
+  }
+}
+
 /* -----------------------------------------------------------------------------
  * removeNode()
  *