Merge pull request mthom#2264 from Skgland/fix-os-argv-1

Fix os:argv/1 in case the raw args contain multiple `--`

src/lib/os.pl

@@ -138,7 +138,8 @@
 argv(Argv) :-
     can_be(list, Argv),
     '$argv'(Argv0),
-    (    append(_, ["--"|Argv], Argv0) ->
-	 true
-    ;    Argv = []
+    ( append(_, ["--"|Argv1], Argv0) ->
+        Argv = Argv1
+    ;
+        Argv = []
     ).

tests/scryer/cli/issues/os_argv-no-final--.stdin

@@ -0,0 +1,6 @@
+os:argv(V).
+os:argv(["test1"|_]).
+os:argv(["--"|_]).
+os:argv([V, "--"|_]).
+os:argv(["test2"|_]).
+os:argv([]).

tests/scryer/cli/issues/os_argv-no-final--.stdout

@@ -0,0 +1,6 @@
+   V = ["test1","--","test2"].
+   true.
+   false.
+   V = "test1".
+   false.
+   false.

tests/scryer/cli/issues/os_argv-no-final--.toml

@@ -0,0 +1,2 @@
+# https://github.com/mthom/scryer-prolog/pull/2263#issuecomment-1874400820
+args = ["-f", "--no-add-history", "--", "test1", "--", "test2"]

tests/scryer/cli/issues/os_argv.stdin

@@ -0,0 +1,6 @@
+os:argv(V).
+os:argv(["test1"|_]).
+os:argv(["--"|_]).
+os:argv([V, "--"|_]).
+os:argv(["test2"|_]).
+os:argv([]).

tests/scryer/cli/issues/os_argv.stdout

@@ -0,0 +1,6 @@
+   V = ["test1","--","test2","--"].
+   true.
+   false.
+   V = "test1".
+   false.
+   false.

tests/scryer/cli/issues/os_argv.toml

@@ -0,0 +1,2 @@
+# https://github.com/mthom/scryer-prolog/pull/2263#issuecomment-1874400820
+args = ["-f", "--no-add-history", "--", "test1", "--", "test2", "--"]