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

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-stack.hpp (modified) (3 diffs)

doc/papers/general/evaluation/cpp-stack.hpp

@@ -2 +2 @@
 #include <utility>
 
-template<typename T> class stack {
+template<typename T> struct stack {
         struct node {
                 T value;
-                node* next;
+                node * next;
+                node( const T & v, node * n = nullptr ) : value( v ), next( n ) {}
+        };
+        node * head;
 
-                node( const T& v, node* n = nullptr ) : value(v), next(n) {}
-        };
-        node* head;
+        stack() : head( nullptr ) {}
+        stack( const stack<T> & o ) { copy( o ); }
 
-        void copy(const stack<T>& o) {
-                node** crnt = &head;
-                for ( node* next = o.head; next; next = next->next ) {
-                        *crnt = new node{ next->value }; /***/
-                        crnt = &(*crnt)->next;
-                }
-                *crnt = nullptr;
-        }
-public:
         void clear() {
-            for ( node* next = head; next; ) {
-                        node* crnt = next;
+                for ( node * next = head; next; ) {
+                        node * crnt = next;
                         next = crnt->next;
                         delete crnt;
@@ -29 +22 @@
         }
 
-        stack() : head(nullptr) {}
-        stack(const stack<T>& o) { copy(o); }
-        stack(stack<T>&& o) : head(o.head) { o.head = nullptr; }
+        void copy( const stack<T> & o ) {
+                node ** crnt = &head;
+                for ( node * next = o.head; next; next = next->next ) {
+                        *crnt = new node{ next->value }; /***/
+                        crnt = &(*crnt)->next;
+                }
+                *crnt = nullptr;
+        }
+
         ~stack() { clear(); }
 
-        stack& operator= (const stack<T>& o) {
+        stack & operator= ( const stack<T> & o ) {
                 if ( this == &o ) return *this;
                 clear();
-                copy(o);
-                return *this;
-        }
-
-        stack& operator= (stack<T>&& o) {
-                if ( this == &o ) return *this;
-                head = o.head;
-                o.head = nullptr;
+                copy( o );
                 return *this;
         }
@@ -50 +42 @@
         bool empty() const { return head == nullptr; }
 
-        void push(const T& value) { head = new node{ value, head };  /***/ }
+        void push( const T & value ) { head = new node{ value, head };  /***/ }
 
         T pop() {
-                node* n = head;
+                node * n = head;
                 head = n->next;
-                T x = std::move(n->value);
+                T v = std::move( n->value );
                 delete n;
-                return x;
+                return v;
         }
 };