Changeset f7e749f

Timestamp:

Dec 13, 2016, 3:56:44 PM (7 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:

fc638d2

Parents:

0f35657

Message:

added tests for polymorphic tuples and cast on tuples, updated a couple of other tests

Location:

src/tests

Files:

• .expect/memberCtors.txt (modified) (3 diffs)
• .expect/simpleGenericTriple.txt (modified) (1 diff)
• .expect/tupleCast.txt (added)
• .expect/tuplePolymorphism.txt (added)
• completeTypeError.c (modified) (3 diffs)
• memberCtors.c (modified) (2 diffs)
• simpleGenericTriple.c (modified) (1 diff)
• tupleCast.c (added)
• tuplePolymorphism.c (added)

src/tests/.expect/memberCtors.txt

@@ -6 +6 @@
 constructing int
 constructing int
+begin construct B
+assign b->a2
 constructing int
 constructing int
+begin construct A
+construct a->x
 constructing int: 1001
+assign a->y
 assigning int: 0 0
+end construct A
+construct b->a1
 constructing int
 constructing int
+begin construct A
+construct a->x
 constructing int: 1000
+assign a->y
 assigning int: 0 0
+end construct A
+end construct B
 destructing int: 0
 destructing int: 0
@@ -20 +32 @@
 copy constructing int: 0
 copy constructing int: 0
+begin copy construct A
+copy construct this->x
 copy constructing int: 1000
+assign this->y
+end copy construct A
 copy constructing int: 0
 copy constructing int: 0
+begin copy construct A
+copy construct this->x
 copy constructing int: 1001
+assign this->y
+end copy construct A
 copy constructing int: 0
 copy constructing int: 0
+begin copy construct A
+copy construct this->x
 copy constructing int: 0
+assign this->y
+end copy construct A
 End of main
 constructing int
 constructing int
+begin construct A
+construct a->x
 constructing int: 999
+assign a->y
 assigning int: 0 0
+end construct A
 destructing int: 0
 destructing int: 0
@@ -46 +74 @@
 constructing int
 constructing int
+begin construct A
+construct a->x
 constructing int: 999
+assign a->y
 assigning int: 0 0
+end construct A
 destructing int: 0
 destructing int: 0

src/tests/.expect/simpleGenericTriple.txt

@@ -1 +1 @@
 132 1001 459
+132 1001.12 459

src/tests/completeTypeError.c

@@ -5 +5 @@
 forall(dtype T | sized(T)) void quux(T *);
 
+struct A; // incomplete
+struct B {}; // complete
+
 int main() {
         int *i;
         void *v;
 
+        // A * x;
+        // A * y;
+        // B * x;
+        // B * z;
+
         // okay
         *i;
+        // *x; // picks B
+        // *z;
         foo(i);
         bar(i);
@@ -23 +33 @@
         // bad
         *v;
+        // *y;
         baz(v);
         quux(v);
 }
+
 
 forall(otype T)
@@ -60 +72 @@
         baz(z);
 }
-

src/tests/memberCtors.c

@@ -32 +32 @@
 
 void ?{}(A * a, int x) {
+  printf("begin construct A\n");
+  printf("construct a->x\n");
   (&a->x){ x+999 };
+  printf("assign a->y\n");
   a->y = 0; // not a constructor - default constructor will be inserted
+  printf("end construct A\n");
 } // z never constructed - will be automatically default constructed
 
 void ?{}(A * this, A other) {
+  printf("begin copy construct A\n");
+  printf("copy construct this->x\n");
   (&this->x){ other.x };
+  printf("assign this->y\n");
   this->y = other.y; // not a constructor - copy constructor will be inserted
+  printf("end copy construct A\n");
 } // z never constructed - will be automatically copy constructed
 
@@ -46 +54 @@
 
 void ?{}(B * b) {
+  printf("begin construct B\n");
+  printf("assign b->a2\n");
   b->a2 = (A) { 2 };
+  printf("construct b->a1\n");
   (&b->a1){ 1 };
 #ifdef ERR1
   (&b->a2){ b->a3 }; // error, b->a2 was used previously but is explicitly constructed
 #endif
+  printf("end construct B\n");
 } // a2, a3 never constructed - will be automatically default constructed
 

src/tests/simpleGenericTriple.c

@@ -28 +28 @@
   int x1 = 123, x3 = 456;
   double x2 = 999.123;
-  struct T3(int) L = { x1, x2, x3 };
-  struct T3(int) R = { 9, 2, 3 };
-  struct T3(int) ret = L+R;
-  printf("%d %d %d\n", ret.f0, ret.f1, ret.f2);
+  struct T3(int) Li = { x1, x2, x3 };
+  struct T3(int) Ri = { 9, 2, 3 };
+  struct T3(int) reti = Li+Ri;
+  printf("%d %d %d\n", reti.f0, reti.f1, reti.f2);
+
+  struct T3(double) Ld = { x1, x2, x3 };
+  struct T3(double) Rd = { 9, 2, 3 };
+  struct T3(double) retd = Ld+Rd;
+  printf("%g %g %g\n", retd.f0, retd.f1, retd.f2);
 }