wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 804738 part 2. Fix codegen for indexed operations to be consistent about the naming of the index argument. r=peterv

Browse Source
This commit is contained in:
Boris Zbarsky 2012-11-06 08:01:49 -08:00
parent dd4d31b923
commit 8b9e634fac
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dom/bindings/Codegen.py
View File

@ -5052,7 +5052,25 @@ class CGProxySpecialOperation(CGPerSignatureCall):
wrap = CGIfWrapper(wrap, "found")
return "\n" + wrap.define()
class CGProxyIndexedGetter(CGProxySpecialOperation):
class CGProxyIndexedOperation(CGProxySpecialOperation):
"""
Class to generate a call to an indexed operation.
"""
def __init__(self, descriptor, name):
CGProxySpecialOperation.__init__(self, descriptor, name)
def define(self):
# Our first argument is the id we're getting.
argName = self.arguments[0].identifier.name
if argName == "index":
# We already have our index in a variable with that name
setIndex = ""
else:
setIndex = "uint32_t %s = index;\n" % argName
return (setIndex +
"%s* self = UnwrapProxy(proxy);\n" +
CGProxySpecialOperation.define(self))
class CGProxyIndexedGetter(CGProxyIndexedOperation):
"""
Class to generate a call to an indexed getter. If templateValues is not None
the returned value will be wrapped with wrapForType using templateValues.
@ -5070,7 +5088,7 @@ class CGProxyIndexedPresenceChecker(CGProxyIndexedGetter):
def __init__(self, descriptor):
CGProxyIndexedGetter.__init__(self, descriptor)
class CGProxyIndexedSetter(CGProxySpecialOperation):
class CGProxyIndexedSetter(CGProxyIndexedOperation):
"""
Class to generate a call to an indexed setter.
"""
@ -5122,7 +5140,7 @@ class CGProxyNamedSetter(CGProxyNamedOperation):
def __init__(self, descriptor):
CGProxySpecialOperation.__init__(self, descriptor, 'NamedSetter')
class CGProxyIndexedDeleter(CGProxySpecialOperation):
class CGProxyIndexedDeleter(CGProxyIndexedOperation):
"""
Class to generate a call to an indexed deleter.
"""
@ -5195,7 +5213,6 @@ class CGDOMJSProxyHandler_getOwnPropertyDescriptor(ClassMethod):
templateValues = {'jsvalRef': 'desc->value', 'jsvalPtr': '&desc->value',
'obj': 'proxy', 'successCode': fillDescriptor}
get = ("if (index >= 0) {\n" +
" %s* self = UnwrapProxy(proxy);\n" +
CGIndenter(CGProxyIndexedGetter(self.descriptor, templateValues)).define() + "\n" +
"}\n") % (self.descriptor.nativeType)
@ -5275,7 +5292,6 @@ class CGDOMJSProxyHandler_defineProperty(ClassMethod):
raise TypeError("Can't handle creator that's different from the setter")
set += ("int32_t index = GetArrayIndexFromId(cx, id);\n" +
"if (index >= 0) {\n" +
" %s* self = UnwrapProxy(proxy);\n" +
CGIndenter(CGProxyIndexedSetter(self.descriptor)).define() +
" return true;\n" +
"}\n") % (self.descriptor.nativeType)
@ -5348,7 +5364,6 @@ class CGDOMJSProxyHandler_delete(ClassMethod):
if indexedBody is not None:
delete += ("int32_t index = GetArrayIndexFromId(cx, id);\n" +
"if (index >= 0) {\n" +
" %s* self = UnwrapProxy(proxy);\n" +
CGIndenter(CGGeneric(indexedBody)).define() + "\n"
" // We always return here, even if the property was not found\n"
" return true;\n" +
@ -5417,7 +5432,6 @@ class CGDOMJSProxyHandler_hasOwn(ClassMethod):
if self.descriptor.supportsIndexedProperties():
indexed = ("int32_t index = GetArrayIndexFromId(cx, id);\n" +
"if (index >= 0) {\n" +
" %s* self = UnwrapProxy(proxy);\n" +
CGIndenter(CGProxyIndexedPresenceChecker(self.descriptor)).define() + "\n" +
" *bp = found;\n" +
" return true;\n" +
@ -5473,7 +5487,6 @@ if (expando) {
if self.descriptor.supportsIndexedProperties():
getIndexedOrExpando = ("int32_t index = GetArrayIndexFromId(cx, id);\n" +
"if (index >= 0) {\n" +
" %s* self = UnwrapProxy(proxy);\n" +
CGIndenter(CGProxyIndexedGetter(self.descriptor, templateValues)).define()) % (self.descriptor.nativeType)
getIndexedOrExpando += """
// Even if we don't have this index, we don't forward the
@ -5539,8 +5552,7 @@ class CGDOMJSProxyHandler_getElementIfPresent(ClassMethod):
return true;"""
templateValues = {'jsvalRef': '*vp', 'jsvalPtr': 'vp',
'obj': 'proxy', 'successCode': successCode}
get = ("%s* self = UnwrapProxy(proxy);\n" +
CGProxyIndexedGetter(self.descriptor, templateValues).define() + "\n"
get = (CGProxyIndexedGetter(self.descriptor, templateValues).define() + "\n"
"// We skip the expando object if there is an indexed getter.\n" +
"\n") % (self.descriptor.nativeType)
else:

8
dom/bindings/test/TestCodeGen.webidl
View File

@ -424,7 +424,7 @@ dictionary DictContainingSequence {
};
interface TestIndexedGetterInterface {
getter long item(unsigned long index);
getter long item(unsigned long idx);
readonly attribute unsigned long length;
};
@ -445,8 +445,8 @@ interface TestIndexedAndNamedGetterInterface {
};
interface TestIndexedSetterInterface {
setter creator void setItem(unsigned long index, DOMString item);
getter DOMString (unsigned long index);
setter creator void setItem(unsigned long idx, DOMString item);
getter DOMString (unsigned long idx);
};
interface TestNamedSetterInterface {
@ -471,7 +471,7 @@ interface TestIndexedAndNamedGetterAndSetterInterface : TestIndexedSetterInterfa
};
interface TestIndexedDeleterInterface {
deleter void delItem(unsigned long index);
deleter void delItem(unsigned long idx);
getter long (unsigned long index);
};