fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-05-04 10:02:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #804 from alexcrichton/bigint

Browse Source 
Expand LongLong to `(i32 or f64)` instead of `i64`
This commit is contained in:
Alex Crichton 2018-09-10 11:40:35 -07:00 committed by GitHub
commit 1565951a0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/webidl-tests/consts.rs
View File

@ -26,11 +26,6 @@ fn ints() {
assert_eq!(ConstLong::IMAX, i32::max_value()); assert_eq!(ConstLong::IMAX, i32::max_value());
assert_eq!(ConstLong::UMIN, u32::min_value()); assert_eq!(ConstLong::UMIN, u32::min_value());
assert_eq!(ConstLong::UMAX, u32::max_value()); assert_eq!(ConstLong::UMAX, u32::max_value());
assert_eq!(ConstLongLong::IMIN, i64::min_value());
assert_eq!(ConstLongLong::IMAX, i64::max_value());
assert_eq!(ConstLongLong::UMIN, u64::min_value());
assert_eq!(ConstLongLong::UMAX, u64::max_value());
} }
#[wasm_bindgen_test] #[wasm_bindgen_test]

6
crates/webidl-tests/simple.rs
View File

@ -86,9 +86,11 @@ fn optional_and_union_arguments() {
assert_eq!(f.m_with_b("abc", false), "string, abc, boolean, false, number, 123, number, 456"); assert_eq!(f.m_with_b("abc", false), "string, abc, boolean, false, number, 123, number, 456");
assert_eq!(f.m_with_b_and_i16("abc", false, 5), "string, abc, boolean, false, number, 5, number, 456"); assert_eq!(f.m_with_b_and_i16("abc", false, 5), "string, abc, boolean, false, number, 5, number, 456");
assert_eq!(f.m_with_b_and_str("abc", false, "5"), "string, abc, boolean, false, string, 5, number, 456"); assert_eq!(f.m_with_b_and_str("abc", false, "5"), "string, abc, boolean, false, string, 5, number, 456");
assert_eq!(f.m_with_b_and_i16_and_opt_i64("abc", false, 5, Some(10)), "string, abc, boolean, false, number, 5, bigint, 10"); assert_eq!(f.m_with_b_and_i16_and_opt_i32("abc", false, 5, Some(10)), "string, abc, boolean, false, number, 5, number, 10");
assert_eq!(f.m_with_b_and_i16_and_opt_f64("abc", false, 5, Some(10.0)), "string, abc, boolean, false, number, 5, number, 10");
assert_eq!(f.m_with_b_and_i16_and_opt_bool("abc", false, 5, Some(true)), "string, abc, boolean, false, number, 5, boolean, true"); assert_eq!(f.m_with_b_and_i16_and_opt_bool("abc", false, 5, Some(true)), "string, abc, boolean, false, number, 5, boolean, true");
assert_eq!(f.m_with_b_and_str_and_opt_i64("abc", false, "5", Some(10)), "string, abc, boolean, false, string, 5, bigint, 10"); assert_eq!(f.m_with_b_and_str_and_opt_i32("abc", false, "5", Some(10)), "string, abc, boolean, false, string, 5, number, 10");
assert_eq!(f.m_with_b_and_str_and_opt_f64("abc", false, "5", Some(12.0)), "string, abc, boolean, false, string, 5, number, 12");
assert_eq!(f.m_with_b_and_str_and_opt_bool("abc", false, "5", Some(true)), "string, abc, boolean, false, string, 5, boolean, true"); assert_eq!(f.m_with_b_and_str_and_opt_bool("abc", false, "5", Some(true)), "string, abc, boolean, false, string, 5, boolean, true");
} }

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

@ -449,8 +449,8 @@ impl<'a> IdlType<'a> {
IdlType::UnsignedShort => Some(ident_ty(raw_ident("u16"))), IdlType::UnsignedShort => Some(ident_ty(raw_ident("u16"))),
IdlType::Long => Some(ident_ty(raw_ident("i32"))), IdlType::Long => Some(ident_ty(raw_ident("i32"))),
IdlType::UnsignedLong => Some(ident_ty(raw_ident("u32"))), IdlType::UnsignedLong => Some(ident_ty(raw_ident("u32"))),
IdlType::LongLong => Some(ident_ty(raw_ident("i64"))), IdlType::LongLong => None,
IdlType::UnsignedLongLong => Some(ident_ty(raw_ident("u64"))), IdlType::UnsignedLongLong => None,
IdlType::Float => Some(ident_ty(raw_ident("f32"))), IdlType::Float => Some(ident_ty(raw_ident("f32"))),
IdlType::UnrestrictedFloat => Some(ident_ty(raw_ident("f32"))), IdlType::UnrestrictedFloat => Some(ident_ty(raw_ident("f32"))),
IdlType::Double => Some(ident_ty(raw_ident("f64"))), IdlType::Double => Some(ident_ty(raw_ident("f64"))),
@ -582,6 +582,12 @@ impl<'a> IdlType<'a> {
IdlType::BufferSource => { IdlType::BufferSource => {
vec![IdlType::BufferSource, IdlType::Uint8ArrayMut] vec![IdlType::BufferSource, IdlType::Uint8ArrayMut]
} }
IdlType::LongLong => {
vec![IdlType::Long, IdlType::Double]
}
IdlType::UnsignedLongLong => {
vec![IdlType::UnsignedLong, IdlType::Double]
}
idl_type @ _ => vec![idl_type.clone()], idl_type @ _ => vec![idl_type.clone()],
} }
} }