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

Move optional/nullable handling out of CastableObjectUnwrapper.

Browse source 
This puts the code that wraps the type in Option<> and the code that wraps
the expression in Some() into the same if block, which should clarify the
code.
This commit is contained in:
Ms2ger 2014-04-27 19:44:09 +02:00
parent 89d4fac36e
commit 7c3480de60
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,19 +92,18 @@ class CastableObjectUnwrapper():
codeOnFailure is the code to run if unwrapping fails.
"""
def __init__(self, descriptor, source, codeOnFailure, isOptional=False):
def __init__(self, descriptor, source, codeOnFailure):
self.substitution = { "type" : descriptor.nativeType,
"depth": descriptor.interface.inheritanceDepth(),
"prototype": "PrototypeList::id::" + descriptor.name,
"protoID" : "PrototypeList::id::" + descriptor.name + " as uint",
"source" : source,
"codeOnFailure" : CGIndenter(CGGeneric(codeOnFailure), 4).define(),
"unwrapped_val" : "Some(val)" if isOptional else "val"}
"codeOnFailure" : CGIndenter(CGGeneric(codeOnFailure), 4).define()}
def __str__(self):
return string.Template(
"""match unwrap_jsmanaged(${source}, ${prototype}, ${depth}) {
Ok(val) => ${unwrapped_val},
Ok(val) => val,
Err(()) => {
${codeOnFailure}
}
@ -121,10 +120,9 @@ class FailureFatalCastableObjectUnwrapper(CastableObjectUnwrapper):
"""
As CastableObjectUnwrapper, but defaulting to throwing if unwrapping fails
"""
def __init__(self, descriptor, source, isOptional):
def __init__(self, descriptor, source):
CastableObjectUnwrapper.__init__(self, descriptor, source,
"return 0; //XXXjdm return Throw(cx, rv);",
isOptional)
"return 0; //XXXjdm return Throw(cx, rv);")
class CGThing():
"""
@ -619,26 +617,24 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
raise TypeError("Consequential interface %s being used as an "
"argument" % descriptor.interface.identifier.name)
if failureCode is not None:
templateBody = str(CastableObjectUnwrapper(
descriptor,
"(${val}).to_object()",
failureCode,
isOptional or type.nullable()))
failureCode))
else:
templateBody = str(FailureFatalCastableObjectUnwrapper(
descriptor,
"(${val}).to_object()",
isOptional or type.nullable()))
templateBody = wrapObjectTemplate(templateBody, isDefinitelyObject,
type, failureCode)
"(${val}).to_object()"))
declType = CGGeneric(descriptor.nativeType)
if type.nullable() or isOptional:
templateBody = "Some(%s)" % templateBody
declType = CGWrapper(declType, pre="Option<", post=">")
templateBody = wrapObjectTemplate(templateBody, isDefinitelyObject,
type, failureCode)
return (templateBody, declType, isOptional, "None" if isOptional else None)
if type.isSpiderMonkeyInterface():