unnamed matcher handling now in annotator

common/python/nomadcore/annotator.py

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

common/python/nomadcore/simple_parser.py

@@ -694,7 +694,7 @@ class CompiledMatcher(object):
             'line': line,
             'lineNr': parser.fIn.lineNr,
             # information about SimpleMatcher
-            'name': self.matcher.name if self.matcher.name else 'UNNAMED',
+            'name': self.matcher.name,
             'defFile': self.matcher.defFile,
             'defLine': self.matcher.defLine,
             'matcher_does_nothing': self.matcher.does_nothing, # matcher without effect