Skip to content

Commit 6848cba

Browse files
committed
use more consistent terminology
1 parent 1ed3bae commit 6848cba

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

docs/codeql/ql-language-reference/ql-language-specification.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ Instantiation-relative and instantiation-nested entities
286286

287287
Given an *instantiated module*, every entity has a corresponding entity called the *instantiation-relative* entity, which is determined as follows:
288288

289-
- If the entity is the *underlying module*, its *instantiation-relative entity* is the *instantiated module*.
290-
- If the entity is a parameter of the *underlying module*, its *instantiation-relative entity* is the corresponding argument.
289+
- If the entity is the *underlying module*, its *instantiation-relative* entity is the *instantiated module*.
290+
- If the entity is a parameter of the *underlying module*, its *instantiation-relative* entity is the corresponding argument.
291291
- 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.
292292
- Otherwise, the entity's *instantiation-relative* entity is the initial entity itself.
293293

@@ -318,12 +318,12 @@ Every *completely uninstantiated* entity has a *relevant set of parameters*, whi
318318

319319
Note that the *relevant set of parameters* by construction contains only *completely uninstantiated* parameters.
320320

321-
For a *completely uninstantiated* parameter, the *bottom-up instantiation-resolved* parameter relative to an entity is defined as:
321+
For a *completely uninstantiated* parameter, the *bottom-up instantiation-resolution* relative to an entity is defined as:
322322

323-
- 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*.
324-
- Otherwise, the *bottom-up instantiation-resolved* parameter is the parameter itself.
323+
- 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*.
324+
- Otherwise, the *bottom-up instantiation-resolution* is the parameter itself.
325325

326-
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*.
326+
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*.
327327

328328
Module instantiation is applicative, meaning that *equivalent* *instantiated modules* and *equivalent* *instantiation-nested* entities are indistinguishable.
329329

0 commit comments

Comments
 (0)