use std::move in move constructor and assignment operator

Author: dunyaoguz

ArrayList.cpp

@@ -28,9 +28,9 @@ ArrayList::ArrayList(const ArrayList &arrayToCopy)
 ArrayList::ArrayList(ArrayList&& arrayToMove) 
 {   
     std::cout << "Arraylist move constructor is called." << std::endl;
-    this->capacity = arrayToMove.capacity;
-    this->used = arrayToMove.used;
-    this->pArray = arrayToMove.pArray;
+    this->capacity = arrayToMove.getCapacity();
+    this->used = arrayToMove.size();
+    this->pArray = arrayToMove.getPArray();
     arrayToMove.capacity = 0;
     arrayToMove.used = 0;
     arrayToMove.pArray = nullptr;
@@ -63,9 +63,9 @@ ArrayList& ArrayList::operator=(ArrayList &&rhs)
     if (&rhs != this)
     {
         delete[] this->pArray;
-        this->capacity = rhs.capacity;
-        this->used = rhs.used;
-        this->pArray = rhs.pArray;
+        this->capacity = rhs.getCapacity();
+        this->used = rhs.size();
+        this->pArray = rhs.getPArray();
         rhs.capacity = 0;
         rhs.used = 0;
         rhs.pArray = nullptr;

ArrayListDriver

@@ -42,12 +42,11 @@ Token::Token(const Token& token)
 Token::Token(Token&& token)
 {
     std::cout << "Token move constructor is called." << std::endl;
-    this->cstr = token.cstr;
-    this->frequency = token.frequency;
-    this->number_list = token.number_list;
+    this->cstr = token.c_str();
+    this->number_list = std::move(token.number_list);
+    this->frequency = token.getFrequency();
     token.cstr = nullptr;
     token.frequency = 0;
-    // token.number_list = nullptr; --> why is this not working?
 }
 
 // copy assignment operator
@@ -77,9 +76,9 @@ Token& Token::operator=(Token &&rhs)
     if (&rhs != this)
     {
         delete[] this->cstr;
-        this->frequency = rhs.frequency;
-        this->number_list = rhs.number_list;
-        this->cstr = rhs.cstr;
+        this->frequency = rhs.getFrequency();
+        this->number_list = std::move(rhs.number_list);
+        this->cstr = rhs.c_str();
         rhs.cstr = nullptr;
         rhs.frequency = 0;
     }

Token.cpp

@@ -14,10 +14,10 @@ class Token
 
     public:
         // constructors
-        Token();                                       // default constructor
-        Token(const char* chars, int line_num);        // normal constructor
-        Token(const Token& token);                     // copy constructor
-        Token(Token&& token);                          // move constructor
+        Token();                                                // default constructor
+        explicit Token(const char* chars, int line_num);        // normal constructor
+        Token(const Token& token);                              // copy constructor
+        Token(Token&& token);                                   // move constructor
 
         // assignment operators
         Token& operator=(const Token& rhs);            // copy assignment operator

Token.h

@@ -26,7 +26,7 @@ class TokenList {
     private:
         TNode* head{ nullptr };         // points to the first node in the list
         TNode* tail{ nullptr };         // points to the last node in the list
-        size_t size{ 0 };               // counts the number of noded in the list
+        size_t size{ 0 };               // counts the number of nodes in the list
 
         bool remove(TNode* nodePtr);
         TNode* lookup(const Token& aToken) const;
@@ -42,7 +42,7 @@ class TokenList {
         TokenList& operator=(const TokenList& rhs);     // copy assignment operator
         TokenList& operator=(TokenList&& rhs);          // move assignment operator
 
-        ~TokenList(); 
+        ~TokenList();                                   // destructor
 
         // member functions
         bool empty() const;