aboutsummaryrefslogtreecommitdiffstats
path: root/pyGHDL/dom
diff options
context:
space:
mode:
Diffstat (limited to 'pyGHDL/dom')
-rw-r--r--pyGHDL/dom/DesignUnit.py16
-rw-r--r--pyGHDL/dom/InterfaceItem.py6
-rw-r--r--pyGHDL/dom/Object.py8
-rw-r--r--pyGHDL/dom/Symbol.py2
-rw-r--r--pyGHDL/dom/_Translate.py14
-rw-r--r--pyGHDL/dom/_Utils.py2
6 files changed, 24 insertions, 24 deletions
diff --git a/pyGHDL/dom/DesignUnit.py b/pyGHDL/dom/DesignUnit.py
index 534149677..8e10aa815 100644
--- a/pyGHDL/dom/DesignUnit.py
+++ b/pyGHDL/dom/DesignUnit.py
@@ -51,7 +51,7 @@ from pyVHDLModel.VHDLModel import Configuration as VHDLModel_Configuration
from pyGHDL.libghdl.vhdl import nodes
-from pyGHDL.dom._Utils import NodeToName
+from pyGHDL.dom._Utils import GetNameOfNode
from pyGHDL.dom._Translate import (
GetGenericsFromChainedNodes,
GetPortsFromChainedNodes,
@@ -67,7 +67,7 @@ __all__ = []
class Entity(VHDLModel_Entity, GHDLMixin):
@classmethod
def parse(cls, libraryUnit):
- name = NodeToName(libraryUnit)
+ name = GetNameOfNode(libraryUnit)
entity = cls(name)
for generic in GetGenericsFromChainedNodes(
@@ -95,8 +95,8 @@ class Architecture(VHDLModel_Architecture, GHDLMixin):
@classmethod
def parse(cls, libraryUnit):
- name = NodeToName(libraryUnit)
- entityName = NodeToName(nodes.Get_Entity_Name(libraryUnit))
+ name = GetNameOfNode(libraryUnit)
+ entityName = GetNameOfNode(nodes.Get_Entity_Name(libraryUnit))
entity = EntitySymbol(entityName)
architecture = cls(name, entity)
@@ -116,7 +116,7 @@ class Architecture(VHDLModel_Architecture, GHDLMixin):
class Package(VHDLModel_Package, GHDLMixin):
@classmethod
def parse(cls, libraryUnit):
- name = NodeToName(libraryUnit)
+ name = GetNameOfNode(libraryUnit)
package = cls(name)
@@ -132,7 +132,7 @@ class Package(VHDLModel_Package, GHDLMixin):
class PackageBody(VHDLModel_PackageBody, GHDLMixin):
@classmethod
def parse(cls, libraryUnit):
- name = NodeToName(libraryUnit)
+ name = GetNameOfNode(libraryUnit)
packageBody = cls(name)
@@ -148,7 +148,7 @@ class PackageBody(VHDLModel_PackageBody, GHDLMixin):
class Context(VHDLModel_Context, GHDLMixin):
@classmethod
def parse(cls, libraryUnit):
- name = NodeToName(libraryUnit)
+ name = GetNameOfNode(libraryUnit)
return cls(name)
@@ -156,5 +156,5 @@ class Context(VHDLModel_Context, GHDLMixin):
class Configuration(VHDLModel_Configuration, GHDLMixin):
@classmethod
def parse(cls, libraryUnit):
- name = NodeToName(libraryUnit)
+ name = GetNameOfNode(libraryUnit)
return cls(name)
diff --git a/pyGHDL/dom/InterfaceItem.py b/pyGHDL/dom/InterfaceItem.py
index c2cd3a2c9..6c0d2641b 100644
--- a/pyGHDL/dom/InterfaceItem.py
+++ b/pyGHDL/dom/InterfaceItem.py
@@ -43,7 +43,7 @@ from pyVHDLModel.VHDLModel import (
Expression,
)
-from pyGHDL.dom._Utils import NodeToName, GetModeOfNode
+from pyGHDL.dom._Utils import GetNameOfNode, GetModeOfNode
from pyGHDL.dom._Translate import GetSubtypeIndicationFromNode, GetExpressionFromNode
from pyGHDL.dom.Common import GHDLMixin
@@ -54,7 +54,7 @@ __all__ = []
class GenericConstantInterfaceItem(VHDLModel_GenericConstantInterfaceItem, GHDLMixin):
@classmethod
def parse(cls, generic):
- name = NodeToName(generic)
+ name = GetNameOfNode(generic)
mode = GetModeOfNode(generic)
subTypeIndication = GetSubtypeIndicationFromNode(generic, "generic", name)
default = nodes.Get_Default_Value(generic)
@@ -80,7 +80,7 @@ class GenericConstantInterfaceItem(VHDLModel_GenericConstantInterfaceItem, GHDLM
class PortSignalInterfaceItem(VHDLModel_PortSignalInterfaceItem, GHDLMixin):
@classmethod
def parse(cls, port):
- name = NodeToName(port)
+ name = GetNameOfNode(port)
mode = GetModeOfNode(port)
subTypeIndication = GetSubtypeIndicationFromNode(port, "port", name)
diff --git a/pyGHDL/dom/Object.py b/pyGHDL/dom/Object.py
index bd37455ea..1f1f8f6d9 100644
--- a/pyGHDL/dom/Object.py
+++ b/pyGHDL/dom/Object.py
@@ -34,7 +34,7 @@ from pyGHDL.libghdl.vhdl import nodes
from pydecor import export
from pyGHDL.dom._Translate import GetSubtypeIndicationFromNode, GetExpressionFromNode
-from pyGHDL.dom._Utils import NodeToName
+from pyGHDL.dom._Utils import GetNameOfNode
from pyVHDLModel.VHDLModel import (
Constant as VHDLModel_Constant,
Variable as VHDLModel_Variable,
@@ -59,7 +59,7 @@ class Constant(VHDLModel_Constant):
@classmethod
def parse(cls, node):
- name = NodeToName(node)
+ name = GetNameOfNode(node)
subTypeIndication = GetSubtypeIndicationFromNode(node, "constant", name)
defaultExpression = GetExpressionFromNode(nodes.Get_Default_Value(node))
@@ -81,7 +81,7 @@ class Variable(VHDLModel_Variable):
@classmethod
def parse(cls, node):
- name = NodeToName(node)
+ name = GetNameOfNode(node)
subTypeIndication = GetSubtypeIndicationFromNode(node, "variable", name)
defaultExpression = GetExpressionFromNode(nodes.Get_Default_Value(node))
@@ -103,7 +103,7 @@ class Signal(VHDLModel_Signal):
@classmethod
def parse(cls, node):
- name = NodeToName(node)
+ name = GetNameOfNode(node)
subTypeIndication = GetSubtypeIndicationFromNode(node, "signal", name)
default = nodes.Get_Default_Value(node)
defaultExpression = GetExpressionFromNode(default) if default else None
diff --git a/pyGHDL/dom/Symbol.py b/pyGHDL/dom/Symbol.py
index 020f9fbc7..af9e59b1d 100644
--- a/pyGHDL/dom/Symbol.py
+++ b/pyGHDL/dom/Symbol.py
@@ -34,7 +34,7 @@ from pydecor import export
from typing import List
-from pyGHDL.dom._Utils import NodeToName
+from pyGHDL.dom._Utils import GetNameOfNode, GetIirKindOfNode
from pyVHDLModel.VHDLModel import (
EntitySymbol as VHDLModel_EntitySymbol,
SimpleSubTypeSymbol as VHDLModel_SimpleSubTypeSymbol,
diff --git a/pyGHDL/dom/_Translate.py b/pyGHDL/dom/_Translate.py
index 2445d0574..119f5816e 100644
--- a/pyGHDL/dom/_Translate.py
+++ b/pyGHDL/dom/_Translate.py
@@ -38,7 +38,7 @@ from pyVHDLModel.VHDLModel import Constraint, Direction, Expression, SubTypeOrSy
from pyGHDL.libghdl import utils
from pyGHDL.libghdl.utils import flist_iter
from pyGHDL.libghdl.vhdl import nodes
-from pyGHDL.dom._Utils import NodeToName, GetIirKindOfNode
+from pyGHDL.dom._Utils import GetNameOfNode, GetIirKindOfNode
from pyGHDL.dom.Common import DOMException
from pyGHDL.dom.Range import Range, RangeExpression
from pyGHDL.dom.Symbol import (
@@ -73,12 +73,12 @@ def GetSubtypeIndicationFromNode(node, entity: str, name: str) -> SubTypeOrSymbo
subTypeKind = GetIirKindOfNode(subTypeIndication)
if subTypeKind == nodes.Iir_Kind.Simple_Name:
- subTypeName = NodeToName(subTypeIndication)
+ subTypeName = GetNameOfNode(subTypeIndication)
subType = SimpleSubTypeSymbol(subTypeName)
elif subTypeKind == nodes.Iir_Kind.Array_Subtype_Definition:
typeMark = nodes.Get_Subtype_Type_Mark(subTypeIndication)
- typeMarkName = NodeToName(typeMark)
+ typeMarkName = GetNameOfNode(typeMark)
constraints = GetArrayConstraintsFromSubtypeIndication(subTypeIndication)
subType = ConstrainedSubTypeSymbol(typeMarkName, constraints)
@@ -247,19 +247,19 @@ def GetDeclaredItemsFromChainedNodes(nodeChain, entity: str, name: str):
result.append(Signal.parse(item))
elif kind == nodes.Iir_Kind.Anonymous_Type_Declaration:
- typeName = NodeToName(item)
+ typeName = GetNameOfNode(item)
print("found type '{name}'".format(name=typeName))
elif kind == nodes.Iir_Kind.Subtype_Declaration:
- subTypeName = NodeToName(item)
+ subTypeName = GetNameOfNode(item)
print("found subtype '{name}'".format(name=subTypeName))
elif kind == nodes.Iir_Kind.Function_Declaration:
- functionName = NodeToName(item)
+ functionName = GetNameOfNode(item)
print("found function '{name}'".format(name=functionName))
elif kind == nodes.Iir_Kind.Function_Body:
# functionName = NodeToName(item)
print("found function body '{name}'".format(name="????"))
elif kind == nodes.Iir_Kind.Object_Alias_Declaration:
- aliasName = NodeToName(item)
+ aliasName = GetNameOfNode(item)
print("found alias '{name}'".format(name=aliasName))
else:
raise DOMException(
diff --git a/pyGHDL/dom/_Utils.py b/pyGHDL/dom/_Utils.py
index dbbb69e81..b5cf1fc5c 100644
--- a/pyGHDL/dom/_Utils.py
+++ b/pyGHDL/dom/_Utils.py
@@ -56,7 +56,7 @@ def GetIirKindOfNode(node) -> nodes.Iir_Kind:
@export
-def NodeToName(node) -> str:
+def GetNameOfNode(node) -> str:
"""Return the python string from node :obj:`node` identifier"""
identifier = nodes.Get_Identifier(node)
return name_table.Get_Name_Ptr(identifier)
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 04:23:24 +0000