Changeset 2afec66 for src/tests/memberCtors.c

Timestamp:

Jul 26, 2017, 5:24:33 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:

25bd9074

Parents:

8a6cf7e

Message:

Update several tests for references

File:

• src/tests/memberCtors.c (modified) (3 diffs)

src/tests/memberCtors.c

@@ -3 +3 @@
 };
 
-void ?{}(WrappedInt * this) {
+void ?{}(WrappedInt & this) {
   printf("constructing int\n");
-  this->x = 0;
+  this.x = 0;
 }
 
-void ?{}(WrappedInt * this, WrappedInt other) {
+void ?{}(WrappedInt & this, WrappedInt other) {
   printf("copy constructing int: %d\n", other.x);
-  this->x = other.x;
+  this.x = other.x;
 }
 
-void ?{}(WrappedInt * this, int x) {
+void ?{}(WrappedInt & this, int x) {
   printf("constructing int: %d\n", x);
-  this->x = x;
+  this.x = x;
 }
 
-void ^?{}(WrappedInt * this) {
-  printf("destructing int: %d\n", this->x);
+void ^?{}(WrappedInt & this) {
+  printf("destructing int: %d\n", this.x);
 }
 
-void ?=?(WrappedInt * this, int x) {
-  printf("assigning int: %d %d\n", this->x, x);
-  this->x = x;
+void ?=?(WrappedInt & this, int x) {
+  printf("assigning int: %d %d\n", this.x, x);
+  this.x = x;
 }
 
@@ -31 +31 @@
 };
 
-void ?{}(A * a) {
+void ?{}(A & a) {
   // currently must define default ctor, since there's no "= default" syntax
 }
 
-void ?{}(A * a, int x) {
+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("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) {
+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("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
 
-A ?=?(A * this, A other) {
+A ?=?(A & this, A other) {
   printf("begin ?=? A\n");
-  this->x = other.x;
-  this->y = other.y;
-  this->z = other.z;
+  this.x = other.x;
+  this.y = other.y;
+  this.z = other.z;
   printf("end ?=? A\n");
-  return *this;
+  return this;
 }
 
@@ -66 +66 @@
 };
 
-void ?{}(B * b) {
+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 };
+  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
+  (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
 
-void ^?{}(B * b) {
-  b->a2 = (A) { 0 };
-  ^(&b->a1){};
+void ^?{}(B & b) {
+  b.a2 = (A) { 0 };
+  ^(b.a1){};
 } // a2, a3 never destructed - will be automatically destructed