Merge pull request RustPython#267 from coolreader18/wasm-vm-class

Add a VirtualMachine class to the WASM library

Author: windelbouwman

Cargo.lock

@@ -18,6 +18,8 @@ use crate::pyobject::{
     AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef,
     PyResult, Scope, TypeProtocol,
 };
+
+#[cfg(not(target_arch = "wasm32"))]
 use crate::stdlib::io::io_open;
 
 use crate::vm::VirtualMachine;
@@ -702,7 +704,7 @@ fn builtin_sum(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 // builtin___import__
 
 pub fn make_module(ctx: &PyContext) -> PyObjectRef {
-    py_module!(ctx, "__builtins__", {
+    let py_mod = py_module!(ctx, "__builtins__", {
         //set __name__ fixes: https://github.com/RustPython/RustPython/issues/146
         "__name__" => ctx.new_str(String::from("__main__")),
 
@@ -747,7 +749,6 @@ pub fn make_module(ctx: &PyContext) -> PyObjectRef {
         "min" => ctx.new_rustfunc(builtin_min),
         "object" => ctx.object(),
         "oct" => ctx.new_rustfunc(builtin_oct),
-        "open" => ctx.new_rustfunc(io_open),
         "ord" => ctx.new_rustfunc(builtin_ord),
         "next" => ctx.new_rustfunc(builtin_next),
         "pow" => ctx.new_rustfunc(builtin_pow),
@@ -789,7 +790,12 @@ pub fn make_module(ctx: &PyContext) -> PyObjectRef {
         "StopIteration" => ctx.exceptions.stop_iteration.clone(),
         "ZeroDivisionError" => ctx.exceptions.zero_division_error.clone(),
         "KeyError" => ctx.exceptions.key_error.clone(),
-    })
+    });
+
+    #[cfg(not(target_arch = "wasm32"))]
+    ctx.set_attr(&py_mod, "open", ctx.new_rustfunc(io_open));
+
+    py_mod
 }
 
 pub fn builtin_build_class_(vm: &mut VirtualMachine, mut args: PyFuncArgs) -> PyResult {

vm/src/builtins.rs

@@ -28,7 +28,7 @@ extern crate rustpython_parser;
 
 // This is above everything else so that the defined macros are available everywhere
 #[macro_use]
-mod macros;
+pub mod macros;
 
 mod builtins;
 pub mod bytecode;

vm/src/lib.rs

@@ -1,15 +1,18 @@
 // count number of tokens given as arguments.
 // see: https://danielkeep.github.io/tlborm/book/blk-counting.html
+#[macro_export]
 macro_rules! replace_expr {
     ($_t:tt $sub:expr) => {
         $sub
     };
 }
 
+#[macro_export]
 macro_rules! count_tts {
     ($($tts:tt)*) => {0usize $(+ replace_expr!($tts 1usize))*};
 }
 
+#[macro_export]
 macro_rules! type_check {
     ($vm:ident, $args:ident, $arg_count:ident, $arg_name:ident, $arg_type:expr) => {
         // None indicates that we have no type requirement (i.e. we accept any type)
@@ -31,6 +34,7 @@ macro_rules! type_check {
     };
 }
 
+#[macro_export]
 macro_rules! arg_check {
     ( $vm: ident, $args:ident ) => {
         // Zero-arg case
@@ -94,6 +98,7 @@ macro_rules! arg_check {
     };
 }
 
+#[macro_export]
 macro_rules! no_kwargs {
     ( $vm: ident, $args:ident ) => {
         // Zero-arg case

vm/src/macros.rs

@@ -1,10 +1,8 @@
 mod ast;
 mod dis;
-pub mod io;
 mod json;
 mod keyword;
 mod math;
-mod os;
 mod pystruct;
 mod random;
 mod re;
@@ -15,6 +13,11 @@ mod types;
 mod weakref;
 use std::collections::HashMap;
 
+#[cfg(not(target_arch = "wasm32"))]
+pub mod io;
+#[cfg(not(target_arch = "wasm32"))]
+mod os;
+
 use crate::pyobject::{PyContext, PyObjectRef};
 
 pub type StdlibInitFunc = fn(&PyContext) -> PyObjectRef;
@@ -23,11 +26,9 @@ pub fn get_module_inits() -> HashMap<String, StdlibInitFunc> {
     let mut modules = HashMap::new();
     modules.insert("ast".to_string(), ast::mk_module as StdlibInitFunc);
     modules.insert("dis".to_string(), dis::mk_module as StdlibInitFunc);
-    modules.insert("io".to_string(), io::mk_module as StdlibInitFunc);
     modules.insert("json".to_string(), json::mk_module as StdlibInitFunc);
     modules.insert("keyword".to_string(), keyword::mk_module as StdlibInitFunc);
     modules.insert("math".to_string(), math::mk_module as StdlibInitFunc);
-    modules.insert("os".to_string(), os::mk_module as StdlibInitFunc);
     modules.insert("re".to_string(), re::mk_module as StdlibInitFunc);
     modules.insert("random".to_string(), random::mk_module as StdlibInitFunc);
     modules.insert("string".to_string(), string::mk_module as StdlibInitFunc);
@@ -39,5 +40,13 @@ pub fn get_module_inits() -> HashMap<String, StdlibInitFunc> {
     );
     modules.insert("types".to_string(), types::mk_module as StdlibInitFunc);
     modules.insert("_weakref".to_string(), weakref::mk_module as StdlibInitFunc);
+
+    // disable some modules on WASM
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        modules.insert("io".to_string(), io::mk_module as StdlibInitFunc);
+        modules.insert("os".to_string(), os::mk_module as StdlibInitFunc);
+    }
+
     modules
 }

vm/src/stdlib/mod.rs

@@ -39,6 +39,7 @@ pub struct VirtualMachine {
     pub stdlib_inits: HashMap<String, stdlib::StdlibInitFunc>,
     pub ctx: PyContext,
     pub current_frame: Option<PyObjectRef>,
+    pub wasm_id: Option<String>,
 }
 
 impl VirtualMachine {
@@ -61,6 +62,7 @@ impl VirtualMachine {
             stdlib_inits,
             ctx,
             current_frame: None,
+            wasm_id: None,
         }
     }
 

vm/src/vm.rs

@@ -11,12 +11,25 @@ edition = "2018"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-rustpython_parser = {path = "../../parser"}
-rustpython_vm = {path = "../../vm"}
+rustpython_parser = { path = "../../parser" }
+rustpython_vm = { path = "../../vm" }
 cfg-if = "0.1.2"
 wasm-bindgen = "0.2"
+wasm-bindgen-futures = "0.3"
 js-sys = "0.3"
+futures = "0.1"
+console_error_panic_hook = "0.1"
 
 [dependencies.web-sys]
 version = "0.3"
-features = [ "console", "Document", "Element", "HtmlTextAreaElement", "Window" ]
+features = [
+    "console",
+    "Document",
+    "Element",
+    "HtmlTextAreaElement",
+    "Window",
+    "Headers",
+    "Request",
+    "RequestInit",
+    "Response"
+]