Merge branch 'master' into unstable

hdlcc/builders/ghdl.py

@@ -90,7 +90,7 @@ def _makeRecords(self, line):
     def _checkEnvironment(self):
         stdout = self._subprocessRunner(['ghdl', '--version'])
         self._version = \
-                re.findall(r"(?<=GHDL)\s+([\w\.]+)\s+", \
+                re.findall(r"(?<=GHDL)\s+([^\s]+)\s+", \
                 stdout[0])[0]
         self._logger.info("GHDL version string: '%s'. " + \
                 "Version number is '%s'", \

hdlcc/parsers/base_parser.py

@@ -51,7 +51,9 @@ def __init__(self, filename, library='work', flags=None):
         self._content = None
         self._mtime = 0
         self.filetype = getFileType(self.filename)
+
         self._prev = None
+
         self.abspath = p.abspath(filename)
 
     def getState(self):
@@ -122,7 +124,6 @@ def _changed(self):
         provided by p.getmtime
         """
         if self.getmtime() > self._mtime:
-            _logger.debug("File '%s' has changed", self.filename)
             return True
         return False
 
@@ -135,7 +136,7 @@ def _clearCachesIfChanged(self):
             # Since the content was set by the caller, we can't really clear
             # this unless we're handling with a proper file
             if not self.hasBufferContent():  # pragma: no cover
-                self._content = None
+            self._content = None
             self._cache = {}
 
     def getmtime(self):
@@ -203,6 +204,7 @@ def getSourceContent(self):
         """
         Cached version of the _getSourceContent method
         """
+
         self._clearCachesIfChanged()
 
         if self._content is None:
@@ -220,7 +222,6 @@ def getRawSourceContent(self):
 
         if self.hasBufferContent():
             return self._content
-
         if 'raw_content' not in self._cache or self._changed():
             self._cache['raw_content'] = \
                 open(self.filename, mode='rb').read().decode(errors='ignore')