Skip to content

Commit a0a9445

Browse files
ClotildeToullecClotildeToullec
authored
Merge pull request #31 from moosetechnology/adapt-to-parametrics
Modify metamodel to adapt to changes in Famix metamodel
2 parents aa2e726 + f173f9c commit a0a9445

31 files changed

+270
-357
lines changed

‎src/Famix-C-Entities/FamixCAttribute.class.st‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
|---|
88
| `parentType` | `FamixTAttribute` | `attributes` | `FamixTWithAttributes` | Type declaring the attribute. belongsTo implementation|
99
10+
### Outgoing dependencies
11+
| Relation | Origin | Opposite | Type | Comment |
12+
|---|
13+
| `typing` | `FamixTTypedEntity` | `typedEntity` | `FamixTEntityTyping` | Association linking this entity to its declared type.|
14+
1015
### Incoming dependencies
1116
| Relation | Origin | Opposite | Type | Comment |
1217
|---|
@@ -15,7 +20,6 @@
1520
### Other
1621
| Relation | Origin | Opposite | Type | Comment |
1722
|---|
18-
| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
1923
| `receivingInvocations` | `FamixTInvocationsReceiver` | `receiver` | `FamixTInvocation` | List of invocations performed on this entity (considered as the receiver)|
2024
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
2125

‎src/Famix-C-Entities/FamixCBehaviouralEntity.class.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
| `behaviouralPointers` | `FamixCBehaviouralEntity` | `referer` | `FamixCBehaviouralPointer` | All functions which addresses are used in this entity|
1515
| `outgoingInvocations` | `FamixTWithInvocations` | `sender` | `FamixTInvocation` | Outgoing invocations sent by this behaviour.|
1616
| `outgoingReferences` | `FamixTWithReferences` | `referencer` | `FamixTReference` | References from this entity to other entities.|
17+
| `typing` | `FamixTTypedEntity` | `typedEntity` | `FamixTEntityTyping` | Association linking this entity to its declared type.|
1718
1819
### Incoming dependencies
1920
| Relation | Origin | Opposite | Type | Comment |
@@ -24,7 +25,6 @@
2425
### Other
2526
| Relation | Origin | Opposite | Type | Comment |
2627
|---|
27-
| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
2828
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
2929
3030

‎src/Famix-C-Entities/FamixCComment.class.st‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
|---|
88
| `commentedEntity` | `FamixTComment` | `comments` | `FamixTWithComments` | Source code commented by the comment|
99
10+
### Other
11+
| Relation | Origin | Opposite | Type | Comment |
12+
|---|
13+
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
1014
11-
## Properties
12-
======================
1315
14-
| Name | Type | Default value | Comment |
15-
|---|
16-
| `content` | `String` | nil | Content of the comment as a String|
1716
1817
"
1918
Class {

‎src/Famix-C-Entities/FamixCEntityTyping.class.st‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
"
2+
## Relations
3+
======================
4+
5+
### Association source
6+
| Relation | Origin | Opposite | Type | Comment |
7+
|---|
8+
| `typedEntity` | `FamixTEntityTyping` | `typing` | `FamixTTypedEntity` | Entity deckaring the type.|
9+
10+
### Association target
11+
| Relation | Origin | Opposite | Type | Comment |
12+
|---|
13+
| `declaredType` | `FamixTEntityTyping` | `incomingTypings` | `FamixTType` | Type of the entity.|
14+
15+
### Other
16+
| Relation | Origin | Opposite | Type | Comment |
17+
|---|
18+
| `next` | `FamixTAssociation` | `previous` | `FamixTAssociation` | Next association in an ordered collection of associations. Currently not supported by the Moose importer|
19+
| `previous` | `FamixTAssociation` | `next` | `FamixTAssociation` | Previous association in an ordered collection of associations. Currently not supported by the Moose importer|
20+
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
21+
22+
23+
24+
"
25+
Class {
26+
#name : 'FamixCEntityTyping',
27+
#superclass : 'FamixCEntity',
28+
#traits : 'FamixTEntityTyping',
29+
#classTraits : 'FamixTEntityTyping classTrait',
30+
#category : 'Famix-C-Entities-Entities',
31+
#package : 'Famix-C-Entities',
32+
#tag : 'Entities'
33+
}
34+
35+
{ #category : 'meta' }
36+
FamixCEntityTyping class >> annotation [
37+
38+
<FMClass: #EntityTyping super: #FamixCEntity>
39+
<package: #'Famix-C-Entities'>
40+
<generated>
41+
^ self
42+
]

‎src/Famix-C-Entities/FamixCEnum.class.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
| Relation | Origin | Opposite | Type | Comment |
1717
|---|
1818
| `incomingReferences` | `FamixTReferenceable` | `referredEntity` | `FamixTReference` | References to this entity by other entities.|
19+
| `incomingTypings` | `FamixTType` | `declaredType` | `FamixTEntityTyping` | Relations to the entities that have this as type.|
1920
2021
### Other
2122
| Relation | Origin | Opposite | Type | Comment |
2223
|---|
2324
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
24-
| `typedEntities` | `FamixTType` | `declaredType` | `FamixTTypedEntity` | Entities that have this type as declaredType|
2525
2626
2727
## Properties

‎src/Famix-C-Entities/FamixCEnumValue.class.st‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
|---|
88
| `parentEnum` | `FamixTEnumValue` | `enumValues` | `FamixTWithEnumValues` | The Enum declaring this value. It offers the implementation of belongsTo|
99
10+
### Outgoing dependencies
11+
| Relation | Origin | Opposite | Type | Comment |
12+
|---|
13+
| `typing` | `FamixTTypedEntity` | `typedEntity` | `FamixTEntityTyping` | Association linking this entity to its declared type.|
14+
1015
### Incoming dependencies
1116
| Relation | Origin | Opposite | Type | Comment |
1217
|---|
@@ -15,7 +20,6 @@
1520
### Other
1621
| Relation | Origin | Opposite | Type | Comment |
1722
|---|
18-
| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
1923
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
2024
2125

‎src/Famix-C-Entities/FamixCFunction.class.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
| `accesses` | `FamixTWithAccesses` | `accessor` | `FamixTAccess` | Accesses to variables made by this behaviour.|
2020
| `outgoingInvocations` | `FamixTWithInvocations` | `sender` | `FamixTInvocation` | Outgoing invocations sent by this behaviour.|
2121
| `outgoingReferences` | `FamixTWithReferences` | `referencer` | `FamixTReference` | References from this entity to other entities.|
22+
| `typing` | `FamixTTypedEntity` | `typedEntity` | `FamixTEntityTyping` | Association linking this entity to its declared type.|
2223
2324
### Incoming dependencies
2425
| Relation | Origin | Opposite | Type | Comment |
@@ -28,7 +29,6 @@
2829
### Other
2930
| Relation | Origin | Opposite | Type | Comment |
3031
|---|
31-
| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
3232
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
3333
3434

‎src/Famix-C-Entities/FamixCImportingContext.class.st‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@ FamixCImportingContext >> importDereferencedInvocation [
8080
^ self importAssociation: (self class fm3ClassNamed: #DereferencedInvocation)
8181
]
8282

83+
{ #category : 'importing' }
84+
FamixCImportingContext >> importEntityTyping [
85+
86+
<generated>
87+
^ self importAssociation: (self class fm3ClassNamed: #EntityTyping)
88+
]
89+
8390
{ #category : 'importing' }
8491
FamixCImportingContext >> importEnum [
8592

@@ -283,6 +290,13 @@ FamixCImportingContext >> shouldImportDereferencedInvocation [
283290
^ self shouldImport: #DereferencedInvocation
284291
]
285292

293+
{ #category : 'testing' }
294+
FamixCImportingContext >> shouldImportEntityTyping [
295+
296+
<generated>
297+
^ self shouldImport: #EntityTyping
298+
]
299+
286300
{ #category : 'testing' }
287301
FamixCImportingContext >> shouldImportEnum [
288302

‎src/Famix-C-Entities/FamixCLocalVariable.class.st‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
|---|
88
| `parentBehaviouralEntity` | `FamixTLocalVariable` | `localVariables` | `FamixTWithLocalVariables` | Behavioural entity declaring this local variable. belongsTo implementation|
99
10+
### Outgoing dependencies
11+
| Relation | Origin | Opposite | Type | Comment |
12+
|---|
13+
| `typing` | `FamixTTypedEntity` | `typedEntity` | `FamixTEntityTyping` | Association linking this entity to its declared type.|
14+
1015
### Incoming dependencies
1116
| Relation | Origin | Opposite | Type | Comment |
1217
|---|
@@ -15,7 +20,6 @@
1520
### Other
1621
| Relation | Origin | Opposite | Type | Comment |
1722
|---|
18-
| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
1923
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
2024
2125

‎src/Famix-C-Entities/FamixCParameter.class.st‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
|---|
88
| `parentBehaviouralEntity` | `FamixTParameter` | `parameters` | `FamixTWithParameters` | Behavioural entity containing this parameter. belongsTo implementation|
99
10+
### Outgoing dependencies
11+
| Relation | Origin | Opposite | Type | Comment |
12+
|---|
13+
| `typing` | `FamixTTypedEntity` | `typedEntity` | `FamixTEntityTyping` | Association linking this entity to its declared type.|
14+
1015
### Incoming dependencies
1116
| Relation | Origin | Opposite | Type | Comment |
1217
|---|
@@ -15,7 +20,6 @@
1520
### Other
1621
| Relation | Origin | Opposite | Type | Comment |
1722
|---|
18-
| `declaredType` | `FamixTTypedEntity` | `typedEntities` | `FamixTType` | Type of the entity, if any|
1923
| `sourceAnchor` | `FamixTSourceEntity` | `element` | `FamixTSourceAnchor` | SourceAnchor entity linking to the original source code for this entity|
2024
2125

0 commit comments

Comments
 (0)