From b68c48f5f87890ad0faa940727036c388d3afeef Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 10 Sep 2020 05:23:47 +1000 Subject: Remove last remaining uses of elements in layouts, and print warning messages on encountering deprecated elements. --- scripts/build/complay.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/build/complay.py b/scripts/build/complay.py index 9b3334d96c2..2fbc7667a8e 100755 --- a/scripts/build/complay.py +++ b/scripts/build/complay.py @@ -97,7 +97,6 @@ class LayoutChecker(Minifyer): VARPATTERN = re.compile('^.*~[0-9A-Za-z_]+~.*$') FLOATCHARS = re.compile('^.*[.eE].*$') SHAPES = frozenset(('disk', 'dotmatrix', 'dotmatrix5dot', 'dotmatrixdot', 'led14seg', 'led14segsc', 'led16seg', 'led16segsc', 'led7seg', 'led8seg_gts1', 'rect')) - OBJECTS = frozenset(('backdrop', )) ORIENTATIONS = frozenset((0, 90, 180, 270)) YESNO = frozenset(('yes', 'no')) BLENDMODES = frozenset(('none', 'alpha', 'multiply', 'add')) @@ -452,12 +451,11 @@ class LayoutChecker(Minifyer): self.handlers.pop() def groupViewStartHandler(self, name, attrs): - if (name in self.OBJECTS) or ('element' == name): - refattr = 'ref' if 'element' == name else 'element' - if refattr not in attrs: - self.handleError('Element %s missing attribute %s' % (name, refattr)) - elif attrs[refattr] not in self.referenced_elements: - self.referenced_elements[attrs[refattr]] = self.formatLocation() + if 'element' == name: + if 'ref' not in attrs: + self.handleError('Element %s missing attribute ref' % (name, )) + elif attrs['ref'] not in self.referenced_elements: + self.referenced_elements[attrs['ref']] = self.formatLocation() if ('blend' in attrs) and (attrs['blend'] not in self.BLENDMODES) and not self.VARPATTERN.match(attrs['blend']): self.handleError('Element %s attribute blend "%s" is unsupported' % (name, attrs['blend'])) if 'inputtag' in attrs: -- cgit v1.2.3-70-g09d2