Changeset fc20514 for src/Parser/parser.yy

Timestamp:

Jul 11, 2018, 11:53:09 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:

777ed2b

Parents:

132d276

Message:

fix distribution to put type names at correct scopes

File:

• src/Parser/parser.yy (modified) (12 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 : Fri Jul  6 08:02:38 2018
-// Update Count     : 3716
+// Last Modified On : Wed Jul 11 11:20:51 2018
+// Update Count     : 3738
 //
 
@@ -166 +166 @@
 } // build_postfix_name
 
-bool forall = false, xxx = false, yyy = false;                  // aggregate have one or more forall qualifiers ?
+bool forall = false, yyy = false;                                               // aggregate have one or more forall qualifiers ?
 
 // https://www.gnu.org/software/bison/manual/bison.html#Location-Type
@@ -422 +422 @@
 //   Foo ( *fp )( int );
 //   `---'                                              matches start of TYPEGENname '('
-// Must be:
+// must be:
 //   Foo( int ) ( *fp )( int );
+// The same problem occurs here:
+//   forall( otype T ) struct Foo { T v; } ( *fp )( int );
+// must be:
+//   forall( otype T ) struct Foo { T v; } ( int ) ( *fp )( int );
 
 // Order of these lines matters (low-to-high precedence).
@@ -1856 +1860 @@
 
 aggregate_type:                                                                                 // struct, union
-        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
+                { forall = false; }                                                             // reset
+          '{' field_declaration_list_opt '}' type_parameters_opt
+                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), $7, $5, true )->addQualifiers( $2 ); }
         | aggregate_key attribute_list_opt no_attr_identifier fred
                 {
-                        typedefTable.makeTypedef( *$3, forall ? TYPEGENname : TYPEDEFname ); // create typedef
+                        typedefTable.makeTypedef( *$3, forall | typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
                         forall = false;                                                         // reset
                 }
@@ -1867 +1873 @@
         | aggregate_key attribute_list_opt type_name fred
                 {
-                        typedefTable.makeTypedef( *$3->type->symbolic.name, forall ? TYPEGENname : TYPEDEFname ); // create typedef
+                        typedefTable.makeTypedef( *$3->type->symbolic.name, forall | typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
                         forall = false;                                                         // reset
                 }
@@ -1885 +1891 @@
         aggregate_key attribute_list_opt no_attr_identifier fred
                 {
-                        typedefTable.makeTypedef( *$3, forall ? TYPEGENname : TYPEDEFname );
+                        typedefTable.makeTypedef( *$3, forall | typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname );
                         forall = false;                                                         // reset
                         $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
@@ -1891 +1897 @@
         | aggregate_key attribute_list_opt type_name fred
                 {
+                        forall = false;                                                         // reset
                         // Create new generic declaration with same name as previous forward declaration, where the IDENTIFIER is
                         // switched to a TYPEGENname. Link any generic arguments from typegen_name to new generic declaration and
@@ -2366 +2373 @@
         push external_definition pop
                 { $$ = $2; }
-        | external_definition_list
-                { forall = xxx; }
-          push external_definition pop
-                { $$ = $1 ? $1->appendList( $4 ) : $4; }
+        | external_definition_list push external_definition pop
+                { $$ = $1 ? $1->appendList( $3 ) : $3; }
         ;
 
@@ -2379 +2384 @@
 
 up:
-                { typedefTable.up(); }
+                { typedefTable.up( forall ); forall = false; }
         ;
 
@@ -2412 +2417 @@
                 {
                         if ( $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
-                        if ( $1->type->forall ) xxx = forall = true; // remember generic type
+                        if ( $1->type->forall ) forall = true;          // remember generic type
                 }
           '{' up external_definition_list_opt down '}'          // CFA, namespace
                 {
                         distQual( $5, $1 );
-                        xxx = false;
+                        forall = false;
                         $$ = $5;
                 }
@@ -2423 +2428 @@
                 {
                         if ( $1->type && $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
-                        if ( $1->type && $1->type->forall ) xxx = forall = true; // remember generic type
+                        if ( $1->type && $1->type->forall ) forall = true; // remember generic type
                 }
           '{' up external_definition_list_opt down '}'          // CFA, namespace
                 {
                         distQual( $5, $1 );
-                        xxx = false;
+                        forall = false;
                         $$ = $5;
                 }
@@ -2434 +2439 @@
                 {
                         if ( ($1->type && $1->type->qualifiers.val) || $2->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
-                        if ( ($1->type && $1->type->forall) || $2->type->forall ) xxx = forall = true; // remember generic type
+                        if ( ($1->type && $1->type->forall) || $2->type->forall ) forall = true; // remember generic type
                 }
           '{' up external_definition_list_opt down '}'          // CFA, namespace
                 {
                         distQual( $6, $1->addQualifiers( $2 ) );
-                        xxx = false;
+                        forall = false;
                         $$ = $6;
                 }