Rebuild handling has broken

Author: asouto

hdl_checker/builders/base_builder.py

@@ -31,6 +31,7 @@
 from hdl_checker.types import (
     BuildFlags,
     BuildFlagScope,
+    DesignUnitType,
     FileType,
     RebuildInfo,
     RebuildLibraryUnit,
@@ -200,24 +201,30 @@ def _getRebuilds(self, path, line, library):
 
         rebuilds = set()  # type: Set[RebuildInfo]
         for rebuild in parse_results:
-            unit_type = rebuild.get("unit_type", None)
-            library_name = rebuild.get("library_name", None)
-            unit_name = rebuild.get("unit_name", None)
-            rebuild_path = rebuild.get("rebuild_path", None)
+            unit_type = rebuild.get("unit_type", None)  # type: str
+            library_name = rebuild.get("library_name", None)  # type: str
+            unit_name = rebuild.get("unit_name", None)  # type: str
+            rebuild_path = rebuild.get("rebuild_path", None)  # type: str
 
             if None not in (unit_type, unit_name):
                 for dependency in self._database.getDependenciesByPath(path):
                     if dependency.name.name == rebuild["unit_name"]:
-                        rebuilds.add(RebuildUnit(unit_name, unit_type))
+                        rebuilds.add(
+                            RebuildUnit(
+                                Identifier(unit_name), DesignUnitType(unit_type)
+                            )
+                        )
                         break
             elif None not in (library_name, unit_name):
                 if library_name == "work":
                     library_name = library.name
-                rebuilds.add(RebuildLibraryUnit(unit_name, library_name))
+                rebuilds.add(
+                    RebuildLibraryUnit(Identifier(unit_name), Identifier(library_name))
+                )
             elif rebuild_path is not None:
                 # GHDL sometimes gives the full path of the file that
                 # should be recompiled
-                rebuilds.add(RebuildPath(rebuild_path))
+                rebuilds.add(RebuildPath(Path(rebuild_path)))
             else:  # pragma: no cover
                 self._logger.warning("Don't know what to do with %s", rebuild)
 

hdl_checker/parsers/elements/design_unit.py

@@ -17,25 +17,16 @@
 "Class defining a parsed design unit"
 
 import logging
-from enum import Enum
 from typing import Optional, Union
 
 from .identifier import Identifier, VerilogIdentifier, VhdlIdentifier
 from .parsed_element import LocationList, ParsedElement
 
-from hdl_checker import types as t  # pylint: disable=unused-import
+from hdl_checker.types import DesignUnitType
 from hdl_checker.path import Path
 
 _logger = logging.getLogger(__name__)
 
-
-class DesignUnitType(str, Enum):
-    "Specifies tracked design unit types"
-    package = "package"
-    entity = "entity"
-    context = "context"
-
-
 class _DesignUnit(ParsedElement):
     """
     Specifies a design unit (uses mostly VHDL nomenclature)

hdl_checker/parsers/verilog_parser.py

@@ -20,9 +20,11 @@
 import re
 from typing import Any, Generator
 
-from .elements.design_unit import DesignUnitType, VerilogDesignUnit
+from .elements.design_unit import VerilogDesignUnit
+from .elements.parsed_element import Location
 
 from hdl_checker.parsers.base_parser import BaseSourceFile
+from hdl_checker.types import DesignUnitType
 from hdl_checker.utils import readFile
 
 _logger = logging.getLogger(__name__)
@@ -76,14 +78,14 @@ def _getDesignUnits(self):  # type: () -> Generator[VerilogDesignUnit, None, Non
                     owner=self.filename,
                     name=match["module_name"],
                     type_=DesignUnitType.entity,
-                    locations={(line_number, None)},
+                    locations={Location(line_number, None)},
                 )
             if match["package_name"] is not None:
                 yield VerilogDesignUnit(
                     owner=self.filename,
                     name=match["package_name"],
                     type_=DesignUnitType.package,
-                    locations={(line_number, None)},
+                    locations={Location(line_number, None)},
                 )
 
     def _getLibraries(self):

hdl_checker/parsers/vhdl_parser.py

@@ -21,11 +21,12 @@
 from typing import Any, Dict, Generator, Optional, Set, Tuple, Union
 
 from .elements.dependency_spec import DependencySpec
-from .elements.design_unit import DesignUnitType, VhdlDesignUnit
+from .elements.design_unit import VhdlDesignUnit
 from .elements.identifier import VhdlIdentifier
 from .elements.parsed_element import Location
 
 from hdl_checker.parsers.base_parser import BaseSourceFile
+from hdl_checker.types import DesignUnitType
 from hdl_checker.utils import readFile
 
 _logger = logging.getLogger(__name__)

hdl_checker/tests/test_builders.py

@@ -45,13 +45,19 @@
     Fallback,
     MSim,
 )
-from hdl_checker.builders.base_builder import RebuildLibraryUnit, RebuildPath, RebuildUnit
 from hdl_checker.diagnostics import BuilderDiag, DiagType
 from hdl_checker.exceptions import SanityCheckError
 from hdl_checker.parsers.elements.dependency_spec import DependencySpec
 from hdl_checker.parsers.elements.identifier import Identifier
 from hdl_checker.path import Path
-from hdl_checker.types import BuildFlagScope, FileType
+from hdl_checker.types import (
+    BuildFlagScope,
+    DesignUnitType,
+    FileType,
+    RebuildLibraryUnit,
+    RebuildPath,
+    RebuildUnit,
+)
 
 _logger = logging.getLogger(__name__)
 
@@ -558,19 +564,23 @@ def test_ghdl_recompile_msg(self):
         [
             (
                 {"unit_type": "package", "unit_name": "very_common_pkg"},
-                RebuildUnit(name="very_common_pkg", type_="package"),
+                RebuildUnit(
+                    name=Identifier("very_common_pkg"), type_=DesignUnitType.package
+                ),
             ),
             # Should replace 'work' with the path's library
             (
                 {"library_name": "work", "unit_name": "foo"},
-                RebuildLibraryUnit(name="foo", library="some_lib"),
+                RebuildLibraryUnit(
+                    name=Identifier("foo"), library=Identifier("some_lib")
+                ),
             ),
             # Should not touch the library name when != 'work'
             (
                 {"library_name": "foo", "unit_name": "bar"},
-                RebuildLibraryUnit(name="bar", library="foo"),
+                RebuildLibraryUnit(name=Identifier("bar"), library=Identifier("foo")),
             ),
-            ({"rebuild_path": "some_path"}, RebuildPath("some_path")),
+            ({"rebuild_path": "some_path"}, RebuildPath(Path("some_path"))),
         ]
     )
     def test_get_rebuilds(self, rebuild_info, expected):

hdl_checker/tests/test_database.py

@@ -41,12 +41,12 @@
 from hdl_checker.database import Database
 from hdl_checker.diagnostics import DependencyNotUnique, PathNotInProjectFile
 from hdl_checker.parsers.elements.dependency_spec import DependencySpec
-from hdl_checker.parsers.elements.design_unit import DesignUnitType, VhdlDesignUnit
+from hdl_checker.parsers.elements.design_unit import VhdlDesignUnit
 from hdl_checker.parsers.elements.identifier import Identifier
 from hdl_checker.parsers.elements.parsed_element import Location
 from hdl_checker.path import Path, TemporaryPath
 from hdl_checker.serialization import StateEncoder, jsonObjectHook
-from hdl_checker.types import BuildFlagScope, FileType
+from hdl_checker.types import BuildFlagScope, DesignUnitType, FileType
 
 _logger = logging.getLogger(__name__)
 
@@ -928,6 +928,8 @@ def test_infer_library_from_path(self):
 
 
 class TestUnitsDefinedInMultipleSources(TestCase):
+    maxDiff = None
+
     def setUp(self):
         # type: (...) -> Any
         _logger.info("Setting up %s", self)

hdl_checker/tests/test_verilog_parser.py

@@ -27,10 +27,10 @@
 
 from hdl_checker.tests import assertCountEqual, writeListToFile
 
-from hdl_checker.parsers.elements.design_unit import DesignUnitType
 from hdl_checker.parsers.verilog_parser import VerilogDesignUnit, VerilogParser
 from hdl_checker.path import Path
 from hdl_checker.serialization import StateEncoder, jsonObjectHook
+from hdl_checker.types import DesignUnitType
 
 _logger = logging.getLogger(__name__)
 

hdl_checker/tests/test_vhdl_parser.py

@@ -32,11 +32,12 @@
 from hdl_checker.tests import assertCountEqual, assertSameFile, writeListToFile
 
 from hdl_checker.parsers.elements.dependency_spec import DependencySpec
-from hdl_checker.parsers.elements.design_unit import DesignUnitType, VhdlDesignUnit
+from hdl_checker.parsers.elements.design_unit import VhdlDesignUnit
 from hdl_checker.parsers.elements.identifier import Identifier
 from hdl_checker.parsers.vhdl_parser import VhdlParser
 from hdl_checker.path import Path
 from hdl_checker.serialization import StateEncoder, jsonObjectHook
+from hdl_checker.types import DesignUnitType
 
 _logger = logging.getLogger(__name__)
 

hdl_checker/types.py

@@ -17,16 +17,29 @@
 "Common type definitions for type hinting"
 from collections import namedtuple
 from enum import Enum
-from typing import Tuple, Union
+from typing import NamedTuple, Tuple, Union
 
+from hdl_checker.parsers.elements.identifier import Identifier
 from hdl_checker.path import Path
 
+
+class DesignUnitType(str, Enum):
+    "Specifies tracked design unit types"
+    package = "package"
+    entity = "entity"
+    context = "context"
+
+
 BuildFlags = Tuple[str, ...]
 LibraryAndUnit = namedtuple("LibraryAndUnit", ["library", "unit"])
 
-RebuildUnit = namedtuple("RebuildUnit", ["name", "type_"])
-RebuildLibraryUnit = namedtuple("RebuildLibraryUnit", ["name", "library"])
-RebuildPath = namedtuple("RebuildPath", ["path"])
+RebuildUnit = NamedTuple(
+    "RebuildUnit", (("name", Identifier), ("type_", DesignUnitType))
+)
+RebuildLibraryUnit = NamedTuple(
+    "RebuildLibraryUnit", (("name", Identifier), ("library", Identifier))
+)
+RebuildPath = NamedTuple("RebuildPath", (("path", Path),))
 
 RebuildInfo = Union[RebuildUnit, RebuildLibraryUnit, RebuildPath]