Skip to content

Commit e17e5e8

Browse files
committed
Fix #671
Update FamixGenerator>>defineHierarchy with `tFunction --|> tInvocable.`
1 parent 3001348 commit e17e5e8

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/Famix-MetamodelGeneration/FamixGenerator.class.st

+1
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,7 @@ FamixGenerator >> defineHierarchy [
10111011
tFunction --|> tTypedEntity.
10121012
tFunction --|> tWithStatements.
10131013
tFunction --|> tWithLocalVariables.
1014+
tFunction --|> tInvocable.
10141015
tFunction --|> #TEntityMetaLevelDependency.
10151016

10161017
tGlobalVariable --|> tStructuralEntity.

src/Famix-Traits/FamixTFunction.trait.st

+7-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ FamixTFunction represents a behavioural entity in a procedural language.
2222
| `outgoingInvocations` | `FamixTWithInvocations` | `sender` | `FamixTInvocation` | Outgoing invocations sent by this behaviour.|
2323
| `outgoingReferences` | `FamixTWithReferences` | `referencer` | `FamixTReference` | References from this entity to other entities.|
2424
25+
### Incoming dependencies
26+
| Relation | Origin | Opposite | Type | Comment |
27+
|---|
28+
| `incomingInvocations` | `FamixTInvocable` | `candidates` | `FamixTInvocation` | Incoming invocations from other behaviours computed by the candidate operator.|
29+
2530
### Other
2631
| Relation | Origin | Opposite | Type | Comment |
2732
|---|
@@ -44,8 +49,8 @@ Trait {
4449
#instVars : [
4550
'#functionOwner => FMOne type: #FamixTWithFunctions opposite: #functions'
4651
],
47-
#traits : 'FamixTHasSignature + FamixTNamedEntity + FamixTTypedEntity + FamixTWithLocalVariables + FamixTWithParameters + FamixTWithStatements + TEntityMetaLevelDependency',
48-
#classTraits : 'FamixTHasSignature classTrait + FamixTNamedEntity classTrait + FamixTTypedEntity classTrait + FamixTWithLocalVariables classTrait + FamixTWithParameters classTrait + FamixTWithStatements classTrait + TEntityMetaLevelDependency classTrait',
52+
#traits : 'FamixTHasSignature + FamixTInvocable + FamixTNamedEntity + FamixTTypedEntity + FamixTWithLocalVariables + FamixTWithParameters + FamixTWithStatements + TEntityMetaLevelDependency',
53+
#classTraits : 'FamixTHasSignature classTrait + FamixTInvocable classTrait + FamixTNamedEntity classTrait + FamixTTypedEntity classTrait + FamixTWithLocalVariables classTrait + FamixTWithParameters classTrait + FamixTWithStatements classTrait + TEntityMetaLevelDependency classTrait',
4954
#category : #'Famix-Traits-Behavioral'
5055
}
5156

src/Famix-Traits/FamixTWithTypes.trait.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
| Relation | Origin | Opposite | Type | Comment |
77
|---|
88
| `types` | `FamixTWithTypes` | `typeContainer` | `FamixTType` | Types contained (declared) in this entity, if any.
9-
types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.|
9+
#types is declared in ContainerEntity because different kinds of container can embed types. Types are usually contained in a Famix.Namespace. But types can also be contained in a Famix.Class or Famix.Method (in Java with inner classes for example). Famix.Function can also contain some types such as structs.|
1010
1111
1212

0 commit comments

Comments
 (0)