Changeset b826e6b for src/Parser/DeclarationNode.cc

Timestamp:

Jul 19, 2017, 11:49:33 AM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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:

9cc0472

Parents:

fea3faa (diff), a57cb58 (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:software/cfa/cfa-cc

File:

• src/Parser/DeclarationNode.cc (modified) (4 diffs)

src/Parser/DeclarationNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 15:46:33 2017
-// Update Count     : 1018
+// Last Modified By : Andrew Beach
+// 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 ) {
@@ -1063 +1079 @@
           case TypeData::Enum:
           case TypeData::Aggregate: {
-                  ReferenceToType * ret = buildComAggInst( type, attributes );
+                  ReferenceToType * ret = buildComAggInst( type, attributes, linkage );
                   buildList( type->aggregate.actuals, ret->get_parameters() );
                   return ret;