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

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
Switch to using json.dumps for py_to_js()
  • Loading branch information
@coolreader18
coolreader18 committed Dec 15, 2018
commit 921efd4d141ca2c1ec86b0fba023272eedd8bcbc
58 changes: 14 additions & 44 deletions wasm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,50 +18,20 @@ fn py_str_err(vm: &mut VirtualMachine, py_err: &PyObjectRef) -> String {
.unwrap_or_else(|_| "Error, and error getting error message".into())
}

fn py_to_js(vm: &mut VirtualMachine, py_obj: &PyObjectRef) -> JsValue {
use pyobject::PyObjectKind;
let py_obj = py_obj.borrow();
match py_obj.kind {
PyObjectKind::String { ref value } => value.into(),
PyObjectKind::Integer { ref value } => {
if let Some(ref typ) = py_obj.typ {
if typ.is(&vm.ctx.bool_type()) {
let out_bool = value == &BigInt::new(num_bigint::Sign::Plus, vec![1]);
return out_bool.into();
}
}
let int = vm.ctx.new_int(value.clone());
rustpython_vm::obj::objfloat::make_float(vm, &int)
.unwrap()
.into()
}
PyObjectKind::Float { ref value } => JsValue::from_f64(*value),
PyObjectKind::Bytes { ref value } => {
let arr = js_sys::Uint8Array::new(&JsValue::from(value.len() as u32));
for (i, byte) in value.iter().enumerate() {
console::log_1(&JsValue::from(i as u32));
js_sys::Reflect::set(&arr, &JsValue::from(i as u32), &JsValue::from(*byte))
.unwrap();
}
arr.into()
}
PyObjectKind::Sequence { ref elements } => {
let arr = js_sys::Array::new();
for val in elements {
arr.push(&py_to_js(vm, val));
}
arr.into()
}
PyObjectKind::Dict { ref elements } => {
let obj = js_sys::Object::new();
for (key, (_, val)) in elements {
js_sys::Reflect::set(&obj, &key.into(), &py_to_js(vm, val))
.expect("couldn't set property of object");
}
obj.into()
fn py_to_js(vm: &mut VirtualMachine, py_obj: PyObjectRef) -> JsValue {
let dumps = rustpython_vm::import::import(
vm,
std::path::PathBuf::default(),
"json",
&Some("dumps".into()),
)
.expect("Couldn't get json.dumps function");
match vm.invoke(dumps, pyobject::PyFuncArgs::new(vec![py_obj], vec![])) {
Ok(value) => {
let json = vm.to_pystr(&value).unwrap();
js_sys::JSON::parse(&json).unwrap_or(JsValue::UNDEFINED)
}
PyObjectKind::None => JsValue::UNDEFINED,
_ => JsValue::UNDEFINED,
Err(_) => JsValue::UNDEFINED,
}
}

Expand Down Expand Up @@ -91,7 +61,7 @@ pub fn eval_py(source: &str) -> Result<JsValue, JsValue> {
);

eval(&mut vm, source)
.map(|value| py_to_js(&mut vm, &value))
.map(|value| py_to_js(&mut vm, value))
.map_err(|err| py_str_err(&mut vm, &err).into())
}

Expand Down