Changeset 3d5701e for tests/nested-types.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• tests/nested-types.cfa (modified) (2 diffs)

tests/nested-types.cfa

@@ -10 +10 @@
 // Created On       : Mon Jul 9 10:20:03 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:59:40 2018
-// Update Count     : 2
+// Last Modified On : Wed Feb 12 18:21:15 2020
+// Update Count     : 3
 //
 
@@ -50 +50 @@
 //   double d;
 // };
+
+// struct S {
+//     enum C { R, G, B };
+//     int i;
+//     struct T {
+//      int i;
+//     };
+//     T t;
+// };
+
+// S s;
+// S.C c;
+// S.T t;
 
 int main() {