mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
Auto merge of #12541 - jdm:seqseq, r=nox
Support sequences of sequences in generated bindings. This fixes a blocker for #11897. `unroll` recursively gets the inner type of any sequence type encountered, so it's inappropriate for codegen that only wants the immediate inner type. However, if a type identifies as a sequence and is nullable, we need to reach through the nullable wrapper first. Gecko does very similar things. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #12528 (github issue number if applicable). - [X] There are tests for these changes <!-- 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/12541) <!-- Reviewable:end -->
This commit is contained in:
commit
4ae0897175
3 changed files with 24 additions and 5 deletions
|
@ -88,6 +88,11 @@ def stripTrailingWhitespace(text):
|
|||
return '\n'.join(lines) + tail
|
||||
|
||||
|
||||
def innerSequenceType(type):
|
||||
assert type.isSequence()
|
||||
return type.inner.inner if type.nullable() else type.inner
|
||||
|
||||
|
||||
def MakeNativeName(name):
|
||||
return name[0].upper() + name[1:]
|
||||
|
||||
|
@ -714,7 +719,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
|
|||
raise TypeError("Can't handle array arguments yet")
|
||||
|
||||
if type.isSequence():
|
||||
innerInfo = getJSToNativeConversionInfo(type.unroll(), descriptorProvider)
|
||||
innerInfo = getJSToNativeConversionInfo(innerSequenceType(type), descriptorProvider)
|
||||
declType = CGWrapper(innerInfo.declType, pre="Vec<", post=">")
|
||||
config = getConversionConfigForType(type, isEnforceRange, isClamp, treatNullAs)
|
||||
|
||||
|
@ -1303,8 +1308,7 @@ def getRetvalDeclarationForType(returnType, descriptorProvider):
|
|||
if returnType.isObject() or returnType.isSpiderMonkeyInterface():
|
||||
return CGGeneric("*mut JSObject")
|
||||
if returnType.isSequence():
|
||||
inner = returnType.unroll()
|
||||
result = getRetvalDeclarationForType(inner, descriptorProvider)
|
||||
result = getRetvalDeclarationForType(innerSequenceType(returnType), descriptorProvider)
|
||||
result = CGWrapper(result, pre="Vec<", post=">")
|
||||
if returnType.nullable():
|
||||
result = CGWrapper(result, pre="Option<", post=">")
|
||||
|
@ -3744,7 +3748,7 @@ def getUnionTypeTemplateVars(type, descriptorProvider):
|
|||
typeName = name
|
||||
elif type.isSequence():
|
||||
name = type.name
|
||||
inner = getUnionTypeTemplateVars(type.unroll(), descriptorProvider)
|
||||
inner = getUnionTypeTemplateVars(innerSequenceType(type), descriptorProvider)
|
||||
typeName = "Vec<" + inner["typeName"] + ">"
|
||||
elif type.isArray():
|
||||
name = str(type)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue