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

Remove the codeToSetNull argument to wrapObjectTemplate.

Browse source
This commit is contained in:
Ms2ger 2014-03-20 20:27:30 +01:00
parent 022dfa0a5e
commit 904e8eaf17
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -556,7 +556,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
# A helper function for wrapping up the template body for
# possibly-nullable objecty stuff
def wrapObjectTemplate(templateBody, isDefinitelyObject, type,
codeToSetNull, failureCode=None):
failureCode=None):
if not isDefinitelyObject:
# Handle the non-object cases by wrapping up the whole
# thing in an if cascade.
@ -566,13 +566,13 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
if type.nullable():
templateBody += (
"} else if (${val}).is_null_or_undefined() {\n"
" %s;\n" % codeToSetNull)
" ${declName} = None;\n")
templateBody += (
"} else {\n" +
CGIndenter(onFailureNotAnObject(failureCode)).define() +
"}")
if type.nullable():
templateBody = handleDefaultNull(templateBody, codeToSetNull)
templateBody = handleDefaultNull(templateBody, "${declName} = None")
else:
assert(defaultValue is None)
@ -625,7 +625,6 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
conversion = ("${declName} = Some(%s::new((${val}).to_object()));" % name)
template = wrapObjectTemplate(conversion, isDefinitelyObject, type,
"${declName} = None",
failureCode)
return (template, declType, None, isOptional, None)
@ -667,8 +666,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
"}\n")
templateBody = wrapObjectTemplate(templateBody, isDefinitelyObject,
type, "${declName} = None",
failureCode)
type, failureCode)
declType = CGGeneric(typePtr)
if type.nullable() or isOptional: