make coverageIgnore constructor kwarg of Annotator

common/python/nomadcore/annotator.py

@@ -6,8 +6,9 @@ LOGGER = logging.getLogger(__name__)
 
 
 class Annotator(object):
-    def __init__(self, annotateFilename=None):
+    def __init__(self, annotateFilename=None, coverageIgnore=None):
         self.matchHighlighter = MatchHighlighter()
+        self.coverageIgnore = coverageIgnore
         if annotateFilename is None:
             self.annotateFile = None
         else:
@@ -18,13 +19,8 @@ class Annotator(object):
     def annotate(self,match,line,parser,matcher,targetStartEnd):
         if not self.annotateFile:
             return 1
-        coverageIgnore = None
-        try:
-            coverageIgnore = parser.superContext.coverageIgnore
-        except AttributeError:
-            pass
         (matchtype, highlightedLine) = self.matchHighlighter.highlight(
-            match, line, coverageIgnore)
+            match, line, self.coverageIgnore)
         matchlabel = ''
         if matchtype == 0:
             matchlabel='ign'

common/python/nomadcore/simple_parser.py

@@ -960,11 +960,14 @@ class SimpleParser(object):
         self.superContext = superContext
         self.lastMatch = {}
         annofilename = None
+        coverageIgnore = None
         if annotate:
             annofilename=fIn.fIn.name + ".annotate"
+            coverageIgnore = getattr(superContext, 'coverageIgnore', None)
         else:
             logger.info("no annotations requested for " + fIn.fIn.name)
-        self.annotator = Annotator(annotateFilename=annofilename)
+        self.annotator = Annotator(annotateFilename=annofilename,
+                                   coverageIgnore=coverageIgnore)
 
     def enterInState(self, stateIndex):
         compiledMatcher = self.parserBuilder.compiledMatchers[stateIndex]