From c5bf011d1eed6de6237c83955b92ccc5ffb92434 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 25 Apr 2014 10:55:16 +0200 Subject: [PATCH] Rewrite the enumeration unwrapping to return an expression. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 6 +++--- 1 file 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