Changes in src/Parser/DeclarationNode.cc [c194661:a1c9ddd]

File:

• src/Parser/DeclarationNode.cc (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -253 +253 @@
         return newnode;
 } // DeclarationNode::newFromTypedef
-
-DeclarationNode * DeclarationNode::newFromGlobalScope() {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::GlobalScope );
-        return newnode;
-}
-
-DeclarationNode * DeclarationNode::newQualifiedType( DeclarationNode * parent, DeclarationNode * child) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Qualified );
-        newnode->type->qualified.parent = parent->type;
-        newnode->type->qualified.child = child->type;
-        parent->type = nullptr;
-        child->type = nullptr;
-        delete parent;
-        delete child;
-        return newnode;
-}
 
 DeclarationNode * DeclarationNode::newAggregate( Aggregate kind, const string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
@@ -1011 +993 @@
                 try {
                         Declaration * decl = cur->build();
-                        assert( decl );
-                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
-                                dwt->location = cur->location;
-                                * out++ = dwt;
-                        } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
-                                // xxx - this might be where anonymous struct members are added - should be conditional on struct name
-                                StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->name );
-                                auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
-                                obj->location = cur->location;
-                                * out++ = obj;
-                                delete agg;
-                        } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
-                                UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->name );
-                                auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
-                                obj->location = cur->location;
-                                * out++ = obj;
+                        if ( decl ) {
+                                if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                        dwt->location = cur->location;
+                                        * out++ = dwt;
+                                } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
+                                        StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
+                                        auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                        obj->location = cur->location;
+                                        * out++ = obj;
+                                        delete agg;
+                                } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
+                                        UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
+                                        auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
+                                        obj->location = cur->location;
+                                        * out++ = obj;
+                                } // if
                         } // if
                 } catch( SemanticErrorException &e ) {