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

File:

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

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul  6 06:56:08 2018
-// Update Count     : 1088
+// Last Modified On : Thu Jun  7 12:08:55 2018
+// Update Count     : 1079
 //
 
@@ -254 +254 @@
 } // 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 ) {
         assert( name );
@@ -504 +522 @@
 
 static void addQualifiersToType( TypeData *&src, TypeData * dst ) {
+        if ( src->forall && dst->kind == TypeData::Function ) {
+                if ( dst->forall ) {
+                        dst->forall->appendList( src->forall );
+                } else {
+                        dst->forall = src->forall;
+                } // if
+                src->forall = nullptr;
+        } // if
         if ( dst->base ) {
                 addQualifiersToType( src, dst->base );
@@ -985 +1011 @@
                 try {
                         Declaration * decl = cur->build();
-                        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
+                        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
                 } catch( SemanticErrorException &e ) {
@@ -1056 +1082 @@
                 if ( type->kind != TypeData::Function && funcSpecs.any() ) {
                         SemanticError( this, "invalid function specifier for " );
-                } // if
-                // Forall qualifier can only appear on a function/aggregate definition/declaration.
-                //
-                //    forall int f();                                   // allowed
-                //    forall int g( int i );                    // allowed
-                //    forall int i;                                             // disallowed
-                if ( type->kind != TypeData::Function && type->forall ) {
-                        SemanticError( this, "invalid type qualifier for " );
                 } // if
                 bool isDelete = initializer && initializer->get_isDelete();