# HG changeset patch
# User Teemu Piippo <crimsondusk64@gmail.com>
# Date 1406210483 -10800
# Node ID 1f5518dd814645e0482112975a8af0fb0eaee6a6
# Parent  68d60e2cfa762aaa6480578e9a517e5850fc257c
- and --help works now correctly too

diff -r 68d60e2cfa76 -r 1f5518dd8146 src/commandline.cpp
--- a/src/commandline.cpp	Thu Jul 24 16:54:45 2014 +0300
+++ b/src/commandline.cpp	Thu Jul 24 17:01:23 2014 +0300
@@ -41,9 +41,8 @@
 StringList CommandLine::process (int const argc, char* argv[])
 {
 	StringList args;
-	int const trueargc = argc;
 
-	for (int argn = 1; argn < trueargc; ++argn)
+	for (int argn = 1; argn < argc; ++argn)
 	{
 		String const arg (argv[argn]);
 
diff -r 68d60e2cfa76 -r 1f5518dd8146 src/list.h
--- a/src/list.h	Thu Jul 24 16:54:45 2014 +0300
+++ b/src/list.h	Thu Jul 24 17:01:23 2014 +0300
@@ -184,8 +184,9 @@
 template<typename T>
 void List<T>::merge (const List<T>& other)
 {
+	int oldsize = size();
 	resize (size() + other.size());
-	std::copy (other.begin(), other.end(), begin() + other.size());
+	std::copy (other.begin(), other.end(), begin() + oldsize);
 }
 
 template<typename T>
diff -r 68d60e2cfa76 -r 1f5518dd8146 src/main.cpp
--- a/src/main.cpp	Thu Jul 24 16:54:45 2014 +0300
+++ b/src/main.cpp	Thu Jul 24 17:01:23 2014 +0300
@@ -50,12 +50,10 @@
 		Verbosity verboselevel (Verbosity::None);
 		bool listcommands (false);
 		bool sendhelp (false);
-		bool test (true);
 
 		CommandLine cmdline;
 		cmdline.addOption (listcommands, 'l', "listfunctions", "List available functions");
 		cmdline.addOption (sendhelp, 'h', "help", "Print help text");
-		cmdline.addOption (test, 'x', "test", "testy test");
 		cmdline.addEnumeratedOption (verboselevel, 'V', "verbose", "Output more information");
 		StringList args = cmdline.process (argc, argv);
 
@@ -68,7 +66,7 @@
 #endif
 			printTo (stderr, "%1\n", header);
 			printTo (stderr, "usage: %1 [OPTIONS] SOURCE [OUTPUT]\n\n", argv[0]);
-			printTo (stderr, "Options:\n" + cmdline.describeOptions());
+			printTo (stderr, "Options:\n" + cmdline.describeOptions() + "\n");
 			return EXIT_SUCCESS;
 		}