Changeset 779a4a3 for doc/papers/general/evaluation/cpp-vstack.cpp

Timestamp:

May 3, 2018, 4:33:19 PM (6 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, with_gc

Children:

f3152ab

Parents:

f465f0e (diff), c9d5c4f (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' into fix-reference-overloading

File:

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

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

@@ -3 +3 @@
 
 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() {
@@ -11 +20 @@
         }
         head = nullptr;
-}
-
-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;
 }
 
@@ -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() {