Merge branch 'SM-peekline-branch' into 'master'

Added peekline feature to SimpleMatcher.

See merge request !5

common/python/nomadcore/simple_parser.py

@@ -29,6 +29,7 @@ class PushbackLineFile(object):
 
     def __init__(self, fIn, lines=tuple()):
         self.fIn = fIn
+        self.fInLine = None
         self.lines = list(lines)
         self.lineNr = 0
         self.name = fIn.name
@@ -40,10 +41,18 @@ class PushbackLineFile(object):
         else:
             res = self.fIn.readline()
             if res:
+                self.fInLine = res
                 self.lineNr += 1
             return res
 
+    def peekline(self):
+        pos = self.fIn.tell()
+        line = self.fIn.readline()
+        self.fIn.seek(pos)
+        return line
+
     def pushbackLine(self, line):
+        self.fInLine = line
         self.lines.append(line)
         self.lineNr -= 1