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

auto merge of #5110 : Ms2ger/servo/defaultvalue-strings, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-03-02 12:57:59 -07:00
commit 2f3697f5f3
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -706,16 +706,9 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
default = "None" default = "None"
else: else:
assert defaultValue.type.tag() == IDLType.Tags.domstring assert defaultValue.type.tag() == IDLType.Tags.domstring
value = "str::from_utf8(&data).unwrap().to_owned()" default = '"%s".to_owned()' % defaultValue.value
if type.nullable(): if type.nullable():
value = "Some(%s)" % value default = "Some(%s)" % default
default = (
"const data: [u8; %s] = [ %s ];\n"
"%s" %
(len(defaultValue.value) + 1,
", ".join(["'" + char + "' as u8" for char in defaultValue.value] + ["0"]),
value))
declType = "DOMString" declType = "DOMString"
if type.nullable(): if type.nullable():

8
components/script/dom/webidls/TestBinding.webidl
View file

@ -34,7 +34,7 @@ dictionary TestDictionaryDefaults {
unsigned long long unsignedLongLongValue = 7; unsigned long long unsignedLongLongValue = 7;
// float floatValue = 7.0; // float floatValue = 7.0;
// double doubleValue = 7.0; // double doubleValue = 7.0;
DOMString stringValue = ""; DOMString stringValue = "foo";
TestEnum enumValue = "bar"; TestEnum enumValue = "bar";
any anyValue = null; any anyValue = null;
@ -49,7 +49,7 @@ dictionary TestDictionaryDefaults {
unsigned long long? nullableUnsignedLongLongValue = 7; unsigned long long? nullableUnsignedLongLongValue = 7;
// float? nullableFloatValue = 7.0; // float? nullableFloatValue = 7.0;
// double? nullableDoubleValue = 7.0; // double? nullableDoubleValue = 7.0;
DOMString? nullableStringValue = ""; DOMString? nullableStringValue = "foo";
// TestEnum? nullableEnumValue = "bar"; // TestEnum? nullableEnumValue = "bar";
}; };
@ -224,7 +224,7 @@ interface TestBinding {
void passOptionalUnsignedLongWithDefault(optional unsigned long arg = 6); void passOptionalUnsignedLongWithDefault(optional unsigned long arg = 6);
void passOptionalLongLongWithDefault(optional long long arg = -12); void passOptionalLongLongWithDefault(optional long long arg = -12);
void passOptionalUnsignedLongLongWithDefault(optional unsigned long long arg = 17); void passOptionalUnsignedLongLongWithDefault(optional unsigned long long arg = 17);
void passOptionalStringWithDefault(optional DOMString arg = ""); void passOptionalStringWithDefault(optional DOMString arg = "x");
void passOptionalEnumWithDefault(optional TestEnum arg = "foo"); void passOptionalEnumWithDefault(optional TestEnum arg = "foo");
// void passOptionalUnionWithDefault(optional (HTMLElement or long) arg = 9); // void passOptionalUnionWithDefault(optional (HTMLElement or long) arg = 9);
// void passOptionalUnion2WithDefault(optional(Event or DOMString)? data = "foo"); // void passOptionalUnion2WithDefault(optional(Event or DOMString)? data = "foo");
@ -259,7 +259,7 @@ interface TestBinding {
void passOptionalNullableUnsignedLongLongWithNonNullDefault(optional unsigned long long? arg = 7); void passOptionalNullableUnsignedLongLongWithNonNullDefault(optional unsigned long long? arg = 7);
// void passOptionalNullableFloatWithNonNullDefault(optional float? arg = 0.0); // void passOptionalNullableFloatWithNonNullDefault(optional float? arg = 0.0);
// void passOptionalNullableDoubleWithNonNullDefault(optional double? arg = 0.0); // void passOptionalNullableDoubleWithNonNullDefault(optional double? arg = 0.0);
void passOptionalNullableStringWithNonNullDefault(optional DOMString? arg = ""); void passOptionalNullableStringWithNonNullDefault(optional DOMString? arg = "x");
// void passOptionalNullableEnumWithNonNullDefault(optional TestEnum? arg = "foo"); // void passOptionalNullableEnumWithNonNullDefault(optional TestEnum? arg = "foo");
// void passOptionalNullableUnionWithNonNullDefault(optional (HTMLElement or long)? arg = 7); // void passOptionalNullableUnionWithNonNullDefault(optional (HTMLElement or long)? arg = 7);
// void passOptionalNullableUnion2WithNonNullDefault(optional (Event or DOMString)? data = "foo"); // void passOptionalNullableUnion2WithNonNullDefault(optional (Event or DOMString)? data = "foo");