Changeset 1518b39 for doc/papers/general/evaluation/cfa-stack.c

Timestamp:

May 1, 2018, 2:43:15 PM (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, with_gc

Children:

5da5a96

Parents:

b9c432f (diff), 4c80a75 (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:/u/cforall/software/cfa/cfa-cc

File:

• doc/papers/general/evaluation/cfa-stack.c (modified) (3 diffs)

doc/papers/general/evaluation/cfa-stack.c

@@ -8 +8 @@
         };
 
-        void ?{}( stack(T) & s ) { (s.head){ 0 }; }
-
-        void ?{}( stack(T) & s, stack(T) t ) {
+        void ?{}( stack(T) & s, stack(T) t ) {          // copy
                 node(T) ** cr = &s.head;
                 for ( node(T) * nx = t.head; nx; nx = nx->next ) {
@@ -20 +18 @@
         }
 
-        void ^?{}( stack(T) & s) { clear( s ); }
-
-    void clear( stack(T) & s ) with( s ) {
+        void clear( stack(T) & s ) with( s ) {
                 for ( node(T) * nx = head; nx; ) {
                         node(T) * cr = nx;
                         nx = cr->next;
                         ^(*cr){};
-                        free(cr);
+                        free( cr );
                 }
                 head = 0;
         }
+
+        void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+        void ^?{}( stack(T) & s) { clear( s ); }
 
         stack(T) ?=?( stack(T) & s, stack(T) t ) {
@@ -39 +38 @@
         }
 
-        _Bool empty( const stack(T) & s ) { return s.head == 0; }
+        _Bool empty( const stack(T) & s ) {
+                return s.head == 0;
+        }
 
         void push( stack(T) & s, T value ) with( s ) {