Changeset 610194e for src/Parser/TypeData.cc

Timestamp:

Jul 13, 2018, 11:36:05 AM (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:

2e02851

Parents:

825170d (diff), 79caea8 (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/TypeData.cc (modified) (5 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  6 17:40:33 2018
-// Update Count     : 604
+// Last Modified On : Thu Jul 12 13:52:09 2018
+// Update Count     : 606
 //
 
@@ -76 +76 @@
                 aggregate.parent = nullptr;
                 aggregate.anon = false;
+                aggregate.inLine = false;
                 break;
           case AggregateInst:
@@ -81 +82 @@
                 aggInst.aggregate = nullptr;
                 aggInst.params = nullptr;
-                aggInst.hoistType = false;;
+                aggInst.hoistType = false;
+                aggInst.inLine = false;
                 break;
           case Symbolic:
@@ -219 +221 @@
                 newtype->aggregate.body = aggregate.body;
                 newtype->aggregate.anon = aggregate.anon;
+                newtype->aggregate.inLine = aggregate.inLine;
                 newtype->aggregate.tagged = aggregate.tagged;
                 newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr;
@@ -226 +229 @@
                 newtype->aggInst.params = maybeClone( aggInst.params );
                 newtype->aggInst.hoistType = aggInst.hoistType;
+                newtype->aggInst.inLine = aggInst.inLine;
                 break;
           case Enum: