mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
Rename innerSequenceType to innerContainerType.
This commit is contained in:
parent
e942f50e1b
commit
b2fc80a847
1 changed files with 4 additions and 4 deletions
|
@ -92,7 +92,7 @@ def stripTrailingWhitespace(text):
|
||||||
return '\n'.join(lines) + tail
|
return '\n'.join(lines) + tail
|
||||||
|
|
||||||
|
|
||||||
def innerSequenceType(type):
|
def innerContainerType(type):
|
||||||
assert type.isSequence()
|
assert type.isSequence()
|
||||||
return type.inner.inner if type.nullable() else type.inner
|
return type.inner.inner if type.nullable() else type.inner
|
||||||
|
|
||||||
|
@ -725,7 +725,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
|
||||||
raise TypeError("Can't handle array arguments yet")
|
raise TypeError("Can't handle array arguments yet")
|
||||||
|
|
||||||
if type.isSequence():
|
if type.isSequence():
|
||||||
innerInfo = getJSToNativeConversionInfo(innerSequenceType(type),
|
innerInfo = getJSToNativeConversionInfo(innerContainerType(type),
|
||||||
descriptorProvider,
|
descriptorProvider,
|
||||||
isMember=isMember)
|
isMember=isMember)
|
||||||
declType = CGWrapper(innerInfo.declType, pre="Vec<", post=">")
|
declType = CGWrapper(innerInfo.declType, pre="Vec<", post=">")
|
||||||
|
@ -1351,7 +1351,7 @@ def getRetvalDeclarationForType(returnType, descriptorProvider):
|
||||||
result = CGWrapper(result, pre="Option<", post=">")
|
result = CGWrapper(result, pre="Option<", post=">")
|
||||||
return result
|
return result
|
||||||
if returnType.isSequence():
|
if returnType.isSequence():
|
||||||
result = getRetvalDeclarationForType(innerSequenceType(returnType), descriptorProvider)
|
result = getRetvalDeclarationForType(innerContainerType(returnType), descriptorProvider)
|
||||||
result = CGWrapper(result, pre="Vec<", post=">")
|
result = CGWrapper(result, pre="Vec<", post=">")
|
||||||
if returnType.nullable():
|
if returnType.nullable():
|
||||||
result = CGWrapper(result, pre="Option<", post=">")
|
result = CGWrapper(result, pre="Option<", post=">")
|
||||||
|
@ -3997,7 +3997,7 @@ def getUnionTypeTemplateVars(type, descriptorProvider):
|
||||||
typeName = name
|
typeName = name
|
||||||
elif type.isSequence():
|
elif type.isSequence():
|
||||||
name = type.name
|
name = type.name
|
||||||
inner = getUnionTypeTemplateVars(innerSequenceType(type), descriptorProvider)
|
inner = getUnionTypeTemplateVars(innerContainerType(type), descriptorProvider)
|
||||||
typeName = "Vec<" + inner["typeName"] + ">"
|
typeName = "Vec<" + inner["typeName"] + ">"
|
||||||
elif type.isByteString():
|
elif type.isByteString():
|
||||||
name = type.name
|
name = type.name
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue