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

Rewrite the union unwrapping to return an expression.

Browse source
This commit is contained in:
Ms2ger 2014-04-17 12:06:23 +02:00
parent a9ffff9215
commit 4905b22673
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

@ -584,21 +584,21 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
declType = CGWrapper(declType, pre="Option<", post=" >")
value = CGWrapper(value, pre="Some(", post=")")
templateBody = CGGeneric("${declName} = match %s::from_value(cx, ${val}) {\n"
templateBody = CGGeneric("match %s::from_value(cx, ${val}) {\n"
" Err(()) => { %s },\n"
" Ok(value) => %s,\n"
"};" % (type.name, exceptionCode, value.define()))
"}" % (type.name, exceptionCode, value.define()))
if type.nullable():
templateBody = CGIfElseWrapper(
"(${val}).is_null_or_undefined()",
CGGeneric("${declName} = None;"),
CGGeneric("None"),
templateBody)
templateBody = handleDefaultNull(templateBody.define(),
"${declName} = None;")
"None")
return (templateBody, declType, None, isOptional, "None" if isOptional else None)
return ("${declName} = " + templateBody + ";", declType, None, isOptional, "None" if isOptional else None)
if type.isGeckoInterface():
assert not isEnforceRange and not isClamp