feat: add corrections

Author: Mortalite

includes/containers/list.hpp

@@ -93,6 +93,42 @@ namespace ft {
 					push_back(*first++);
 			}
 
+			void fill_assign(size_type n, const value_type& val) {
+				clear();
+				while (n--)
+					push_back(val);
+			}
+
+			template<typename Integer>
+			void assign_dispatch(Integer n, Integer val, true_type) {
+				fill_assign(static_cast<size_type>(n), val);
+			}
+
+			template<typename InputIterator>
+			void assign_dispatch(InputIterator first, InputIterator last, false_type) {
+				clear();
+				while (first != last)
+					push_back(*first++);
+			}
+
+			void fill_insert(iterator position, size_type n, const value_type& val) {
+				while (n--)
+					insert(position, val);
+			}
+
+			template<typename Integer>
+			void insert_dispatch(iterator position, Integer n, Integer val, true_type) {
+				fill_insert(position, static_cast<size_type>(n), val);
+			}
+
+			template<typename InputIterator>
+			void insert_dispatch(iterator position, InputIterator first, InputIterator last, false_type) {
+				while (first != last) {
+					position = insert(position, *first++);
+					position++;
+				}
+			}
+
 		public:
 
 			/*
@@ -232,15 +268,12 @@ namespace ft {
 			*/
 			template <class InputIterator>
 			void					assign(InputIterator first, InputIterator last) {
-				clear();
-				while (first != last)
-					push_back(*first++);
+				typedef typename ft::is_integer<InputIterator>::type Integral;
+				assign_dispatch(first, last, Integral());
 			}
 
 			void					assign(size_type n, const value_type& val) {
-				clear();
-				while (n--)
-					push_back(val);
+				fill_assign(n, val);
 			}
 
 			void					push_front(const value_type& val) {
@@ -311,14 +344,13 @@ namespace ft {
 			}
 
 			void 					insert(iterator position, size_type n, const value_type& val) {
-				while (n--)
-					insert(position, val);
+				fill_insert(position, n, val);
 			}
 
 			template<class InputIterator>
 			void 					insert(iterator position, InputIterator first, InputIterator last) {
-				while (first != last)
-					insert(position, *first++);
+				typedef typename ft::is_integer<InputIterator>::type Integral;
+				insert_dispatch(position, first, last, Integral());
 			}
 
 			iterator				erase(iterator position) {

includes/containers/vector.hpp

@@ -63,6 +63,43 @@ namespace ft {
 					_array = NULL;
 			}
 
+
+			void fill_assign(size_type n, const value_type& val) {
+				clear();
+				while (n--)
+					push_back(val);
+			}
+
+			template<typename Integer>
+			void assign_dispatch(Integer n, Integer val, true_type) {
+				fill_assign(static_cast<size_type>(n), val);
+			}
+
+			template<typename InputIterator>
+			void assign_dispatch(InputIterator first, InputIterator last, false_type) {
+				clear();
+				while (first != last)
+					push_back(*first++);
+			}
+
+			void fill_insert(iterator position, size_type n, const value_type& val) {
+				while (n--)
+					insert(position, val);
+			}
+
+			template<typename Integer>
+			void insert_dispatch(iterator position, Integer n, Integer val, true_type) {
+				fill_insert(position, static_cast<size_type>(n), val);
+			}
+
+			template<typename InputIterator>
+			void insert_dispatch(iterator position, InputIterator first, InputIterator last, false_type) {
+				while (first != last) {
+					position = insert(position, *first++);
+					position++;
+				}
+			}
+
 		public:
 
 			/*
@@ -242,15 +279,12 @@ namespace ft {
 
 			template <class InputIterator>
 			void				assign(InputIterator first, InputIterator last) {
-				clear();
-				while (first != last)
-					push_back(*first++);
+				typedef typename ft::is_integer<InputIterator>::type Integral;
+				assign_dispatch(first, last, Integral());
 			}
 
 			void				assign(size_type n, const value_type& val) {
-				clear();
-				while (n--)
-					push_back(val);
+				fill_assign(n, val);
 			}
 
 			void				push_back(const value_type& val) {
@@ -278,16 +312,13 @@ namespace ft {
 			}
 
 			void				insert(iterator position, size_type n, const value_type& val) {
-				while (n--)
-					position = insert(position, val);
+				fill_insert(position, n, val);
 			}
 
 			template <class InputIterator>
 			void				insert(iterator position, InputIterator first, InputIterator last) {
-				while (first != last) {
-					position = insert(position, *first++);
-					position++;
-				}
+				typedef typename ft::is_integer<InputIterator>::type Integral;
+				insert_dispatch(position, first, last, Integral());
 			}
 
 			iterator			erase(iterator position) {

includes/defines.hpp

@@ -15,6 +15,6 @@ extern size_t	g_mapMarginCoeff;
 extern int		g_intMin, g_intMax;
 extern float	g_floatMin, g_floatMax;
 
-typedef float	cType;
+typedef int	cType;
 
 #endif

includes/mainTest.hpp

@@ -106,8 +106,8 @@ namespace ft {
 		T mainContainer2;
 		C alterContainer2;
 
-		mainContainer2.assign(11, (typename T::size_type)10);
-		alterContainer2.assign(11,(typename C::size_type)10);
+		mainContainer2.assign(11, 10);
+		alterContainer2.assign(11, 10);
 		printCmpIterator(mainContainer2, alterContainer2);
 	}
 
@@ -158,7 +158,7 @@ namespace ft {
 		typename C::iterator alterIt;
 
 		typename T::value_type randomValue = getRandomValue<T>();
-		typename T::size_type randomTimes = getRandomValueByType<int>()%4 + 1;
+		typename T::size_type randomTimes = getRandomValueByType<typename T::size_type>()%4 + 1;
 		std::cout << BLUE << "Insert " << randomValue << " in begin()" << RESET << std::endl;
 		mainIt = mainContainer.insert(mainContainer.begin(), randomValue);
 		alterIt = alterContainer.insert(alterContainer.begin(), randomValue);

srcs/main.cpp

@@ -143,8 +143,8 @@ int main() {
 	std::cout.setf(std::ios::left);
 
 	std::cout << RED << "Mandatory part" << RESET << std::endl;
-//	testList();
-	testVector();
+	testList();
+//	testVector();
 //	testMap();
 //	testStack();
 //	testQueue();