mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Support union variadic arguments and add tests.
This commit is contained in:
parent
d89f867b14
commit
78f368d336
3 changed files with 40 additions and 4 deletions
|
@ -551,10 +551,6 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
|
||||||
raise TypeError("Can't handle sequence arguments yet")
|
raise TypeError("Can't handle sequence arguments yet")
|
||||||
|
|
||||||
if type.isUnion():
|
if type.isUnion():
|
||||||
if isMember:
|
|
||||||
raise TypeError("Can't handle unions as members, we have a "
|
|
||||||
"holderType")
|
|
||||||
|
|
||||||
declType = CGGeneric(type.name + "::" + type.name)
|
declType = CGGeneric(type.name + "::" + type.name)
|
||||||
if type.nullable():
|
if type.nullable():
|
||||||
declType = CGWrapper(declType, pre="Option<", post=" >")
|
declType = CGWrapper(declType, pre="Option<", post=" >")
|
||||||
|
|
|
@ -255,6 +255,26 @@ pub trait TestBindingMethods {
|
||||||
// fn PassOptionalNullableDoubleWithNonNullDefault(&self, _: Option<f64>) {}
|
// fn PassOptionalNullableDoubleWithNonNullDefault(&self, _: Option<f64>) {}
|
||||||
fn PassOptionalNullableStringWithNonNullDefault(&self, _: Option<DOMString>) {}
|
fn PassOptionalNullableStringWithNonNullDefault(&self, _: Option<DOMString>) {}
|
||||||
// fn PassOptionalNullableEnumWithNonNullDefault(&self, _: Option<TestEnum>) {}
|
// fn PassOptionalNullableEnumWithNonNullDefault(&self, _: Option<TestEnum>) {}
|
||||||
|
|
||||||
|
fn PassVariadicBoolean(&self, _: Vec<bool>) {}
|
||||||
|
fn PassVariadicByte(&self, _: Vec<i8>) {}
|
||||||
|
fn PassVariadicOctet(&self, _: Vec<u8>) {}
|
||||||
|
fn PassVariadicShort(&self, _: Vec<i16>) {}
|
||||||
|
fn PassVariadicUnsignedShort(&self, _: Vec<u16>) {}
|
||||||
|
fn PassVariadicLong(&self, _: Vec<i32>) {}
|
||||||
|
fn PassVariadicUnsignedLong(&self, _: Vec<u32>) {}
|
||||||
|
fn PassVariadicLongLong(&self, _: Vec<i64>) {}
|
||||||
|
fn PassVariadicUnsignedLongLong(&self, _: Vec<u64>) {}
|
||||||
|
fn PassVariadicFloat(&self, _: Vec<f32>) {}
|
||||||
|
fn PassVariadicDouble(&self, _: Vec<f64>) {}
|
||||||
|
fn PassVariadicString(&self, _: Vec<DOMString>) {}
|
||||||
|
fn PassVariadicByteString(&self, _: Vec<ByteString>) {}
|
||||||
|
fn PassVariadicEnum(&self, _: Vec<TestEnum>) {}
|
||||||
|
// fn PassVariadicInterface(&self, _: Vec<JSRef<Blob>>) {}
|
||||||
|
fn PassVariadicUnion(&self, _: Vec<HTMLElementOrLong>) {}
|
||||||
|
fn PassVariadicUnion2(&self, _: Vec<EventOrString>) {}
|
||||||
|
fn PassVariadicUnion3(&self, _: Vec<BlobOrString>) {}
|
||||||
|
fn PassVariadicAny(&self, _: *mut JSContext, _: Vec<JSVal>) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
|
impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
|
||||||
|
|
|
@ -246,4 +246,24 @@ interface TestBinding {
|
||||||
// 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");
|
||||||
|
|
||||||
|
void passVariadicBoolean(boolean... args);
|
||||||
|
void passVariadicByte(byte... args);
|
||||||
|
void passVariadicOctet(octet... args);
|
||||||
|
void passVariadicShort(short... args);
|
||||||
|
void passVariadicUnsignedShort(unsigned short... args);
|
||||||
|
void passVariadicLong(long... args);
|
||||||
|
void passVariadicUnsignedLong(unsigned long... args);
|
||||||
|
void passVariadicLongLong(long long... args);
|
||||||
|
void passVariadicUnsignedLongLong(unsigned long long... args);
|
||||||
|
void passVariadicFloat(float... args);
|
||||||
|
void passVariadicDouble(double... args);
|
||||||
|
void passVariadicString(DOMString... args);
|
||||||
|
void passVariadicByteString(ByteString... args);
|
||||||
|
void passVariadicEnum(TestEnum... args);
|
||||||
|
// void passVariadicInterface(Blob... args);
|
||||||
|
void passVariadicUnion((HTMLElement or long)... args);
|
||||||
|
void passVariadicUnion2((Event or DOMString)... args);
|
||||||
|
void passVariadicUnion3((Blob or DOMString)... args);
|
||||||
|
void passVariadicAny(any... args);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue