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

Rewrite dictionary codegen to initialize members directly into the struct.

Browse source
This commit is contained in:
Ms2ger 2014-04-25 11:51:47 +02:00
parent 66c89f27aa
commit 1d51e7d227
1 changed files with 14 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4208,31 +4208,17 @@ class CGDictionary(CGThing):
else: else:
initParent = "" initParent = ""
memberInits = [CGIndenter(self.getMemberConversion(m), indentLevel=6).define() def memberInit(memberInfo):
for m in self.memberInfo] member, _ = memberInfo
name = self.makeMemberName(member.identifier.name)
conversion = self.getMemberConversion(memberInfo)
return CGGeneric("%s: %s,\n" % (name, conversion.define()))
def defaultValue(ty): memberInits = CGList([memberInit(m) for m in self.memberInfo])
if ty is "bool":
return "false"
elif ty in ["i32", "u32", "i16", "u16"]:
return "0"
elif ty == "DOMString":
return '~""'
elif ty.startswith("Option"):
return "None"
elif ty == "JSVal":
return "UndefinedValue()"
else:
return "/* uh oh: %s */" % ty
return string.Template( return string.Template(
"impl ${selfName} {\n" "impl ${selfName} {\n"
" pub fn new(cx: *JSContext, val: JSVal) -> Result<${selfName}, ()> {\n" " pub fn new(cx: *JSContext, val: JSVal) -> Result<${selfName}, ()> {\n"
" let mut result = ${selfName} {\n"
"${initParent}" +
"\n".join(" %s: %s," % (self.makeMemberName(m[0].identifier.name), defaultValue(self.getMemberType(m))) for m in self.memberInfo) + "\n"
" };\n"
"\n"
" let object = if val.is_null_or_undefined() {\n" " let object = if val.is_null_or_undefined() {\n"
" ptr::null()\n" " ptr::null()\n"
" } else if val.is_object() {\n" " } else if val.is_object() {\n"
@ -4241,15 +4227,15 @@ class CGDictionary(CGThing):
" //XXXjdm throw properly here\n" " //XXXjdm throw properly here\n"
" return Err(());\n" " return Err(());\n"
" };\n" " };\n"
" unsafe {\n" " Ok(${selfName} {\n"
"${initMembers}\n" "${initParent}"
" }\n" "${initMembers}"
" Ok(result)\n" " })\n"
" }\n" " }\n"
"}").substitute({ "}").substitute({
"selfName": self.makeClassName(d), "selfName": self.makeClassName(d),
"initParent": CGIndenter(CGGeneric(initParent), indentLevel=6).define(), "initParent": CGIndenter(CGGeneric(initParent), indentLevel=6).define(),
"initMembers": "\n\n".join(memberInits), "initMembers": CGIndenter(memberInits, indentLevel=6).define(),
}) })
@staticmethod @staticmethod
@ -4280,22 +4266,15 @@ class CGDictionary(CGThing):
def getMemberConversion(self, memberInfo): def getMemberConversion(self, memberInfo):
(member, (templateBody, declType, (member, (templateBody, declType,
holderType, dealWithOptional, initialValue)) = memberInfo holderType, dealWithOptional, initialValue)) = memberInfo
replacements = { "val": "value.unwrap()", replacements = { "val": "value.unwrap()" }
"declName": ("result.%s" % self.makeMemberName(member.identifier.name)),
# We need a holder name for external interfaces, but
# it's scoped down to the conversion so we can just use
# anything we want.
"holderName": "holder"}
# We can't handle having a holderType here # We can't handle having a holderType here
assert holderType is None assert holderType is None
if dealWithOptional:
replacements["declName"] = "(" + replacements["declName"] + ".Value())"
if member.defaultValue: if member.defaultValue:
replacements["haveValue"] = "value.is_some()" replacements["haveValue"] = "value.is_some()"
propName = member.identifier.name propName = member.identifier.name
conversion = CGIndenter( conversion = CGIndenter(
CGGeneric(string.Template("${declName} = " + templateBody + ";").substitute(replacements)), CGGeneric(string.Template(templateBody).substitute(replacements)),
8).define() 8).define()
if not member.defaultValue: if not member.defaultValue:
raise TypeError("We don't support dictionary members without a " raise TypeError("We don't support dictionary members without a "
@ -4307,7 +4286,7 @@ class CGDictionary(CGThing):
" Ok(value) => {\n" " Ok(value) => {\n"
"%s\n" "%s\n"
" },\n" " },\n"
"}\n") % (propName, conversion) "}") % (propName, conversion)
return CGGeneric(conversion) return CGGeneric(conversion)