Skip to content

Improve wasm demo website #230

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
shinglyu merged 8 commits into from
Dec 21, 2018
Merged

Improve wasm demo website #230

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b428f2e
Improve demo site
coolreader18 Dec 15, 2018
f8cce25
Formatting; move the `+ '\n'` hack to eval().
coolreader18 Dec 15, 2018
2ae1df5
Rename run_code() to run_from_textbox()
coolreader18 Dec 15, 2018
921efd4
Switch to using json.dumps for py_to_js()
coolreader18 Dec 15, 2018
3be6fee
Clarify names of wasm builtins
coolreader18 Dec 15, 2018
e78a251
Remove dependency on num_bigint
coolreader18 Dec 15, 2018
a796b13
Allow injecting JS variables into python with eval_py()
coolreader18 Dec 15, 2018
e77f223
Add documentation for eval_py() and update error message handling
coolreader18 Dec 19, 2018
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
Clarify names of wasm builtins
  • Loading branch information
@coolreader18
coolreader18 committed Dec 15, 2018
commit 3be6fee73737cb6052376beccd07cbe0fa6f7b0a
4 changes: 2 additions & 2 deletions wasm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pub fn eval_py(source: &str) -> Result<JsValue, JsValue> {
vm.ctx.set_attr(
&vm.builtins,
"print",
vm.context().new_rustfunc(wasm_builtins::builtin_log),
vm.context().new_rustfunc(wasm_builtins::builtin_print_console),
);

eval(&mut vm, source)
Expand All @@ -79,7 +79,7 @@ pub fn run_from_textbox(source: &str) -> Result<JsValue, JsValue> {
vm.ctx.set_attr(
Comment thread
coolreader18 marked this conversation as resolved.
&vm.builtins,
"print",
vm.context().new_rustfunc(wasm_builtins::builtin_print),
vm.context().new_rustfunc(wasm_builtins::builtin_print_html),
Copy link
Copy Markdown
Contributor

@shinglyu shinglyu Dec 18, 2018

Choose a reason for hiding this comment

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

Nice! I like this dual-function design of print_html + print_console

);

match eval(&mut vm, source) {
Expand Down
4 changes: 2 additions & 2 deletions wasm/src/wasm_builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub fn print_to_html(text: &str) {
textarea.set_value(&format!("{}{}", value, text));
}

pub fn builtin_print(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
pub fn builtin_print_html(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
let mut first = true;
for a in args.args {
if first {
Expand All @@ -43,7 +43,7 @@ pub fn builtin_print(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
Ok(vm.get_none())
}

pub fn builtin_log(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
pub fn builtin_print_console(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
let arr = Array::new();
for a in args.args {
let v = vm.to_str(&a)?;
Expand Down