# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1650900910 -3600
# Node ID 82270a6b1234bdbb6a4aa2f8cc09aaef7d3b9a57
# Parent  d8a6e03a716134c1eed415449e8e32d93172f69f# Parent  cc84682b8429c15f9232201eca66f9a1394f3fdd
Merge 0.12->trunk

diff -r d8a6e03a7161 -r 82270a6b1234 spec/util_argparse_spec.lua
--- a/spec/util_argparse_spec.lua	Mon Apr 25 15:09:53 2022 +0100
+++ b/spec/util_argparse_spec.lua	Mon Apr 25 16:35:10 2022 +0100
@@ -20,7 +20,7 @@
 		local arg = { "--foo"; "bar"; "--baz" };
 		local opts, err = parse(arg);
 		assert.falsy(err);
-		assert.same({ foo = true }, opts);
+		assert.same({ foo = true, "bar", "--baz" }, opts);
 		assert.same({ "bar"; "--baz" }, arg);
 	end);
 
diff -r d8a6e03a7161 -r 82270a6b1234 util/argparse.lua
--- a/util/argparse.lua	Mon Apr 25 15:09:53 2022 +0100
+++ b/util/argparse.lua	Mon Apr 25 16:35:10 2022 +0100
@@ -5,7 +5,7 @@
 	local parsed_opts = {};
 
 	if #arg == 0 then
-		return parsed_opts, arg;
+		return parsed_opts;
 	end
 	while true do
 		local raw_param = arg[1];
@@ -47,7 +47,10 @@
 		end
 		parsed_opts[param_k] = param_v;
 	end
-	return parsed_opts, arg;
+	for i = 1, #arg do
+		parsed_opts[i] = arg[i];
+	end
+	return parsed_opts;
 end
 
 return {