Added String<T, N>.ParseArgs().

include/ehs/Str.h

@@ -1110,6 +1110,54 @@ namespace ehs
             return false;
         }
 
+		Vector<Str> ParseArgs() const
+        {
+	        Vector<Str> args;
+        	T *quoteStart = nullptr;
+        	T *spaceStart = nullptr;
+
+        	for (T *i = data; i <= data + size; ++i)
+        	{
+        		if (*i == '\"' && !spaceStart)
+        		{
+        			if (quoteStart)
+        			{
+        				args.Push(Str(quoteStart, i - quoteStart));
+        				quoteStart = nullptr;
+        			}
+        			else
+        			{
+        				if (i + 1 < &data[size - 1])
+        					quoteStart = i + 1;
+        				else
+        					args.Push({});
+        			}
+        		}
+        		else if (*i == ' ' && !quoteStart)
+        		{
+        			if (spaceStart)
+        			{
+        				args.Push(Str(spaceStart, i - spaceStart));
+        				spaceStart = i + 1;
+        			}
+        			else
+        			{
+        				if (i + 1 < &data[size - 1])
+        					spaceStart = i + 1;
+        				else
+        					args.Push({});
+        			}
+        		}
+        	}
+
+        	if (quoteStart)
+        		args.Push(Str(quoteStart, &data[size - 1] - (quoteStart - 1)));
+        	else if (spaceStart)
+        		args.Push(Str(spaceStart, &data[size - 1] - (spaceStart - 1)));
+
+        	return args;
+        }
+
 		/// Checks if the string represents a number. Must not have any alphabetical characters.
 		/// @returns The result.
 		bool IsNum() const

include/ehs/Vector.h

@@ -392,7 +392,7 @@ namespace ehs
 			{
 				if (stride)
 				{
-					rawSize = (this->size + size()) / stride * stride;
+					rawSize = (this->size + size) / stride * stride;
 					if ((this->size + size) % stride)
 						rawSize += stride;
 				}
@@ -403,7 +403,7 @@ namespace ehs
 
 				T* result = new T[rawSize];
 
-				for (N i = 0; i < size; ++i)
+				for (N i = 0; i < this->size; ++i)
 					result[i] = std::move(data[i]);
 
 				delete[] data;

src/io/Console.cpp

@@ -693,7 +693,7 @@ namespace ehs
 	Vector<Str_32> Console::GetArgs_32(const UInt_64 bufferSize)
     {
         #if defined(EHS_OS_WINDOWS)
-            return UTF::To_32(GetCommandLineW()).Split(U" ");
+            return UTF::To_32(GetCommandLineW()).ParseArgs();
         #elif defined(EHS_OS_LINUX)
 			File cmdFile("/proc/self/cmdline", Mode::READ, Disposition::OPEN);
 			Array<Byte> data = cmdFile.ReadArray(bufferSize);
@@ -725,7 +725,7 @@ namespace ehs
 	Vector<Str_16> Console::GetArgs_16(const UInt_64 bufferSize)
     {
         #if defined(EHS_OS_WINDOWS)
-            return Str_16(GetCommandLineW()).Split(L" ");
+            return Str_16(GetCommandLineW()).ParseArgs();
         #elif defined(EHS_OS_LINUX)
 			File cmdFile("/proc/self/cmdline", Mode::READ, Disposition::OPEN);
 			Array<Byte> data = cmdFile.ReadArray(bufferSize);
@@ -755,7 +755,7 @@ namespace ehs
     Vector<Str_8> Console::GetArgs_8(const UInt_64 bufferSize)
     {
         #if defined(EHS_OS_WINDOWS)
-            return UTF::To_8(GetCommandLineW()).Split(" ");
+            return UTF::To_8(GetCommandLineW()).ParseArgs();
         #elif defined(EHS_OS_LINUX)
 			File cmdFile("/proc/self/cmdline", Mode::READ, Disposition::OPEN);
 			Array<Byte> data = cmdFile.ReadArray(bufferSize);