ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify and Improve error/warning parser for arm_gcc

pull/5915/head
PHST 2018-01-24 08:48:15 +01:00
parent f1cf77fa44
commit 3ce173b5ce
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/toolchains/gcc.py
View File

@ -26,8 +26,7 @@ class GCC(mbedToolchain):
LIBRARY_EXT = '.a' LIBRARY_EXT = '.a'
STD_LIB_NAME = "lib%s.a" STD_LIB_NAME = "lib%s.a"
DIAGNOSTIC_PATTERN = re.compile('((?P<file>[^:]+):(?P<line>\d+):)(\d+:)? (?P<severity>warning|[eE]rror|fatal error): (?P<message>.+)') DIAGNOSTIC_PATTERN = re.compile('((?P<file>[^:]+):(?P<line>\d+):)(?P<col>\d+):? (?P<severity>warning|[eE]rror|fatal error): (?P<message>.+)')
INDEX_PATTERN = re.compile('(?P<col>\s*)\^')
def __init__(self, target, notify=None, macros=None, def __init__(self, target, notify=None, macros=None,
silent=False, extra_verbose=False, build_profile=None, silent=False, extra_verbose=False, build_profile=None,
@ -128,21 +127,12 @@ class GCC(mbedToolchain):
'severity': match.group('severity').lower(), 'severity': match.group('severity').lower(),
'file': match.group('file'), 'file': match.group('file'),
'line': match.group('line'), 'line': match.group('line'),
'col': 0, 'col': match.group('col'),
'message': match.group('message'), 'message': match.group('message'),
'text': '', 'text': '',
'target_name': self.target.name, 'target_name': self.target.name,
'toolchain_name': self.name 'toolchain_name': self.name
} }
elif msg is not None:
# Determine the warning/error column by calculating the ^ position
match = self.INDEX_PATTERN.match(line)
if match is not None:
msg['col'] = len(match.group('col'))
self.cc_info(msg)
msg = None
else:
msg['text'] += line+"\n"
if msg is not None: if msg is not None:
self.cc_info(msg) self.cc_info(msg)