summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Pate <jamie.pate@gmail.com>2015-12-15 00:30:34 -0800
committerJamie Pate <jamie.pate@gmail.com>2015-12-15 00:33:33 -0800
commit1188ae39dbf5e821a26522e804b24f2c99a36046 (patch)
treeccabd1fe95e912ca7b683ae5fa44d3e2236cd8f4
parent904cecd150c2c5c768944d199169957cdb8433f9 (diff)
downloadpycparser-1188ae39dbf5e821a26522e804b24f2c99a36046.tar.gz
Update c_generator to add {} around nested NamedInitializers
-rw-r--r--pycparser/c_generator.py2
-rw-r--r--tests/test_c_generator.py13
2 files changed, 14 insertions, 1 deletions
diff --git a/pycparser/c_generator.py b/pycparser/c_generator.py
index 4c53721..ad0e89d 100644
--- a/pycparser/c_generator.py
+++ b/pycparser/c_generator.py
@@ -279,7 +279,7 @@ class CGenerator(object):
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 edaced1..35afe17 100644
--- a/tests/test_c_generator.py
+++ b/tests/test_c_generator.py
@@ -172,6 +172,19 @@ class TestCtoC(unittest.TestCase):
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()