Added -m option to main program.

windelbouwman · windelbouwman · commit ce91a2510618 · 2018-10-13T11:17:09.000+02:00
diff --git a/src/main.rs b/src/main.rs
@@ -9,11 +9,11 @@ extern crate rustpython_vm;
 
 use clap::{App, Arg};
 use rustpython_parser::parser;
-use rustpython_vm::compile;
 use rustpython_vm::obj::objstr;
 use rustpython_vm::print_exception;
 use rustpython_vm::pyobject::PyObjectRef;
 use rustpython_vm::VirtualMachine;
+use rustpython_vm::{compile, import};
 use std::io;
 use std::io::prelude::*;
 use std::path::Path;
@@ -37,18 +37,25 @@ fn main() {
                 .takes_value(true)
                 .help("run the given string as a program"),
         )
+        .arg(
+            Arg::with_name("m")
+                .short("m")
+                .takes_value(true)
+                .help("run library module as script"),
+        )
         .get_matches();
 
     // Figure out if a -c option was given:
     if let Some(command) = matches.value_of("c") {
         run_command(&mut command.to_string());
-        return;
-    }
-
-    // Figure out if a script was passed:
-    match matches.value_of("script") {
-        None => run_shell(),
-        Some(filename) => run_script(&filename.to_string()),
+    } else if let Some(module) = matches.value_of("m") {
+        run_module(module);
+    } else {
+        // Figure out if a script was passed:
+        match matches.value_of("script") {
+            None => run_shell(),
+            Some(filename) => run_script(&filename.to_string()),
+        }
     }
 }
 
@@ -82,6 +89,17 @@ fn run_command(source: &mut String) {
     _run_string(source, None)
 }
 
+fn run_module(module: &str) {
+    debug!("Running module {}", module);
+    let mut vm = VirtualMachine::new();
+    match import::import_module(&mut vm, module) {
+        Ok(_value) => {}
+        Err(err) => {
+            print_exception(&mut vm, &err);
+        }
+    }
+}
+
 fn run_script(script_file: &str) {
     debug!("Running file {}", script_file);
     // Parse an ast from it:
diff --git a/vm/src/import.rs b/vm/src/import.rs
@@ -49,7 +49,7 @@ fn import_uncached_module(vm: &mut VirtualMachine, module: &str) -> PyResult {
     Ok(vm.ctx.new_module(module, scope))
 }
 
-fn import_module(vm: &mut VirtualMachine, module_name: &str) -> PyResult {
+pub fn import_module(vm: &mut VirtualMachine, module_name: &str) -> PyResult {
     // First, see if we already loaded the module:
     let sys_modules = vm.sys_module.get_item("modules").unwrap();
     if let Some(module) = sys_modules.get_item(module_name) {
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -19,7 +19,7 @@ pub mod compile;
 pub mod eval;
 mod exceptions;
 mod frame;
-mod import;
+pub mod import;
 pub mod obj;
 pub mod pyobject;
 pub mod stdlib;
diff --git a/vm/src/stdlib/json.rs b/vm/src/stdlib/json.rs
@@ -213,7 +213,8 @@ fn loads(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     Ok(de
         .deserialize(&mut serde_json::Deserializer::from_str(&objstr::get_value(
             &string,
-        ))).unwrap())
+        )))
+        .unwrap())
 }
 
 pub fn mk_module(ctx: &PyContext) -> PyObjectRef {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ fn import_uncached_module(vm: &mut VirtualMachine, module: &str) -> PyResult {`
`49`	`49`	`Ok(vm.ctx.new_module(module, scope))`
`50`	`50`	`}`
`51`	`51`
`52`		`-fn import_module(vm: &mut VirtualMachine, module_name: &str) -> PyResult {`
	`52`	`+pub fn import_module(vm: &mut VirtualMachine, module_name: &str) -> PyResult {`
`53`	`53`	`// First, see if we already loaded the module:`
`54`	`54`	`let sys_modules = vm.sys_module.get_item("modules").unwrap();`
`55`	`55`	`if let Some(module) = sys_modules.get_item(module_name) {`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,8 @@ fn loads(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`213`	`213`	`Ok(de`
`214`	`214`	`.deserialize(&mut serde_json::Deserializer::from_str(&objstr::get_value(`
`215`	`215`	`&string,`
`216`		`- ))).unwrap())`
	`216`	`+ )))`
	`217`	`+ .unwrap())`
`217`	`218`	`}`
`218`	`219`
`219`	`220`	`pub fn mk_module(ctx: &PyContext) -> PyObjectRef {`