Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1157588. Produce a better error message when someone tries to pass a mixin as an argument. r=peterv

Browse Source
This commit is contained in:
Boris Zbarsky 2015-04-28 12:25:55 -04:00
parent 864f723c0c
commit 7fb122d0a2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/bindings/Configuration.py
View File

@ -25,6 +25,7 @@ class Configuration:
# |parseData|.
self.descriptors = []
self.interfaces = {}
self.optimizedOutDescriptorNames = set()
self.generatedEvents = generatedEvents;
self.maxProtoChainLength = 0;
for thing in parseData:
@ -60,6 +61,7 @@ class Configuration:
# if they have no interface object because chances are we
# don't need to do anything interesting with them.
if iface.isConsequential() and not iface.hasInterfaceObject():
self.optimizedOutDescriptorNames.add(iface.identifier.name)
continue
entry = {}
else:
@ -246,14 +248,24 @@ class Configuration:
Gets the appropriate descriptor for the given interface name
and the given workers boolean.
"""
for d in self.descriptorsByName[interfaceName]:
# We may have optimized out this descriptor, but the chances of anyone
# asking about it are then slim. Put the check for that _after_ we've
# done our normal lookups. But that means we have to do our normal
# lookups in a way that will not throw if they fail.
for d in self.descriptorsByName.get(interfaceName, []):
if d.workers == workers:
return d
if workers:
for d in self.descriptorsByName[interfaceName]:
for d in self.descriptorsByName.get(interfaceName, []):
return d
if interfaceName in self.optimizedOutDescriptorNames:
raise NoSuchDescriptorError(
"No descriptor for '%s', which is a mixin ([NoInterfaceObject] "
"and a consequential interface) without an explicit "
"Bindings.conf annotation." % interfaceName)
raise NoSuchDescriptorError("For " + interfaceName + " found no matches");
def getDescriptorProvider(self, workers):
"""