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

Timestamp:

Apr 28, 2018, 9:20:28 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

6926a6d

Parents:

aa5fdac

Message:

shorten experimental code

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 stack_node {
-        T value;
-        stack_node(T) * next;
-};
+forall( otype T ) {
+        struct node {
+                T value;
+                node(T) * next;
+        };
 
-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);
+        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;
         }
-        head = 0;
+
+        void ^?{}( stack(T) & s) { clear( s ); }
+
+    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;
+        }
+
+        stack(T) ?=?( stack(T) & s, stack(T) t ) {
+                if ( s.head == t.head ) return s;
+                clear( s );
+                s{ t };
+                return s;
+        }
+
+        _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;
+        }
+
+        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 ) 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 ) {
-                *crnt = alloc();
-                ((*crnt)->value){ next->value };
-                crnt = &(*crnt)->next;
-        }
-        *crnt = 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;
-}
-
-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 ) 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 ) with( s ) {
-        stack_node(T) * n = head;
-        head = n->next;
-        T v = n->value;
-        ^(*n){};
-        free( n );
-        return v;
-}