Merge pull request #35 from yusuf601/main

feat: add two overloads splice after

Author: yusuf601

CMakeLists.txt

@@ -26,6 +26,7 @@ FetchContent_MakeAvailable(googletest)
 
 # ==== Testing ====
 include(CTest)
+set(CMAKE_CTEST_ARGUMENTS "--timeout 5")
 enable_testing()
 
 add_executable(forward_list_test

header/forward_list.hpp

@@ -613,26 +613,67 @@ class forward_lists{
             size++;
         }
         void splice_after(const Iterator pos,forward_lists& others){
+            if(this == &others){
+                return;
+            }
             Node* src = pos.get_raw();//pos object saat ini
             Node* begin = others.head->next ; //begin object lain
             Node* end = others.tail; //end object lain
 
-            //lingking node pertama others ke object saat ini
-            Node* moved = src->next; 
-            moved->next = begin->next; //tunjuk node setelah begin
-
-            begin->next = moved; //linking begin ke node setelah iterator
-            //linking node terakhir object lain ke src->next
             end->next = src->next;
+            src->next = begin;
+            //update tail
+            if(src == tail){
+                tail = end;
+            }
+            //update size
+            size += others.size;
+            //kosong object lain
+            others.head->next = nullptr; //harus menunjuk nullptr
+            others.tail = others.head;//reset tail,tail menunjuk head(dummy node)
+            others.size = 0;
+        }
+        void splice_after(const Iterator pos,forward_lists&& others){ //global reference
+            if(this == &others){
+                return;
+            }
+            Node* src = pos.get_raw();//pos object saat ini
+            Node* begin = others.head->next ; //begin object lain
+            Node* end = others.tail; //end object lain
 
-            //linking node pertama object saat ini ke head object lain
+            end->next = src->next;
             src->next = begin;
+            //update tail
+            if(src == tail){
+                tail = end;
+            }
+            //update size
             size += others.size;
+            //kosong object lain
+            others.head->next = nullptr; //harus menunjuk nullptr
+            others.tail = others.head;//reset tail,tail menunjuk head(dummy node)
             others.size = 0;
         }
-        // void splice_after(const Iterator pos,forward_lists& others,const Iterator first,const Iterator last){
-        //     Node* curr = pos.get_raw();
-        // }
+        void splice_after(const Iterator pos,forward_lists& others,const Iterator first,const Iterator last){
+            Node* curr = pos.get_raw();
+            Node* start = others.head->next;
+            Node* other_begin = first.get_raw()->next;
+            Node* other_end = last.get_raw();
+            //linking other_end to curr->next
+            other_end->next =curr->next;
+            //lingking curr->next with to others_begin
+            curr->next = other_begin;
+
+            //update size
+            //karena linking dimulai dari node setelah posisi first
+            size += std::distance(next(first,last));
+            others.size -= size;
+
+            //kosongkan object lain
+            
+            tail = first.get_raw(); 
+
+        }
     public:
         /**
          * @brief method untuk print semua node list 

implementation/implementation.cpp

@@ -4,10 +4,12 @@
 int main(){
     std::cout << "Pop Front" << std::endl;
     forward_lists<int>flst = {1,2,3};
-    flst.pop_front();
-    flst.pop_front();
-    std::cout << "harus nya sisa 3" << std::endl;
-    std::cout << "ini tail " << flst.back() << std::endl;
+    forward_lists<int>fa = {10,20,30};
+    flst.splice_after(flst.begin(),fa);
+    // flst.pop_front();
+    // flst.pop_front();
+     std::cout << "ini splice" << std::endl;
+    // std::cout << "ini tail " << flst.back() << std::endl;
     flst.print_all(flst.begin(),flst.end()); //3
     //initializer list
     std::cout << "initializer list constructor" << std::endl;

test/testing.cpp

@@ -213,17 +213,32 @@ TEST(Assign_test,Assign_testIII){
     }
     EXPECT_EQ(actual,expectations);
 }
-// TEST(splice_test,splice_testI){
-//     forward_lists<int>fl = {1,2,3};
-//     forward_lists<int>list = {10,20,30};
-//     fl.splice_after(fl.begin(),list);
-//     std::vector<int>expectations = {1,10,20,30,2,3};
-//     std::vector<int>actual;
-//     for(auto x: fl){
-//         actual.push_back(x);
-//     }
-//     EXPECT_EQ(fl.get_size(),6);
-//     EXPECT_EQ(list.get_size(),0);
-//     EXPECT_TRUE(!list.is_empty());
-//     EXPECT_EQ(actual,expectations);
-// }
+TEST(splice_test,splice_testI){
+    forward_lists<int>fl = {1,2,3};
+    forward_lists<int>list = {10,20,30};
+    fl.splice_after(fl.begin(),list);
+    std::vector<int>expectations = {1,10,20,30,2,3};
+    std::vector<int>actual;
+    for(auto x: fl){
+        actual.push_back(x);
+    }
+    EXPECT_EQ(fl.get_size(),6);
+    EXPECT_EQ(list.get_size(),0);
+    EXPECT_TRUE(list.is_empty());
+    EXPECT_EQ(actual,expectations);
+}
+TEST(splice_test,splice_testII){
+    forward_lists<int>fl = {100,200,300};
+    forward_lists<int>lists = {20,30,40};
+    EXPECT_EQ(fl.get_size(),3);
+    EXPECT_EQ(lists.get_size(),3);
+    fl.splice_after(fl.begin(),lists,lists.begin());
+    std::vector<int>expectations = {100,30,200,300};
+    std::vector<int>actual;
+    for(auto x: fl){
+        actual.push_back(x);
+    }
+    EXPECT_EQ(fl.get_size(),4);
+    EXPECT_EQ(lists.get_size(),2); 
+    EXPECT_EQ(actual,expectations);
+}