Changeset 28e58fd for src/tests/init_once.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/init_once.c (modified) (2 diffs)

src/tests/init_once.c

@@ -60 +60 @@
         return -1;
 }
-void ?{}(array * arr) {
-        memset(arr->elems, 0, sizeof(arr->elems));
-        arr->length = 0;
+void ?{}(array & arr) {
+        memset(arr.elems, 0, sizeof(arr.elems));
+        arr.length = 0;
 }
 array constructed;
 array destructed;
 
-void ?{}(init_once * x) {
-        assert( find( &constructed, x ) == -1 );
-        remove( &destructed, x );
-        insert( &constructed, x );
+void ?{}(init_once & x) {
+        assert( find( &constructed, &x ) == -1 );
+        remove( &destructed, &x );
+        insert( &constructed, &x );
 
-        x->x = malloc(sizeof(int));
+        x.x = malloc(sizeof(int));
 }
 
-void ?{}(init_once * x, init_once other) {
+void ?{}(init_once & x, init_once other) {
         x{};  // reuse default ctor
 }
 
-void ^?{}(init_once * x) {
-        assert( find( &destructed, x ) == -1 );
-        remove( &constructed, x );
-        insert( &destructed, x );
+void ^?{}(init_once & x) {
+        assert( find( &destructed, &x ) == -1 );
+        remove( &constructed, &x );
+        insert( &destructed, &x );
 
-        free(x->x);
+        free(x.x);
 }
 //*** end setup
@@ -125 +125 @@
                                 init_once x;
                                 init_once y = x;
-                                (&x) {}; // ensure this doesn't execute
+                                x{}; // ensure this doesn't execute
                                 break;
                         }