Fix wasm

coolreader18 · coolreader18 · commit e44ea3f9a58d · 2020-10-19T23:55:55.000-05:00
diff --git a/vm/src/frozen.rs b/vm/src/frozen.rs
@@ -3,25 +3,28 @@ use crate::builtins::code;
 use crate::bytecode;
 use std::collections::HashMap;
 
+pub fn map_frozen<'a>(
+    ctx: &'a PyContext,
+    i: impl IntoIterator<Item = (String, bytecode::FrozenModule)> + 'a,
+) -> impl Iterator<Item = (String, code::FrozenModule)> + 'a {
+    i.into_iter()
+        .map(move |(k, bytecode::FrozenModule { code, package })| {
+            (
+                k,
+                code::FrozenModule {
+                    code: ctx.map_codeobj(code),
+                    package,
+                },
+            )
+        })
+}
+
 pub fn get_module_inits(ctx: &PyContext) -> HashMap<String, code::FrozenModule> {
     let mut modules = HashMap::new();
 
-    let map_freeze = |m: HashMap<String, bytecode::FrozenModule>| {
-        m.into_iter()
-            .map(|(k, bytecode::FrozenModule { code, package })| {
-                (
-                    k,
-                    code::FrozenModule {
-                        code: ctx.map_codeobj(code),
-                        package,
-                    },
-                )
-            })
-    };
-
     macro_rules! ext_modules {
         ($($t:tt)*) => {
-            modules.extend(map_freeze(py_freeze!($($t)*)));
+            modules.extend(map_frozen(ctx, py_freeze!($($t)*)));
         };
     }
 
@@ -45,7 +48,7 @@ pub fn get_module_inits(ctx: &PyContext) -> HashMap<String, code::FrozenModule>
     // if we're on freeze-stdlib, the core stdlib modules will be included anyway
     #[cfg(feature = "freeze-stdlib")]
     {
-        modules.extend(map_freeze(rustpython_pylib::frozen_stdlib()));
+        modules.extend(map_frozen(ctx, rustpython_pylib::frozen_stdlib()));
     }
 
     modules
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -13,7 +13,6 @@ use arr_macro::arr;
 use crossbeam_utils::atomic::AtomicCell;
 use num_traits::{Signed, ToPrimitive};
 
-use crate::builtins;
 use crate::builtins::code::{self, PyCode, PyCodeRef};
 use crate::builtins::dict::PyDictRef;
 use crate::builtins::int::{PyInt, PyIntRef};
@@ -27,18 +26,14 @@ use crate::builtins::tuple::PyTuple;
 use crate::common::{hash::HashSecret, lock::PyMutex, rc::PyRc};
 use crate::exceptions::{self, PyBaseException, PyBaseExceptionRef};
 use crate::frame::{ExecutionResult, Frame, FrameRef};
-use crate::frozen;
 use crate::function::{FuncArgs, IntoFuncArgs};
-use crate::import;
-use crate::iterator;
 use crate::pyobject::{
     BorrowValue, Either, IdProtocol, IntoPyObject, ItemProtocol, PyArithmaticValue, PyContext,
     PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, TryIntoRef, TypeProtocol,
 };
 use crate::scope::Scope;
 use crate::slots::PyComparisonOp;
-use crate::stdlib;
-use crate::sysmodule;
+use crate::{builtins, bytecode, frozen, import, iterator, stdlib, sysmodule};
 #[cfg(feature = "rustpython-compiler")]
 use rustpython_compiler::{
     compile::{self, CompileOpts},
@@ -126,6 +121,15 @@ pub struct PyGlobalState {
     pub atexit_funcs: PyMutex<Vec<(PyObjectRef, FuncArgs)>>,
 }
 
+impl PyGlobalState {
+    pub fn add_frozen<I>(&mut self, ctx: &PyContext, frozen: I)
+    where
+        I: IntoIterator<Item = (String, bytecode::FrozenModule)>,
+    {
+        self.frozen.extend(frozen::map_frozen(ctx, frozen))
+    }
+}
+
 pub const NSIG: usize = 64;
 
 #[derive(Copy, Clone, PartialEq, Eq)]
diff --git a/wasm/lib/src/browser_module.rs b/wasm/lib/src/browser_module.rs
@@ -280,7 +280,8 @@ pub fn setup_browser_module(vm: &mut VirtualMachine) {
     state
         .stdlib_inits
         .insert("_browser".to_owned(), Box::new(make_module));
-    state
-        .frozen
-        .extend(py_freeze!(file = "src/browser.py", module_name = "browser",));
+    state.add_frozen(
+        &vm.ctx,
+        py_freeze!(file = "src/browser.py", module_name = "browser"),
+    );
 }
