Changeset 28e58fd for src/tests/multiDimension.c

Timestamp:

Aug 25, 2017, 10:38:34 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

800d275

Parents:

af08051 (diff), 3eab308c (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:software/cfa/cfa-cc

File:

• src/tests/multiDimension.c (modified) (1 diff)

src/tests/multiDimension.c

@@ -4 +4 @@
 };
 
-void ?{}(X * this) {
+void ?{}(X & this) {
   printf("default constructing\n");
-  (&this->a){ 123 };
-  this->ptr = malloc(sizeof(int));
+  (this.a){ 123 };
+  this.ptr = malloc(sizeof(int));
 }
 
-void ?{}(X * this, X other) {
+void ?{}(X & this, X other) {
   printf("copy constructing\n");
-  (&this->a){ other.a };
-  this->ptr = malloc(sizeof(int));
+  (this.a){ other.a };
+  this.ptr = malloc(sizeof(int));
 }
 
-void ?{}(X * this, int a) {
+void ?{}(X & this, int a) {
   printf("constructing with %d\n", a);
-  (&this->a){ a };
-  this->ptr = malloc(sizeof(int));
+  (this.a){ a };
+  this.ptr = malloc(sizeof(int));
 }
 
-void ^?{}(X * this) {
+void ^?{}(X & this) {
   printf("destructing\n");
-  free(this->ptr);
+  free(this.ptr);
 }
 
-X ?=?(X * this, X other) {
-  this->a = other.a;
-  return *this;
+X ?=?(X & this, X other) {
+  this.a = other.a;
+  return this;
 }