Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite the primitive unwrapping to return an expression.

Browse source
This commit is contained in:
Ms2ger 2014-04-17 15:41:38 +02:00
parent 643ea874d1
commit 2b9d1d6bc1
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -826,10 +826,10 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
#XXXjdm support conversionBehavior here #XXXjdm support conversionBehavior here
template = ( template = (
"${declName} = match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" "match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n"
" Ok(v) => %s,\n" " Ok(v) => %s,\n"
" Err(_) => { %s }\n" " Err(_) => { %s }\n"
"};" % (value, exceptionCode)) "}" % (value, exceptionCode))
if defaultValue is not None: if defaultValue is not None:
if isinstance(defaultValue, IDLNullValue): if isinstance(defaultValue, IDLNullValue):
@ -838,7 +838,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
else: else:
tag = defaultValue.type.tag() tag = defaultValue.type.tag()
if tag in numericTags: if tag in numericTags:
defaultStr = defaultValue.value defaultStr = str(defaultValue.value)
else: else:
assert(tag == IDLType.Tags.bool) assert(tag == IDLType.Tags.bool)
defaultStr = toStringBool(defaultValue.value) defaultStr = toStringBool(defaultValue.value)
@ -848,9 +848,9 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
template = CGIfElseWrapper("${haveValue}", template = CGIfElseWrapper("${haveValue}",
CGGeneric(template), CGGeneric(template),
CGGeneric("${declName} = %s;" % defaultStr)).define() CGGeneric(defaultStr)).define()
return (template, declType, None, isOptional, "None" if isOptional else None) return ("${declName} = " + template + ";", declType, None, isOptional, "None" if isOptional else None)
def instantiateJSToNativeConversionTemplate(templateTuple, replacements, def instantiateJSToNativeConversionTemplate(templateTuple, replacements,
argcAndIndex=None): argcAndIndex=None):