From 9d920a551e9108d9ddc99c87e8f2f5f8744ff418 Mon Sep 17 00:00:00 2001
From: Patrick Lehmann <Patrick.Lehmann@plc2.de>
Date: Sat, 15 Apr 2023 18:38:14 +0200
Subject: Fixes due to errors reported by unit tests.

---
 pyGHDL/dom/Attribute.py  | 2 +-
 pyGHDL/dom/Expression.py | 4 ++--
 pyGHDL/dom/Type.py       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyGHDL/dom/Attribute.py b/pyGHDL/dom/Attribute.py
index 08295817d..46ea109aa 100644
--- a/pyGHDL/dom/Attribute.py
+++ b/pyGHDL/dom/Attribute.py
@@ -63,7 +63,7 @@ class Attribute(VHDLModel_Attribute, DOMMixin):
         subtypeMark = nodes.Get_Type_Mark(attributeNode)
         subtypeName = GetNameOfNode(subtypeMark)
 
-        subtype = SimpleSubtypeSymbol(subtypeMark, SimpleName(subtypeName))
+        subtype = SimpleSubtypeSymbol(subtypeMark, SimpleName(subtypeMark, subtypeName))
         return cls(attributeNode, name, subtype, documentation)
 
 
diff --git a/pyGHDL/dom/Expression.py b/pyGHDL/dom/Expression.py
index 0d8dbfba7..532a1c9ed 100644
--- a/pyGHDL/dom/Expression.py
+++ b/pyGHDL/dom/Expression.py
@@ -439,9 +439,9 @@ class QualifiedExpression(VHDLModel_QualifiedExpression, DOMMixin):
 
     @classmethod
     def parse(cls, node: Iir) -> "QualifiedExpression":
-        from pyGHDL.dom._Translate import GetExpressionFromNode, GetNameOfNode
+        from pyGHDL.dom._Translate import GetExpressionFromNode, GetName
 
-        typeMarkName = GetNameOfNode(nodes.Get_Type_Mark(node))
+        typeMarkName = GetName(nodes.Get_Type_Mark(node))
         subtype = SimpleSubtypeSymbol(node, typeMarkName)
         operand = GetExpressionFromNode(nodes.Get_Expression(node))
         return cls(node, subtype, operand)
diff --git a/pyGHDL/dom/Type.py b/pyGHDL/dom/Type.py
index 98dab3af0..b0102217c 100644
--- a/pyGHDL/dom/Type.py
+++ b/pyGHDL/dom/Type.py
@@ -314,7 +314,7 @@ class FileType(VHDLModel_FileType, DOMMixin):
 
         designatedSubtypeMark = nodes.Get_File_Type_Mark(typeDefinitionNode)
         designatedSubtypeName = GetNameOfNode(designatedSubtypeMark)
-        designatedSubtype = SimpleSubtypeSymbol(typeDefinitionNode, SimpleName(designatedSubtypeName))
+        designatedSubtype = SimpleSubtypeSymbol(typeDefinitionNode, SimpleName(designatedSubtypeMark, designatedSubtypeName))
 
         return cls(typeDefinitionNode, typeName, designatedSubtype)
 
-- 
cgit v1.2.3