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

Improve handling of ConversionResult::Failure in unions.

Browse source
This commit is contained in:
Ms2ger 2016-09-19 16:54:25 +02:00
parent 6023560863
commit d1d2074d43
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -649,6 +649,11 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
if exceptionCode is None: if exceptionCode is None:
exceptionCode = "return false;" exceptionCode = "return false;"
if failureCode is None:
failOrPropagate = "throw_type_error(cx, &error);\n%s" % exceptionCode
else:
failOrPropagate = failureCode
needsRooting = typeNeedsRooting(type, descriptorProvider) needsRooting = typeNeedsRooting(type, descriptorProvider)
def handleOptional(template, declType, default): def handleOptional(template, declType, default):
@ -732,11 +737,10 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
templateBody = ("match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n" templateBody = ("match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n"
" Ok(ConversionResult::Success(value)) => value,\n" " Ok(ConversionResult::Success(value)) => value,\n"
" Ok(ConversionResult::Failure(error)) => {\n" " Ok(ConversionResult::Failure(error)) => {\n"
" throw_type_error(cx, &error);\n" "%s\n"
" %s\n"
" }\n" " }\n"
" _ => { %s },\n" " _ => { %s },\n"
"}" % (config, exceptionCode, exceptionCode)) "}" % (config, indent(failOrPropagate, 8), exceptionCode))
return handleOptional(templateBody, declType, handleDefaultNull("None")) return handleOptional(templateBody, declType, handleDefaultNull("None"))
@ -748,11 +752,10 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
templateBody = ("match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" templateBody = ("match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n"
" Ok(ConversionResult::Success(value)) => value,\n" " Ok(ConversionResult::Success(value)) => value,\n"
" Ok(ConversionResult::Failure(error)) => {\n" " Ok(ConversionResult::Failure(error)) => {\n"
" throw_type_error(cx, &error);\n" "%s\n"
" %s\n"
" }\n" " }\n"
" _ => { %s },\n" " _ => { %s },\n"
"}" % (exceptionCode, exceptionCode)) "}" % (indent(failOrPropagate, 8), exceptionCode))
return handleOptional(templateBody, declType, handleDefaultNull("None")) return handleOptional(templateBody, declType, handleDefaultNull("None"))
@ -823,11 +826,10 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
"match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n" "match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n"
" Ok(ConversionResult::Success(strval)) => strval,\n" " Ok(ConversionResult::Success(strval)) => strval,\n"
" Ok(ConversionResult::Failure(error)) => {\n" " Ok(ConversionResult::Failure(error)) => {\n"
" throw_type_error(cx, &error);\n" "%s\n"
" %s\n"
" }\n" " }\n"
" _ => { %s },\n" " _ => { %s },\n"
"}" % (nullBehavior, exceptionCode, exceptionCode)) "}" % (nullBehavior, indent(failOrPropagate, 8), exceptionCode))
if defaultValue is None: if defaultValue is None:
default = None default = None
@ -853,11 +855,10 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
"match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" "match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n"
" Ok(ConversionResult::Success(strval)) => strval,\n" " Ok(ConversionResult::Success(strval)) => strval,\n"
" Ok(ConversionResult::Failure(error)) => {\n" " Ok(ConversionResult::Failure(error)) => {\n"
" throw_type_error(cx, &error);\n" "%s\n"
" %s\n"
" }\n" " }\n"
" _ => { %s },\n" " _ => { %s },\n"
"}" % (exceptionCode, exceptionCode)) "}" % (indent(failOrPropagate, 8), exceptionCode))
if defaultValue is None: if defaultValue is None:
default = None default = None
@ -883,11 +884,10 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
"match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" "match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n"
" Ok(ConversionResult::Success(strval)) => strval,\n" " Ok(ConversionResult::Success(strval)) => strval,\n"
" Ok(ConversionResult::Failure(error)) => {\n" " Ok(ConversionResult::Failure(error)) => {\n"
" throw_type_error(cx, &error);\n" "%s\n"
" %s\n"
" }\n" " }\n"
" _ => { %s },\n" " _ => { %s },\n"
"}" % (exceptionCode, exceptionCode)) "}" % (indent(failOrPropagate, 8), exceptionCode))
if defaultValue is None: if defaultValue is None:
default = None default = None
@ -1042,11 +1042,10 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
template = ("match %s::new(cx, ${val}) {\n" template = ("match %s::new(cx, ${val}) {\n"
" Ok(ConversionResult::Success(dictionary)) => dictionary,\n" " Ok(ConversionResult::Success(dictionary)) => dictionary,\n"
" Ok(ConversionResult::Failure(error)) => {\n" " Ok(ConversionResult::Failure(error)) => {\n"
" throw_type_error(cx, &error);\n" "%s\n"
" %s\n"
" }\n" " }\n"
" _ => { %s },\n" " _ => { %s },\n"
"}" % (typeName, exceptionCode, exceptionCode)) "}" % (typeName, indent(failOrPropagate, 8), exceptionCode))
return handleOptional(template, declType, handleDefaultNull("%s::empty(cx)" % typeName)) return handleOptional(template, declType, handleDefaultNull("%s::empty(cx)" % typeName))
@ -1071,11 +1070,10 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
"match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n" "match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n"
" Ok(ConversionResult::Success(v)) => v,\n" " Ok(ConversionResult::Success(v)) => v,\n"
" Ok(ConversionResult::Failure(error)) => {\n" " Ok(ConversionResult::Failure(error)) => {\n"
" throw_type_error(cx, &error);\n" "%s\n"
" %s\n"
" }\n" " }\n"
" _ => { %s }\n" " _ => { %s }\n"
"}" % (conversionBehavior, exceptionCode, exceptionCode)) "}" % (conversionBehavior, indent(failOrPropagate, 8), exceptionCode))
if defaultValue is not None: if defaultValue is not None:
if isinstance(defaultValue, IDLNullValue): if isinstance(defaultValue, IDLNullValue):