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

Remove support for non-object unions, add more comments

Browse Source
This commit is contained in:
Anton Danilkin 2018-09-05 18:15:02 +03:00
parent fcd890a70e
commit e5f382eccf
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/webidl/src/idl_type.rs
View File

@ -469,24 +469,7 @@ impl<'a> IdlType<'a> {
}, },
IdlType::Enum(name) => Some(ident_ty(rust_ident(camel_case_ident(name).as_str()))), IdlType::Enum(name) => Some(ident_ty(rust_ident(camel_case_ident(name).as_str()))),
IdlType::Nullable(idl_type) => { IdlType::Nullable(idl_type) => Some(option_ty(idl_type.to_syn_type(pos)?)),
match **idl_type {
IdlType::Union(ref idl_types) =>
if idl_types
.iter()
.all(|idl_type|
match idl_type {
IdlType::Interface(..) => true,
_ => false,
}
) {
IdlType::Nullable(Box::new(IdlType::Object)).to_syn_type(pos)
} else {
IdlType::Any.to_syn_type(pos)
},
_ => Some(option_ty(idl_type.to_syn_type(pos)?))
}
},
IdlType::FrozenArray(_idl_type) => None, IdlType::FrozenArray(_idl_type) => None,
IdlType::Sequence(_idl_type) => None, IdlType::Sequence(_idl_type) => None,
IdlType::Promise(_idl_type) => { IdlType::Promise(_idl_type) => {
@ -501,8 +484,12 @@ impl<'a> IdlType<'a> {
IdlType::Record(_idl_type_from, _idl_type_to) => None, IdlType::Record(_idl_type_from, _idl_type_to) => None,
IdlType::Union(idl_types) => { IdlType::Union(idl_types) => {
// Handles union types in all places except operation argument types. // Handles union types in all places except operation argument types.
// Currently treats them as object or any types. // Currently treats them as object type, if possible.
// TODO: add better support for union types here? // TODO: add better support for union types here?
// Approaches for it:
// 1. Use strategy of finding the nearest common subclass (finding the best type
// that is suitable for all values of this union)
// 2. Generate enum with payload in Rust for each union type
if idl_types if idl_types
.iter() .iter()
.all(|idl_type| .all(|idl_type|
@ -513,7 +500,7 @@ impl<'a> IdlType<'a> {
) { ) {
IdlType::Object.to_syn_type(pos) IdlType::Object.to_syn_type(pos)
} else { } else {
IdlType::Any.to_syn_type(pos) None
} }
}, },