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/Object.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'pyGHDL/dom/Object.py') diff --git a/pyGHDL/dom/Object.py b/pyGHDL/dom/Object.py index 953fae02a..f1028c305 100644 --- a/pyGHDL/dom/Object.py +++ b/pyGHDL/dom/Object.py @@ -34,16 +34,14 @@ from typing import Union, List, Iterable from pyTooling.Decorators import export -from pyVHDLModel.SyntaxModel import ( - Constant as VHDLModel_Constant, - DeferredConstant as VHDLModel_DeferredConstant, - Variable as VHDLModel_Variable, - SharedVariable as VHDLModel_SharedVariable, - Signal as VHDLModel_Signal, - File as VHDLModel_File, - ExpressionUnion, - SubtypeOrSymbol, -) +from pyVHDLModel.Base import ExpressionUnion +from pyVHDLModel.Symbol import Symbol +from pyVHDLModel.Object import Constant as VHDLModel_Constant +from pyVHDLModel.Object import DeferredConstant as VHDLModel_DeferredConstant +from pyVHDLModel.Object import Variable as VHDLModel_Variable +from pyVHDLModel.Object import SharedVariable as VHDLModel_SharedVariable +from pyVHDLModel.Object import Signal as VHDLModel_Signal +from pyVHDLModel.Object import File as VHDLModel_File from pyGHDL.libghdl._types import Iir from pyGHDL.libghdl.vhdl import nodes @@ -57,7 +55,7 @@ class Constant(VHDLModel_Constant, DOMMixin): self, node: Iir, identifiers: List[str], - subtype: SubtypeOrSymbol, + subtype: Symbol, defaultExpression: ExpressionUnion, documentation: str = None, ): @@ -90,7 +88,7 @@ class Constant(VHDLModel_Constant, DOMMixin): @export class DeferredConstant(VHDLModel_DeferredConstant, 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) @@ -114,7 +112,7 @@ class Variable(VHDLModel_Variable, DOMMixin): self, node: Iir, identifiers: List[str], - subtype: SubtypeOrSymbol, + subtype: Symbol, defaultExpression: ExpressionUnion, documentation: str = None, ): @@ -144,7 +142,7 @@ class Variable(VHDLModel_Variable, DOMMixin): @export class SharedVariable(VHDLModel_SharedVariable, 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) @@ -168,7 +166,7 @@ class Signal(VHDLModel_Signal, DOMMixin): self, node: Iir, identifiers: List[str], - subtype: SubtypeOrSymbol, + subtype: Symbol, defaultExpression: ExpressionUnion, documentation: str = None, ): @@ -196,7 +194,7 @@ class Signal(VHDLModel_Signal, DOMMixin): @export class File(VHDLModel_File, 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