View difference between Paste ID: 9HaJEs8E and KvSzqtCB

 std::vector<std::string> split(const std::string& str, const std::string& delimiter, bool ignore_empty, bool strip_spaces)
 {
 	if (str.empty()) {
 		return {};
 	}
 
 	std::vector<std::string> res;
 
 	for (size_t p = 0, q = 0; p < str.length(); ++p) {
 		if (delimiter.empty()) {
 			res.push_back(std::string(1, str[p]));
 			continue;
 		}
 
 		// If we are looking at the last character we want to check if the
 		// remainder needs to be pushed into the result below, otherwise always
 		// check for the delimiter first.
 		if (p + 1 < str.length() &&
 			str.compare(p, delimiter.length(), delimiter) != 0) {
 			continue;
 		}
 
-		if (p == q) {
+		std::string sub = str.substr(q, p + 1 == str.length() ? std::string::npos : p - q);
-			// An empty fragment.
+
-			if (!ignore_empty) {
+		if (strip_spaces) {
-				res.push_back("");
+			strip(sub);
-			}
+
-			q += delimiter.length();
+
-		} else {
+		if (!ignore_empty || !sub.empty()) {
-			// Maybe an empty fragment
+			res.push_back(std::move(sub));
-			std::string sub = str.substr(q, p - q);
+
 
-			if (strip_spaces) {
+		q = p + delimiter.length();
-				strip(sub);
+
-			}
+
 	return res;
-			if (!ignore_empty || !sub.empty()) {
+