Changeset ff29f08 for doc/papers/general/evaluation/cpp-vstack.cpp

Timestamp:

May 18, 2018, 2:09:21 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (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 remote-tracking branch 'origin/master' into with_gc

File:

• doc/papers/general/evaluation/cpp-vstack.cpp (modified) (2 diffs)

doc/papers/general/evaluation/cpp-vstack.cpp

@@ -4 +4 @@
 stack::node::node( const object & v, node * n ) : value( v.new_copy() ), next( n ) {}
 
+void stack::copy( const stack & o ) {
+        node ** cr = &head;
+        for ( node * nx = o.head; nx; nx = nx->next ) {
+                *cr = new node{ *nx->value }; /***/
+                cr = &(*cr)->next;
+        }
+        *cr = nullptr;
+}
+
 void stack::clear() {
-        for ( node * next = head; next; ) {
-                node * crnt = next;
-                next = crnt->next;
-                delete crnt;
+        for ( node * nx = head; nx; ) {
+                node * cr = nx;
+                nx = cr->next;
+                delete cr;
         }
         head = nullptr;
-}
-
-void stack::copy( const stack & o ) {
-        node ** crnt = &head;
-        for ( node * next = o.head; next; next = next->next ) {
-                *crnt = new node{ *next->value }; /***/
-                crnt = &(*crnt)->next;
-        }
-        *crnt = nullptr;
 }
 
@@ -33 +33 @@
 }
 
-bool stack::empty() const { return head == nullptr; }
+bool stack::empty() const {
+        return head == nullptr;
+}
 
-void stack::push( const object & value ) { head = new node{ value, head }; /***/ }
+void stack::push( const object & value ) {
+        head = new node{ value, head }; /***/
+}
 
 ptr<object> stack::pop() {