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

Make GetCallableProperty more rustic.

Browse source
This commit is contained in:
Ms2ger 2014-04-10 15:05:52 +02:00
parent 986664f527
commit d11316fa05
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5312,19 +5312,19 @@ class CallbackOperationBase(CallbackMethod):
"methodName": self.methodName
}
getCallableFromProp = string.Template(
'if "${methodName}".to_c_str().with_ref(|name| !self.parent.GetCallableProperty(cx, name, &mut callable)) {\n'
' return${errorReturn};\n'
'}\n').substitute(replacements)
'match self.parent.GetCallableProperty(cx, "${methodName}") {\n'
' Err(_) => return${errorReturn},\n'
' Ok(callable) => callable,\n'
'}').substitute(replacements)
if not self.singleOperation:
return 'JS::Rooted<JS::Value> callable(cx);\n' + getCallableFromProp
return (
'let isCallable = unsafe { JS_ObjectIsCallable(cx, self.parent.callback) != 0 };\n'
'let mut callable = UndefinedValue();\n'
'if isCallable {\n'
' callable = unsafe { ObjectValue(&*self.parent.callback) };\n'
'} else {\n'
'%s'
'}\n' % CGIndenter(CGGeneric(getCallableFromProp)).define())
'let callable =\n' +
CGIndenter(
CGIfElseWrapper('isCallable',
CGGeneric('unsafe { ObjectValue(&*self.parent.callback) }'),
CGGeneric(getCallableFromProp))).define() + ';\n')
class CallbackOperation(CallbackOperationBase):
"""