From 1188ae39dbf5e821a26522e804b24f2c99a36046 Mon Sep 17 00:00:00 2001 From: Jamie Pate Date: Tue, 15 Dec 2015 00:30:34 -0800 Subject: [PATCH] Update c_generator to add {} around nested NamedInitializers --- pycparser/c_generator.py | 2 +- tests/test_c_generator.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pycparser/c_generator.py b/pycparser/c_generator.py index 4c537219..ad0e89da 100644 --- 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 index edaced18..35afe170 100644 --- 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()