From 71a7c3b1102b888f0560de64d9efaa48d8a3738f Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 29 Dec 2020 00:46:41 +0100 Subject: Fixed package names in pyGHDL.dom and Initialize test case. --- pyGHDL/dom/Common.py | 4 ++-- pyGHDL/dom/DesignUnit.py | 5 +++-- pyGHDL/dom/Misc.py | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'pyGHDL/dom') diff --git a/pyGHDL/dom/Common.py b/pyGHDL/dom/Common.py index 8baa6537e..0cd41c99e 100644 --- a/pyGHDL/dom/Common.py +++ b/pyGHDL/dom/Common.py @@ -2,8 +2,8 @@ from pydecor import export from pyVHDLModel.VHDLModel import Modes -from libghdl.thin import name_table -from libghdl.thin.vhdl import nodes +from pyGHDL.libghdl import name_table +from pyGHDL.libghdl.vhdl import nodes __all__ = [] __api__ = __all__ diff --git a/pyGHDL/dom/DesignUnit.py b/pyGHDL/dom/DesignUnit.py index 894651c2c..3e87bb41a 100644 --- a/pyGHDL/dom/DesignUnit.py +++ b/pyGHDL/dom/DesignUnit.py @@ -7,9 +7,10 @@ from pyVHDLModel.VHDLModel import PackageBody as VHDLModel_PackageBody from pyVHDLModel.VHDLModel import Context as VHDLModel_Context from pyVHDLModel.VHDLModel import Configuration as VHDLModel_Configuration -from libghdl.thin.vhdl import nodes, pyutils +from pyGHDL.libghdl.vhdl import nodes +import pyGHDL.libghdl.utils as pyutils -from pyGHDL.dom.Common import GHDLMixin +from pyGHDL.dom.Common import GHDLMixin __all__ = [] __api__ = __all__ diff --git a/pyGHDL/dom/Misc.py b/pyGHDL/dom/Misc.py index 8493028de..af8c6247a 100644 --- a/pyGHDL/dom/Misc.py +++ b/pyGHDL/dom/Misc.py @@ -7,9 +7,9 @@ from pyVHDLModel.VHDLModel import Design as VHDLModel_Design from pyVHDLModel.VHDLModel import Library as VHDLModel_Library from pyVHDLModel.VHDLModel import Document as VHDLModel_Document -import libghdl -from libghdl.thin import name_table, files_map, errorout_console -from libghdl.thin.vhdl import nodes, sem_lib +import pyGHDL.libghdl as libghdl +from pyGHDL.libghdl import name_table, files_map, errorout_console +from pyGHDL.libghdl.vhdl import nodes, sem_lib from pyGHDL.dom.Common import LibGHDLException, GHDLException from pyGHDL.dom.DesignUnit import Entity, Architecture, Package, PackageBody, Context, Configuration -- cgit v1.2.3