diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-03-06 23:07:42 +0100 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-03-06 23:07:42 +0100 |
| commit | 3a0b7fe62144b119a5d98fbb2da27bab4541ba3a (patch) | |
| tree | 7cad9a379fb39734b2c8f6d371185d5f4d6006dc /src/components/script/dom | |
| parent | 9fba4bcfbaa966b360159eb4d897276074caffcb (diff) | |
| download | servo-3a0b7fe62144b119a5d98fbb2da27bab4541ba3a.tar.gz servo-3a0b7fe62144b119a5d98fbb2da27bab4541ba3a.zip | |
Common up some more code in the handling of default values for primitive types.
Diffstat (limited to 'src/components/script/dom')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 25b92afcecc..daff75a16ac 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -1256,12 +1256,7 @@ for (uint32_t i = 0; i < length; ++i) { if defaultValue is not None: if isinstance(defaultValue, IDLNullValue): assert type.nullable() - template = CGWrapper(CGIndenter(CGGeneric(template)), - pre="if ${haveValue} {\n", - post=("\n" - "} else {\n" - " ${declName} = None;\n" - "}")).define() + defaultStr = "None" else: tag = defaultValue.type.tag() if tag in numericTags: @@ -1273,12 +1268,12 @@ for (uint32_t i = 0; i < length; ++i) { if type.nullable(): defaultStr = "Some(%s)" % defaultStr - template = CGWrapper(CGIndenter(CGGeneric(template)), - pre="if ${haveValue} {\n", - post=("\n" - "} else {\n" - " ${declName} = %s;\n" - "}" % defaultStr)).define() + template = CGWrapper(CGIndenter(CGGeneric(template)), + pre="if ${haveValue} {\n", + post=("\n" + "} else {\n" + " ${declName} = %s;\n" + "}" % defaultStr)).define() initialVal = "false" if typeName == "bool" else ("0 as %s" % typeName) if type.nullable(): |