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

fix JS IndexedGetter and NamedSetter bindings generation

Browse source
This commit is contained in:
Alexandrov Sergey 2016-09-20 14:50:21 +03:00
parent 77651959e2
commit 3488d15022
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4831,13 +4831,12 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod):
" let this = UnwrapProxy(proxy);\n" + " let this = UnwrapProxy(proxy);\n" +
" let this = &*this;\n" + " let this = &*this;\n" +
CGIndenter(CGProxyIndexedSetter(self.descriptor)).define() + CGIndenter(CGProxyIndexedSetter(self.descriptor)).define() +
" return true;\n" + " return (*opresult).succeed();\n" +
"}\n") "}\n")
elif self.descriptor.operations['IndexedGetter']: elif self.descriptor.operations['IndexedGetter']:
set += ("if get_array_index_from_id(cx, id).is_some() {\n" + set += ("if get_array_index_from_id(cx, id).is_some() {\n" +
" return false;\n" + " return (*opresult).failNoIndexedSetter();\n" +
" //return ThrowErrorMessage(cx, MSG_NO_PROPERTY_SETTER, \"%s\");\n" + "}\n")
"}\n") % self.descriptor.name
namedSetter = self.descriptor.operations['NamedSetter'] namedSetter = self.descriptor.operations['NamedSetter']
if namedSetter: if namedSetter:
@ -4853,15 +4852,10 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod):
else: else:
set += ("if RUST_JSID_IS_STRING(id) {\n" + set += ("if RUST_JSID_IS_STRING(id) {\n" +
CGIndenter(CGProxyNamedGetter(self.descriptor)).define() + CGIndenter(CGProxyNamedGetter(self.descriptor)).define() +
" if (found) {\n" " if result.is_some() {\n"
# TODO(Issue 5876) " return (*opresult).failNoNamedSetter();\n"
" //return js::IsInNonStrictPropertySet(cx)\n" + " }\n"
" // ? opresult.succeed()\n" + "}\n")
" // : ThrowErrorMessage(cx, MSG_NO_NAMED_SETTER, \"${name}\");\n" +
" return (*opresult).succeed();\n" +
" }\n" +
" return (*opresult).succeed();\n"
"}\n") % (self.descriptor.name, self.descriptor.name)
set += "return proxyhandler::define_property(%s);" % ", ".join(a.name for a in self.args) set += "return proxyhandler::define_property(%s);" % ", ".join(a.name for a in self.args)
return set return set