From 53c14da2206c74783acb792eab6085cc7d06f068 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 28 Jan 2016 21:53:46 -0700 Subject: parseh understands bodyless struct used in fn --- src/parseh.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/parseh.cpp') diff --git a/src/parseh.cpp b/src/parseh.cpp index 8efef636a5..5a829edc4b 100644 --- a/src/parseh.cpp +++ b/src/parseh.cpp @@ -537,6 +537,10 @@ static void visit_enum_decl(Context *c, const EnumDecl *enum_decl) { return; } + // eagerly put the name in the table, but we need to remember to remove it if it fails + // boy it would be nice to have defer here wouldn't it + c->enum_type_table.put(bare_name, true); + const EnumDecl *enum_def = enum_decl->getDefinition(); if (!enum_def) { @@ -553,10 +557,6 @@ static void visit_enum_decl(Context *c, const EnumDecl *enum_decl) { node->data.struct_decl.visib_mod = VisibModExport; node->data.struct_decl.directives = create_empty_directives(c); - // eagerly put the name in the table, but we need to remember to remove it if it fails - // boy it would be nice to have defer here wouldn't it - c->enum_type_table.put(bare_name, true); - ZigList var_decls = {0}; int i = 0; @@ -624,6 +624,11 @@ static void visit_record_decl(Context *c, const RecordDecl *record_decl) { return; } + // eagerly put the name in the table, but we need to remember to remove it if it fails + // boy it would be nice to have defer here wouldn't it + c->struct_type_table.put(bare_name, true); + + RecordDecl *record_def = record_decl->getDefinition(); if (!record_def) { // this is a type that we can point to but that's it, such as `struct Foo;`. @@ -639,10 +644,6 @@ static void visit_record_decl(Context *c, const RecordDecl *record_decl) { node->data.struct_decl.visib_mod = VisibModExport; node->data.struct_decl.directives = create_empty_directives(c); - // eagerly put the name in the table, but we need to remember to remove it if it fails - // boy it would be nice to have defer here wouldn't it - c->struct_type_table.put(bare_name, true); - for (auto it = record_def->field_begin(), it_end = record_def->field_end(); it != it_end; ++it) -- cgit v1.2.3