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

Use handleOptional for the DOMString conversion.

Browse source
This commit is contained in:
Ms2ger 2014-04-26 17:29:30 +02:00
parent b73a87e955
commit 13e26e0fe0
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -658,16 +658,12 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
else:
nullBehavior = treatAs[treatNullAs]
def getConversionCode(isOptional=False):
strval = "strval"
if isOptional:
strval = "Some(%s)" % strval
def getConversionCode():
conversionCode = (
"match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n"
" Ok(strval) => %s,\n"
" Ok(strval) => strval,\n"
" Err(_) => { %s },\n"
"}" % (nullBehavior, strval, exceptionCode))
"}" % (nullBehavior, exceptionCode))
if defaultValue is None:
return conversionCode
@ -690,15 +686,10 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
return handleDefault(conversionCode, default)
declType = "DOMString"
initialValue = None
if type.nullable():
declType = "Option<%s>" % declType
if isOptional:
declType = "Option<%s>" % declType
initialValue = "None"
return (getConversionCode(isOptional), CGGeneric(declType), False, initialValue)
return handleOptional(getConversionCode(), CGGeneric(declType), isOptional)
if type.isEnum():
assert not isEnforceRange and not isClamp