Changes in doc/papers/general/evaluation/cfa-stack.c [b2e8841:81e8ab0]

File:

• doc/papers/general/evaluation/cfa-stack.c (modified) (2 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_node(T) & node, T value, stack_node(T) * next ) {
-    node.value = value;
-    node.next = next;
-}
 
-forall(otype T) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+forall( otype T ) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
 
-forall(otype T) void ?{}( stack(T) & s, stack(T) t ) {
+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 ) {
-                // *crnt = new( next->value, (stack_node(T)*)0 );
-                stack_node(T)* new_node = ((stack_node(T)*)malloc());
-                (*new_node){ next->value }; /***/
-                *crnt = new_node;
-                stack_node(T) * acrnt = *crnt;
-                crnt = &acrnt->next;
+                *crnt = alloc();
+                ((*crnt)->value){ next->value };
+                crnt = &(*crnt)->next;
         }
         *crnt = 0;
 }
 
-forall(otype T) stack(T) ?=?( stack(T) & s, stack(T) t ) {
+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 ) stack(T) ?=?( stack(T) & s, stack(T) t ) {
         if ( s.head == t.head ) return s;
         clear( s );
@@ -33 +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 ) {
-        // s.head = new( value, s.head );
-        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;
-        delete( n );
+        ^(*n){};
+        free( n );
         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;
-                delete( crnt );
-        }
-        s.head = 0;
-}