Changeset b93a3de

Timestamp:

Oct 19, 2017, 11:15:35 AM (8 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

86f852b

Parents:

f232977

git-author:

Rob Schluntz <rschlunt@…> (10/13/17 16:07:34)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:15:35)

Message:

Update ctor-autogen test case

Location:

src/tests

Files:

• .expect/ctor-autogen-ERR1.txt (added)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• ctor-autogen.c (modified) (3 diffs)

src/tests/Makefile.am

@@ -133 +133 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
+ctor-autogen-ERR1: ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/Makefile.in

@@ -886 +886 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
+ctor-autogen-ERR1: ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/ctor-autogen.c

@@ -32 +32 @@
 };
 
+// managed type - defines a constructor - can't use field constructors
+struct Managed {
+        int x;
+};
+
+void ?{}(Managed & m) { m.x = 0; }
+
+// managed type since it contains a managed type - can't use field constructors
+struct InheritManaged {
+        Managed m;
+};
+
 forall(otype T)
 T identity(T x) { return x; }
@@ -49 +61 @@
         identity(s);  // S should be an otype
 
+        SimpleStruct ss;
+        SimpleUnion su;
+
+        identity(ss);
+        identity(su);
+
         PopulatedStruct ps;
         PopulatedUnion pu;
@@ -54 +72 @@
         identity(ps); // should recursively be an otype
         identity(pu); // should recursively be an otype
+
+#if ERR1
+        Managed x = { 123 }; // error
+        Managed y;           // okay
+
+        InheritManaged z = { y };  // error?
+#endif
+
 }