From 75c3f850ce617b86fd1393d12638ebee32c516cc Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 6 Dec 2022 08:12:27 +0100 Subject: Here is blacks opinion. --- pyGHDL/dom/Attribute.py | 2 +- pyGHDL/dom/DesignUnit.py | 24 +++++++++-------------- pyGHDL/dom/InterfaceItem.py | 46 ++++++++++----------------------------------- pyGHDL/dom/Object.py | 10 ++++++---- pyGHDL/dom/Subprogram.py | 4 ++-- pyGHDL/dom/Type.py | 2 +- 6 files changed, 29 insertions(+), 59 deletions(-) (limited to 'pyGHDL') diff --git a/pyGHDL/dom/Attribute.py b/pyGHDL/dom/Attribute.py index 576b05245..ccd3ecf47 100644 --- a/pyGHDL/dom/Attribute.py +++ b/pyGHDL/dom/Attribute.py @@ -103,7 +103,7 @@ class AttributeSpecification(VHDLModel_AttributeSpecification, DOMMixin): attribute: Name, entityClass: EntityClass, expression: Expression, - documentation: str = None + documentation: str = None, ): super().__init__(identifiers, attribute, entityClass, expression, documentation) DOMMixin.__init__(self, node) diff --git a/pyGHDL/dom/DesignUnit.py b/pyGHDL/dom/DesignUnit.py index 853184450..47eb8e766 100644 --- a/pyGHDL/dom/DesignUnit.py +++ b/pyGHDL/dom/DesignUnit.py @@ -132,7 +132,7 @@ class Entity(VHDLModel_Entity, DOMMixin): portItems: Iterable[PortInterfaceItem] = None, declaredItems: Iterable = None, statements: Iterable["ConcurrentStatement"] = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifier, contextItems, genericItems, portItems, declaredItems, statements, documentation) DOMMixin.__init__(self, node) @@ -163,7 +163,7 @@ class Architecture(VHDLModel_Architecture, DOMMixin): contextItems: Iterable[ContextUnion] = None, declaredItems: Iterable = None, statements: Iterable["ConcurrentStatement"] = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifier, entity, contextItems, declaredItems, statements, documentation) DOMMixin.__init__(self, node) @@ -195,7 +195,7 @@ class Component(VHDLModel_Component, DOMMixin): identifier: str, genericItems: Iterable[GenericInterfaceItem] = None, portItems: Iterable[PortInterfaceItem] = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifier, genericItems, portItems, documentation) DOMMixin.__init__(self, node) @@ -219,7 +219,7 @@ class Package(VHDLModel_Package, DOMMixin): contextItems: Iterable[ContextUnion] = None, genericItems: Iterable[GenericInterfaceItem] = None, declaredItems: Iterable = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifier, contextItems, genericItems, declaredItems, documentation) DOMMixin.__init__(self, node) @@ -250,7 +250,7 @@ class PackageBody(VHDLModel_PackageBody, DOMMixin): identifier: str, contextItems: Iterable[ContextUnion] = None, declaredItems: Iterable = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifier, contextItems, declaredItems, documentation) DOMMixin.__init__(self, node) @@ -274,7 +274,7 @@ class PackageInstantiation(VHDLModel_PackageInstantiation, DOMMixin): identifier: str, uninstantiatedPackageName: Name, # genericItems: List[GenericInterfaceItem] = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifier, uninstantiatedPackageName, documentation) DOMMixin.__init__(self, node) @@ -301,7 +301,7 @@ class Context(VHDLModel_Context, DOMMixin): identifier: str, libraryReferences: Iterable[LibraryClause] = None, packageReferences: Iterable[UseClause] = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifier, libraryReferences, packageReferences, documentation) DOMMixin.__init__(self, node) @@ -335,19 +335,13 @@ class Context(VHDLModel_Context, DOMMixin): @export class Configuration(VHDLModel_Configuration, DOMMixin): - def __init__( - self, - node: Iir, - identifier: str, - contextItems: Iterable[Context] = None, - documentation: str = None - ): + def __init__(self, node: Iir, identifier: str, contextItems: Iterable[Context] = None, documentation: str = None): super().__init__(identifier, contextItems, documentation) DOMMixin.__init__(self, node) @classmethod def parse(cls, configurationNode: Iir, contextItems: Iterable[Context]): - name = GetNameOfNode(configurationNode), + name = (GetNameOfNode(configurationNode),) documentation = GetDocumentationOfNode(configurationNode) # FIXME: read use clauses diff --git a/pyGHDL/dom/InterfaceItem.py b/pyGHDL/dom/InterfaceItem.py index e42c8dcb2..fb8a1b320 100644 --- a/pyGHDL/dom/InterfaceItem.py +++ b/pyGHDL/dom/InterfaceItem.py @@ -69,7 +69,7 @@ class GenericConstantInterfaceItem(VHDLModel_GenericConstantInterfaceItem, DOMMi mode: Mode, subtype: SubtypeOrSymbol, defaultExpression: ExpressionUnion, - documentation: str = None + documentation: str = None, ): super().__init__(identifiers, mode, subtype, defaultExpression, documentation) DOMMixin.__init__(self, node) @@ -88,12 +88,7 @@ class GenericConstantInterfaceItem(VHDLModel_GenericConstantInterfaceItem, DOMMi @export class GenericTypeInterfaceItem(VHDLModel_GenericTypeInterfaceItem, DOMMixin): - def __init__( - self, - node: Iir, - identifier: str, - documentation: str = None - ): + def __init__(self, node: Iir, identifier: str, documentation: str = None): super().__init__(identifier, documentation) DOMMixin.__init__(self, node) @@ -107,12 +102,7 @@ class GenericTypeInterfaceItem(VHDLModel_GenericTypeInterfaceItem, DOMMixin): @export class GenericPackageInterfaceItem(VHDLModel_GenericPackageInterfaceItem, DOMMixin): - def __init__( - self, - node: Iir, - name: str, - documentation: str = None - ): + def __init__(self, node: Iir, name: str, documentation: str = None): super().__init__(name, documentation) DOMMixin.__init__(self, node) @@ -126,12 +116,7 @@ class GenericPackageInterfaceItem(VHDLModel_GenericPackageInterfaceItem, DOMMixi @export class GenericProcedureInterfaceItem(VHDLModel_GenericProcedureInterfaceItem, DOMMixin): - def __init__( - self, - node: Iir, - identifier: str, - documentation: str = None - ): + def __init__(self, node: Iir, identifier: str, documentation: str = None): super().__init__(identifier, documentation) DOMMixin.__init__(self, node) @@ -145,12 +130,7 @@ class GenericProcedureInterfaceItem(VHDLModel_GenericProcedureInterfaceItem, DOM @export class GenericFunctionInterfaceItem(VHDLModel_GenericFunctionInterfaceItem, DOMMixin): - def __init__( - self, - node: Iir, - identifier: str, - documentation: str = None - ): + def __init__(self, node: Iir, identifier: str, documentation: str = None): super().__init__(identifier, documentation) DOMMixin.__init__(self, node) @@ -171,7 +151,7 @@ class PortSignalInterfaceItem(VHDLModel_PortSignalInterfaceItem, DOMMixin): mode: Mode, subtype: SubtypeOrSymbol, defaultExpression: ExpressionUnion = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifiers, mode, subtype, defaultExpression, documentation) DOMMixin.__init__(self, node) @@ -198,7 +178,7 @@ class ParameterConstantInterfaceItem(VHDLModel_ParameterConstantInterfaceItem, D mode: Mode, subtype: SubtypeOrSymbol, defaultExpression: ExpressionUnion = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifiers, mode, subtype, defaultExpression, documentation) DOMMixin.__init__(self, node) @@ -225,7 +205,7 @@ class ParameterVariableInterfaceItem(VHDLModel_ParameterVariableInterfaceItem, D mode: Mode, subtype: SubtypeOrSymbol, defaultExpression: ExpressionUnion = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifiers, mode, subtype, defaultExpression, documentation) DOMMixin.__init__(self, node) @@ -252,7 +232,7 @@ class ParameterSignalInterfaceItem(VHDLModel_ParameterSignalInterfaceItem, DOMMi mode: Mode, subtype: SubtypeOrSymbol, defaultExpression: ExpressionUnion = None, - documentation: str = None + documentation: str = None, ): super().__init__(identifiers, mode, subtype, defaultExpression, documentation) DOMMixin.__init__(self, node) @@ -272,13 +252,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: SubtypeOrSymbol, documentation: str = None): super().__init__(identifiers, subtype, documentation) DOMMixin.__init__(self, node) diff --git a/pyGHDL/dom/Object.py b/pyGHDL/dom/Object.py index 1cf92179d..e3528c9db 100644 --- a/pyGHDL/dom/Object.py +++ b/pyGHDL/dom/Object.py @@ -61,13 +61,15 @@ class Constant(VHDLModel_Constant, DOMMixin): identifiers: List[str], subtype: SubtypeOrSymbol, defaultExpression: ExpressionUnion, - documentation: str = None + documentation: str = None, ): super().__init__(identifiers, subtype, defaultExpression, documentation) DOMMixin.__init__(self, node) @classmethod - def parse(cls, constantNode: Iir, furtherIdentifiers: Iterable[str] = None) -> Union["Constant", "DeferredConstant"]: + def parse( + cls, constantNode: Iir, furtherIdentifiers: Iterable[str] = None + ) -> Union["Constant", "DeferredConstant"]: from pyGHDL.dom._Translate import ( GetSubtypeIndicationFromNode, GetExpressionFromNode, @@ -116,7 +118,7 @@ class Variable(VHDLModel_Variable, DOMMixin): identifiers: List[str], subtype: SubtypeOrSymbol, defaultExpression: ExpressionUnion, - documentation: str = None + documentation: str = None, ): super().__init__(identifiers, subtype, defaultExpression, documentation) DOMMixin.__init__(self, node) @@ -170,7 +172,7 @@ class Signal(VHDLModel_Signal, DOMMixin): identifiers: List[str], subtype: SubtypeOrSymbol, defaultExpression: ExpressionUnion, - documentation: str = None + documentation: str = None, ): super().__init__(identifiers, subtype, defaultExpression, documentation) DOMMixin.__init__(self, node) diff --git a/pyGHDL/dom/Subprogram.py b/pyGHDL/dom/Subprogram.py index ba7ee035a..46ce92707 100644 --- a/pyGHDL/dom/Subprogram.py +++ b/pyGHDL/dom/Subprogram.py @@ -57,7 +57,7 @@ class Function(VHDLModel_Function, DOMMixin): returnType: SubtypeOrSymbol, genericItems: List[GenericInterfaceItem] = None, parameterItems: List[ParameterInterfaceItem] = None, - documentation: str = None + documentation: str = None, ): super().__init__(functionName, documentation) DOMMixin.__init__(self, node) @@ -95,7 +95,7 @@ class Procedure(VHDLModel_Procedure, DOMMixin): procedureName: str, genericItems: List[GenericInterfaceItem] = None, parameterItems: List[ParameterInterfaceItem] = None, - documentation: str = None + documentation: str = None, ): super().__init__(procedureName, documentation) DOMMixin.__init__(self, node) diff --git a/pyGHDL/dom/Type.py b/pyGHDL/dom/Type.py index 13362fdd6..2b71ccc3c 100644 --- a/pyGHDL/dom/Type.py +++ b/pyGHDL/dom/Type.py @@ -196,7 +196,7 @@ class RecordTypeElement(VHDLModel_RecordTypeElement, DOMMixin): if furtherIdentifiers is not None: identifiers.extend(furtherIdentifiers) - return cls(elementDeclarationNode, identifiers, elementType,) + return cls(elementDeclarationNode, identifiers, elementType) @export -- cgit v1.2.3