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

auto merge of #2164 : Ms2ger/servo/dictionary-init, r=jdm

Browse source
This commit is contained in:
bors-servo 2014-04-18 12:58:04 -04:00
commit e332f2f0fe
1 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -670,8 +670,8 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
conversionCode = ( conversionCode = (
"match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n" "match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n"
" Ok(strval) => ${declName} = %s,\n" " Ok(strval) => ${declName} = %s,\n"
" Err(_) => return 0,\n" " Err(_) => { %s },\n"
"}" % (nullBehavior, strval)) "}" % (nullBehavior, strval, exceptionCode))
if defaultValue is None: if defaultValue is None:
return conversionCode return conversionCode
@ -794,7 +794,6 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
assert not isOptional assert not isOptional
typeName = CGDictionary.makeDictionaryName(type.inner) typeName = CGDictionary.makeDictionaryName(type.inner)
selfRef = "${declName}"
declType = CGGeneric(typeName) declType = CGGeneric(typeName)
@ -806,10 +805,10 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
else: else:
val = "${val}" val = "${val}"
template = ("%s = %s::new();\n" template = ("${declName} = match %s::new(cx, %s) {\n"
"if %s.Init(cx, %s) == 0 {\n" " Ok(dictionary) => dictionary,\n"
" return 0;\n" " Err(_) => return 0,\n"
"}" % (selfRef, typeName, selfRef, val)) "};" % (typeName, val))
return (template, declType, None, False, None) return (template, declType, None, False, None)
@ -4143,7 +4142,9 @@ class CGDictionary(CGThing):
descriptorProvider, descriptorProvider,
isMember=True, isMember=True,
isOptional=(not member.defaultValue), isOptional=(not member.defaultValue),
defaultValue=member.defaultValue)) defaultValue=member.defaultValue,
failureCode="return Err(());",
exceptionCode="return Err(());"))
for member in dictionary.members ] for member in dictionary.members ]
def define(self): def define(self):
@ -4172,10 +4173,11 @@ class CGDictionary(CGThing):
def impl(self): def impl(self):
d = self.dictionary d = self.dictionary
if d.parent: if d.parent:
initParent = ("// Per spec, we init the parent's members first\n" initParent = ("parent: match %s::%s::new(cx, val) {\n"
"if self.parent.Init(cx, val) == 0 {\n" " Ok(parent) => parent,\n"
" return 0;\n" " Err(_) => return Err(()),\n"
"}\n") "},\n") % (self.makeModuleName(d.parent),
self.makeClassName(d.parent))
else: else:
initParent = "" initParent = ""
@ -4196,27 +4198,23 @@ class CGDictionary(CGThing):
return string.Template( return string.Template(
"impl ${selfName} {\n" "impl ${selfName} {\n"
" pub fn new() -> ${selfName} {\n" " pub fn new(cx: *JSContext, val: JSVal) -> Result<${selfName}, ()> {\n"
" ${selfName} {\n" + " let mut result = ${selfName} {\n"
((" parent: %s::%s::new(),\n" % (self.makeModuleName(d.parent), "${initParent}" +
self.makeClassName(d.parent))) if d.parent else "") +
"\n".join(" %s: %s," % (self.makeMemberName(m[0].identifier.name), defaultValue(self.getMemberType(m))) for m in self.memberInfo) + "\n" "\n".join(" %s: %s," % (self.makeMemberName(m[0].identifier.name), defaultValue(self.getMemberType(m))) for m in self.memberInfo) + "\n"
" }\n" " };\n"
" }\n"
"\n" "\n"
" pub fn Init(&mut self, cx: *JSContext, val: JSVal) -> JSBool {\n"
" unsafe {\n" " unsafe {\n"
"${initParent}"
" let mut found: JSBool = 0;\n" " let mut found: JSBool = 0;\n"
" let temp: JSVal = NullValue();\n" " let temp: JSVal = NullValue();\n"
" let isNull = val.is_null_or_undefined();\n" " let isNull = val.is_null_or_undefined();\n"
" if !isNull && val.is_primitive() {\n" " if !isNull && val.is_primitive() {\n"
" return 0; //XXXjdm throw properly here\n" " return Err(()); //XXXjdm throw properly here\n"
" //return Throw(cx, NS_ERROR_XPC_BAD_CONVERT_JS);\n" " //return Throw(cx, NS_ERROR_XPC_BAD_CONVERT_JS);\n"
" }\n" " }\n"
"\n" "\n"
"${initMembers}\n" "${initMembers}\n"
" return 1;\n" " Ok(result)\n"
" }\n" " }\n"
" }\n" " }\n"
"}").substitute({ "}").substitute({
@ -4255,7 +4253,7 @@ class CGDictionary(CGThing):
holderType, dealWithOptional, initialValue)) = memberInfo holderType, dealWithOptional, initialValue)) = memberInfo
replacements = { "val": "temp", replacements = { "val": "temp",
"valPtr": "&temp", "valPtr": "&temp",
"declName": ("self.%s" % self.makeMemberName(member.identifier.name)), "declName": ("result.%s" % self.makeMemberName(member.identifier.name)),
# We need a holder name for external interfaces, but # We need a holder name for external interfaces, but
# it's scoped down to the conversion so we can just use # it's scoped down to the conversion so we can just use
# anything we want. # anything we want.
@ -4282,13 +4280,13 @@ class CGDictionary(CGThing):
conversion = ("if isNull {\n" conversion = ("if isNull {\n"
" found = 0;\n" " found = 0;\n"
"} else if ${propCheck} == 0 {\n" "} else if ${propCheck} == 0 {\n"
" return 0;\n" " return Err(());\n"
"}\n") "}\n")
if member.defaultValue: if member.defaultValue:
conversion += ( conversion += (
"if found != 0 {\n" "if found != 0 {\n"
" if ${propGet} == 0 {\n" " if ${propGet} == 0 {\n"
" return 0;\n" " return Err(());\n"
" }\n" " }\n"
"}\n" "}\n"
"${convert}") "${convert}")
@ -4297,7 +4295,7 @@ class CGDictionary(CGThing):
"if found != 0 {\n" "if found != 0 {\n"
" ${prop}.Construct();\n" " ${prop}.Construct();\n"
" if ${propGet} == 0 {\n" " if ${propGet} == 0 {\n"
" return 0;\n" " return Err(());\n"
" }\n" " }\n"
"${convert}\n" "${convert}\n"
"}") "}")