Changeset 284da8c for src/Parser/DeclarationNode.cc

Timestamp:

Jul 6, 2018, 9:45:43 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

a1cfa0c, ac4ebc1

Parents:

57fc7d8

Message:

cleanup, fix distribution order, add generic declaration/instantiation, extra qualifier check

File:

• src/Parser/DeclarationNode.cc (modified) (3 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 : Thu Jun  7 12:08:55 2018
-// Update Count     : 1079
+// Last Modified On : Fri Jul  6 06:56:08 2018
+// Update Count     : 1088
 //
 
@@ -504 +504 @@
 
 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 );
@@ -1065 +1057 @@
                         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();
                 Declaration * decl = buildDecl( type, name ? *name : string( "" ), storageClasses, maybeBuild< Expression >( bitfieldWidth ), funcSpecs, linkage, asmName, isDelete ? nullptr : maybeBuild< Initializer >(initializer), attributes )->set_extension( extension );