Handle component declarations.

4 files changed, 68 insertions, 24 deletions

diff --git a/pyGHDL/dom/DesignUnit.py b/pyGHDL/dom/DesignUnit.py
index 8e10aa815..53cc03395 100644
--- a/pyGHDL/dom/DesignUnit.py
+++ b/pyGHDL/dom/DesignUnit.py
@@ -39,24 +39,25 @@ This module contains all DOM classes for VHDL's design units (:class:`context <E
 
 
 """
+from pyGHDL.libghdl._types import Iir
 from pydecor import export
 
-from pyGHDL.dom.Symbol import EntitySymbol
-from pyVHDLModel.VHDLModel import Entity as VHDLModel_Entity, EntityOrSymbol
-from pyVHDLModel.VHDLModel import Architecture as VHDLModel_Architecture
-from pyVHDLModel.VHDLModel import Package as VHDLModel_Package
-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 pyVHDLModel.VHDLModel import (Entity as VHDLModel_Entity, EntityOrSymbol,
+ Architecture as VHDLModel_Architecture,
+ Package as VHDLModel_Package,
+ PackageBody as VHDLModel_PackageBody,
+ Context as VHDLModel_Context,
+Configuration as VHDLModel_Configuration,
+Component as VHDLModel_Component)
 
 from pyGHDL.libghdl.vhdl import nodes
-
 from pyGHDL.dom._Utils import GetNameOfNode
 from pyGHDL.dom._Translate import (
     GetGenericsFromChainedNodes,
     GetPortsFromChainedNodes,
     GetDeclaredItemsFromChainedNodes,
 )
+from pyGHDL.dom.Symbol import EntitySymbol
 from pyGHDL.dom.Common import GHDLMixin
 
 
@@ -66,20 +67,20 @@ __all__ = []
 @export
 class Entity(VHDLModel_Entity, GHDLMixin):
     @classmethod
-    def parse(cls, libraryUnit):
-        name = GetNameOfNode(libraryUnit)
+    def parse(cls, entityNode: Iir):
+        name = GetNameOfNode(entityNode)
         entity = cls(name)
 
         for generic in GetGenericsFromChainedNodes(
-            nodes.Get_Generic_Chain(libraryUnit)
+            nodes.Get_Generic_Chain(entityNode)
         ):
             entity.GenericItems.append(generic)
 
-        for port in GetPortsFromChainedNodes(nodes.Get_Port_Chain(libraryUnit)):
+        for port in GetPortsFromChainedNodes(nodes.Get_Port_Chain(entityNode)):
             entity.PortItems.append(port)
 
         for item in GetDeclaredItemsFromChainedNodes(
-            nodes.Get_Declaration_Chain(libraryUnit), "entity", name
+            nodes.Get_Declaration_Chain(entityNode), "entity", name
         ):
             entity.DeclaredItems.append(item)
 
@@ -94,15 +95,15 @@ class Architecture(VHDLModel_Architecture, GHDLMixin):
         self._entity = entity
 
     @classmethod
-    def parse(cls, libraryUnit):
-        name = GetNameOfNode(libraryUnit)
-        entityName = GetNameOfNode(nodes.Get_Entity_Name(libraryUnit))
+    def parse(cls, architectureNode: Iir):
+        name = GetNameOfNode(architectureNode)
+        entityName = GetNameOfNode(nodes.Get_Entity_Name(architectureNode))
         entity = EntitySymbol(entityName)
 
         architecture = cls(name, entity)
 
         for item in GetDeclaredItemsFromChainedNodes(
-            nodes.Get_Declaration_Chain(libraryUnit), "architecture", name
+            nodes.Get_Declaration_Chain(architectureNode), "architecture", name
         ):
             architecture.DeclaredItems.append(item)
 
@@ -113,9 +114,28 @@ class Architecture(VHDLModel_Architecture, GHDLMixin):
 
 
 @export
+class Component(VHDLModel_Component):
+    @classmethod
+    def parse(cls, componentNode: Iir):
+        name = GetNameOfNode(componentNode)
+
+        component = cls(name)
+
+        for generic in GetGenericsFromChainedNodes(
+            nodes.Get_Generic_Chain(componentNode)
+        ):
+            component.GenericItems.append(generic)
+
+        for port in GetPortsFromChainedNodes(nodes.Get_Port_Chain(componentNode)):
+            component.PortItems.append(port)
+
+        return component
+
+
+@export
 class Package(VHDLModel_Package, GHDLMixin):
     @classmethod
-    def parse(cls, libraryUnit):
+    def parse(cls, libraryUnit: Iir):
         name = GetNameOfNode(libraryUnit)
 
         package = cls(name)
@@ -131,7 +151,7 @@ class Package(VHDLModel_Package, GHDLMixin):
 @export
 class PackageBody(VHDLModel_PackageBody, GHDLMixin):
     @classmethod
-    def parse(cls, libraryUnit):
+    def parse(cls, libraryUnit: Iir):
         name = GetNameOfNode(libraryUnit)
 
         packageBody = cls(name)
@@ -147,7 +167,7 @@ class PackageBody(VHDLModel_PackageBody, GHDLMixin):
 @export
 class Context(VHDLModel_Context, GHDLMixin):
     @classmethod
-    def parse(cls, libraryUnit):
+    def parse(cls, libraryUnit: Iir):
         name = GetNameOfNode(libraryUnit)
         return cls(name)
 
@@ -155,6 +175,6 @@ class Context(VHDLModel_Context, GHDLMixin):
 @export
 class Configuration(VHDLModel_Configuration, GHDLMixin):
     @classmethod
-    def parse(cls, libraryUnit):
+    def parse(cls, libraryUnit: Iir):
         name = GetNameOfNode(libraryUnit)
         return cls(name)
diff --git a/pyGHDL/dom/Literal.py b/pyGHDL/dom/Literal.py
index 334355b35..78f3f279a 100644
--- a/pyGHDL/dom/Literal.py
+++ b/pyGHDL/dom/Literal.py
@@ -30,6 +30,7 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 # ============================================================================
+from pyGHDL.dom._Utils import GetIirKindOfNode
 from pyGHDL.libghdl import name_table
 
 from pyGHDL.libghdl.vhdl import nodes
diff --git a/pyGHDL/dom/_Translate.py b/pyGHDL/dom/_Translate.py
index e1770672d..e29a9f827 100644
--- a/pyGHDL/dom/_Translate.py
+++ b/pyGHDL/dom/_Translate.py
@@ -34,7 +34,6 @@ from typing import List
 
 from pydecor import export
 
-from pyGHDL.dom.Misc import Alias
 from pyVHDLModel.VHDLModel import (
     Constraint,
     Direction,
@@ -97,6 +96,7 @@ from pyGHDL.dom.Expression import (
     RotateRightExpression,
 )
 from pyGHDL.dom.Subprogram import Function
+from pyGHDL.dom.Misc import Alias
 
 
 __all__ = []
@@ -313,6 +313,10 @@ def GetDeclaredItemsFromChainedNodes(nodeChain: Iir, entity: str, name: str):
             print("found function body '{name}'".format(name="????"))
         elif kind == nodes.Iir_Kind.Object_Alias_Declaration:
             result.append(GetAliasFromNode(item))
+        elif kind == nodes.Iir_Kind.Component_Declaration:
+            from pyGHDL.dom.DesignUnit import Component
+
+            result.append(Component.parse(item))
         else:
             raise DOMException(
                 "Unknown declared item kind '{kindName}'({kind}) in {entity} '{name}'.".format(
diff --git a/pyGHDL/dom/formatting/prettyprint.py b/pyGHDL/dom/formatting/prettyprint.py
index afbcbb851..7d07abcfe 100644
--- a/pyGHDL/dom/formatting/prettyprint.py
+++ b/pyGHDL/dom/formatting/prettyprint.py
@@ -8,7 +8,8 @@ from pyVHDLModel.VHDLModel import (
     GenericInterfaceItem,
     NamedEntity,
     PortInterfaceItem,
-    WithDefaultExpression, Function,
+    WithDefaultExpression,
+    Function,
 )
 
 from pyGHDL import GHDLBaseException
@@ -19,7 +20,7 @@ from pyGHDL.dom.DesignUnit import (
     Package,
     PackageBody,
     Configuration,
-    Context,
+    Context, Component,
 )
 from pyGHDL.dom.Object import Constant, Signal
 from pyGHDL.dom.InterfaceItem import (
@@ -163,6 +164,21 @@ class PrettyPrint:
 
         return buffer
 
+    def formatComponent(self, component: Component, level: int = 0) -> StringBuffer:
+        buffer = []
+        prefix = "  " * level
+        buffer.append("{prefix}- Component: {name}".format(name=component.Name, prefix=prefix))
+        buffer.append("{prefix}  Generics:".format(prefix=prefix))
+        for generic in component.GenericItems:
+            for line in self.formatGeneric(generic, level + 1):
+                buffer.append(line)
+        buffer.append("{prefix}  Ports:".format(prefix=prefix))
+        for port in component.PortItems:
+            for line in self.formatPort(port, level + 1):
+                buffer.append(line)
+
+        return buffer
+
     def formatPackage(self, package: Package, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
@@ -326,6 +342,9 @@ class PrettyPrint:
                     name=item.Name,
                 )
             )
+        elif isinstance(item, Component):
+            for line in self.formatComponent(item, level):
+                buffer.append(line)
         else:
             raise PrettyPrintException("Unhandled declared item kind.")