Skip to content

[WASM] Clean up a bit #795

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
windelbouwman merged 7 commits into from
Apr 9, 2019
Merged

[WASM] Clean up a bit #795

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
157204c
Clean up the wasm crate
coolreader18 Apr 6, 2019
3aeaa05
Merge branch 'master' into coolreader18/wasm-cleanup1
coolreader18 Apr 6, 2019
5afc558
Add id() method
coolreader18 Apr 7, 2019
7ca3b77
Just a fn
coolreader18 Apr 7, 2019
1568637
Merge branch 'master' into coolreader18/wasm-cleanup1
coolreader18 Apr 9, 2019
c581852
Merge branch 'master' into coolreader18/wasm-cleanup1
coolreader18 Apr 9, 2019
422ab69
Use impl style classes
coolreader18 Apr 9, 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
Use impl style classes
  • Loading branch information
@coolreader18
coolreader18 committed Apr 9, 2019
commit 422ab69b99af4611cd8d3f416cfe24e94894782c
54 changes: 25 additions & 29 deletions wasm/lib/src/browser_module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use rustpython_vm::obj::{
objdict::PyDictRef, objfunction::PyFunctionRef, objint::PyIntRef, objstr::PyStringRef,
objtype::PyClassRef,
};
use rustpython_vm::pyobject::{PyObject, PyObjectRef, PyRef, PyResult, PyValue};
use rustpython_vm::pyobject::{PyClassImpl, PyObject, PyObjectRef, PyRef, PyResult, PyValue};
use rustpython_vm::VirtualMachine;

use crate::{convert, vm_class::weak_vm, wasm_builtins::window};
Expand Down Expand Up @@ -161,6 +161,7 @@ fn browser_cancel_animation_frame(id: PyIntRef, vm: &VirtualMachine) -> PyResult
Ok(vm.get_none())
}

#[pyclass(name = "Promise")]
#[derive(Debug)]
pub struct PyPromise {
value: Promise,
Expand All @@ -173,6 +174,7 @@ impl PyValue for PyPromise {
}
}

#[pyimpl]
impl PyPromise {
pub fn new(value: Promise) -> PyPromise {
PyPromise { value }
Expand All @@ -187,15 +189,16 @@ impl PyPromise {
self.value.clone()
}

#[pymethod]
fn then(
zelf: PyPromiseRef,
&self,
on_fulfill: PyFunctionRef,
on_reject: OptionalArg<PyFunctionRef>,
vm: &VirtualMachine,
) -> PyPromiseRef {
let weak_vm = weak_vm(vm);

let ret_future = JsFuture::from(zelf.value.clone()).then(move |res| {
let ret_future = JsFuture::from(self.value.clone()).then(move |res| {
let stored_vm = &weak_vm
.upgrade()
.expect("that the vm is valid when the promise resolves");
Expand All @@ -220,10 +223,11 @@ impl PyPromise {
PyPromise::from_future(ret_future).into_ref(vm)
}

fn catch(zelf: PyPromiseRef, on_reject: PyFunctionRef, vm: &VirtualMachine) -> PyPromiseRef {
#[pymethod]
fn catch(&self, on_reject: PyFunctionRef, vm: &VirtualMachine) -> PyPromiseRef {
let weak_vm = weak_vm(vm);

let ret_future = JsFuture::from(zelf.value.clone()).then(move |res| {
let ret_future = JsFuture::from(self.value.clone()).then(move |res| {
res.or_else(|err| {
let stored_vm = weak_vm
.upgrade()
Expand All @@ -239,21 +243,23 @@ impl PyPromise {
}
}

#[pyclass]
#[derive(Debug)]
struct Document {
doc: web_sys::Document,
}
type DocumentRef = PyRef<Document>;

impl PyValue for Document {
fn class(vm: &VirtualMachine) -> PyClassRef {
vm.class("browser", "Document")
}
}

#[pyimpl]
impl Document {
fn query(zelf: DocumentRef, query: PyStringRef, vm: &VirtualMachine) -> PyResult {
let elem = zelf
#[pymethod]
fn query(&self, query: PyStringRef, vm: &VirtualMachine) -> PyResult {
let elem = self
.doc
.query_selector(&query.value)
.map_err(|err| convert::js_py_typeerror(vm, err))?;
Expand All @@ -265,38 +271,36 @@ impl Document {
}
}

#[pyclass]
#[derive(Debug)]
struct Element {
elem: web_sys::Element,
}
type ElementRef = PyRef<Element>;

impl PyValue for Element {
fn class(vm: &VirtualMachine) -> PyClassRef {
vm.class("browser", "Element")
}
}

#[pyimpl]
impl Element {
#[pymethod]
fn get_attr(
zelf: ElementRef,
&self,
attr: PyStringRef,
default: OptionalArg<PyObjectRef>,
vm: &VirtualMachine,
) -> PyObjectRef {
match zelf.elem.get_attribute(&attr.value) {
match self.elem.get_attribute(&attr.value) {
Some(s) => vm.new_str(s),
None => default.into_option().unwrap_or_else(|| vm.get_none()),
}
}

fn set_attr(
zelf: ElementRef,
attr: PyStringRef,
value: PyStringRef,
vm: &VirtualMachine,
) -> PyResult<()> {
zelf.elem
#[pymethod]
fn set_attr(&self, attr: PyStringRef, value: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
self.elem
.set_attribute(&attr.value, &value.value)
.map_err(|err| convert::js_to_py(vm, err))
}
Expand Down Expand Up @@ -340,14 +344,9 @@ fn browser_prompt(
pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
let ctx = &vm.ctx;

let promise = py_class!(ctx, "Promise", ctx.object(), {
"then" => ctx.new_rustfunc(PyPromise::then),
"catch" => ctx.new_rustfunc(PyPromise::catch),
});
let promise = PyPromise::make_class(ctx);

let document_class = py_class!(ctx, "Document", ctx.object(), {
"query" => ctx.new_rustfunc(Document::query),
});
let document_class = Document::make_class(ctx);

let document = PyObject::new(
Document {
Expand All @@ -357,10 +356,7 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
None,
);

let element = py_class!(ctx, "Element", ctx.object(), {
"get_attr" => ctx.new_rustfunc(Element::get_attr),
"set_attr" => ctx.new_rustfunc(Element::set_attr),
});
let element = Element::make_class(ctx);

py_module!(vm, "browser", {
"fetch" => ctx.new_rustfunc(browser_fetch),
Expand Down