From fb7ef864c019d325f3fc37125e6d6cdc50ae4b83 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Thu, 12 Jan 2023 05:53:48 +0100 Subject: Dependency Graphs (#2308) * Further fixes to the example code. * Bumped dependencies. * Fixed Debouncer example code. * Some more cleanup. * Black's opinion. * Run with pyVHDLModel dev-branch. * Fixed imports for Name. * Fixed test case. * Added a formatter to write dependency graphs and hierarchy as graphml. * Improved GraphML formatting. * Write compile order graph. * Computing compile order. * Bumped dependencies. * Black's opinion. * Fixed incorrect dependency. --- pyGHDL/dom/InterfaceItem.py | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'pyGHDL/dom/InterfaceItem.py') diff --git a/pyGHDL/dom/InterfaceItem.py b/pyGHDL/dom/InterfaceItem.py index 44b67a79c..25128772f 100644 --- a/pyGHDL/dom/InterfaceItem.py +++ b/pyGHDL/dom/InterfaceItem.py @@ -34,21 +34,18 @@ from typing import List, Iterable from pyTooling.Decorators import export -from pyVHDLModel.SyntaxModel import ( - GenericConstantInterfaceItem as VHDLModel_GenericConstantInterfaceItem, - GenericTypeInterfaceItem as VHDLModel_GenericTypeInterfaceItem, - GenericPackageInterfaceItem as VHDLModel_GenericPackageInterfaceItem, - GenericProcedureInterfaceItem as VHDLModel_GenericProcedureInterfaceItem, - GenericFunctionInterfaceItem as VHDLModel_GenericFunctionInterfaceItem, - PortSignalInterfaceItem as VHDLModel_PortSignalInterfaceItem, - ParameterConstantInterfaceItem as VHDLModel_ParameterConstantInterfaceItem, - ParameterVariableInterfaceItem as VHDLModel_ParameterVariableInterfaceItem, - ParameterSignalInterfaceItem as VHDLModel_ParameterSignalInterfaceItem, - ParameterFileInterfaceItem as VHDLModel_ParameterFileInterfaceItem, - Mode, - SubtypeOrSymbol, - ExpressionUnion, -) +from pyVHDLModel.Base import Mode, ExpressionUnion +from pyVHDLModel.Symbol import Symbol +from pyVHDLModel.Interface import GenericConstantInterfaceItem as VHDLModel_GenericConstantInterfaceItem +from pyVHDLModel.Interface import GenericTypeInterfaceItem as VHDLModel_GenericTypeInterfaceItem +from pyVHDLModel.Interface import GenericProcedureInterfaceItem as VHDLModel_GenericProcedureInterfaceItem +from pyVHDLModel.Interface import GenericFunctionInterfaceItem as VHDLModel_GenericFunctionInterfaceItem +from pyVHDLModel.Interface import GenericPackageInterfaceItem as VHDLModel_GenericPackageInterfaceItem +from pyVHDLModel.Interface import PortSignalInterfaceItem as VHDLModel_PortSignalInterfaceItem +from pyVHDLModel.Interface import ParameterConstantInterfaceItem as VHDLModel_ParameterConstantInterfaceItem +from pyVHDLModel.Interface import ParameterVariableInterfaceItem as VHDLModel_ParameterVariableInterfaceItem +from pyVHDLModel.Interface import ParameterSignalInterfaceItem as VHDLModel_ParameterSignalInterfaceItem +from pyVHDLModel.Interface import ParameterFileInterfaceItem as VHDLModel_ParameterFileInterfaceItem from pyGHDL.libghdl._types import Iir from pyGHDL.libghdl.vhdl import nodes @@ -64,7 +61,7 @@ class GenericConstantInterfaceItem(VHDLModel_GenericConstantInterfaceItem, DOMMi node: Iir, identifiers: List[str], mode: Mode, - subtype: SubtypeOrSymbol, + subtype: Symbol, defaultExpression: ExpressionUnion, documentation: str = None, ): @@ -149,7 +146,7 @@ class PortSignalInterfaceItem(VHDLModel_PortSignalInterfaceItem, DOMMixin): node: Iir, identifiers: List[str], mode: Mode, - subtype: SubtypeOrSymbol, + subtype: Symbol, defaultExpression: ExpressionUnion = None, documentation: str = None, ): @@ -179,7 +176,7 @@ class ParameterConstantInterfaceItem(VHDLModel_ParameterConstantInterfaceItem, D node: Iir, identifiers: List[str], mode: Mode, - subtype: SubtypeOrSymbol, + subtype: Symbol, defaultExpression: ExpressionUnion = None, documentation: str = None, ): @@ -209,7 +206,7 @@ class ParameterVariableInterfaceItem(VHDLModel_ParameterVariableInterfaceItem, D node: Iir, identifiers: List[str], mode: Mode, - subtype: SubtypeOrSymbol, + subtype: Symbol, defaultExpression: ExpressionUnion = None, documentation: str = None, ): @@ -239,7 +236,7 @@ class ParameterSignalInterfaceItem(VHDLModel_ParameterSignalInterfaceItem, DOMMi node: Iir, identifiers: List[str], mode: Mode, - subtype: SubtypeOrSymbol, + subtype: Symbol, defaultExpression: ExpressionUnion = None, documentation: str = None, ): @@ -264,7 +261,7 @@ class ParameterSignalInterfaceItem(VHDLModel_ParameterSignalInterfaceItem, DOMMi @export class ParameterFileInterfaceItem(VHDLModel_ParameterFileInterfaceItem, DOMMixin): - def __init__(self, node: Iir, identifiers: List[str], subtype: SubtypeOrSymbol, documentation: str = None): + def __init__(self, node: Iir, identifiers: List[str], subtype: Symbol, documentation: str = None): super().__init__(identifiers, subtype, documentation) DOMMixin.__init__(self, node) -- cgit v1.2.3