diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-04-17 12:15:28 +0200 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-04-25 10:46:58 +0200 |
| commit | 1027801b04b8fa2670642021aa0a2632b8d6c15b (patch) | |
| tree | 47901c728c7039636f04e8655f58444f2356cbc9 /src/components/script/dom/bindings/codegen | |
| parent | 4905b226737062356bac280563b0760114fef721 (diff) | |
| download | servo-1027801b04b8fa2670642021aa0a2632b8d6c15b.tar.gz servo-1027801b04b8fa2670642021aa0a2632b8d6c15b.zip | |
Rewrite the DOMString unwrapping to return an expression.
Diffstat (limited to 'src/components/script/dom/bindings/codegen')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 9b45d130055..7262c6d7a77 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -665,17 +665,17 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, strval = "Some(%s)" % strval conversionCode = ( - "${declName} = match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n" + "match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n" " Ok(strval) => %s,\n" " Err(_) => { %s },\n" - "};" % (nullBehavior, strval, exceptionCode)) + "}" % (nullBehavior, strval, exceptionCode)) if defaultValue is None: return conversionCode if isinstance(defaultValue, IDLNullValue): assert(type.nullable()) - return handleDefault(conversionCode, "${declName} = None;") + return handleDefault(conversionCode, "None") value = "str::from_utf8(data).unwrap().to_owned()" if type.nullable(): @@ -683,7 +683,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, default = ( "static data: [u8, ..%s] = [ %s ];\n" - "${declName} = %s;" % + "%s" % (len(defaultValue.value) + 1, ", ".join(["'" + char + "' as u8" for char in defaultValue.value] + ["0"]), value)) @@ -700,8 +700,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, initialValue = "None" return ( - "%s\n" % - (getConversionCode(isOptional)), + "${declName} = %s;" % getConversionCode(isOptional), CGGeneric(declType), None, #CGGeneric("FakeDependentString"), False, initialValue) |