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

CodegenRust fixes for NamedGetter

Browse source
This commit is contained in:
Bruno de Oliveira Abinader 2014-11-19 11:59:32 -04:00
parent c17d5330af
commit 1533c07453
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2090,11 +2090,14 @@ class CGDefineProxyHandler(CGAbstractMethod):
return CGAbstractMethod.define(self) return CGAbstractMethod.define(self)
def definition_body(self): def definition_body(self):
customDefineProperty = 'defineProperty_'
if self.descriptor.operations['IndexedSetter'] or self.descriptor.operations['NamedSetter']:
customDefineProperty = 'defineProperty'
body = """\ body = """\
let traps = ProxyTraps { let traps = ProxyTraps {
getPropertyDescriptor: Some(getPropertyDescriptor), getPropertyDescriptor: Some(getPropertyDescriptor),
getOwnPropertyDescriptor: Some(getOwnPropertyDescriptor), getOwnPropertyDescriptor: Some(getOwnPropertyDescriptor),
defineProperty: Some(defineProperty_), defineProperty: Some(%s),
getOwnPropertyNames: ptr::null(), getOwnPropertyNames: ptr::null(),
delete_: Some(delete_), delete_: Some(delete_),
enumerate: ptr::null(), enumerate: ptr::null(),
@ -2124,7 +2127,7 @@ let traps = ProxyTraps {
}; };
CreateProxyHandler(&traps, &Class as *const _ as *const _) CreateProxyHandler(&traps, &Class as *const _ as *const _)
""" % (FINALIZE_HOOK_NAME, """ % (customDefineProperty, FINALIZE_HOOK_NAME,
TRACE_HOOK_NAME) TRACE_HOOK_NAME)
return CGGeneric(body) return CGGeneric(body)
@ -2280,8 +2283,15 @@ class CGPerSignatureCall(CGThing):
invalidEnumValueFatal=not setter) for invalidEnumValueFatal=not setter) for
i in range(argConversionStartsAt, self.argCount)]) i in range(argConversionStartsAt, self.argCount)])
errorResult = None
if self.isFallible():
if nativeMethodName == "NamedSetter":
errorResult = " false"
else:
errorResult = " false as JSBool"
cgThings.append(CGCallGenerator( cgThings.append(CGCallGenerator(
' false as JSBool' if self.isFallible() else None, errorResult,
self.getArguments(), self.argsPre, returnType, self.getArguments(), self.argsPre, returnType,
self.extendedAttributes, descriptor, nativeMethodName, self.extendedAttributes, descriptor, nativeMethodName,
static)) static))
@ -3840,14 +3850,14 @@ if expando.is_not_null() {
getIndexedOrExpando = getFromExpando + "\n" getIndexedOrExpando = getFromExpando + "\n"
namedGetter = self.descriptor.operations['NamedGetter'] namedGetter = self.descriptor.operations['NamedGetter']
if namedGetter and False: #XXXjdm unfinished if namedGetter:
getNamed = ("if (JSID_IS_STRING(id)) {\n" + getNamed = ("if (RUST_JSID_IS_STRING(id) != 0) {\n" +
" let name = jsid_to_str(cx, id);\n" + " let name = jsid_to_str(cx, id);\n" +
" let this = UnwrapProxy(proxy);\n" + " let this = UnwrapProxy(proxy);\n" +
" let this = JS::from_raw(this);\n" + " let this = JS::from_raw(this);\n" +
" let this = this.root();\n" + " let this = this.root();\n" +
CGIndenter(CGProxyNamedGetter(self.descriptor, templateValues)).define() + CGIndenter(CGProxyNamedGetter(self.descriptor, templateValues)).define() +
"}\n") % (self.descriptor.concreteType) "}\n")
else: else:
getNamed = "" getNamed = ""