Skip to content

Allow stdlib freeze #1159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
palaviv merged 7 commits into from
Jul 24, 2019
Merged

Allow stdlib freeze #1159

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
befe180
Add freeze-stdlib compile flag
palaviv Jul 20, 2019
f271a0e
Change py_compile_bytecode to return map
palaviv Jul 20, 2019
5c240d7
Support freezing of stdlib
palaviv Jul 20, 2019
c480449
Fix clippy comments
palaviv Jul 20, 2019
7226c92
Add hashmap macro to __exports
palaviv Jul 20, 2019
64f1024
Fix clippy warning
palaviv Jul 22, 2019
0a62535
Change compile_dir path to &Path
palaviv Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add hashmap macro to __exports
  • Loading branch information
@palaviv
palaviv committed Jul 20, 2019
commit 7226c925d2801efb1b310eb5683c8179f4b005c0
1 change: 1 addition & 0 deletions derive/src/compile_bytecode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ pub fn impl_py_compile_bytecode(input: TokenStream2) -> Result<TokenStream2, Dia
let output = quote! {
({
use ::rustpython_vm::__exports::bincode;
use ::rustpython_vm::__exports::hashmap;
hashmap! {

@coolreader18 coolreader18 Jul 20, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should probably add hashmap to __exports and use it here.

@palaviv palaviv Jul 20, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of the __exports? This is my first time using procedural macro

@palaviv palaviv Jul 20, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I understand what __exports do. Added hashmap

#(#modules),*
}
Expand Down
1 change: 1 addition & 0 deletions vm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,5 @@ pub use rustpython_bytecode::*;
#[doc(hidden)]
pub mod __exports {
pub use bincode;
pub use maplit::hashmap;
}
8 changes: 4 additions & 4 deletions wasm/lib/src/browser_module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ pub fn setup_browser_module(vm: &VirtualMachine) {
vm.stdlib_inits
.borrow_mut()
.insert("_browser".to_string(), Box::new(make_module));
vm.frozen.borrow_mut().insert(
"browser".to_string(),
py_compile_bytecode!(file = "src/browser.py"),
);
vm.frozen.borrow_mut().extend(py_compile_bytecode!(
file = "src/browser.py",
module_name = "browser",
));
}