Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-16 20:34:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow passing options to FromJSValConvertible::from_jsval.

Browse source
This commit is contained in:
Ms2ger 2014-03-10 11:19:48 +01:00
parent 5f9e649491
commit 476699a114
2 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -1232,7 +1232,7 @@ for (uint32_t i = 0; i < length; ++i) {
successVal = preSuccess + successVal + postSuccess successVal = preSuccess + successVal + postSuccess
#XXXjdm support conversionBehavior here #XXXjdm support conversionBehavior here
template = ( template = (
"match FromJSValConvertible::from_jsval(cx, ${val}) {\n" "match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n"
" Ok(v) => ${declName} = %s,\n" " Ok(v) => ${declName} = %s,\n"
" Err(_) => %s\n" " Err(_) => %s\n"
"}" % (successVal, failureCode)) "}" % (successVal, failureCode))

57
src/components/script/dom/bindings/conversions.rs
View file

@ -14,8 +14,8 @@ pub trait ToJSValConvertible {
fn to_jsval(&self, cx: *JSContext) -> JSVal; fn to_jsval(&self, cx: *JSContext) -> JSVal;
} }
pub trait FromJSValConvertible { pub trait FromJSValConvertible<T> {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<Self, ()>; fn from_jsval(cx: *JSContext, val: JSVal, option: T) -> Result<Self, ()>;
} }
@ -37,8 +37,8 @@ impl ToJSValConvertible for bool {
} }
} }
impl FromJSValConvertible for bool { impl FromJSValConvertible<()> for bool {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<bool, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<bool, ()> {
let result = unsafe { convert_from_jsval(cx, val, JS_ValueToBoolean) }; let result = unsafe { convert_from_jsval(cx, val, JS_ValueToBoolean) };
result.map(|b| b != 0) result.map(|b| b != 0)
} }
@ -50,8 +50,8 @@ impl ToJSValConvertible for i8 {
} }
} }
impl FromJSValConvertible for i8 { impl FromJSValConvertible<()> for i8 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<i8, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<i8, ()> {
let result = unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) }; let result = unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) };
result.map(|v| v as i8) result.map(|v| v as i8)
} }
@ -63,8 +63,8 @@ impl ToJSValConvertible for u8 {
} }
} }
impl FromJSValConvertible for u8 { impl FromJSValConvertible<()> for u8 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<u8, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<u8, ()> {
let result = unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) }; let result = unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) };
result.map(|v| v as u8) result.map(|v| v as u8)
} }
@ -76,8 +76,8 @@ impl ToJSValConvertible for i16 {
} }
} }
impl FromJSValConvertible for i16 { impl FromJSValConvertible<()> for i16 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<i16, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<i16, ()> {
let result = unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) }; let result = unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) };
result.map(|v| v as i16) result.map(|v| v as i16)
} }
@ -89,8 +89,8 @@ impl ToJSValConvertible for u16 {
} }
} }
impl FromJSValConvertible for u16 { impl FromJSValConvertible<()> for u16 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<u16, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<u16, ()> {
unsafe { convert_from_jsval(cx, val, JS_ValueToUint16) } unsafe { convert_from_jsval(cx, val, JS_ValueToUint16) }
} }
} }
@ -101,8 +101,8 @@ impl ToJSValConvertible for i32 {
} }
} }
impl FromJSValConvertible for i32 { impl FromJSValConvertible<()> for i32 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<i32, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<i32, ()> {
unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) } unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) }
} }
} }
@ -113,8 +113,8 @@ impl ToJSValConvertible for u32 {
} }
} }
impl FromJSValConvertible for u32 { impl FromJSValConvertible<()> for u32 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<u32, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<u32, ()> {
unsafe { convert_from_jsval(cx, val, JS_ValueToECMAUint32) } unsafe { convert_from_jsval(cx, val, JS_ValueToECMAUint32) }
} }
} }
@ -127,8 +127,8 @@ impl ToJSValConvertible for i64 {
} }
} }
impl FromJSValConvertible for i64 { impl FromJSValConvertible<()> for i64 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<i64, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<i64, ()> {
unsafe { convert_from_jsval(cx, val, JS_ValueToInt64) } unsafe { convert_from_jsval(cx, val, JS_ValueToInt64) }
} }
} }
@ -141,8 +141,8 @@ impl ToJSValConvertible for u64 {
} }
} }
impl FromJSValConvertible for u64 { impl FromJSValConvertible<()> for u64 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<u64, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<u64, ()> {
unsafe { convert_from_jsval(cx, val, JS_ValueToUint64) } unsafe { convert_from_jsval(cx, val, JS_ValueToUint64) }
} }
} }
@ -155,8 +155,8 @@ impl ToJSValConvertible for f32 {
} }
} }
impl FromJSValConvertible for f32 { impl FromJSValConvertible<()> for f32 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<f32, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<f32, ()> {
let result = unsafe { convert_from_jsval(cx, val, JS_ValueToNumber) }; let result = unsafe { convert_from_jsval(cx, val, JS_ValueToNumber) };
result.map(|f| f as f32) result.map(|f| f as f32)
} }
@ -170,8 +170,8 @@ impl ToJSValConvertible for f64 {
} }
} }
impl FromJSValConvertible for f64 { impl FromJSValConvertible<()> for f64 {
fn from_jsval(cx: *JSContext, val: JSVal) -> Result<f64, ()> { fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result<f64, ()> {
unsafe { convert_from_jsval(cx, val, JS_ValueToNumber) } unsafe { convert_from_jsval(cx, val, JS_ValueToNumber) }
} }
} }
@ -185,13 +185,14 @@ impl<T: ToJSValConvertible> ToJSValConvertible for Option<T> {
} }
} }
impl<T: FromJSValConvertible> FromJSValConvertible for Option<T> { impl<X: Default, T: FromJSValConvertible<X>> FromJSValConvertible<()> for Option<T> {
fn from_jsval(cx: *JSContext, value: JSVal) -> Result<Option<T>, ()> { fn from_jsval(cx: *JSContext, value: JSVal, _: ()) -> Result<Option<T>, ()> {
if value.is_null_or_undefined() { if value.is_null_or_undefined() {
Ok(None) Ok(None)
} else { } else {
let result: Result<T, ()> = FromJSValConvertible::from_jsval(cx, value); let option: X = Default::default();
result.map(|v| Some(v)) let result: Result<T, ()> = FromJSValConvertible::from_jsval(cx, value, option);
result.map(Some)
} }
} }
} }