From 4d17a3c835e5d7eb2d6d1bf05cf635cfefc9c4c9 Mon Sep 17 00:00:00 2001
From: Alessandro Ferro <49845537+xfarrow@users.noreply.github.com>
Date: Wed, 9 Jun 2021 11:55:47 +0200
Subject: [PATCH] Library 3

---
 librerie/exercise3/binarytree/binarytree.cpp        | 8 ++++----
 librerie/exercise3/binarytree/lnk/binarytreelnk.cpp | 1 -
 librerie/exercise3/binarytree/vec/binarytreevec.cpp | 4 +++-
 librerie/exercise3/list/list.cpp                    | 2 +-
 librerie/exercise3/queue/vec/queuevec.cpp           | 4 ++--
 librerie/exercise3/stack/lst/stacklst.cpp           | 2 +-
 librerie/exercise3/stack/vec/stackvec.cpp           | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/librerie/exercise3/binarytree/binarytree.cpp b/librerie/exercise3/binarytree/binarytree.cpp
index 028f727..862cde2 100755
--- a/librerie/exercise3/binarytree/binarytree.cpp
+++ b/librerie/exercise3/binarytree/binarytree.cpp
@@ -465,8 +465,8 @@ BTInOrderIterator<Data>::BTInOrderIterator(const BTInOrderIterator& itr){
 
 template <typename Data>
 BTInOrderIterator<Data>::BTInOrderIterator(BTInOrderIterator&& toMove) noexcept{
-  std::move(curr, toMove.curr);
-  std::move(stack, toMove.stack);
+  std::swap(curr, toMove.curr);
+  std::swap(stack, toMove.stack);
 }
 
 template <typename Data>
@@ -484,8 +484,8 @@ BTInOrderIterator<Data>& BTInOrderIterator<Data>::operator=(const BTInOrderItera
 
 template <typename Data>
 BTInOrderIterator<Data>& BTInOrderIterator<Data>::operator=(BTInOrderIterator&& toMove) noexcept{
-  std::move(curr, toMove.curr);
-  std::move(stack, toMove.stack);
+  std::swap(curr, toMove.curr);
+  std::swap(stack, toMove.stack);
   return *this;
 }
 
diff --git a/librerie/exercise3/binarytree/lnk/binarytreelnk.cpp b/librerie/exercise3/binarytree/lnk/binarytreelnk.cpp
index eca6ed9..3167335 100755
--- a/librerie/exercise3/binarytree/lnk/binarytreelnk.cpp
+++ b/librerie/exercise3/binarytree/lnk/binarytreelnk.cpp
@@ -134,7 +134,6 @@ BinaryTreeLnk<Data>& BinaryTreeLnk<Data>::operator=(const BinaryTreeLnk<Data>& t
 
 template <typename Data>
 BinaryTreeLnk<Data>& BinaryTreeLnk<Data>::operator=(BinaryTreeLnk<Data>&& tree) noexcept{
-  Clear();
   std::swap(size, tree.size);
   std::swap(root, tree.root);
   return *this;
diff --git a/librerie/exercise3/binarytree/vec/binarytreevec.cpp b/librerie/exercise3/binarytree/vec/binarytreevec.cpp
index f954771..2bc3694 100755
--- a/librerie/exercise3/binarytree/vec/binarytreevec.cpp
+++ b/librerie/exercise3/binarytree/vec/binarytreevec.cpp
@@ -117,12 +117,14 @@ BinaryTreeVec<Data>& BinaryTreeVec<Data>::operator=(const BinaryTreeVec<Data>& b
 
 template <typename Data>
 BinaryTreeVec<Data>& BinaryTreeVec<Data>::operator=(BinaryTreeVec<Data>&& bt) noexcept{
-  Clear();
   std::swap(size, bt.size);
   std::swap(tree, bt.tree);
   for(ulong i=0 ; i<size ; ++i){
     tree[i]->ReferenceToTree = this;
   }
+  for(ulong j=0 ; j<bt.Size() ; ++j){
+    (bt.tree[j])->ReferenceToTree = &bt;
+  }
   return *this;
 }
 
diff --git a/librerie/exercise3/list/list.cpp b/librerie/exercise3/list/list.cpp
index 3396301..05c06d1 100644
--- a/librerie/exercise3/list/list.cpp
+++ b/librerie/exercise3/list/list.cpp
@@ -167,7 +167,7 @@ void List<Data>::InsertAtBack(const Data& data){
 template <typename Data>
 void List<Data>::InsertAtBack(Data&& data){
   if(size == 0){
-    InsertAtFront(data);
+    InsertAtFront(std::move(data));
   }
   else{
     struct Node* last = new Node(std::move(data));
diff --git a/librerie/exercise3/queue/vec/queuevec.cpp b/librerie/exercise3/queue/vec/queuevec.cpp
index 42f6857..a76066f 100755
--- a/librerie/exercise3/queue/vec/queuevec.cpp
+++ b/librerie/exercise3/queue/vec/queuevec.cpp
@@ -37,7 +37,7 @@ QueueVec<Data>::QueueVec(const QueueVec& toCopy){
 
 template <typename Data>
 QueueVec<Data>::QueueVec(QueueVec&& toMove) noexcept{
-    Clear();
+    Clear(); // the moved Queue will be in a consistent state
     std::swap(Elements, toMove.Elements);
     std::swap(rear, toMove.rear);
     std::swap(front, toMove.front);
@@ -140,7 +140,7 @@ bool QueueVec<Data>::Empty() const noexcept{
 
 template <typename Data>
 ulong QueueVec<Data>::Size() const noexcept{
-  //if(size == 0) return 0; // this won't ever get executed, it's here just in case  
+  //if(size == 0) return 0; // this won't ever get executed, it's here just in case
   return ((rear + size) - front) % size;
 }
 
diff --git a/librerie/exercise3/stack/lst/stacklst.cpp b/librerie/exercise3/stack/lst/stacklst.cpp
index f1f24d8..a9b6cdc 100755
--- a/librerie/exercise3/stack/lst/stacklst.cpp
+++ b/librerie/exercise3/stack/lst/stacklst.cpp
@@ -52,7 +52,7 @@ void StackLst<Data>::Push(const Data& element){
 
 template <typename Data>
 void StackLst<Data>::Push(Data&& element) noexcept{
-  List<Data>::InsertAtFront(element);
+  List<Data>::InsertAtFront(std::move(element));
 }
 
 template <typename Data>
diff --git a/librerie/exercise3/stack/vec/stackvec.cpp b/librerie/exercise3/stack/vec/stackvec.cpp
index eabb6ad..ca711d3 100755
--- a/librerie/exercise3/stack/vec/stackvec.cpp
+++ b/librerie/exercise3/stack/vec/stackvec.cpp
@@ -44,7 +44,7 @@ StackVec<Data>& StackVec<Data>::operator=(const StackVec<Data>& copyFrom){
 template <typename Data>
 StackVec<Data>& StackVec<Data>::operator=(StackVec<Data>&& moveFrom) noexcept{
   Vector<Data>::operator=(std::move(moveFrom));
-  stackSize = moveFrom.Size();
+  std::swap(stackSize, moveFrom.stackSize);
   return *this;
 }