Changeset fdca7c6

Timestamp:

May 18, 2017, 8:42:21 PM (8 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

27caf8d

Parents:

17e0dc9

Message:

mark aggregate as generic before parsing aggregate body so generic-type name available in body

File:

• src/Parser/parser.yy (modified) (4 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 : Thu Mar 30 15:42:32 2017
-// Update Count     : 2318
+// Last Modified On : Thu May 18 18:06:17 2017
+// Update Count     : 2338
 //
 
@@ -85 +85 @@
         } // for
 } // distExt
+
+bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
 %}
 
@@ -1556 +1558 @@
 sue_type_specifier:                                                                             // struct, union, enum + type specifier
         elaborated_type
-        | type_qualifier_list elaborated_type
-                { $$ = $2->addQualifiers( $1 ); }
+        | type_qualifier_list
+                { if ( $1->type != nullptr && $1->type->forall ) forall = true; } // remember generic type
+          elaborated_type
+                { $$ = $3->addQualifiers( $1 ); }
         | sue_type_specifier type_qualifier
                 { $$ = $1->addQualifiers( $2 ); }
@@ -1613 +1617 @@
                 { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), nullptr, $4, true )->addQualifiers( $2 ); }
         | aggregate_key attribute_list_opt no_attr_identifier_or_type_name
-                { typedefTable.makeTypedef( *$3 ); }
+                {
+                        typedefTable.makeTypedef( *$3 );                        // create typedef
+                        if ( forall ) typedefTable.changeKind( *$3, TypedefTable::TG ); // possibly update
+                        forall = false;                                                         // reset
+                }
           '{' field_declaration_list '}'
                 { $$ = DeclarationNode::newAggregate( $1, $3, nullptr, $6, true )->addQualifiers( $2 ); }