Simplify ARMC6 parsing logic

Author: theotherjimmy

tools/toolchains/arm.py

@@ -624,14 +624,10 @@ def is_not_supported_error(self, output):
         return "#error [NOT_SUPPORTED]" in output
 
     def parse_output(self, output):
-        msg = None
         for line in output.splitlines():
             match = self.LD_DIAGNOSTIC_PATTERN.match(line)
             if match is not None:
-                if msg is not None:
-                    self.notify.cc_info(msg)
-                    msg = None
-                msg = {
+                self.notify.cc_info({
                     'severity': match.group('severity').lower(),
                     'message': match.group('message'),
                     'text': '',
@@ -640,30 +636,10 @@ def parse_output(self, output):
                     'col': 0,
                     'file': "",
                     'line': 0
-                }
-            elif msg is not None:
-                # Determine the warning/error column by calculating the '^'
-                # position
-                match = ARM.INDEX_PATTERN.match(line)
-                if match is not None:
-                    msg['col'] = len(match.group('col'))
-                    self.notify.cc_info(msg)
-                    msg = None
-                else:
-                    msg['text'] += line+"\n"
-
-        if msg is not None:
-            self.notify.cc_info(msg)
-
-        # The warning/error notification is multiline
-        msg = None
-        for line in output.splitlines():
+                })
             match = self.DIAGNOSTIC_PATTERN.search(line)
             if match is not None:
-                if msg is not None:
-                    self.notify.cc_info(msg)
-                    msg = None
-                msg = {
+                self.notify.cc_info({
                     'severity': match.group('severity').lower(),
                     'file': match.group('file'),
                     'line': match.group('line'),
@@ -672,10 +648,7 @@ def parse_output(self, output):
                     'text': '',
                     'target_name': self.target.name,
                     'toolchain_name': self.name
-                }
-
-        if msg is not None:
-            self.notify.cc_info(msg)
+                })
 
     def get_config_option(self, config_header):
         return ["-include", config_header]