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

Remove support for non-castable arguments.

Browse source
This commit is contained in:
Ms2ger 2014-03-20 23:17:46 +01:00
parent 7bfb15ec62
commit a4fc6961a8
3 changed files with 16 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,6 @@ class CastableObjectUnwrapper():
codeOnFailure is the code to run if unwrapping fails.
"""
def __init__(self, descriptor, source, target, codeOnFailure, isOptional=False):
assert descriptor.castable
self.substitution = { "type" : descriptor.nativeType,
"depth": descriptor.interface.inheritanceDepth(),
"prototype": "PrototypeList::id::" + descriptor.name,
@ -383,7 +382,6 @@ class CGMethodCall(CGThing):
class FakeCastableDescriptor():
def __init__(self, descriptor):
self.castable = True
self.nativeType = "*%s" % descriptor.concreteType
self.name = descriptor.name
class FakeInterface:
@ -630,35 +628,23 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
typePtr = descriptor.nativeType
templateBody = ""
if descriptor.castable:
if descriptor.interface.isConsequential():
raise TypeError("Consequential interface %s being used as an "
"argument but flagged as castable" %
descriptor.interface.identifier.name)
if failureCode is not None:
templateBody += str(CastableObjectUnwrapper(
descriptor,
"(${val}).to_object()",
"${declName}",
failureCode,
isOptional or type.nullable()))
else:
templateBody += str(FailureFatalCastableObjectUnwrapper(
descriptor,
"(${val}).to_object()",
"${declName}",
isOptional or type.nullable()))
if descriptor.interface.isConsequential():
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()",
"${declName}",
failureCode,
isOptional or type.nullable()))
else:
templateBody += (
"match unwrap_value::<" + typePtr + ">(&${val} as *JSVal, "
"PrototypeList::id::%s, %d) {\n" % (descriptor.name, descriptor.interface.inheritanceDepth() if descriptor.concrete else 0) +
" Err(()) => {")
templateBody += CGIndenter(onFailureBadType(failureCode,
descriptor.interface.identifier.name)).define()
templateBody += (
" }\n"
" Ok(unwrapped) => ${declName} = Some(unwrapped)\n"
"}\n")
templateBody += str(FailureFatalCastableObjectUnwrapper(
descriptor,
"(${val}).to_object()",
"${declName}",
isOptional or type.nullable()))
templateBody = wrapObjectTemplate(templateBody, isDefinitelyObject,
type, failureCode)