rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: Fix %if logical OP parsing.

Browse Source 
Updates #2655.
This commit is contained in:
Chris Johns 2016-03-18 10:45:28 +11:00
parent 52cb466a6d
commit 8bde727065
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source-builder/sb/config.py
View File

@ -781,20 +781,26 @@ class file:
elif cls[0] == '&&': elif cls[0] == '&&':
join_op = 'and' join_op = 'and'
cls = cls[1:] cls = cls[1:]
log.trace('config: %s: _if: joining: %s' % (self.name, join_op))
ori = 0 ori = 0
andi = 0 andi = 0
i = len(cls) i = len(cls)
if '||' in cls: if '||' in cls:
ori = cls.index('||') ori = cls.index('||')
log.trace('config: %s: _if: OR found at %i' % (self.name, ori))
if '&&' in cls: if '&&' in cls:
andi = cls.index('&&') andi = cls.index('&&')
log.trace('config: %s: _if: AND found at %i' % (self.name, andi))
if ori > 0 or andi > 0: if ori > 0 or andi > 0:
if ori < andi: if ori == 0:
i = andii
elif andi == 0:
i = ori i = ori
elif ori < andi:
i = andi
else: else:
i = andi i = andi
if ori == 0: log.trace('config: %s: _if: next OP found at %i' % (self.name, i))
i = andi
ls = cls[:i] ls = cls[:i]
if len(ls) == 0: if len(ls) == 0:
self._error('invalid if expression: ' + reduce(add, sls, '')) self._error('invalid if expression: ' + reduce(add, sls, ''))