From bda9c90e2bea477f03be4715c9f92fcf856bff69 Mon Sep 17 00:00:00 2001
From: Vladimir Kalinin <vkalinin@opendesign.com>
Date: Mon, 3 Feb 2014 02:21:44 +0400
Subject: [PATCH] warnfilter fixed scoping for "anonymous forward declaration"
 fixed

---
 Examples/test-suite/namespace_union.i |  2 ++
 Examples/test-suite/nested_class.i    |  1 +
 Examples/test-suite/nested_comment.i  |  2 ++
 Source/CParse/parser.y                | 17 ++++++++++++-----
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Examples/test-suite/namespace_union.i b/Examples/test-suite/namespace_union.i
index 84e38b4d5..85885f399 100644
--- a/Examples/test-suite/namespace_union.i
+++ b/Examples/test-suite/namespace_union.i
@@ -1,5 +1,7 @@
 %module namespace_union
 
+#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS
+
 %inline %{
 namespace SpatialIndex 
 { 
diff --git a/Examples/test-suite/nested_class.i b/Examples/test-suite/nested_class.i
index ccb7ecac1..1cdfaade6 100644
--- a/Examples/test-suite/nested_class.i
+++ b/Examples/test-suite/nested_class.i
@@ -19,6 +19,7 @@
 %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerMultipleNamedTypedef;
 %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerSameName;
 %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer2::IgnoreMe;
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer::InnerSameName2;
 
 %inline %{
 struct Outer {
diff --git a/Examples/test-suite/nested_comment.i b/Examples/test-suite/nested_comment.i
index df160b157..99d0ffb43 100644
--- a/Examples/test-suite/nested_comment.i
+++ b/Examples/test-suite/nested_comment.i
@@ -1,5 +1,7 @@
 %module nested_comment
 
+#pragma SWIG nowarn=SWIGWARN_PARSE_UNNAMED_NESTED_CLASS
+
 // this example shows a problem with 'dump_nested' (parser.y).
 
 // bug #949654
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index 102cba368..77d253299 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -1076,7 +1076,7 @@ static void update_nested_classes(Node *n)
  * Create the nested class/struct/union as a forward declaration.
  * ----------------------------------------------------------------------------- */
 
-static Node *nested_forward_declaration(const char *storage, const char *kind, String *sname, String *name, Node *cpp_opt_declarators) {
+static Node *nested_forward_declaration(const char *storage, const char *kind, String *sname, String *name, Node *cpp_opt_declarators, Node* nested) {
   Node *nn = 0;
   int warned = 0;
 
@@ -1120,15 +1120,19 @@ static Node *nested_forward_declaration(const char *storage, const char *kind, S
   }
 
   if (nn && Equal(nodeType(nn), "classforward")) {
-    Node *n = nn;
+    Node *n = nested;
     SWIG_WARN_NODE_BEGIN(n);
     Swig_warning(WARN_PARSE_NAMED_NESTED_CLASS, cparse_file, cparse_line,"Nested %s not currently supported (%s ignored)\n", kind, sname ? sname : name);
     SWIG_WARN_NODE_END(n);
     warned = 1;
   }
 
-  if (!warned)
+  if (!warned) {
+    Node *n = nested;
+    SWIG_WARN_NODE_BEGIN(n);
     Swig_warning(WARN_PARSE_UNNAMED_NESTED_CLASS, cparse_file, cparse_line, "Nested %s not currently supported (ignored).\n", kind);
+    SWIG_WARN_NODE_END(n);
+  }
 
   return nn;
 }
@@ -3624,7 +3628,7 @@ cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
 		   if (cplus_mode == CPLUS_PRIVATE) {
 		     $$ = 0; /* skip private nested classes */
 		   } else if (cparse_cplusplus && currentOuterClass && ignore_nested_classes && !GetFlag($$, "feature:flatnested")) {
-		     $$ = nested_forward_declaration($1, $2, $3, Copy($3), $9);
+		     $$ = nested_forward_declaration($1, $2, $3, Copy($3), $9, $$);
 		   } else if (nscope_inner) {
 		     /* this is tricky */
 		     /* we add the declaration in the original namespace */
@@ -3737,7 +3741,10 @@ cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
 	       Swig_features_get(Swig_cparse_features(), Namespaceprefix, 0, 0, $$);
 	       if (cparse_cplusplus && currentOuterClass && ignore_nested_classes && !GetFlag($$, "feature:flatnested")) {
 		 String *name = n ? Copy(Getattr(n, "name")) : 0;
-		 $$ = nested_forward_declaration($1, $2, 0, name, n);
+		 $$ = nested_forward_declaration($1, $2, 0, name, n, $$);
+		 Swig_symbol_popscope();
+	         Delete(Namespaceprefix);
+		 Namespaceprefix = Swig_symbol_qualifiedscopename(0);
 	       } else if (n) {
 	         appendSibling($$,n);
 		 /* If a proper typedef name was given, we'll use it to set the scope name */