From 3be6fee73737cb6052376beccd07cbe0fa6f7b0a Mon Sep 17 00:00:00 2001 From: coolreader18 <33094578+coolreader18@users.noreply.github.com> Date: Sat, 15 Dec 2018 11:36:53 -0600 Subject: [PATCH] Clarify names of wasm builtins --- wasm/src/lib.rs | 4 ++-- wasm/src/wasm_builtins.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wasm/src/lib.rs b/wasm/src/lib.rs index bcb5df303..ec343d863 100644 --- a/wasm/src/lib.rs +++ b/wasm/src/lib.rs @@ -57,7 +57,7 @@ pub fn eval_py(source: &str) -> Result { 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) @@ -79,7 +79,7 @@ pub fn run_from_textbox(source: &str) -> Result { vm.ctx.set_attr( &vm.builtins, "print", - vm.context().new_rustfunc(wasm_builtins::builtin_print), + vm.context().new_rustfunc(wasm_builtins::builtin_print_html), ); match eval(&mut vm, source) { diff --git a/wasm/src/wasm_builtins.rs b/wasm/src/wasm_builtins.rs index 1bf5b1aa4..99e59f6be 100644 --- a/wasm/src/wasm_builtins.rs +++ b/wasm/src/wasm_builtins.rs @@ -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 { @@ -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)?;