fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-21 00:36:33 +00:00
Code Issues Projects Releases Wiki Activity

Allow specifying getter/setter properties

Browse Source 
Should help with style clashes!
This commit is contained in:
Alex Crichton
2018-03-22 18:21:41 -07:00
parent 78e3537279
commit 30936a6b22
4 changed files with 107 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
crates/wasm-bindgen-macro/src/ast.rs
View File

@ -651,24 +651,26 @@ impl BindgenAttrs {
.next()
}
pub fn getter(&self) -> bool {
pub fn getter(&self) -> Option<Option<String>> {
self.attrs.iter()
.any(|a| {
.filter_map(|a| {
match *a {
BindgenAttr::Getter => true,
_ => false,
BindgenAttr::Getter(ref s) => Some(s.clone()),
_ => None,
}
})
.next()
}
pub fn setter(&self) -> bool {
pub fn setter(&self) -> Option<Option<String>> {
self.attrs.iter()
.any(|a| {
.filter_map(|a| {
match *a {
BindgenAttr::Setter => true,
_ => false,
BindgenAttr::Setter(ref s) => Some(s.clone()),
_ => None,
}
})
.next()
}
pub fn structural(&self) -> bool {
@ -703,8 +705,8 @@ enum BindgenAttr {
Method,
JsNamespace(syn::Ident),
Module(String),
Getter,
Setter,
Getter(Option<String>),
Setter(Option<String>),
Structural,
}
@ -716,9 +718,25 @@ impl syn::synom::Synom for BindgenAttr {
|
call!(term, "method") => { |_| BindgenAttr::Method }
|
call!(term, "getter") => { |_| BindgenAttr::Getter }
do_parse!(
call!(term, "getter") >>
val: option!(do_parse!(
punct!(=) >>
s: syn!(syn::LitStr) >>
(s.value())
)) >>
(val)
)=> { BindgenAttr::Getter }
|
call!(term, "setter") => { |_| BindgenAttr::Setter }
do_parse!(
call!(term, "setter") >>
val: option!(do_parse!(
punct!(=) >>
s: syn!(syn::LitStr) >>
(s.value())
)) >>
(val)
)=> { BindgenAttr::Setter }
|
call!(term, "structural") => { |_| BindgenAttr::Structural }
|

8
crates/wasm-bindgen-macro/src/literal.rs
View File

@ -244,11 +244,11 @@ impl Literal for ast::ImportFunction {
let mut setter = None;
let structural = self.function.opts.structural();
if self.function.opts.getter() {
getter = Some(self.infer_getter_property());
if let Some(s) = self.function.opts.getter() {
getter = Some(s.unwrap_or_else(|| self.infer_getter_property()));
}
if self.function.opts.setter() {
setter = Some(self.infer_setter_property());
if let Some(s) = self.function.opts.setter() {
setter = Some(s.unwrap_or_else(|| self.infer_setter_property()));
}
a.fields(&[
("kind", &|a| a.str("function")),