use more consistent terminology

This commit is contained in:
Philip Ginsbach
2023-06-20 08:56:58 +01:00
parent 1ed3baea17
commit 6848cba685

View File

@@ -286,8 +286,8 @@ Instantiation-relative and instantiation-nested entities
Given an *instantiated module*, every entity has a corresponding entity called the *instantiation-relative* entity, which is determined as follows:
- If the entity is the *underlying module*, its *instantiation-relative entity* is the *instantiated module*.
- If the entity is a parameter of the *underlying module*, its *instantiation-relative entity* is the corresponding argument.
- If the entity is the *underlying module*, its *instantiation-relative* entity is the *instantiated module*.
- If the entity is a parameter of the *underlying module*, its *instantiation-relative* entity is the corresponding argument.
- If the entity is declared inside the *underlying module* or its nested modules, its *instantiation-relative* entity is an *instantiation-nested* entity that is generated by the module instantiation. Parameters of any modules that are nested inside the *underlying module* are considered declared inside the module for this purpose.
- Otherwise, the entity's *instantiation-relative* entity is the initial entity itself.
@@ -318,12 +318,12 @@ Every *completely uninstantiated* entity has a *relevant set of parameters*, whi
Note that the *relevant set of parameters* by construction contains only *completely uninstantiated* parameters.
For a *completely uninstantiated* parameter, the *bottom-up instantiation-resolved* parameter relative to an entity is defined as:
For a *completely uninstantiated* parameter, the *bottom-up instantiation-resolution* relative to an entity is defined as:
- If the entity is an *instantiated module* or an *instantiation-nested* entity, the *bottom-up instantiation-resolved* parameter is the *instantiation-relative* parameter of the *bottom-up instantiation-resolved* parameter relative to the *underlying module*.
- Otherwise, the *bottom-up instantiation-resolved* parameter is the parameter itself.
- If the entity is an *instantiated module* or an *instantiation-nested* entity, the *bottom-up instantiation-resolution* is the *instantiation-relative* entity of the *bottom-up instantiation-resolution* relative to the *underlying module*.
- Otherwise, the *bottom-up instantiation-resolution* is the parameter itself.
Two *instantiated modules* or two *instantiation-nested* entities are considered *equivalent* if they have the same *underlying completely uninstantiated* entity and each parameter in its *relevant set of parameters* has the same *bottom-up instantiation-resolved* parameter relative to either *instantiated module*.
Two *instantiated modules* or two *instantiation-nested* entities are considered *equivalent* if they have the same *underlying completely uninstantiated* entity and each parameter in its *relevant set of parameters* has the same *bottom-up instantiation-resolution* relative to either *instantiated module*.
Module instantiation is applicative, meaning that *equivalent* *instantiated modules* and *equivalent* *instantiation-nested* entities are indistinguishable.