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

Implement variadic arguments (fixes #1985).

Browse source
This commit is contained in:
Ms2ger 2014-06-09 10:32:02 +02:00
parent 4b5fd956bd
commit d89f867b14
1 changed files with 47 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -890,9 +890,6 @@ class CGArgumentConverter(CGThing):
def __init__(self, argument, index, argv, argc, descriptorProvider, def __init__(self, argument, index, argv, argc, descriptorProvider,
invalidEnumValueFatal=True): invalidEnumValueFatal=True):
CGThing.__init__(self) CGThing.__init__(self)
if argument.variadic:
raise TypeError("We don't support variadic arguments yet " +
str(argument.location))
assert(not argument.defaultValue or argument.optional) assert(not argument.defaultValue or argument.optional)
replacer = { replacer = {
@ -914,26 +911,57 @@ class CGArgumentConverter(CGThing):
treatNullAs=argument.treatNullAs, treatNullAs=argument.treatNullAs,
isEnforceRange=argument.enforceRange, isEnforceRange=argument.enforceRange,
isClamp=argument.clamp, isClamp=argument.clamp,
isMember="Variadic" if argument.variadic else False,
allowTreatNonObjectAsNull=argument.allowTreatNonCallableAsNull()) allowTreatNonObjectAsNull=argument.allowTreatNonCallableAsNull())
if argument.optional: if not argument.variadic:
if argument.defaultValue: if argument.optional:
assert default if argument.defaultValue:
template = CGIfElseWrapper(condition, assert default
CGGeneric(template), template = CGIfElseWrapper(condition,
CGGeneric(default)).define() CGGeneric(template),
CGGeneric(default)).define()
else:
assert not default
declType = CGWrapper(declType, pre="Option<", post=">")
template = CGIfElseWrapper(condition,
CGGeneric("Some(%s)" % template),
CGGeneric("None")).define()
else: else:
assert not default assert not default
declType = CGWrapper(declType, pre="Option<", post=">")
template = CGIfElseWrapper(condition,
CGGeneric("Some(%s)" % template),
CGGeneric("None")).define()
else:
assert not default
self.converter = instantiateJSToNativeConversionTemplate( self.converter = instantiateJSToNativeConversionTemplate(
template, replacementVariables, declType, "arg%d" % index, template, replacementVariables, declType, "arg%d" % index,
needsRooting) needsRooting)
else:
assert argument.optional
variadicConversion = {
"val": string.Template("(*${argv}.offset(variadicArg as int))").substitute(replacer),
}
innerConverter = instantiateJSToNativeConversionTemplate(
template, variadicConversion, declType, "slot",
needsRooting)
seqType = CGTemplatedType("Vec", declType)
variadicConversion = string.Template(
"{\n"
" let mut vector: ${seqType} = vec![];\n"
" for variadicArg in range(${index}, ${argc}) {\n"
"${inner}\n"
" vector.push(slot);\n"
" }\n"
" vector\n"
"}"
).substitute({
"index": index,
"argc": argc,
"seqType": seqType.define(),
"inner": CGIndenter(innerConverter, 4).define(),
})
self.converter = instantiateJSToNativeConversionTemplate(
variadicConversion, replacementVariables, seqType, "arg%d" % index,
False)
def define(self): def define(self):
return self.converter.define() return self.converter.define()
@ -4023,7 +4051,7 @@ class CGDictionary(CGThing):
(member, (member,
getJSToNativeConversionTemplate(member.type, getJSToNativeConversionTemplate(member.type,
descriptorProvider, descriptorProvider,
isMember=True, isMember="Dictionary",
defaultValue=member.defaultValue, defaultValue=member.defaultValue,
failureCode="return Err(());", failureCode="return Err(());",
exceptionCode="return Err(());")) exceptionCode="return Err(());"))