Genericize the wasm lib to not be specifically for the demo

This included changing RustObjectKind::RustFunction.function to be a `Box<Fn()>` instead of a `fn()` to support closures.
RustPython · windelbouwman · Dec 29, 2018 · Dec 19, 2018 · Dec 18, 2018 · Dec 22, 2018
commit ca30ebcf5d0fffd0fa80e3b9b728b5f37cde01fd
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.1"
 authors = ["Windel Bouwman", "Shing Lyu <shing.lyu@gmail.com>"]
 
 [workspace]
-members = [".", "vm", "wasm", "parser"]
+members = [".", "vm", "wasm/lib", "parser"]
 
 [dependencies]
 log="0.4.1"

diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -559,7 +559,7 @@ impl Frame {
             bytecode::Instruction::LoadBuildClass => {
                 let rustfunc = PyObject::new(
                     PyObjectKind::RustFunction {
-                        function: builtins::builtin_build_class_,
+                        function: Box::new(builtins::builtin_build_class_),
                     },
                     vm.ctx.type_type(),
                 );

diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -452,9 +452,24 @@ impl PyContext {
         )
     }
 
-    pub fn new_rustfunc(&self, function: RustPyFunc) -> PyObjectRef {
+    pub fn new_rustfunc<F: 'static + Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>(
+        &self,
+        function: F,
+    ) -> PyObjectRef {
         PyObject::new(
-            PyObjectKind::RustFunction { function: function },
+            PyObjectKind::RustFunction {
+                function: Box::new(function),
+            },
+            self.function_type(),
+        )
+    }
+
+    pub fn new_rustfunc_from_box(
+        &self,
+        function: Box<(Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult)>,
+    ) -> PyObjectRef {
+        PyObject::new(
+            PyObjectKind::RustFunction { function },
             self.function_type(),
         )
     }
@@ -463,7 +478,10 @@ impl PyContext {
         PyObject::new(PyObjectKind::Frame { frame: frame }, self.frame_type())
     }
 
-    pub fn new_property(&self, function: RustPyFunc) -> PyObjectRef {
+    pub fn new_property<F: 'static + Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>(
+        &self,
+        function: F,
+    ) -> PyObjectRef {
         let fget = self.new_rustfunc(function);
         let py_obj = PyObject::new(
             PyObjectKind::Instance {
@@ -505,7 +523,10 @@ impl PyContext {
         )
     }
 
-    pub fn new_member_descriptor(&self, function: RustPyFunc) -> PyObjectRef {
+    pub fn new_member_descriptor<F: 'static + Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>(
+        &self,
+        function: F,
+    ) -> PyObjectRef {
         let dict = self.new_dict();
         self.set_item(&dict, "function", self.new_rustfunc(function));
         self.new_instance(dict, self.member_descriptor_type())
@@ -762,8 +783,6 @@ impl PyFuncArgs {
     }
 }
 
-type RustPyFunc = fn(vm: &mut VirtualMachine, PyFuncArgs) -> PyResult;
-
 /// Rather than determining the type of a python object, this enum is more
 /// a holder for the rust payload of a python object. It is more a carrier
 /// of rust data for a particular python object. Determine the python type
@@ -840,7 +859,7 @@ pub enum PyObjectKind {
         dict: PyObjectRef,
     },
     RustFunction {
-        function: RustPyFunc,
+        function: Box<(Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult)>,
     },
 }
 

diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -229,7 +229,7 @@ impl VirtualMachine {
     pub fn invoke(&mut self, func_ref: PyObjectRef, args: PyFuncArgs) -> PyResult {
         trace!("Invoke: {:?} {:?}", func_ref, args);
         match func_ref.borrow().kind {
-            PyObjectKind::RustFunction { function } => function(self, args),
+            PyObjectKind::RustFunction { ref function } => function(self, args),
             PyObjectKind::Function {
                 ref code,
                 ref scope,

diff --git a/wasm/build.sh b/wasm/build.sh
@@ -1,7 +1,3 @@
-wasm-pack build --debug && \
-cd pkg && \
-npm link && \
-cd ../app && \
-npm install && \
-npm link rustpython_wasm && \
-node_modules/.bin/webpack-dev-server
+set -e
+(cd lib; wasm-pack build --debug)
+(cd demo; npm install && node_modules/.bin/webpack-dev-server)
diff --git a/wasm/app/.gitignore → wasm/demo/.gitignore b/wasm/app/.gitignore → wasm/demo/.gitignore
diff --git a/wasm/app/.prettierrc → wasm/demo/.prettierrc b/wasm/app/.prettierrc → wasm/demo/.prettierrc