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

File:

• doc/papers/general/evaluation/cfa-stack.c (modified) (1 diff)

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

@@ -2 +2 @@
 #include "cfa-stack.h"
 
-forall( otype T ) {
-        struct node {
-                T value;
-                node(T) * next;
-        };
+forall( otype T ) struct stack_node {
+        T value;
+        stack_node(T) * next;
+};
 
-        void ?{}( stack(T) & s ) { (s.head){ 0 }; }
+forall( otype T ) void ?{}( stack(T) & s ) { (s.head){ 0 }; }
 
-        void ?{}( stack(T) & s, stack(T) t ) {
-                node(T) ** cr = &s.head;
-                for ( node(T) * nx = t.head; nx; nx = nx->next ) {
-                        *cr = alloc();
-                        ((*cr)->value){ nx->value };
-                        cr = &(*cr)->next;
-                }
-                *cr = 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 ) {
+                *crnt = alloc();
+                ((*crnt)->value){ next->value };
+                crnt = &(*crnt)->next;
         }
+        *crnt = 0;
+}
 
-        void ^?{}( stack(T) & s) { clear( s ); }
+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;
+}
 
-    void clear( stack(T) & s ) with( s ) {
-                for ( node(T) * nx = head; nx; ) {
-                        node(T) * cr = nx;
-                        nx = cr->next;
-                        ^(*cr){};
-                        free(cr);
-                }
-                head = 0;
-        }
+forall( otype T ) stack(T) ?=?( stack(T) & s, stack(T) t ) {
+        if ( s.head == t.head ) return s;
+        clear( s );
+        s{ t };
+        return s;
+}
 
-        stack(T) ?=?( stack(T) & s, stack(T) t ) {
-                if ( s.head == t.head ) return s;
-                clear( s );
-                s{ t };
-                return s;
-        }
+forall( otype T ) void ^?{}( stack(T) & s) { clear( s ); }
 
-        _Bool empty( const stack(T) & s ) { return s.head == 0; }
+forall( otype T ) _Bool empty( const stack(T) & s ) { return s.head == 0; }
 
-        void push( stack(T) & s, T value ) with( s ) {
-                node(T) * n = alloc();
-                (*n){ value, head };
-                head = n;
-        }
+forall( otype T ) void push( stack(T) & s, T value ) with( s ) {
+        stack_node(T) * n = alloc();
+        (*n){ value, head };
+        head = n;
+}
 
-        T pop( stack(T) & s ) with( s ) {
-                node(T) * n = head;
-                head = n->next;
-                T v = n->value;
-                ^(*n){};
-                free( n );
-                return v;
-        }
+forall( otype T ) T pop( stack(T) & s ) with( s ) {
+        stack_node(T) * n = head;
+        head = n->next;
+        T v = n->value;
+        ^(*n){};
+        free( n );
+        return v;
 }