Changeset 32cab5b for doc/papers/general/evaluation/cpp-vstack.cpp

Timestamp:

Apr 17, 2018, 12:01:09 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3265399

Parents:

b2fe1c9 (diff), 81bb114 (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:software/cfa/cfa-cc

File:

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

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

@@ -2 +2 @@
 #include <utility>
 
-stack::node::node( const object& v, node* n ) : value( v.new_copy() ), next( n ) {}
-
-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;
-}
-
-stack::stack() : head(nullptr) {}
-stack::stack(const stack& o) { copy(o); }
-stack::stack(stack&& o) : head(o.head) { o.head = nullptr; }
-stack::~stack() { clear(); }
-
-stack& stack::operator= (const stack& o) {
-        if ( this == &o ) return *this;
-        clear();
-        copy(o);
-        return *this;
-}
-
-stack& stack::operator= (stack&& o) {
-        if ( this == &o ) return *this;
-        head = o.head;
-        o.head = nullptr;
-        return *this;
-}
+stack::node::node( const object & v, node * n ) : value( v.new_copy() ), next( n ) {}
 
 void stack::clear() {
-    for ( node* next = head; next; ) {
-                node* crnt = next;
+        for ( node * next = head; next; ) {
+                node * crnt = next;
                 next = crnt->next;
                 delete crnt;
@@ -41 +13 @@
 }
 
+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;
+}
+
+stack::stack() : head( nullptr ) {}
+stack::stack( const stack & o ) { copy( o ); }
+stack::~stack() { clear(); }
+
+stack & stack::operator=( const stack & o ) {
+        if ( this == &o ) return *this;
+        clear();
+        copy( o );
+        return *this;
+}
 
 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() {
-        node* n = head;
+        node * n = head;
         head = n->next;
-        ptr<object> x = std::move(n->value);
+        ptr<object> v = std::move( n->value );
         delete n;
-        return x;
+        return v;
 }