Changeset 32cab5b for doc/papers/general/evaluation/cfa-stack.c

Timestamp:

Apr 17, 2018, 12:01:09 PM (7 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, with_gc

Children:

3265399

Parents:

b2fe1c9 (diff), 81bb114 (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:

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

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

@@ -2 +2 @@
 #include "cfa-stack.h"
 
-forall(otype T) struct stack_node {
+forall( otype T ) struct stack_node {
         T value;
         stack_node(T) * next;
 };
 
-forall(otype T) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+forall( otype T ) void clear( stack(T) & s ) with( s ) {
+        for ( stack_node(T) * next = head; next; ) {
+                stack_node(T) * crnt = next;
+                next = crnt->next;
+                ^(*crnt){};
+                free(crnt);
+        }
+        head = 0;
+}
 
-forall(otype T) void ?{}( stack(T) & s, stack(T) t ) {
+forall( otype T ) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+
+forall( otype T ) void ?{}( stack(T) & s, stack(T) t ) {
         stack_node(T) ** crnt = &s.head;
         for ( stack_node(T) * next = t.head; next; next = next->next ) {
-                stack_node(T)* new_node = (stack_node(T)*)malloc(); /***/
-                (*new_node){ next->value };
-                *crnt = new_node;
+                *crnt = alloc();
+                ((*crnt)->value){ next->value };
                 crnt = &(*crnt)->next;
         }
@@ -20 +29 @@
 }
 
-forall(otype T) stack(T) ?=?( stack(T) & s, stack(T) t ) {
+forall( otype T ) stack(T) ?=?( stack(T) & s, stack(T) t ) {
         if ( s.head == t.head ) return s;
         clear( s );
@@ -27 +36 @@
 }
 
-forall(otype T) void ^?{}( stack(T) & s) { clear( s ); }
+forall( otype T ) void ^?{}( stack(T) & s) { clear( s ); }
 
-forall(otype T) _Bool empty( const stack(T) & s ) { return s.head == 0; }
+forall( otype T ) _Bool empty( const stack(T) & s ) { return s.head == 0; }
 
-forall(otype T) void push( stack(T) & s, T value ) {
-        stack_node(T)* new_node = (stack_node(T)*)malloc(); /***/
-        (*new_node){ value, s.head };
-        s.head = new_node;
+forall( otype T ) void push( stack(T) & s, T value ) with( s ) {
+        stack_node(T) * n = alloc();
+        (*n){ value, head };
+        head = n;
 }
 
-forall(otype T) T pop( stack(T) & s ) {
-        stack_node(T) * n = s.head;
-        s.head = n->next;
+forall( otype T ) T pop( stack(T) & s ) with( s ) {
+        stack_node(T) * n = head;
+        head = n->next;
         T v = n->value;
         ^(*n){};
@@ -45 +54 @@
         return v;
 }
-
-forall(otype T) void clear( stack(T) & s ) {
-        for ( stack_node(T) * next = s.head; next; ) {
-                stack_node(T) * crnt = next;
-                next = crnt->next;
-                ^(*crnt){};
-                free(crnt);
-        }
-        s.head = 0;
-}