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

Timestamp:

Mar 2, 2018, 6:22:52 PM (7 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, resolv-new, with_gc

Children:

2097cd4, 82c367d

Parents:

938dd75 (diff), c9b3a41 (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

@@ -4 +4 @@
 forall(otype T) struct stack_node {
         T value;
-        stack_node(T)* next;
+        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) {
-        stack_node(T)** crnt = &s.head;
-        for ( stack_node(T)* next = t.head; next; next = next->next ) {
-                // *crnt = &(*(stack_node(T)*)malloc()){ next->value }; /***/
+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, 0 );
                 stack_node(T)* new_node = ((stack_node(T)*)malloc());
                 (*new_node){ next->value }; /***/
                 *crnt = new_node;
-
-                stack_node(T)* acrnt = *crnt;
+                stack_node(T) * acrnt = *crnt;
                 crnt = &acrnt->next;
         }
@@ -23 +26 @@
 }
 
-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);
+        clear( s );
         s{ t };
         return s;
 }
 
-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 = &(*(stack_node(T)*)malloc()){ value, s.head }; /***/
+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 }; /***/
@@ -41 +44 @@
 }
 
-forall(otype T) T pop(stack(T)& s) {
-        stack_node(T)* n = s.head;
+forall(otype T) T pop( stack(T) & s ) {
+        stack_node(T) * n = s.head;
         s.head = n->next;
-        T x = n->value;
-        ^n{};
-        free(n);
-        return x;
+        T v = n->value;
+        delete( n );
+        return v;
 }
 
-forall(otype T) void clear(stack(T)& s) {
-    for ( stack_node(T)* next = s.head; next; ) {
-                stack_node(T)* crnt = next;
+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);
+                delete( crnt );
         }
         s.head = 0;