matchTelemetry: rename name -> matcherName, match_flags -> matchFlags

common/python/nomadcore/annotator.py

@@ -64,7 +64,7 @@ class Annotator(object):
         else:
             highlighted = minfo['line']
         # shorted matcher- and source file names
-        name = minfo['name'][-self._formatNameWidth:] if minfo['name'] else 'UNNAMED'
+        name = minfo['matcherName'][-self._formatNameWidth:] if minfo['matcherName'] else 'UNNAMED'
         defFile = minfo['defFile'][-self._formatSourceWidth:]
         self.annotateFile.write(self._annotate_format % (
             defFile, minfo['defLine'], name,

common/python/nomadcore/simple_parser.py

@@ -694,13 +694,13 @@ class CompiledMatcher(object):
             'line': line,
             'lineNr': parser.fIn.lineNr,
             # information about SimpleMatcher
-            'name': self.matcher.name,
+            'matcherName': self.matcher.name,
             'defFile': self.matcher.defFile,
             'defLine': self.matcher.defLine,
             'matcher_does_nothing': self.matcher.does_nothing, # matcher without effect
             'which_re': 'end' if targetStartEnd else 'start',
-            'match_flags': 0,
             # classification of match
+            'matchFlags': 0,
             'match': 0, # 0 - no, 1 - partial, 3 - full
             'coverageIgnore': 0, # 0 - no, 1 - local, 3 - global
             # overall span of match, and spans of group captures
@@ -736,8 +736,8 @@ class CompiledMatcher(object):
                 else:
                     result['match'] = 1 # partial match
                 result['matcher_does_nothing'] = True
-                result['name'] = 'coverageIgnore'
-        result['match_flags'] = (
+                result['matcherName'] = 'coverageIgnore'
+        result['matchFlags'] = (
             result['match'] | (result['coverageIgnore'] << 2) |
             targetStartEnd << 5 | int(result['matcher_does_nothing']) << 6)
         return result