pass of args for clap, pop first arg

rmliddle · rmliddle · commit 064765315dcf · 2018-10-20T10:36:49.000+11:00
diff --git a/src/main.rs b/src/main.rs
@@ -43,6 +43,9 @@ fn main() {
                 .takes_value(true)
                 .help("run library module as script"),
         )
+        .arg(Arg::from_usage("[pyargs] 'args for python'")
+            .multiple(true)
+        )
         .get_matches();
 
     // Construct vm:
diff --git a/tests/snippets/sysmod_argv.py b/tests/snippets/sysmod_argv.py
@@ -1,4 +1,4 @@
 import sys
 
-print(sys.argv[1])
-
+print(sys.argv)
+assert sys.argv[0].endswith('.py')
diff --git a/vm/src/sysmodule.rs b/vm/src/sysmodule.rs
@@ -7,7 +7,8 @@ use super::vm::VirtualMachine;
  */
 
 fn argv(ctx: &PyContext) -> PyObjectRef {
-    let argv: Vec<PyObjectRef> = env::args().map(|x| ctx.new_str(x)).collect();
+    let mut argv: Vec<PyObjectRef> = env::args().map(|x| ctx.new_str(x)).collect();
+    argv.remove(0);
     ctx.new_list(argv)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,9 @@ fn main() {`
`43`	`43`	`.takes_value(true)`
`44`	`44`	`.help("run library module as script"),`
`45`	`45`	`)`
	`46`	`+ .arg(Arg::from_usage("[pyargs] 'args for python'")`
	`47`	`+ .multiple(true)`
	`48`	`+ )`
`46`	`49`	`.get_matches();`
`47`	`50`
`48`	`51`	`// Construct vm:`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ use super::vm::VirtualMachine;`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`fn argv(ctx: &PyContext) -> PyObjectRef {`
`10`		`- let argv: Vec<PyObjectRef> = env::args().map(\|x\| ctx.new_str(x)).collect();`
	`10`	`+ let mut argv: Vec<PyObjectRef> = env::args().map(\|x\| ctx.new_str(x)).collect();`
	`11`	`+ argv.remove(0);`
`11`	`12`	`ctx.new_list(argv)`
`12`	`13`	`}`
`13`	`14`