Merge pull request #109 from jamie-pate/master

Update c_generator to add {} around nested NamedInitializers
eliben · Dec 15, 2015 · bf6aa16 · bf6aa16
2 parents aceb9c9 + 1188ae3
commit bf6aa16
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/pycparser/c_generator.py b/pycparser/c_generator.py
@@ -279,7 +279,7 @@ def visit_NamedInitializer(self, n):
                 s += '.' + name.name
             elif isinstance(name, c_ast.Constant):
                 s += '[' + name.value + ']'
-        s += ' = ' + self.visit(n.expr)
+        s += ' = ' + self._visit_expr(n.expr)
         return s
 
     def visit_FuncDecl(self, n):

diff --git a/tests/test_c_generator.py b/tests/test_c_generator.py
@@ -172,6 +172,19 @@ def test_nest_initializer_list(self):
            int i[1][1] = { { 1 } };
         }''')
 
+    def test_nest_named_initializer(self):
+        self._assert_ctoc_correct(r'''struct test
+            {
+                int i;
+                struct test_i_t
+                {
+                    int k;
+                } test_i;
+                int j;
+            };
+            struct test test_var = {.i = 0, .test_i = {.k = 1}, .j = 2};
+        ''')
+
     def test_expr_list_in_initializer_list(self):
         self._assert_ctoc_correct(r'''
         int main()