Auto merge of #19148 - KiChjang:import-sequence-inner-types, r=jdm

Import sequence inner types if it appears in dictionary members

Relands #19133, as it was backed out wrongly in #19143.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19148)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-08 06:22:16 -06:00 committed by GitHub
commit a1f7337221
3 changed files with 11 additions and 2 deletions

View file

@ -4,7 +4,7 @@
import os
from WebIDL import IDLExternalInterface, IDLWrapperType, WebIDLError
from WebIDL import IDLExternalInterface, IDLSequenceType, IDLWrapperType, WebIDLError
class Configuration:
@ -457,7 +457,7 @@ def getTypesFromDictionary(dictionary):
types = []
curDict = dictionary
while curDict:
types.extend([m.type for m in curDict.members])
types.extend([getUnwrappedType(m.type) for m in curDict.members])
curDict = curDict.parent
return types
@ -473,6 +473,12 @@ def getTypesFromCallback(callback):
return types
def getUnwrappedType(type):
while isinstance(type, IDLSequenceType):
type = type.inner
return type
def iteratorNativeType(descriptor, infer=False):
assert descriptor.interface.isIterable()
iterableDecl = descriptor.interface.maplikeOrSetlikeOrIterable

View file

@ -390,6 +390,7 @@ impl TestBindingMethods for TestBinding {
octetValue: None,
requiredValue: true,
seqDict: None,
elementSequence: None,
shortValue: None,
stringValue: None,
type_: Some(DOMString::from("success")),

View file

@ -34,6 +34,8 @@ dictionary TestDictionary {
object objectValue;
TestDictionaryDefaults dict;
sequence<TestDictionaryDefaults> seqDict;
// Testing codegen to import Element correctly, ensure no other code references Element directly
sequence<Element> elementSequence;
// Reserved rust keyword
DOMString type;
// These are used to test bidirectional conversion