Changeset 638ac26 for src/Parser/parser.yy

Timestamp:

Jul 6, 2018, 2:18:34 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

46e480a5

Parents:

e3b2474 (diff), 1d386a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (11 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  2 20:23:14 2018
-// Update Count     : 3607
+// Last Modified On : Fri Jul  6 08:02:38 2018
+// Update Count     : 3716
 //
 
@@ -116 +116 @@
 
 void distQual( DeclarationNode * declaration, DeclarationNode * qualifiers ) {
-        // distribute qualifiers across all declarations in a distribution statemement
+        // distribute qualifiers across all non-variable declarations in a distribution statemement
         for ( DeclarationNode * iter = declaration; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                if ( isMangled( iter->linkage ) ) {             // ignore extern "C"
-                        iter->addQualifiers( qualifiers->clone() );
+                // SKULLDUGGERY: Distributions are parsed inside out, so qualifiers are added to declarations inside out. Since
+                // addQualifiers appends to the back of the list, the forall clauses are in the wrong order (right to left). To
+                // get the qualifiers in the correct order and still use addQualifiers (otherwise, 90% of addQualifiers has to
+                // be copied to add to front), the appropriate forall pointers are interchanged before calling addQualifiers.
+                DeclarationNode * clone = qualifiers->clone();
+                if ( qualifiers->type ) {                                               // forall clause ? (handles SC)
+                        if ( iter->type->kind == TypeData::Aggregate ) { // struct/union ?
+                                swap( clone->type->forall, iter->type->aggregate.params );
+                                iter->addQualifiers( clone );
+                        } else if ( iter->type->kind == TypeData::AggregateInst && iter->type->aggInst.aggregate->aggregate.body ) { // struct/union ?
+                                // Create temporary node to hold aggregate, call addQualifiers as above, then put nodes back together.
+                                DeclarationNode newnode;
+                                swap( newnode.type, iter->type->aggInst.aggregate );
+                                swap( clone->type->forall, newnode.type->aggregate.params );
+                                newnode.addQualifiers( clone );
+                                swap( newnode.type, iter->type->aggInst.aggregate );
+                        } else if ( iter->type->kind == TypeData::Function ) { // routines ?
+                                swap( clone->type->forall, iter->type->forall );
+                                iter->addQualifiers( clone );
+                        } // if
+                } else {                                                                                // just SC qualifiers
+                        iter->addQualifiers( clone );
                 } // if
         } // for
-} // distExt
+        delete qualifiers;
+} // distQual
 
 // There is an ambiguity for inline generic-routine return-types and generic routines.
@@ -366 +387 @@
 %type<decl> type_parameter type_parameter_list type_initializer_opt
 
-%type<en> type_list
+%type<en> type_parameters_opt type_list
 
 %type<decl> type_qualifier type_qualifier_name forall type_qualifier_list_opt type_qualifier_list
@@ -406 +427 @@
 // Order of these lines matters (low-to-high precedence).
 %precedence TYPEGENname
+%precedence '}'
 %precedence '('
 
@@ -1753 +1775 @@
                 { $$ = $3->addQualifiers( $1 ); }
         | sue_type_specifier type_qualifier
-                { $$ = $1->addQualifiers( $2 ); }
+                {
+                        if ( $2->type != nullptr && $2->type->forall ) forall = true; // remember generic type
+                        $$ = $1->addQualifiers( $2 );
+                }
         ;
 
@@ -1831 +1856 @@
 
 aggregate_type:                                                                                 // struct, union
-        aggregate_key attribute_list_opt '{' field_declaration_list_opt '}'
-                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), nullptr, $4, true )->addQualifiers( $2 ); }
+        aggregate_key attribute_list_opt '{' field_declaration_list_opt '}' type_parameters_opt
+                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), $6, $4, true )->addQualifiers( $2 ); }
         | aggregate_key attribute_list_opt no_attr_identifier fred
                 {
@@ -1838 +1863 @@
                         forall = false;                                                         // reset
                 }
-          '{' field_declaration_list_opt '}'
-                { $$ = DeclarationNode::newAggregate( $1, $3, nullptr, $7, true )->addQualifiers( $2 ); }
+          '{' field_declaration_list_opt '}' type_parameters_opt
+                { $$ = DeclarationNode::newAggregate( $1, $3, $9, $7, true )->addQualifiers( $2 ); }
         | aggregate_key attribute_list_opt type_name fred
                 {
@@ -1845 +1870 @@
                         forall = false;                                                         // reset
                 }
-          '{' field_declaration_list_opt '}'
-                { $$ = DeclarationNode::newAggregate( $1, $3->type->symbolic.name, nullptr, $7, true )->addQualifiers( $2 ); }
-        | aggregate_key attribute_list_opt '(' type_list ')' '{' field_declaration_list_opt '}' // CFA
-                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), $4, $7, false )->addQualifiers( $2 ); }
+          '{' field_declaration_list_opt '}' type_parameters_opt
+                { $$ = DeclarationNode::newAggregate( $1, $3->type->symbolic.name, $9, $7, true )->addQualifiers( $2 ); }
         | aggregate_type_nobody
+        ;
+
+type_parameters_opt:
+        // empty
+                { $$ = nullptr; }                                                               %prec '}'
+        | '(' type_list ')'
+                { $$ = $2; }
         ;
 
@@ -2386 +2416 @@
                         distQual( $5, $1 );
                         xxx = false;
-                        delete $1;
                         $$ = $5;
                 }
@@ -2398 +2427 @@
                         distQual( $5, $1 );
                         xxx = false;
-                        delete $1;
                         $$ = $5;
                 }
@@ -2408 +2436 @@
           '{' up external_definition_list_opt down '}'          // CFA, namespace
                 {
-                        distQual( $6, $2 );
-                        distQual( $6, $1 );
+                        distQual( $6, $1->addQualifiers( $2 ) );
                         xxx = false;
-                        delete $1;
-                        delete $2;
                         $$ = $6;
                 }