Converted string formatting to f-strings.

11 files changed, 128 insertions, 455 deletions

diff --git a/pyGHDL/dom/Attribute.py b/pyGHDL/dom/Attribute.py
index 3b3f3b40e..808f0a6a3 100644
--- a/pyGHDL/dom/Attribute.py
+++ b/pyGHDL/dom/Attribute.py
@@ -121,30 +121,14 @@ class AttributeSpecification(VHDLModel_AttributeSpecification, DOMMixin):
                 print("[NOT IMPLEMENTED] Signature name in attribute specifications.")
             else:
                 position = Position.parse(name)
-                raise DOMException(
-                    "Unknown name kind '{kind}' in attribute specification '{attr}' at {file}:{line}:{column}.".format(
-                        kind=nameKind.name,
-                        attr=attributeNode,
-                        file=position.Filename,
-                        line=position.Line,
-                        column=position.Column,
-                    )
-                )
+                raise DOMException(f"Unknown name kind '{nameKind.name}' in attribute specification '{attributeNode}' at {position.Filename}:{position.Line}:{position.Column}.")
 
         entityClassToken = nodes.Get_Entity_Class(attributeNode)
         try:
             entityClass = _TOKEN_TRANSLATION[entityClassToken]
         except KeyError:
             position = Position.parse(attributeNode)
-            raise DOMException(
-                "Unknown token '{token}' in attribute specification for entity class '{entityClass}' at {file}:{line}:{column}.".format(
-                    token=entityClassToken.name,
-                    entityClass=attributeNode,
-                    file=position.Filename,
-                    line=position.Line,
-                    column=position.Column,
-                )
-            )
+            raise DOMException(f"Unknown token '{entityClassToken.name}' in attribute specification for entity class '{attributeNode}' at {position.Filename}:{position.Line}:{position.Column}.")
 
         expression = GetExpressionFromNode(nodes.Get_Expression(attributeNode))
 
diff --git a/pyGHDL/dom/Concurrent.py b/pyGHDL/dom/Concurrent.py
index f1f545d53..754f58f14 100644
--- a/pyGHDL/dom/Concurrent.py
+++ b/pyGHDL/dom/Concurrent.py
@@ -552,11 +552,7 @@ class CaseGenerateStatement(VHDLModel_CaseGenerateStatement, DOMMixin):
                     rng = GetNameFromNode(choiceRange)
                 else:
                     pos = Position.parse(alternative)
-                    raise DOMException(
-                        "Unknown choice range kind '{kind}' in case...generate statement at line {line}.".format(
-                            kind=choiceRangeKind.name, line=pos.Line
-                        )
-                    )
+                    raise DOMException(f"Unknown choice range kind '{choiceRangeKind.name}' in case...generate statement at line {pos.Line}.")
 
                 choice = RangedGenerateChoice(alternative, rng)
                 if sameAlternative:
@@ -573,11 +569,7 @@ class CaseGenerateStatement(VHDLModel_CaseGenerateStatement, DOMMixin):
                 continue
             else:
                 pos = Position.parse(alternative)
-                raise DOMException(
-                    "Unknown choice kind '{kind}' in case...generate statement at line {line}.".format(
-                        kind=choiceKind.name, line=pos.Line
-                    )
-                )
+                raise DOMException(f"Unknown choice kind '{choiceKind.name}' in case...generate statement at line {pos.Line}.")
 
             if choices is not None:
                 cases.append(GenerateCase.parse(caseNode, choices))
@@ -633,11 +625,7 @@ class ForGenerateStatement(VHDLModel_ForGenerateStatement, DOMMixin):
             rng = GetNameFromNode(discreteRange)
         else:
             pos = Position.parse(generateNode)
-            raise DOMException(
-                "Unknown discete range kind '{kind}' in for...generate statement at line {line}.".format(
-                    kind=rangeKind.name, line=pos.Line
-                )
-            )
+            raise DOMException(f"Unknown discete range kind '{rangeKind.name}' in for...generate statement at line {pos.Line}.")
 
         body = nodes.Get_Generate_Statement_Body(generateNode)
         declarationChain = nodes.Get_Declaration_Chain(body)
diff --git a/pyGHDL/dom/DesignUnit.py b/pyGHDL/dom/DesignUnit.py
index 3c0d2ab0c..f45cb8340 100644
--- a/pyGHDL/dom/DesignUnit.py
+++ b/pyGHDL/dom/DesignUnit.py
@@ -314,11 +314,7 @@ class Context(VHDLModel_Context, DOMMixin):
                 items.append(UseClause.parse(item))
             else:
                 pos = Position.parse(item)
-                raise DOMException(
-                    "Unknown context item kind '{kind}' in context at line {line}.".format(
-                        kind=kind.name, line=pos.Line
-                    )
-                )
+                raise DOMException(f"Unknown context item kind '{kind.name}' in context at line {pos.Line}.")
 
         return cls(contextNode, name, items)
 
diff --git a/pyGHDL/dom/Expression.py b/pyGHDL/dom/Expression.py
index f68ab0d51..f56ca148f 100644
--- a/pyGHDL/dom/Expression.py
+++ b/pyGHDL/dom/Expression.py
@@ -519,11 +519,7 @@ class Aggregate(VHDLModel_Aggregate, DOMMixin):
                     rng = GetNameFromNode(choiceRange)
                 else:
                     pos = Position.parse(item)
-                    raise DOMException(
-                        "Unknown discete range kind '{kind}' in for...generate statement at line {line}.".format(
-                            kind=rangeKind.name, line=pos.Line
-                        )
-                    )
+                    raise DOMException(f"Unknown discete range kind '{rangeKind.name}' in for...generate statement at line {pos.Line}.")
 
                 choices.append(RangedAggregateElement(item, rng, value))
             elif kind == nodes.Iir_Kind.Choice_By_Name:
@@ -533,8 +529,6 @@ class Aggregate(VHDLModel_Aggregate, DOMMixin):
             elif kind == nodes.Iir_Kind.Choice_By_Others:
                 choices.append(OthersAggregateElement(item, value))
             else:
-                raise DOMException(
-                    "Unknown choice kind '{kind}' in aggregate '{aggr}'.".format(kind=kind.name, aggr=node)
-                )
+                raise DOMException(f"Unknown choice kind '{kind.name}' in aggregate '{node}'.")
 
         return cls(node, choices)
diff --git a/pyGHDL/dom/NonStandard.py b/pyGHDL/dom/NonStandard.py
index 4e842f012..e6af8284a 100644
--- a/pyGHDL/dom/NonStandard.py
+++ b/pyGHDL/dom/NonStandard.py
@@ -191,11 +191,7 @@ class Document(VHDLModel_Document):
                         contextItems.append(ContextReference.parse(item))
                     else:
                         pos = Position.parse(item)
-                        raise DOMException(
-                            "Unknown context item kind '{kind}' in context at line {line}.".format(
-                                kind=itemKind.name, line=pos.Line
-                            )
-                        )
+                        raise DOMException(f"Unknown context item kind '{itemKind.name}' in context at line {pos.Line}.")
 
             if nodeKind == nodes.Iir_Kind.Entity_Declaration:
                 entity = Entity.parse(libraryUnit, contextItems)
@@ -238,7 +234,7 @@ class Document(VHDLModel_Document):
                 self.VerificationModes.append(vmod)
 
             else:
-                raise DOMException("Unknown design unit kind '{kind}'.".format(kind=nodeKind.name))
+                raise DOMException(f"Unknown design unit kind '{nodeKind.name}'.")
 
     @property
     def LibGHDLProcessingTime(self) -> float:
diff --git a/pyGHDL/dom/Sequential.py b/pyGHDL/dom/Sequential.py
index 35f7b0d4f..3e9ebaf48 100644
--- a/pyGHDL/dom/Sequential.py
+++ b/pyGHDL/dom/Sequential.py
@@ -291,11 +291,7 @@ class CaseStatement(VHDLModel_CaseStatement, DOMMixin):
                     rng = GetNameFromNode(choiceRange)
                 else:
                     pos = Position.parse(alternative)
-                    raise DOMException(
-                        "Unknown choice range kind '{kind}' in case statement at line {line}.".format(
-                            kind=choiceRangeKind.name, line=pos.Line
-                        )
-                    )
+                    raise DOMException(f"Unknown choice range kind '{choiceRangeKind.name}' in case statement at line {pos.Line}.")
 
                 choice = RangedChoice(alternative, rng)
                 if sameAlternative:
@@ -312,11 +308,7 @@ class CaseStatement(VHDLModel_CaseStatement, DOMMixin):
                 continue
             else:
                 pos = Position.parse(alternative)
-                raise DOMException(
-                    "Unknown choice kind '{kind}' in case statement at line {line}.".format(
-                        kind=choiceKind.name, line=pos.Line
-                    )
-                )
+                raise DOMException(f"Unknown choice kind '{choiceKind.name}' in case statement at line {pos.Line}.")
 
             if choices is not None:
                 cases.append(Case.parse(cNode, choices, label))
@@ -370,11 +362,7 @@ class ForLoopStatement(VHDLModel_ForLoopStatement, DOMMixin):
             rng = GetNameFromNode(discreteRange)
         else:
             pos = Position.parse(loopNode)
-            raise DOMException(
-                "Unknown discete range kind '{kind}' in for...loop statement at line {line}.".format(
-                    kind=rangeKind.name, line=pos.Line
-                )
-            )
+            raise DOMException(f"Unknown discete range kind '{rangeKind.name}' in for...loop statement at line {pos.Line}.")
 
         statementChain = nodes.Get_Sequential_Statement_Chain(loopNode)
         statements = GetSequentialStatementsFromChainedNodes(statementChain, "for", label)
diff --git a/pyGHDL/dom/Type.py b/pyGHDL/dom/Type.py
index ba039852c..6724ac743 100644
--- a/pyGHDL/dom/Type.py
+++ b/pyGHDL/dom/Type.py
@@ -128,11 +128,7 @@ class PhysicalType(VHDLModel_PhysicalType, DOMMixin):
             rng = GetNameFromNode(rangeConstraint)
         else:
             pos = Position.parse(typeDefinitionNode)
-            raise DOMException(
-                "Unknown range kind '{kind}' in physical type definition at line {line}.".format(
-                    kind=rangeKind.name, line=pos.Line
-                )
-            )
+            raise DOMException(f"Unknown range kind '{rangeKind.name}' in physical type definition at line {pos.Line}.")
 
         primaryUnit = nodes.Get_Primary_Unit(typeDefinitionNode)
         primaryUnitName = GetNameOfNode(primaryUnit)
@@ -172,11 +168,7 @@ class ArrayType(VHDLModel_ArrayType, DOMMixin):
                 indexSubtype = GetSimpleTypeFromNode(index)
                 indices.append(indexSubtype)
             else:
-                raise DOMException(
-                    "Unknown kind '{kind}' for an index in the array definition of `{typeName}`.".format(
-                        kind=indexKind.name, typeName=typeName
-                    )
-                )
+                raise DOMException(f"Unknown kind '{indexKind.name}' for an index in the array definition of `{typeName}`.")
 
         elementSubtypeIndication = nodes.Get_Element_Subtype_Indication(typeDefinitionNode)
         elementSubtype = GetSubtypeIndicationFromIndicationNode(elementSubtypeIndication, "array declaration", typeName)
diff --git a/pyGHDL/dom/_Translate.py b/pyGHDL/dom/_Translate.py
index 2f4a90343..7e21b98bf 100644
--- a/pyGHDL/dom/_Translate.py
+++ b/pyGHDL/dom/_Translate.py
@@ -199,7 +199,7 @@ def GetNameFromNode(node: Iir) -> Name:
         prefixName = GetNameFromNode(nodes.Get_Prefix(node))
         return AllName(node, prefixName)
     else:
-        raise DOMException("Unknown name kind '{kind}'".format(kind=kind.name))
+        raise DOMException(f"Unknown name kind '{kind.name}'")
 
 
 def GetAssociations(node: Iir) -> List:
@@ -216,11 +216,7 @@ def GetAssociations(node: Iir) -> List:
 
             associations.append(expr)
         else:
-            raise DOMException(
-                "Unknown association kind '{kind}' in array index/slice or function call '{node}'.".format(
-                    kind=kind.name, node=node
-                )
-            )
+            raise DOMException(f"Unknown association kind '{kind.name}' in array index/slice or function call '{node}'.")
 
     return associations
 
@@ -243,16 +239,7 @@ def GetArrayConstraintsFromSubtypeIndication(
             constraints.append(GetNameFromNode(constraint))
         else:
             position = Position.parse(constraint)
-            raise DOMException(
-                "Unknown constraint kind '{kind}' for constraint '{constraint}' in subtype indication '{indication}' at {file}:{line}:{column}.".format(
-                    kind=constraintKind.name,
-                    constraint=constraint,
-                    indication=subtypeIndication,
-                    file=position.Filename,
-                    line=position.Line,
-                    column=position.Column,
-                )
-            )
+            raise DOMException(f"Unknown constraint kind '{constraintKind.name}' for constraint '{constraint}' in subtype indication '{subtypeIndication}' at {position.Filename}:{position.Line}:{position.Column}.")
 
     return constraints
 
@@ -279,15 +266,7 @@ def GetTypeFromNode(node: Iir) -> BaseType:
         return ProtectedType.parse(typeName, typeDefinition)
     else:
         position = Position.parse(typeDefinition)
-        raise DOMException(
-            "GetTypeFromNode: Unknown type definition kind '{kind}' for type '{name}' at {file}:{line}:{column}.".format(
-                kind=kind.name,
-                name=typeName,
-                file=position.Filename,
-                line=position.Line,
-                column=position.Column,
-            )
-        )
+        raise DOMException(f"GetTypeFromNode: Unknown type definition kind '{kind.name}' for type '{typeName}' at {position.Filename}:{position.Line}:{position.Column}.")
 
 
 @export
@@ -315,15 +294,7 @@ def GetAnonymousTypeFromNode(node: Iir) -> BaseType:
         return ArrayType(typeDefinition, "????", [], None)
     else:
         position = Position.parse(typeDefinition)
-        raise DOMException(
-            "GetAnonymousTypeFromNode: Unknown type definition kind '{kind}' for type '{name}' at {file}:{line}:{column}.".format(
-                kind=kind.name,
-                name=typeName,
-                file=position.Filename,
-                line=position.Line,
-                column=position.Column,
-            )
-        )
+        raise DOMException(f"GetAnonymousTypeFromNode: Unknown type definition kind '{kind.name}' for type '{typeName}' at {position.Filename}:{position.Line}:{position.Column}.")
 
 
 @export
@@ -349,11 +320,7 @@ def GetSubtypeIndicationFromIndicationNode(subtypeIndicationNode: Iir, entity: s
     elif kind == nodes.Iir_Kind.Array_Subtype_Definition:
         return GetCompositeConstrainedSubtypeFromNode(subtypeIndicationNode)
     else:
-        raise DOMException(
-            "Unknown kind '{kind}' for an subtype indication in a {entity} of `{name}`.".format(
-                kind=kind.name, entity=entity, name=name
-            )
-        )
+        raise DOMException(f"Unknown kind '{kind.name}' for an subtype indication in a {entity} of `{name}`.")
 
 
 @export
@@ -471,15 +438,7 @@ def GetExpressionFromNode(node: Iir) -> ExpressionUnion:
         cls = __EXPRESSION_TRANSLATION[kind]
     except KeyError:
         position = Position.parse(node)
-        raise DOMException(
-            "Unknown expression kind '{kind}' in expression '{expr}' at {file}:{line}:{column}.".format(
-                kind=kind.name,
-                expr=node,
-                file=position.Filename,
-                line=position.Line,
-                column=position.Column,
-            )
-        )
+        raise DOMException(f"Unknown expression kind '{kind.name}' in expression '{node}' at {position.Filename}:{position.Line}:{position.Column}.")
 
     return cls.parse(node)
 
@@ -536,15 +495,7 @@ def GetGenericsFromChainedNodes(
                 yield GenericFunctionInterfaceItem.parse(generic)
             else:
                 position = Position.parse(generic)
-                raise DOMException(
-                    "Unknown generic kind '{kind}' in generic '{generic}' at {file}:{line}:{column}.".format(
-                        kind=kind.name,
-                        generic=generic,
-                        file=position.Filename,
-                        line=position.Line,
-                        column=position.Column,
-                    )
-                )
+                raise DOMException(f"Unknown generic kind '{kind.name}' in generic '{generic}' at {position.Filename}:{position.Line}:{position.Column}.")
 
         generic = nodes.Get_Chain(generic)
 
@@ -586,15 +537,7 @@ def GetPortsFromChainedNodes(
             continue
         else:
             position = Position.parse(port)
-            raise DOMException(
-                "Unknown port kind '{kind}' in port '{port}' at {file}:{line}:{column}.".format(
-                    kind=kind.name,
-                    port=port,
-                    file=position.Filename,
-                    line=position.Line,
-                    column=position.Column,
-                )
-            )
+            raise DOMException(f"Unknown port kind '{kind.name}' in port '{port}' at {position.Filename}:{position.Line}:{position.Column}.")
 
 
 @export
@@ -623,15 +566,7 @@ def GetParameterFromChainedNodes(
             param = ParameterFileInterfaceItem.parse(parameter)
         else:
             position = Position.parse(parameter)
-            raise DOMException(
-                "Unknown parameter kind '{kind}' in parameter '{param}' at {file}:{line}:{column}.".format(
-                    kind=kind.name,
-                    param=parameter,
-                    file=position.Filename,
-                    line=position.Line,
-                    column=position.Column,
-                )
-            )
+            raise DOMException(f"Unknown parameter kind '{kind.name}' in parameter '{parameter}' at {position.Filename}:{position.Line}:{position.Column}.")
 
         # Lookahead for parameters with multiple identifiers at once
         if nodes.Get_Has_Identifier_List(parameter):
@@ -679,11 +614,7 @@ def GetMapAspect(mapAspect: Iir, cls: Type, entity: str) -> Generator[Associatio
             yield cls(generic, OpenName(generic), formal)
         else:
             pos = Position.parse(generic)
-            raise DOMException(
-                "Unknown association kind '{kind}' in {entity} map at line {line}.".format(
-                    kind=kind.name, entity=entity, line=pos.Line
-                )
-            )
+            raise DOMException(f"Unknown association kind '{kind.name}' in {entity} map at line {pos.Line}.")
 
 
 def GetGenericMapAspect(
@@ -751,16 +682,7 @@ def GetDeclaredItemsFromChainedNodes(nodeChain: Iir, entity: str, name: str) ->
                     pass
                 else:
                     position = Position.parse(item)
-                    raise DOMException(
-                        "Found unexpected function body '{functionName}' in {entity} '{name}' at {file}:{line}:{column}.".format(
-                            functionName=GetNameOfNode(item),
-                            entity=entity,
-                            name=name,
-                            file=position.Filename,
-                            line=position.Line,
-                            column=position.Column,
-                        )
-                    )
+                    raise DOMException(f"Found unexpected function body '{GetNameOfNode(item)}' in {entity} '{name}' at {position.Filename}:{position.Line}:{position.Column}.")
             elif kind == nodes.Iir_Kind.Procedure_Declaration:
                 if nodes.Get_Has_Body(item):
                     yield Procedure.parse(item)
@@ -775,16 +697,7 @@ def GetDeclaredItemsFromChainedNodes(nodeChain: Iir, entity: str, name: str) ->
                     pass
                 else:
                     position = Position.parse(item)
-                    raise DOMException(
-                        "Found unexpected procedure body '{functionName}' in {entity} '{name}' at {file}:{line}:{column}.".format(
-                            functionName=GetNameOfNode(item),
-                            entity=entity,
-                            name=name,
-                            file=position.Filename,
-                            line=position.Line,
-                            column=position.Column,
-                        )
-                    )
+                    raise DOMException(f"Found unexpected procedure body '{GetNameOfNode(item)}' in {entity} '{name}' at {position.Filename}:{position.Line}:{position.Column}.")
             elif kind == nodes.Iir_Kind.Protected_Type_Body:
                 yield ProtectedTypeBody.parse(item)
             elif kind == nodes.Iir_Kind.Object_Alias_Declaration:
@@ -814,37 +727,28 @@ def GetDeclaredItemsFromChainedNodes(nodeChain: Iir, entity: str, name: str) ->
 
                 yield PackageInstantiation.parse(item)
             elif kind == nodes.Iir_Kind.Configuration_Specification:
-                print("[NOT IMPLEMENTED] Configuration specification in {name}".format(name=name))
+                print(f"[NOT IMPLEMENTED] Configuration specification in {name}")
             elif kind == nodes.Iir_Kind.Psl_Default_Clock:
                 yield DefaultClock.parse(item)
             elif kind == nodes.Iir_Kind.Group_Declaration:
-                print("[NOT IMPLEMENTED] Group declaration in {name}".format(name=name))
+                print(f"[NOT IMPLEMENTED] Group declaration in {name}")
             elif kind == nodes.Iir_Kind.Group_Template_Declaration:
-                print("[NOT IMPLEMENTED] Group template declaration in {name}".format(name=name))
+                print(f"[NOT IMPLEMENTED] Group template declaration in {name}")
             elif kind == nodes.Iir_Kind.Disconnection_Specification:
-                print("[NOT IMPLEMENTED] Disconnect specification in {name}".format(name=name))
+                print(f"[NOT IMPLEMENTED] Disconnect specification in {name}")
             elif kind == nodes.Iir_Kind.Nature_Declaration:
-                print("[NOT IMPLEMENTED] Nature declaration in {name}".format(name=name))
+                print(f"[NOT IMPLEMENTED] Nature declaration in {name}")
             elif kind == nodes.Iir_Kind.Free_Quantity_Declaration:
-                print("[NOT IMPLEMENTED] Free quantity declaration in {name}".format(name=name))
+                print(f"[NOT IMPLEMENTED] Free quantity declaration in {name}")
             elif kind == nodes.Iir_Kind.Across_Quantity_Declaration:
-                print("[NOT IMPLEMENTED] Across quantity declaration in {name}".format(name=name))
+                print(f"[NOT IMPLEMENTED] Across quantity declaration in {name}")
             elif kind == nodes.Iir_Kind.Through_Quantity_Declaration:
-                print("[NOT IMPLEMENTED] Through quantity declaration in {name}".format(name=name))
+                print(f"[NOT IMPLEMENTED] Through quantity declaration in {name}")
             elif kind == nodes.Iir_Kind.Terminal_Declaration:
-                print("[NOT IMPLEMENTED] Terminal declaration in {name}".format(name=name))
+                print(f"[NOT IMPLEMENTED] Terminal declaration in {name}")
             else:
                 position = Position.parse(item)
-                raise DOMException(
-                    "Unknown declared item kind '{kind}' in {entity} '{name}' at {file}:{line}:{column}.".format(
-                        kind=kind.name,
-                        entity=entity,
-                        name=name,
-                        file=position.Filename,
-                        line=position.Line,
-                        column=position.Column,
-                    )
-                )
+                raise DOMException(f"Unknown declared item kind '{kind.name}' in {entity} '{name}' at {position.Filename}:{position.Line}:{position.Column}.")
 
             lastKind = None
             item = nodes.Get_Chain(item)
@@ -880,7 +784,7 @@ def GetConcurrentStatementsFromChainedNodes(
         label = nodes.Get_Label(statement)
         label = name_table.Get_Name_Ptr(label) if label != nodes.Null_Iir else None
 
-        pos = Position.parse(statement)
+        position = Position.parse(statement)
 
         kind = GetIirKindOfNode(statement)
         if kind == nodes.Iir_Kind.Sensitized_Process_Statement:
@@ -892,17 +796,9 @@ def GetConcurrentStatementsFromChainedNodes(
         elif kind == nodes.Iir_Kind.Concurrent_Simple_Signal_Assignment:
             yield ConcurrentSimpleSignalAssignment.parse(statement, label)
         elif kind == nodes.Iir_Kind.Concurrent_Conditional_Signal_Assignment:
-            print(
-                "[NOT IMPLEMENTED] Concurrent (conditional) signal assignment (label: '{label}') at line {line}".format(
-                    label=label, line=pos.Line
-                )
-            )
+            print(f"[NOT IMPLEMENTED] Concurrent (conditional) signal assignment (label: '{label}') at line {position.Line}")
         elif kind == nodes.Iir_Kind.Concurrent_Selected_Signal_Assignment:
-            print(
-                "[NOT IMPLEMENTED] Concurrent (selected) signal assignment (label: '{label}') at line {line}".format(
-                    label=label, line=pos.Line
-                )
-            )
+            print(f"[NOT IMPLEMENTED] Concurrent (selected) signal assignment (label: '{label}') at line {position.Line}")
         elif kind == nodes.Iir_Kind.Concurrent_Procedure_Call_Statement:
             yield ConcurrentProcedureCall.parse(statement, label)
         elif kind == nodes.Iir_Kind.Component_Instantiation_Statement:
@@ -915,15 +811,7 @@ def GetConcurrentStatementsFromChainedNodes(
             elif instantiatedUnitKind == nodes.Iir_Kind.Simple_Name:
                 yield ComponentInstantiation.parse(statement, instantiatedUnit, label)
             else:
-                raise DOMException(
-                    "Unknown instantiation kind '{kind}' in instantiation of label {label} at {file}:{line}:{column}.".format(
-                        kind=instantiatedUnitKind.name,
-                        label=label,
-                        file=pos.Filename,
-                        line=pos.Line,
-                        column=pos.Column,
-                    )
-                )
+                raise DOMException(f"Unknown instantiation kind '{instantiatedUnitKind.name}' in instantiation of label {label} at {position.Filename}:{position.Line}:{position.Column}.")
         elif kind == nodes.Iir_Kind.Block_Statement:
             yield ConcurrentBlockStatement.parse(statement, label)
         elif kind == nodes.Iir_Kind.If_Generate_Statement:
@@ -935,22 +823,9 @@ def GetConcurrentStatementsFromChainedNodes(
         elif kind == nodes.Iir_Kind.Psl_Assert_Directive:
             yield ConcurrentAssertStatement.parse(statement, label)
         elif kind == nodes.Iir_Kind.Simple_Simultaneous_Statement:
-            print(
-                "[NOT IMPLEMENTED] Simple simultaneous statement (label: '{label}') at line {line}".format(
-                    label=label, line=pos.Line
-                )
-            )
+            print(f"[NOT IMPLEMENTED] Simple simultaneous statement (label: '{label}') at line {position.Line}")
         else:
-            raise DOMException(
-                "Unknown statement of kind '{kind}' in {entity} '{name}' at {file}:{line}:{column}.".format(
-                    kind=kind.name,
-                    entity=entity,
-                    name=name,
-                    file=pos.Filename,
-                    line=pos.Line,
-                    column=pos.Column,
-                )
-            )
+            raise DOMException(f"Unknown statement of kind '{kind.name}' in {entity} '{name}' at {position.Filename}:{position.Line}:{position.Column}.")
 
 
 def GetSequentialStatementsFromChainedNodes(
@@ -960,7 +835,7 @@ def GetSequentialStatementsFromChainedNodes(
         label = nodes.Get_Label(statement)
         label = name_table.Get_Name_Ptr(label) if label != nodes.Null_Iir else None
 
-        pos = Position.parse(statement)
+        position = Position.parse(statement)
         kind = GetIirKindOfNode(statement)
         if kind == nodes.Iir_Kind.If_Statement:
             yield IfStatement.parse(statement, label)
@@ -974,11 +849,7 @@ def GetSequentialStatementsFromChainedNodes(
             nodes.Iir_Kind.Variable_Assignment_Statement,
             nodes.Iir_Kind.Conditional_Variable_Assignment_Statement,
         ):
-            print(
-                "[NOT IMPLEMENTED] Variable assignment (label: '{label}') at line {line}".format(
-                    label=label, line=pos.Line
-                )
-            )
+            print(f"[NOT IMPLEMENTED] Variable assignment (label: '{label}') at line {position.Line}")
         elif kind == nodes.Iir_Kind.Wait_Statement:
             yield WaitStatement.parse(statement, label)
         elif kind == nodes.Iir_Kind.Procedure_Call_Statement:
@@ -990,16 +861,7 @@ def GetSequentialStatementsFromChainedNodes(
         elif kind == nodes.Iir_Kind.Null_Statement:
             yield NullStatement(statement, label)
         else:
-            raise DOMException(
-                "Unknown statement of kind '{kind}' in {entity} '{name}' at {file}:{line}:{column}.".format(
-                    kind=kind.name,
-                    entity=entity,
-                    name=name,
-                    file=pos.Filename,
-                    line=pos.Line,
-                    column=pos.Column,
-                )
-            )
+            raise DOMException(f"Unknown statement of kind '{kind.name}' in {entity} '{name}' at {position.Filename}:{position.Line}:{position.Column}.")
 
 
 def GetAliasFromNode(aliasNode: Iir):
diff --git a/pyGHDL/dom/_Utils.py b/pyGHDL/dom/_Utils.py
index 76dec9a06..0349a11ef 100644
--- a/pyGHDL/dom/_Utils.py
+++ b/pyGHDL/dom/_Utils.py
@@ -62,9 +62,7 @@ def CheckForErrors() -> None:
             fileName = ""  # name_table.Get_Name_Ptr(files_map.Get_File_Name(rec.file))
             message = errorout_memory.Get_Error_Message(i + 1)
 
-            errors.append(
-                "{file}:{line}:{column}: {msg}".format(file=fileName, line=rec.line, column=rec.offset, msg=message)
-            )
+            errors.append(f"{fileName}:{rec.line}:{rec.offset}: {message}")
 
         raise DOMException("Error raised in libghdl.") from LibGHDLException("libghdl: Internal error.", errors)
 
diff --git a/pyGHDL/dom/__init__.py b/pyGHDL/dom/__init__.py
index f5d38fa09..e9eb89240 100644
--- a/pyGHDL/dom/__init__.py
+++ b/pyGHDL/dom/__init__.py
@@ -83,7 +83,7 @@ class Position:
         return self._column
 
     def __str__(self):
-        return "{file}:{line}:{column}".format(file=self._filename, line=self._line, column=self._column)
+        return f"{self._filename}:{self._line}:{self._column}"
 
 
 @export
diff --git a/pyGHDL/dom/formatting/prettyprint.py b/pyGHDL/dom/formatting/prettyprint.py
index a72a32862..14d13e2c5 100644
--- a/pyGHDL/dom/formatting/prettyprint.py
+++ b/pyGHDL/dom/formatting/prettyprint.py
@@ -117,14 +117,14 @@ class PrettyPrint:
     def formatDesign(self, design: Design, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}Libraries:".format(prefix=prefix))
+        buffer.append(f"{prefix}Libraries:")
         for library in design.Libraries.values():
-            buffer.append("{prefix}  - Name: {name}".format(prefix=prefix, name=library.Identifier))
+            buffer.append(f"{prefix}  - Name: {library.Identifier}")
             for line in self.formatLibrary(library, level + 2):
                 buffer.append(line)
-        buffer.append("{prefix}Documents:".format(prefix=prefix))
+        buffer.append(f"{prefix}Documents:")
         for document in design.Documents:
-            buffer.append("{prefix}  - Path: '{doc!s}':".format(doc=document.Path, prefix=prefix))
+            buffer.append(f"{prefix}  - Path: '{document.Path!s}':")
             for line in self.formatDocument(document, level + 2):
                 buffer.append(line)
 
@@ -133,48 +133,36 @@ class PrettyPrint:
     def formatLibrary(self, library: Library, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}Entities:".format(prefix=prefix))
+        buffer.append(f"{prefix}Entities:")
         for entity in library.Entities:
-            buffer.append(
-                "{prefix}  - {name}({architectures})".format(
-                    prefix=prefix,
-                    name=entity.Identifier,
-                    architectures=", ".join([a.Identifier for a in entity.Architectures]),
-                )
-            )
-        buffer.append("{prefix}Packages:".format(prefix=prefix))
+            buffer.append(f"{prefix}  - {entity.Identifier}({', '.join([a.Identifier for a in entity.Architectures])})")
+        buffer.append(f"{prefix}Packages:")
         for package in library.Packages:
             if isinstance(package, Package):
-                buffer.append("{prefix}  - {name}".format(prefix=prefix, name=package.Identifier))
+                buffer.append(f"{prefix}  - {package.Identifier}")
             elif isinstance(package, PackageInstantiation):
-                buffer.append(
-                    "{prefix}  - {name} instantiate from {package}".format(
-                        prefix=prefix,
-                        name=package.Identifier,
-                        package=package.PackageReference,
-                    )
-                )
-        buffer.append("{prefix}Configurations:".format(prefix=prefix))
+                buffer.append(f"{prefix}  - {package.Identifier} instantiate from {package.PackageReference}")
+        buffer.append(f"{prefix}Configurations:")
         for configuration in library.Configurations:
-            buffer.append("{prefix}  - {name}".format(prefix=prefix, name=configuration.Identifier))
-        buffer.append("{prefix}Contexts:".format(prefix=prefix))
+            buffer.append(f"{prefix}  - {configuration.Identifier}")
+        buffer.append(f"{prefix}Contexts:")
         for context in library.Contexts:
-            buffer.append("{prefix}  - {name}".format(prefix=prefix, name=context.Identifier))
+            buffer.append(f"{prefix}  - {context.Identifier}")
 
         return buffer
 
     def formatDocument(self, document: Document, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}Entities:".format(prefix=prefix))
+        buffer.append(f"{prefix}Entities:")
         for entity in document.Entities:
             for line in self.formatEntity(entity, level + 1):
                 buffer.append(line)
-        buffer.append("{prefix}Architectures:".format(prefix=prefix))
+        buffer.append(f"{prefix}Architectures:")
         for architecture in document.Architectures:
             for line in self.formatArchitecture(architecture, level + 1):
                 buffer.append(line)
-        buffer.append("{prefix}Packages:".format(prefix=prefix))
+        buffer.append(f"{prefix}Packages:")
         for package in document.Packages:
             if isinstance(package, Package):
                 gen = self.formatPackage
@@ -183,15 +171,15 @@ class PrettyPrint:
 
             for line in gen(package, level + 1):
                 buffer.append(line)
-        buffer.append("{prefix}PackageBodies:".format(prefix=prefix))
+        buffer.append(f"{prefix}PackageBodies:")
         for packageBodies in document.PackageBodies:
             for line in self.formatPackageBody(packageBodies, level + 1):
                 buffer.append(line)
-        buffer.append("{prefix}Configurations:".format(prefix=prefix))
+        buffer.append(f"{prefix}Configurations:")
         for configuration in document.Configurations:
             for line in self.formatConfiguration(configuration, level + 1):
                 buffer.append(line)
-        buffer.append("{prefix}Contexts:".format(prefix=prefix))
+        buffer.append(f"{prefix}Contexts:")
         for context in document.Contexts:
             for line in self.formatContext(context, level + 1):
                 buffer.append(line)
@@ -201,60 +189,44 @@ class PrettyPrint:
     def formatEntity(self, entity: Entity, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append(
-            "{prefix}- Name: {name}\n{prefix}  File: {file}\n{prefix}  Position: {line}:{column}".format(
-                name=entity.Identifier,
-                prefix=prefix,
-                file=entity.Position.Filename.name,
-                line=entity.Position.Line,
-                column=entity.Position.Column,
-            )
-        )
-        buffer.append("{prefix}  Generics:".format(prefix=prefix))
+        buffer.append(f"{prefix}- Name: {entity.Identifier}\n{prefix}  File: {entity.Position.Filename.name}\n{prefix}  Position: {entity.Position.Line}:{entity.Position.Column}")
+        buffer.append(f"{prefix}  Generics:")
         for generic in entity.GenericItems:
             for line in self.formatGeneric(generic, level + 1):
                 buffer.append(line)
-        buffer.append("{prefix}  Ports:".format(prefix=prefix))
+        buffer.append(f"{prefix}  Ports:")
         for port in entity.PortItems:
             for line in self.formatPort(port, level + 1):
                 buffer.append(line)
-        buffer.append("{prefix}  Declared:".format(prefix=prefix))
+        buffer.append(f"{prefix}  Declared:")
         for item in entity.DeclaredItems:
             for line in self.formatDeclaredItems(item, level + 1):
                 buffer.append(line)
-        buffer.append("{prefix}  Statements:".format(prefix=prefix))
+        buffer.append(f"{prefix}  Statements:")
         for item in entity.Statements:
-            buffer.append("{prefix}    ...".format(prefix=prefix))
-        buffer.append("{prefix}  Architecures:".format(prefix=prefix))
+            buffer.append(f"{prefix}    ...")
+        buffer.append(f"{prefix}  Architectures:")
         for item in entity.Architectures:
-            buffer.append("{prefix}  - {name}".format(prefix=prefix, name=item.Identifier))
+            buffer.append(f"{prefix}  - {item.Identifier}")
 
         return buffer
 
     def formatArchitecture(self, architecture: Architecture, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append(
-            "{prefix}- Name: {name}\n{prefix}  File: {file}\n{prefix}  Position: {line}:{column}".format(
-                name=architecture.Identifier,
-                prefix=prefix,
-                file=architecture.Position.Filename.name,
-                line=architecture.Position.Line,
-                column=architecture.Position.Column,
-            )
-        )
-        buffer.append("{prefix}  Entity: {entity}".format(entity=architecture.Entity.SymbolName, prefix=prefix))
-        buffer.append("{prefix}  Declared:".format(prefix=prefix))
+        buffer.append(f"{prefix}- Name: {architecture.Identifier}\n{prefix}  File: {architecture.Position.Filename.name}\n{prefix}  Position: {architecture.Position.Line}:{architecture.Position.Column}")
+        buffer.append(f"{prefix}  Entity: {architecture.Entity.SymbolName}")
+        buffer.append(f"{prefix}  Declared:")
         for item in architecture.DeclaredItems:
             for line in self.formatDeclaredItems(item, level + 2):
                 buffer.append(line)
-        buffer.append("{prefix}  Hierarchy:".format(prefix=prefix))
+        buffer.append(f"{prefix}  Hierarchy:")
         for item in architecture.Statements:
             for line in self.formatHierarchy(item, level + 2):
                 buffer.append(line)
-        buffer.append("{prefix}  Statements:".format(prefix=prefix))
+        buffer.append(f"{prefix}  Statements:")
         for item in architecture.Statements:
-            buffer.append("{prefix}    ...".format(prefix=prefix))
+            buffer.append(f"{prefix}    ...")
         #            for line in self.formatStatements(item, level + 2):
         #                buffer.append(line)
 
@@ -263,12 +235,12 @@ class PrettyPrint:
     def formatComponent(self, component: Component, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}- Component: {name}".format(name=component.Identifier, prefix=prefix))
-        buffer.append("{prefix}  Generics:".format(prefix=prefix))
+        buffer.append(f"{prefix}- Component: {component.Identifier}")
+        buffer.append(f"{prefix}  Generics:")
         for generic in component.GenericItems:
             for line in self.formatGeneric(generic, level + 1):
                 buffer.append(line)
-        buffer.append("{prefix}  Ports:".format(prefix=prefix))
+        buffer.append(f"{prefix}  Ports:")
         for port in component.PortItems:
             for line in self.formatPort(port, level + 1):
                 buffer.append(line)
@@ -278,16 +250,8 @@ class PrettyPrint:
     def formatPackage(self, package: Package, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append(
-            "{prefix}- Name: {name}\n{prefix}  File: {file}\n{prefix}  Position: {line}:{column}".format(
-                name=package.Identifier,
-                prefix=prefix,
-                file=package.Position.Filename.name,
-                line=package.Position.Line,
-                column=package.Position.Column,
-            )
-        )
-        buffer.append("{prefix}  Declared:".format(prefix=prefix))
+        buffer.append(f"{prefix}- Name: {package.Identifier}\n{prefix}  File: {package.Position.Filename.name}\n{prefix}  Position: {package.Position.Line}:{package.Position.Column}")
+        buffer.append(f"{prefix}  Declared:")
         for item in package.DeclaredItems:
             for line in self.formatDeclaredItems(item, level + 1):
                 buffer.append(line)
@@ -297,9 +261,9 @@ class PrettyPrint:
     def formatPackageInstance(self, package: PackageInstantiation, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}- Name: {name}".format(name=package.Identifier, prefix=prefix))
-        buffer.append("{prefix}  Package: {name!s}".format(prefix=prefix, name=package.PackageReference))
-        buffer.append("{prefix}  Generic Map: ...".format(prefix=prefix))
+        buffer.append(f"{prefix}- Name: {package.Identifier}")
+        buffer.append(f"{prefix}  Package: {package.PackageReference!s}")
+        buffer.append(f"{prefix}  Generic Map: ...")
         #        for item in package.GenericItems:
         #            for line in self.formatGeneric(item, level + 1):
         #                buffer.append(line)
@@ -309,8 +273,8 @@ class PrettyPrint:
     def formatPackageBody(self, packageBody: PackageBody, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}- Name: {name}".format(name=packageBody.Identifier, prefix=prefix))
-        buffer.append("{prefix}  Declared:".format(prefix=prefix))
+        buffer.append(f"{prefix}- Name: {packageBody.Identifier}")
+        buffer.append(f"{prefix}  Declared:")
         for item in packageBody.DeclaredItems:
             for line in self.formatDeclaredItems(item, level + 1):
                 buffer.append(line)
@@ -320,14 +284,14 @@ class PrettyPrint:
     def formatConfiguration(self, configuration: Configuration, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}- Name: {name}".format(name=configuration.Identifier, prefix=prefix))
+        buffer.append(f"{prefix}- Name: {configuration.Identifier}")
 
         return buffer
 
     def formatContext(self, context: Context, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
-        buffer.append("{prefix}- Name: {name}".format(name=context.Identifier, prefix=prefix))
+        buffer.append(f"{prefix}- Name: {context.Identifier}")
 
         return buffer
 
@@ -337,21 +301,13 @@ class PrettyPrint:
         elif isinstance(generic, GenericTypeInterfaceItem):
             return self.formatGenericType(generic, level)
         else:
-            raise PrettyPrintException(
-                "Unhandled generic kind '{kind}' for generic '{name}'.".format(
-                    kind=generic.__class__.__name__, name=generic.Identifiers[0]
-                )
-            )
+            raise PrettyPrintException(f"Unhandled generic kind '{generic.__class__.__name__}' for generic '{generic.Identifiers[0]}'.")
 
     def formatPort(self, port: Union[NamedEntity, PortInterfaceItem], level: int = 0) -> StringBuffer:
         if isinstance(port, PortSignalInterfaceItem):
             return self.formatPortSignal(port, level)
         else:
-            raise PrettyPrintException(
-                "Unhandled port kind '{kind}' for port '{name}'.".format(
-                    kind=port.__class__.__name__, name=port.Identifiers[0]
-                )
-            )
+            raise PrettyPrintException(f"Unhandled port kind '{port.__class__.__name__}' for port '{port.Identifiers[0]}'.")
 
     def formatGenericConstant(self, generic: GenericConstantInterfaceItem, level: int = 0) -> StringBuffer:
         buffer = []
@@ -373,12 +329,7 @@ class PrettyPrint:
         buffer = []
         prefix = "  " * level
 
-        buffer.append(
-            "{prefix}  - type {name}".format(
-                prefix=prefix,
-                name=generic.Identifier,
-            )
-        )
+        buffer.append(f"{prefix}  - type {generic.Identifier}")
 
         return buffer
 
@@ -404,7 +355,7 @@ class PrettyPrint:
 
         if isinstance(item, BaseConstant):
             if isinstance(item, Constant):
-                default = " := {expr}".format(expr=str(item.DefaultExpression))
+                default = f" := {item.DefaultExpression!s}"
             else:
                 default = ""
 
@@ -430,7 +381,7 @@ class PrettyPrint:
                     prefix=prefix,
                     name=", ".join(item.Identifiers),
                     subtype=self.formatSubtypeIndication(item.Subtype, "signal", item.Identifiers[0]),
-                    initValue=" := {expr}".format(expr=str(item.DefaultExpression))
+                    initValue=f" := {item.DefaultExpression!s}"
                     if item.DefaultExpression is not None
                     else "",
                 )
@@ -444,74 +395,41 @@ class PrettyPrint:
                 )
             )
         elif isinstance(item, (FullType, IncompleteType)):
-            buffer.append("{prefix}- {type}".format(prefix=prefix, type=self.formatType(item)))
+            buffer.append(f"{prefix}- {self.formatType(item)}")
         elif isinstance(item, Subtype):
-            buffer.append(
-                "{prefix}- subtype {name} is ?????".format(
-                    prefix=prefix,
-                    name=item.Identifier,
-                )
-            )
+            buffer.append(f"{prefix}- subtype {item.Identifier} is ?????")
         elif isinstance(item, Alias):
-            buffer.append(
-                "{prefix}- alias {name} is ?????".format(
-                    prefix=prefix,
-                    name=item.Identifier,
-                )
-            )
+            buffer.append(f"{prefix}- alias {item.Identifier} is ?????")
         elif isinstance(item, Function):
-            buffer.append(
-                "{prefix}- function {name} return {returnType!s}".format(
-                    prefix=prefix, name=item.Identifier, returnType=item.ReturnType
-                )
-            )
+            buffer.append(f"{prefix}- function {item.Identifier} return {item.ReturnType!s}")
         elif isinstance(item, Procedure):
-            buffer.append(
-                "{prefix}- procedure {name}".format(
-                    prefix=prefix,
-                    name=item.Identifier,
-                )
-            )
+            buffer.append(f"{prefix}- procedure {item.Identifier}")
         elif isinstance(item, Component):
             for line in self.formatComponent(item, level):
                 buffer.append(line)
         elif isinstance(item, Attribute):
-            buffer.append(
-                "{prefix}- attribute {name} : {type!s}".format(prefix=prefix, name=item.Identifier, type=item.Subtype)
-            )
+            buffer.append(f"{prefix}- attribute {item.Identifier} : {item.Subtype!s}")
         elif isinstance(item, AttributeSpecification):
-            buffer.append(
-                "{prefix}- attribute {name!s} of {entity} : {entityClass} is {value}".format(
-                    prefix=prefix,
-                    name=item.Attribute,
-                    entity="????",
-                    entityClass="????",
-                    value="????",
-                )
-            )
+            buffer.append(f"{prefix}- attribute {item.Attribute!s} of {'????'} : {'????'} is {'????'}")
         elif isinstance(item, UseClause):
             buffer.append("{prefix}- use {names}".format(prefix=prefix, names=", ".join([str(n) for n in item.Names])))
         elif isinstance(item, Package):
-            buffer.append("{prefix}- package {name} is ..... end package".format(prefix=prefix, name=item.Identifier))
+            buffer.append(f"{prefix}- package {item.Identifier} is ..... end package")
         elif isinstance(item, PackageInstantiation):
-            buffer.append(
-                "{prefix}- package {name} is new {name2!s} generic map (.....)".format(
-                    prefix=prefix, name=item.Identifier, name2=item.PackageReference
-                )
-            )
+            buffer.append(f"{prefix}- package {item.Identifier} is new {item.PackageReference!s} generic map (.....)")
         elif isinstance(item, DefaultClock):
-            buffer.append("{prefix}- default {name} is {expr}".format(prefix=prefix, name=item.Identifier, expr="..."))
+            buffer.append(f"{prefix}- default {item.Identifier} is {'...'}", )
         else:
-            raise PrettyPrintException("Unhandled declared item kind '{name}'.".format(name=item.__class__.__name__))
+            raise PrettyPrintException(f"Unhandled declared item kind '{item.__class__.__name__}'.")
 
         return buffer
 
     def formatType(self, item: BaseType) -> str:
-        result = "type {name} is ".format(name=item.Identifier)
+        result = f"type {item.Identifier} is "
         if isinstance(item, IncompleteType):
             result += ""
         elif isinstance(item, IntegerType):
-            result += "range {range!s}".format(range=item.Range)
+            result += f"range {item.Range!s}"
         elif isinstance(item, EnumeratedType):
             result += "(........)"
         elif isinstance(item, PhysicalType):
@@ -529,13 +447,13 @@ class PrettyPrint:
         elif isinstance(item, ProtectedTypeBody):
             result += "protected body ..... end protected body"
         else:
-            raise PrettyPrintException("Unknown type '{name}'".format(name=item.__class__.__name__))
+            raise PrettyPrintException(f"Unknown type '{item.__class__.__name__}'")
 
         return result
 
     def formatSubtypeIndication(self, subtypeIndication, entity: str, name: str) -> str:
         if isinstance(subtypeIndication, SimpleSubtypeSymbol):
-            return "{type}".format(type=subtypeIndication.SymbolName)
+            return f"{subtypeIndication.SymbolName}"
         elif isinstance(subtypeIndication, ConstrainedCompositeSubtypeSymbol):
             constraints = []
             for constraint in subtypeIndication.Constraints:
@@ -543,102 +461,59 @@ class PrettyPrint:
 
             return "{type}({constraints})".format(type=subtypeIndication.SymbolName, constraints=", ".join(constraints))
         else:
-            raise PrettyPrintException(
-                "Unhandled subtype kind '{type}' for {entity} '{name}'.".format(
-                    type=subtypeIndication.__class__.__name__, entity=entity, name=name
-                )
-            )
+            raise PrettyPrintException(f"Unhandled subtype kind '{subtypeIndication.__class__.__name__}' for {entity} '{name}'.")
 
     def formatInitialValue(self, item: WithDefaultExpressionMixin) -> str:
         if item.DefaultExpression is None:
             return ""
 
-        return " := {expr!s}".format(expr=item.DefaultExpression)
+        return f" := {item.DefaultExpression!s}"
 
     def formatHierarchy(self, statement: ConcurrentStatement, level: int = 0) -> StringBuffer:
         buffer = []
         prefix = "  " * level
 
         if isinstance(statement, ProcessStatement):
-            buffer.append("{prefix}- {label}: process(...)".format(prefix=prefix, label=statement.Label))
+            buffer.append(f"{prefix}- {statement.Label}: process(...)")
         elif isinstance(statement, EntityInstantiation):
-            buffer.append(
-                "{prefix}- {label}: entity {name}".format(prefix=prefix, label=statement.Label, name=statement.Entity)
-            )
+            buffer.append(f"{prefix}- {statement.Label}: entity {statement.Entity}")
         elif isinstance(statement, ComponentInstantiation):
-            buffer.append(
-                "{prefix}- {label}: component {name}".format(
-                    prefix=prefix, label=statement.Label, name=statement.Component
-                )
-            )
+            buffer.append(f"{prefix}- {statement.Label}: component {statement.Component}")
         elif isinstance(statement, ConfigurationInstantiation):
-            buffer.append(
-                "{prefix}- {label}: configuration {name}".format(
-                    prefix=prefix, label=statement.Label, name=statement.Configuration
-                )
-            )
+            buffer.append(f"{prefix}- {statement.Label}: configuration {statement.Configuration}")
         elif isinstance(statement, ConcurrentBlockStatement):
-            buffer.append("{prefix}- {label}: block".format(prefix=prefix, label=statement.Label))
+            buffer.append(f"{prefix}- {statement.Label}: block")
             for stmt in statement.Statements:
                 for line in self.formatHierarchy(stmt, level + 2):
                     buffer.append(line)
         elif isinstance(statement, IfGenerateStatement):
-            buffer.append(
-                "{prefix}- {label}: if {condition} generate".format(
-                    prefix=prefix,
-                    label=statement.Label,
-                    condition=statement.IfBranch.Condition,
-                )
-            )
+            buffer.append(f"{prefix}- {statement.Label}: if {statement.IfBranch.Condition} generate")
             for stmt in statement.IfBranch.Statements:
                 for line in self.formatHierarchy(stmt, level + 2):
                     buffer.append(line)
             for elsifBranch in statement.ElsifBranches:
-                buffer.append(
-                    "{prefix}  {label}: elsif {condition} generate".format(
-                        prefix=prefix,
-                        label=statement.Label,
-                        condition=elsifBranch.Condition,
-                    )
-                )
+                buffer.append(f"{prefix}  {statement.Label}: elsif {elsifBranch.Condition} generate")
                 for stmt in elsifBranch.Statements:
                     for line in self.formatHierarchy(stmt, level + 2):
                         buffer.append(line)
             if statement.ElseBranch is not None:
-                buffer.append("{prefix}  {label}: else generate".format(prefix=prefix, label=statement.Label))
+                buffer.append(f"{prefix}  {statement.Label}: else generate")
                 for stmt in statement.ElseBranch.Statements:
                     for line in self.formatHierarchy(stmt, level + 2):
                         buffer.append(line)
         elif isinstance(statement, CaseGenerateStatement):
-            buffer.append(
-                "{prefix}- {label}: case {expression} generate".format(
-                    prefix=prefix,
-                    label=statement.Label,
-                    expression=statement.SelectExpression,
-                )
-            )
+            buffer.append(f"{prefix}- {statement.Label}: case {statement.SelectExpression} generate")
             for case in statement.Cases:
-                buffer.append("{prefix}    {case!s}".format(prefix=prefix, label=case.Label, case=case))
+                buffer.append(f"{prefix}    {case!s}")
                 for stmt in case.Statements:
                     for line in self.formatHierarchy(stmt, level + 2):
                         buffer.append(line)
         elif isinstance(statement, ForGenerateStatement):
-            buffer.append(
-                "{prefix}- {label}: for {index} in {range} generate".format(
-                    prefix=prefix,
-                    label=statement.Label,
-                    index=statement.LoopIndex,
-                    range=statement.Range,
-                )
-            )
+            buffer.append(f"{prefix}- {statement.Label}: for {statement.LoopIndex} in {statement.Range} generate")
             for stmt in statement.Statements:
                 for line in self.formatHierarchy(stmt, level + 2):
                     buffer.append(line)
         elif isinstance(statement, ConcurrentProcedureCall):
-            buffer.append(
-                "{prefix}- {label}: {name!s}(...)".format(
-                    prefix=prefix, label=statement.Label, name=statement.Procedure
-                )
-            )
+            buffer.append(f"{prefix}- {statement.Label}: {statement.Procedure!s}(...)")
 
         return buffer