aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings/codegen/CodegenRust.py
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2014-04-25 10:55:16 +0200
committerMs2ger <ms2ger@gmail.com>2014-04-25 10:55:16 +0200
commitc5bf011d1eed6de6237c83955b92ccc5ffb92434 (patch)
treec11f4578652c6754b74943197936ec3da489d97e /src/components/script/dom/bindings/codegen/CodegenRust.py
parent2b9d1d6bc150c1c085298fc4df5c558325c3e1c5 (diff)
downloadservo-c5bf011d1eed6de6237c83955b92ccc5ffb92434.tar.gz
servo-c5bf011d1eed6de6237c83955b92ccc5ffb92434.zip
Rewrite the enumeration unwrapping to return an expression.
Diffstat (limited to 'src/components/script/dom/bindings/codegen/CodegenRust.py')
-rw-r--r--src/components/script/dom/bindings/codegen/CodegenRust.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index e1beebc3f8a..594ddde9e65 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -723,7 +723,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
" Ok(None) => { %(handleInvalidEnumValueCode)s },\n"
" Ok(Some(index)) => {\n"
" //XXXjdm need some range checks up in here.\n"
- " ${declName} = cast::transmute(index);\n"
+ " cast::transmute(index)\n"
" },\n"
"}" % { "values" : enum + "Values::strings",
"exceptionCode" : exceptionCode,
@@ -732,11 +732,11 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
if defaultValue is not None:
assert(defaultValue.type.tag() == IDLType.Tags.domstring)
template = handleDefault(template,
- ("${declName} = %sValues::%s;" %
+ ("%sValues::%s" %
(enum,
getEnumValueName(defaultValue.value))))
- return (template, CGGeneric(enum), None, isOptional, None)
+ return ("${declName} = " + template + ";", CGGeneric(enum), None, isOptional, None)
if type.isCallback():
assert not isEnforceRange and not isClamp