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

Use ToJSValConvertible for all conversions to JSVal.

Browse source
This commit is contained in:
Ms2ger 2014-04-10 12:09:18 +02:00
parent d7f450dbd7
commit 8c4a3aa387
2 changed files with 20 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1048,78 +1048,8 @@ def getWrapTemplateForType(type, descriptorProvider, result, successCode,
Returns (templateString, infallibility of conversion template)
"""
haveSuccessCode = successCode is not None
if not haveSuccessCode:
successCode = "return 1;"
# We often want exceptionCode to be indented, since it often appears in an
# if body.
exceptionCodeIndented = CGIndenter(CGGeneric(exceptionCode))
def setValue(value, callWrapValue=False):
"""
Returns the code to set the jsval to value. If "callWrapValue" is true
JS_WrapValue will be called on the jsval.
"""
if not callWrapValue:
tail = successCode
elif haveSuccessCode:
tail = ("if JS_WrapValue(cx, ${jsvalPtr}) == 0 {\n" +
" return 0;\n" +
"}\n" +
successCode)
else:
tail = "return JS_WrapValue(cx, ${jsvalPtr} as *JSVal);"
return ("${jsvalRef} = %s;\n" +
tail) % (value)
if type is None or type.isVoid():
return (setValue("UndefinedValue()"), True)
if type.isArray():
raise TypeError("Can't handle array return values yet")
if type.isSequence():
raise TypeError("Can't handle sequence return values yet")
if type.isGeckoInterface():
return (setValue("(%s).to_jsval(cx)" % result), True)
if type.isString():
return (setValue("(%s).to_jsval(cx)" % result), True)
if type.isEnum():
return (setValue("(%s).to_jsval(cx)" % result), True)
if type.isCallback():
assert not type.isInterface()
# XXXbz we're going to assume that callback types are always
# nullable and always have [TreatNonCallableAsNull] for now.
# See comments in WrapNewBindingObject explaining why we need
# to wrap here.
# NB: setValue(..., True) calls JS_WrapValue(), so is fallible
return (setValue("JS::ObjectOrNullValue(%s)" % result, True), False)
if type.tag() == IDLType.Tags.any:
# See comments in WrapNewBindingObject explaining why we need
# to wrap here.
# NB: setValue(..., True) calls JS_WrapValue(), so is fallible
return (setValue(result, True), False)
if type.isObject() or type.isSpiderMonkeyInterface():
# See comments in WrapNewBindingObject explaining why we need
# to wrap here.
if type.nullable():
toValue = "ObjectOrNullValue(%s)"
else:
toValue = "ObjectValue(&*(%s))"
# NB: setValue(..., True) calls JS_WrapValue(), so is fallible
return (setValue(toValue % result, True), False)
if not type.isPrimitive():
raise TypeError("Need to learn to wrap %s" % type)
return (setValue("(%s).to_jsval(cx)" % result), True)
template = "${jsvalRef} = (%s).to_jsval(cx);\n%s" % (result, successCode or "return 1;")
return (template, True)
def wrapForType(type, descriptorProvider, templateValues):

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

@ -14,8 +14,8 @@ use js::jsapi::{JS_ValueToUint16, JS_ValueToNumber, JS_ValueToBoolean};
use js::jsapi::{JS_NewUCStringCopyN, JS_ValueToString};
use js::jsapi::{JS_WrapValue};
use js::jsval::JSVal;
use js::jsval::{NullValue, BooleanValue, Int32Value, UInt32Value, StringValue};
use js::jsval::ObjectValue;
use js::jsval::{UndefinedValue, NullValue, BooleanValue, Int32Value, UInt32Value};
use js::jsval::{StringValue, ObjectValue};
use js::glue::RUST_JS_NumberValue;
use std::default::Default;
use std::libc;
@ -29,6 +29,22 @@ pub trait FromJSValConvertible<T> {
}
impl ToJSValConvertible for () {
fn to_jsval(&self, _cx: *JSContext) -> JSVal {
UndefinedValue()
}
}
impl ToJSValConvertible for JSVal {
fn to_jsval(&self, cx: *JSContext) -> JSVal {
let mut value = *self;
if unsafe { JS_WrapValue(cx, &mut value as *mut JSVal as *JSVal) } == 0 {
fail!("JS_WrapValue failed.");
}
value
}
}
unsafe fn convert_from_jsval<T: Default>(
cx: *JSContext, value: JSVal,
convert_fn: extern "C" unsafe fn(*JSContext, JSVal, *T) -> JSBool) -> Result<T, ()> {