From 7fd36f5bd6c28331cf9375dc9d35fb5c58aecce3 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 17 Nov 2009 18:45:53 +0000
Subject: [PATCH] Fix parsing of struct declaration and initialization

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11750 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                               |  7 +++++
 Examples/test-suite/common.mk                 |  2 ++
 .../python/struct_initialization_runme.py     | 20 ++++++++++++
 Examples/test-suite/struct_initialization.i   | 31 +++++++++++++++++++
 .../test-suite/struct_initialization_cpp.i    |  5 +++
 Source/CParse/parser.y                        | 10 +++---
 6 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 Examples/test-suite/python/struct_initialization_runme.py
 create mode 100644 Examples/test-suite/struct_initialization.i
 create mode 100644 Examples/test-suite/struct_initialization_cpp.i

diff --git a/CHANGES.current b/CHANGES.current
index 3d5c27950..e97bbc58a 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,6 +1,13 @@
 Version 1.3.41 (in progress)
 ============================
 
+2009-11-17: wsfulton
+            Fix parsing of struct declaration and initialization, for example:
+
+              struct S {
+                 int x;
+              } instance = { 10 };
+
 2009-11-15: wsfulton
             Fix #1960977 - Syntax error parsing derived nested class declaration and member
             variable instance.
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index c8ca09013..db28917ef 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -303,6 +303,7 @@ CPP_TEST_CASES += \
 	static_array_member \
 	static_const_member \
 	static_const_member_2 \
+	struct_initialization_cpp \
 	struct_value \
 	template \
 	template_arg_replace \
@@ -470,6 +471,7 @@ C_TEST_CASES += \
 	sizeof_pointer \
 	sneaky1 \
 	struct_rename \
+	struct_initialization \
 	typedef_struct \
 	typemap_subst \
 	union_parameter \
diff --git a/Examples/test-suite/python/struct_initialization_runme.py b/Examples/test-suite/python/struct_initialization_runme.py
new file mode 100644
index 000000000..fbed6a5e9
--- /dev/null
+++ b/Examples/test-suite/python/struct_initialization_runme.py
@@ -0,0 +1,20 @@
+from struct_initialization import *
+
+if cvar.instanceC1.x != 10:
+  raise RuntimeError
+
+if cvar.instanceD1.x != 10:
+  raise RuntimeError
+
+if cvar.instanceD2.x != 20:
+  raise RuntimeError
+
+if cvar.instanceD3.x != 30:
+  raise RuntimeError
+
+if cvar.instanceE1.x != 1:
+  raise RuntimeError
+
+if cvar.instanceF1.x != 1:
+  raise RuntimeError
+
diff --git a/Examples/test-suite/struct_initialization.i b/Examples/test-suite/struct_initialization.i
new file mode 100644
index 000000000..c378ba31d
--- /dev/null
+++ b/Examples/test-suite/struct_initialization.i
@@ -0,0 +1,31 @@
+// Test declaration and initialization of structs (C code)
+%module struct_initialization
+
+%inline %{
+
+// Named types
+struct StructA {
+   int x;
+} instanceA1;
+
+struct StructB {
+   int x;
+} instanceB1, instanceB2, instanceB3;
+
+struct StructC {
+   int x;
+} instanceC1 = { 10 };
+
+struct StructD {
+   int x;
+} instanceD1 = { 10 }, instanceD2 = { 20 }, instanceD3 = { 30 };
+
+struct StructE {
+   int x;
+} instanceE1[3] = { { 1 }, { 2 }, { 3} };
+
+struct StructF {
+   int x;
+} instanceF1[3] = { { 1 }, { 2 } }, instanceF2[2] = { { -1 }, { -2 } }, instanceF3[2] = { { 11 }, { 22 } };
+
+%}
diff --git a/Examples/test-suite/struct_initialization_cpp.i b/Examples/test-suite/struct_initialization_cpp.i
new file mode 100644
index 000000000..dc47077b5
--- /dev/null
+++ b/Examples/test-suite/struct_initialization_cpp.i
@@ -0,0 +1,5 @@
+// Test declaration and initialization of structs (C++ code)
+%module struct_initialization_cpp
+
+%include "struct_initialization.i" // C code
+
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index b87ba9368..0da3666f8 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -3546,7 +3546,7 @@ cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
 	       Classprefix = NewStringEmpty();
 	       Delete(Namespaceprefix);
 	       Namespaceprefix = Swig_symbol_qualifiedscopename(0);
-             } cpp_members RBRACE declarator c_decl_tail {
+             } cpp_members RBRACE declarator initializer c_decl_tail {
 	       String *unnamed;
 	       Node *n;
 	       Classprefix = 0;
@@ -3564,8 +3564,8 @@ cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
 	       Setattr(n,"decl",$7.type);
 	       Setattr(n,"parms",$7.parms);
 	       Setattr(n,"storage",$1);
-	       if ($8) {
-		 Node *p = $8;
+	       if ($9) {
+		 Node *p = $9;
 		 set_nextSibling(n,p);
 		 while (p) {
 		   String *type = Copy(unnamed);
@@ -3635,12 +3635,12 @@ cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
              ;
 
 cpp_opt_declarators :  SEMI { $$ = 0; }
-                    |  declarator c_decl_tail {
+                    |  declarator initializer c_decl_tail {
                         $$ = new_node("cdecl");
                         Setattr($$,"name",$1.id);
                         Setattr($$,"decl",$1.type);
                         Setattr($$,"parms",$1.parms);
-			set_nextSibling($$,$2);
+			set_nextSibling($$,$3);
                     }
                     ;
 /* ------------------------------------------------------------