Changeset bac5158 for src/Parser

Timestamp:

Jul 15, 2017, 9:47:54 AM (7 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:

478b1d0

Parents:

994d080 (diff), 6ea87486 (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:

fix conflict

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (3 diffs)
• ParseNode.h (modified) (3 diffs)
• TypeData.cc (modified) (5 diffs)
• TypeData.h (modified) (2 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 28 15:27:00 2017
-// Update Count     : 1019
+// Last Modified On : Fri Jul 14 16:55:00 2017
+// Update Count     : 1020
 //
 
@@ -253 +253 @@
         newnode->type->aggregate.fields = fields;
         newnode->type->aggregate.body = body;
+        newnode->type->aggregate.tagged = false;
+        newnode->type->aggregate.parent = nullptr;
         return newnode;
 } // DeclarationNode::newAggregate
@@ -273 +275 @@
         return newnode;
 } // DeclarationNode::newEnumConstant
+
+DeclarationNode * DeclarationNode::newTreeStruct( Aggregate kind, const string * name, const string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
+        assert( name );
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->type = new TypeData( TypeData::Aggregate );
+        newnode->type->aggregate.kind = kind;
+        newnode->type->aggregate.name = name;
+        newnode->type->aggregate.actuals = actuals;
+        newnode->type->aggregate.fields = fields;
+        newnode->type->aggregate.body = body;
+        newnode->type->aggregate.tagged = true;
+        newnode->type->aggregate.parent = parent;
+        return newnode;
+} // DeclarationNode::newTreeStruct
 
 DeclarationNode * DeclarationNode::newName( string * name ) {

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 12 13:00:00 2017
-// Update Count     : 779
+// Last Modified On : Fri Jul 14 16:56:00 2017
+// Update Count     : 780
 //
 
@@ -248 +248 @@
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
 
+        // Perhaps this would best fold into newAggragate.
+        static DeclarationNode * newTreeStruct( Aggregate kind, const std::string * name, const std::string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body );
+
         DeclarationNode();
         ~DeclarationNode();
@@ -332 +335 @@
 
         static UniqueName anonymous;
+
+        // Temp to test TreeStruct
+        const std::string * parent_name;
 }; // DeclarationNode
 

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 28 15:28:00 2017
-// Update Count     : 564
+// Last Modified On : Fri Jul 14 16:58:00 2017
+// Update Count     : 565
 //
 
@@ -63 +63 @@
                 aggregate.fields = nullptr;
                 aggregate.body = false;
+                aggregate.tagged = false;
+                aggregate.parent = nullptr;
                 break;
           case AggregateInst:
@@ -121 +123 @@
                 delete aggregate.actuals;
                 delete aggregate.fields;
+                delete aggregate.parent;
                 // delete aggregate;
                 break;
@@ -192 +195 @@
                 newtype->aggregate.kind = aggregate.kind;
                 newtype->aggregate.body = aggregate.body;
+                newtype->aggregate.tagged = aggregate.tagged;
+                newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr;
                 break;
           case AggregateInst:
@@ -619 +624 @@
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
+                if ( td->aggregate.tagged ) {
+                        at = new StructDecl( *td->aggregate.name, td->aggregate.parent, attributes, linkage );
+                        buildForall( td->aggregate.params, at->get_parameters() );
+                        break;
+                }
           case DeclarationNode::Coroutine:
           case DeclarationNode::Monitor:

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 28 15:29:00 2017
-// Update Count     : 186
+// Last Modified On : Fri Jul 14 16:57:00 2017
+// Update Count     : 187
 //
 
@@ -31 +31 @@
                 DeclarationNode * fields;
                 bool body;
+
+                bool tagged;
+                const std::string * parent;
         };
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 15 08:17:48 2017
-// Update Count     : 2450
+// Last Modified On : Sat Jul 15 09:46:26 2017
+// Update Count     : 2451
 //
 
@@ -1679 +1679 @@
         | aggregate_key attribute_list_opt typegen_name         // CFA
                 { $$ = $3->addQualifiers( $2 ); }
+
+// Temp, testing TreeStruct
+    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name
+        {
+            typedefTable.makeTypedef( *$4 );            // create typedef
+            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
+            forall = false;                             // reset
+        }
+      '{' field_declaration_list '}'
+        {
+            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
+                $4, nullptr, nullptr, $7, true )->addQualifiers( $3 );
+        }
+    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name TYPEDEFname
+        {
+            typedefTable.makeTypedef( *$4 );            // create typedef
+            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
+            forall = false;                             // reset
+        }
+      '{' field_declaration_list '}'
+        {
+            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
+                $4, $5, nullptr, $8, true )->addQualifiers( $3 );
+        }
         ;