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

Common up some more code in the handling of default values for primitive types.

Browse source
This commit is contained in:
Ms2ger 2014-03-06 23:07:42 +01:00
parent 9fba4bcfba
commit 3a0b7fe621
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1256,12 +1256,7 @@ for (uint32_t i = 0; i < length; ++i) {
if defaultValue is not None: if defaultValue is not None:
if isinstance(defaultValue, IDLNullValue): if isinstance(defaultValue, IDLNullValue):
assert type.nullable() assert type.nullable()
template = CGWrapper(CGIndenter(CGGeneric(template)), defaultStr = "None"
pre="if ${haveValue} {\n",
post=("\n"
"} else {\n"
" ${declName} = None;\n"
"}")).define()
else: else:
tag = defaultValue.type.tag() tag = defaultValue.type.tag()
if tag in numericTags: if tag in numericTags:
@ -1273,12 +1268,12 @@ for (uint32_t i = 0; i < length; ++i) {
if type.nullable(): if type.nullable():
defaultStr = "Some(%s)" % defaultStr defaultStr = "Some(%s)" % defaultStr
template = CGWrapper(CGIndenter(CGGeneric(template)), template = CGWrapper(CGIndenter(CGGeneric(template)),
pre="if ${haveValue} {\n", pre="if ${haveValue} {\n",
post=("\n" post=("\n"
"} else {\n" "} else {\n"
" ${declName} = %s;\n" " ${declName} = %s;\n"
"}" % defaultStr)).define() "}" % defaultStr)).define()
initialVal = "false" if typeName == "bool" else ("0 as %s" % typeName) initialVal = "false" if typeName == "bool" else ("0 as %s" % typeName)
if type.nullable(): if type.nullable():