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

Support static and instance members having the same name in IDLs (#36523)

Browse source 
This is needed to implement features like `Response.json` which is a
static helper added to the fetch spec which overlaps with the `json`
instance method `Response` has from `Body`.

Partly based these changes on what Firefox does for this same issue.
(https://searchfox.org/mozilla-central/source/dom/bindings/Codegen.py
and
https://searchfox.org/mozilla-central/source/dom/bindings/Configuration.py
specifically keying `binaryNameFor` on name and `isStatic`).

Testing: I locally updated the Response.webidl to contain the new static
`json` and it compiles.

Signed-off-by: Sebastian C <sebsebmc@gmail.com>
This commit is contained in:
Sebastian C 2025-04-16 16:00:52 -05:00 • committed by GitHub
parent f2ee40e40b
commit a1b9949f75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

46
components/script_bindings/codegen/CodegenRust.py
View file

@ -1745,13 +1745,16 @@ class MethodDefiner(PropertyDefiner):
and (MemberIsLegacyUnforgeable(m, descriptor) == unforgeable or crossorigin)] and (MemberIsLegacyUnforgeable(m, descriptor) == unforgeable or crossorigin)]
else: else:
methods = [] methods = []
self.regular = [{"name": m.identifier.name, self.regular = []
"methodInfo": not m.isStatic(), for m in methods:
"length": methodLength(m), method = self.methodData(m, descriptor, crossorigin)
"flags": "JSPROP_READONLY" if crossorigin else "JSPROP_ENUMERATE",
"condition": PropertyDefiner.getControllingCondition(m, descriptor), if m.isStatic():
"returnsPromise": m.returnsPromise()} method["nativeName"] = CGDictionary.makeMemberName(
for m in methods] descriptor.binaryNameFor(m.identifier.name, True)
)
self.regular.append(method)
# TODO: Once iterable is implemented, use tiebreak rules instead of # TODO: Once iterable is implemented, use tiebreak rules instead of
# failing. Also, may be more tiebreak rules to implement once spec bug # failing. Also, may be more tiebreak rules to implement once spec bug
@ -1841,6 +1844,17 @@ class MethodDefiner(PropertyDefiner):
self.unforgeable = unforgeable self.unforgeable = unforgeable
self.crossorigin = crossorigin self.crossorigin = crossorigin
@staticmethod
def methodData(m, descriptor, crossorigin):
return {
"name": m.identifier.name,
"methodInfo": not m.isStatic(),
"length": methodLength(m),
"flags": "JSPROP_READONLY" if crossorigin else "JSPROP_ENUMERATE",
"condition": PropertyDefiner.getControllingCondition(m, descriptor),
"returnsPromise": m.returnsPromise()
}
def generateArray(self, array, name): def generateArray(self, array, name):
if len(array) == 0: if len(array) == 0:
return "" return ""
@ -4233,7 +4247,7 @@ class CGSpecializedMethod(CGAbstractExternMethod):
if method.underlyingAttr: if method.underlyingAttr:
return CGSpecializedGetter.makeNativeName(descriptor, method.underlyingAttr) return CGSpecializedGetter.makeNativeName(descriptor, method.underlyingAttr)
name = method.identifier.name name = method.identifier.name
nativeName = descriptor.binaryNameFor(name) nativeName = descriptor.binaryNameFor(name, method.isStatic())
if nativeName == name: if nativeName == name:
nativeName = descriptor.internalNameFor(name) nativeName = descriptor.internalNameFor(name)
return MakeNativeName(nativeName) return MakeNativeName(nativeName)
@ -4357,7 +4371,7 @@ class CGStaticMethod(CGAbstractStaticBindingMethod):
""" """
def __init__(self, descriptor, method): def __init__(self, descriptor, method):
self.method = method self.method = method
name = method.identifier.name name = descriptor.binaryNameFor(method.identifier.name, True)
CGAbstractStaticBindingMethod.__init__(self, descriptor, name, templateArgs=["D: DomTypes"]) CGAbstractStaticBindingMethod.__init__(self, descriptor, name, templateArgs=["D: DomTypes"])
def generate_code(self): def generate_code(self):
@ -4395,7 +4409,7 @@ class CGSpecializedGetter(CGAbstractExternMethod):
@staticmethod @staticmethod
def makeNativeName(descriptor, attr): def makeNativeName(descriptor, attr):
name = attr.identifier.name name = attr.identifier.name
nativeName = descriptor.binaryNameFor(name) nativeName = descriptor.binaryNameFor(name, attr.isStatic())
if nativeName == name: if nativeName == name:
nativeName = descriptor.internalNameFor(name) nativeName = descriptor.internalNameFor(name)
nativeName = MakeNativeName(nativeName) nativeName = MakeNativeName(nativeName)
@ -4452,7 +4466,7 @@ class CGSpecializedSetter(CGAbstractExternMethod):
@staticmethod @staticmethod
def makeNativeName(descriptor, attr): def makeNativeName(descriptor, attr):
name = attr.identifier.name name = attr.identifier.name
nativeName = descriptor.binaryNameFor(name) nativeName = descriptor.binaryNameFor(name, attr.isStatic())
if nativeName == name: if nativeName == name:
nativeName = descriptor.internalNameFor(name) nativeName = descriptor.internalNameFor(name)
return f"Set{MakeNativeName(nativeName)}" return f"Set{MakeNativeName(nativeName)}"
@ -5745,7 +5759,7 @@ class CGProxySpecialOperation(CGPerSignatureCall):
(don't use this directly, use the derived classes below). (don't use this directly, use the derived classes below).
""" """
def __init__(self, descriptor, operation): def __init__(self, descriptor, operation):
nativeName = MakeNativeName(descriptor.binaryNameFor(operation)) nativeName = MakeNativeName(descriptor.binaryNameFor(operation, False))
operation = descriptor.operations[operation] operation = descriptor.operations[operation]
assert len(operation.signatures()) == 1 assert len(operation.signatures()) == 1
signature = operation.signatures()[0] signature = operation.signatures()[0]
@ -6535,7 +6549,7 @@ let global = D::GlobalScope::from_object(JS_CALLEE(*cx, vp).to_object());
else: else:
ctorName = GetConstructorNameForReporting(self.descriptor, self.constructor) ctorName = GetConstructorNameForReporting(self.descriptor, self.constructor)
name = self.constructor.identifier.name name = self.constructor.identifier.name
nativeName = MakeNativeName(self.descriptor.binaryNameFor(name)) nativeName = MakeNativeName(self.descriptor.binaryNameFor(name, True))
if len(self.exposureSet) == 1: if len(self.exposureSet) == 1:
args = [ args = [
@ -7988,11 +8002,11 @@ class CGCallback(CGClass):
# We're always fallible # We're always fallible
def callbackGetterName(attr, descriptor): def callbackGetterName(attr, descriptor):
return f"Get{MakeNativeName(descriptor.binaryNameFor(attr.identifier.name))}" return f"Get{MakeNativeName(descriptor.binaryNameFor(attr.identifier.name, attr.isStatic()))}"
def callbackSetterName(attr, descriptor): def callbackSetterName(attr, descriptor):
return f"Set{MakeNativeName(descriptor.binaryNameFor(attr.identifier.name))}" return f"Set{MakeNativeName(descriptor.binaryNameFor(attr.identifier.name, attr.isStatic()))}"
class CGCallbackFunction(CGCallback): class CGCallbackFunction(CGCallback):
@ -8332,7 +8346,7 @@ class CallbackOperation(CallbackOperationBase):
jsName = method.identifier.name jsName = method.identifier.name
CallbackOperationBase.__init__(self, signature, CallbackOperationBase.__init__(self, signature,
jsName, jsName,
MakeNativeName(descriptor.binaryNameFor(jsName)), MakeNativeName(descriptor.binaryNameFor(jsName, False)),
descriptor, descriptor.interface.isSingleOperationInterface()) descriptor, descriptor.interface.isSingleOperationInterface())

10
components/script_bindings/codegen/Configuration.py
View file

@ -353,8 +353,8 @@ class Descriptor(DescriptorProvider):
add('all', [config], attribute) add('all', [config], attribute)
self._binaryNames = desc.get('binaryNames', {}) self._binaryNames = desc.get('binaryNames', {})
self._binaryNames.setdefault('__legacycaller', 'LegacyCall') self._binaryNames.setdefault(('__legacycaller', False), 'LegacyCall')
self._binaryNames.setdefault('__stringifier', 'Stringifier') self._binaryNames.setdefault(('__stringifier', False), 'Stringifier')
self._internalNames = desc.get('internalNames', {}) self._internalNames = desc.get('internalNames', {})
@ -365,7 +365,7 @@ class Descriptor(DescriptorProvider):
if binaryName: if binaryName:
assert isinstance(binaryName, list) assert isinstance(binaryName, list)
assert len(binaryName) == 1 assert len(binaryName) == 1
self._binaryNames.setdefault(member.identifier.name, self._binaryNames.setdefault((member.identifier.name, member.isStatic()),
binaryName[0]) binaryName[0])
self._internalNames.setdefault(member.identifier.name, self._internalNames.setdefault(member.identifier.name,
member.identifier.name.replace('-', '_')) member.identifier.name.replace('-', '_'))
@ -391,8 +391,8 @@ class Descriptor(DescriptorProvider):
return filename return filename
return None return None
def binaryNameFor(self, name): def binaryNameFor(self, name, isStatic):
return self._binaryNames.get(name, name) return self._binaryNames.get((name, isStatic), name)
def internalNameFor(self, name): def internalNameFor(self, name):
return self._internalNames.get(name, name) return self._internalNames.get(name, name)