Skip to content

Commit 3d97202

Browse files
jeciscjecisc
committed
Rename #clauses to #forClauses since there is no if clause in it anymore
1 parent 26ca2eb commit 3d97202

5 files changed

Lines changed: 438 additions & 448 deletions

File tree

‎src/FAST-Python-Model-Generator/FASTPythonMetamodelGenerator.class.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ FASTPythonMetamodelGenerator >> defineRelations [
650650
<>-* ((expression property: #parentComparisonOperator) comment: 'Parent comparison expression of which I am.').
651651

652652
(comprehension property: #body) <>- (expression property: #parentComprehensionBody).
653-
(comprehension property: #clauses) <>-* (expression property: #parentComprehensionClause).
653+
(comprehension property: #forClauses) <>-* (expression property: #parentComprehensionForClause).
654654
(comprehension property: #conditions) <>-* (expression property: #parentComprehensionCondition).
655655

656656
(concatenatedString property: #strings) <>-* (string property: #parentConcatenatedString).

‎src/FAST-Python-Model/FASTPyComprehension.class.st‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
| Relation | Origin | Opposite | Type | Comment |
1212
|---|
1313
| `body` | `FASTPyComprehension` | `parentComprehensionBody` | `FASTPyExpression` | |
14-
| `clauses` | `FASTPyComprehension` | `parentComprehensionClause` | `FASTPyExpression` | |
1514
| `conditions` | `FASTPyComprehension` | `parentComprehensionCondition` | `FASTPyExpression` | |
15+
| `forClauses` | `FASTPyComprehension` | `parentComprehensionForClause` | `FASTPyExpression` | |
1616
1717
1818
@@ -24,8 +24,8 @@ Class {
2424
#classTraits : 'FASTPyTSplatExpression classTrait',
2525
#instVars : [
2626
'#body => FMOne type: #FASTPyExpression opposite: #parentComprehensionBody',
27-
'#clauses => FMMany type: #FASTPyExpression opposite: #parentComprehensionClause',
28-
'#conditions => FMMany type: #FASTPyExpression opposite: #parentComprehensionCondition'
27+
'#conditions => FMMany type: #FASTPyExpression opposite: #parentComprehensionCondition',
28+
'#forClauses => FMMany type: #FASTPyExpression opposite: #parentComprehensionForClause'
2929
],
3030
#category : 'FAST-Python-Model-Entities',
3131
#package : 'FAST-Python-Model',
@@ -42,15 +42,15 @@ FASTPyComprehension class >> annotation [
4242
]
4343

4444
{ #category : 'adding' }
45-
FASTPyComprehension >> addClause: anObject [
45+
FASTPyComprehension >> addCondition: anObject [
4646
<generated>
47-
^ self clauses add: anObject
47+
^ self conditions add: anObject
4848
]
4949

5050
{ #category : 'adding' }
51-
FASTPyComprehension >> addCondition: anObject [
51+
FASTPyComprehension >> addForClause: anObject [
5252
<generated>
53-
^ self conditions add: anObject
53+
^ self forClauses add: anObject
5454
]
5555

5656
{ #category : 'accessing' }
@@ -76,47 +76,47 @@ FASTPyComprehension >> bodyGroup [
7676
]
7777

7878
{ #category : 'accessing' }
79-
FASTPyComprehension >> clauses [
80-
"Relation named: #clauses type: #FASTPyExpression opposite: #parentComprehensionClause"
79+
FASTPyComprehension >> conditions [
80+
"Relation named: #conditions type: #FASTPyExpression opposite: #parentComprehensionCondition"
8181

8282
<generated>
8383
<derived>
84-
^ clauses
84+
^ conditions
8585
]
8686

8787
{ #category : 'accessing' }
88-
FASTPyComprehension >> clauses: anObject [
88+
FASTPyComprehension >> conditions: anObject [
8989

9090
<generated>
91-
clauses value: anObject
91+
conditions value: anObject
9292
]
9393

9494
{ #category : 'navigation' }
95-
FASTPyComprehension >> clausesGroup [
95+
FASTPyComprehension >> conditionsGroup [
9696
<generated>
97-
<navigation: 'Clauses'>
98-
^ MooseSpecializedGroup withAll: self clauses asSet
97+
<navigation: 'Conditions'>
98+
^ MooseSpecializedGroup withAll: self conditions asSet
9999
]
100100

101101
{ #category : 'accessing' }
102-
FASTPyComprehension >> conditions [
103-
"Relation named: #conditions type: #FASTPyExpression opposite: #parentComprehensionCondition"
102+
FASTPyComprehension >> forClauses [
103+
"Relation named: #forClauses type: #FASTPyExpression opposite: #parentComprehensionForClause"
104104

105105
<generated>
106106
<derived>
107-
^ conditions
107+
^ forClauses
108108
]
109109

110110
{ #category : 'accessing' }
111-
FASTPyComprehension >> conditions: anObject [
111+
FASTPyComprehension >> forClauses: anObject [
112112

113113
<generated>
114-
conditions value: anObject
114+
forClauses value: anObject
115115
]
116116

117117
{ #category : 'navigation' }
118-
FASTPyComprehension >> conditionsGroup [
118+
FASTPyComprehension >> forClausesGroup [
119119
<generated>
120-
<navigation: 'Conditions'>
121-
^ MooseSpecializedGroup withAll: self conditions asSet
120+
<navigation: 'ForClauses'>
121+
^ MooseSpecializedGroup withAll: self forClauses asSet
122122
]

‎src/FAST-Python-Model/FASTPyExpression.class.st‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
| `parentChevron` | `FASTPyExpression` | `expression` | `FASTPyChevron` | |
2929
| `parentComparisonOperator` | `FASTPyExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
3030
| `parentComprehensionBody` | `FASTPyExpression` | `body` | `FASTPyComprehension` | |
31-
| `parentComprehensionClause` | `FASTPyExpression` | `clauses` | `FASTPyComprehension` | |
3231
| `parentComprehensionCondition` | `FASTPyExpression` | `conditions` | `FASTPyComprehension` | |
32+
| `parentComprehensionForClause` | `FASTPyExpression` | `forClauses` | `FASTPyComprehension` | |
3333
| `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used|
3434
| `parentDefaultParameterValue` | `FASTPyExpression` | `defaultValue` | `FASTPyParameter` | |
3535
| `parentExceptClause` | `FASTPyExpression` | `expressions` | `FASTPyExceptClause` | |
@@ -83,8 +83,8 @@ Class {
8383
'#parentChevron => FMOne type: #FASTPyChevron opposite: #expression',
8484
'#parentComparisonOperator => FMOne type: #FASTPyComparisonOperator opposite: #operands',
8585
'#parentComprehensionBody => FMOne type: #FASTPyComprehension opposite: #body',
86-
'#parentComprehensionClause => FMOne type: #FASTPyComprehension opposite: #clauses',
8786
'#parentComprehensionCondition => FMOne type: #FASTPyComprehension opposite: #conditions',
87+
'#parentComprehensionForClause => FMOne type: #FASTPyComprehension opposite: #forClauses',
8888
'#parentDefaultParameterValue => FMOne type: #FASTPyParameter opposite: #defaultValue',
8989
'#parentExceptClause => FMOne type: #FASTPyExceptClause opposite: #expressions',
9090
'#parentInterpolation => FMOne type: #FASTPyInterpolation opposite: #expression',
@@ -596,49 +596,49 @@ FASTPyExpression >> parentComprehensionBodyGroup [
596596
]
597597

598598
{ #category : 'accessing' }
599-
FASTPyExpression >> parentComprehensionClause [
600-
"Relation named: #parentComprehensionClause type: #FASTPyComprehension opposite: #clauses"
599+
FASTPyExpression >> parentComprehensionCondition [
600+
"Relation named: #parentComprehensionCondition type: #FASTPyComprehension opposite: #conditions"
601601

602602
<generated>
603603
<container>
604-
^ parentComprehensionClause
604+
^ parentComprehensionCondition
605605
]
606606

607607
{ #category : 'accessing' }
608-
FASTPyExpression >> parentComprehensionClause: anObject [
608+
FASTPyExpression >> parentComprehensionCondition: anObject [
609609

610610
<generated>
611-
parentComprehensionClause := anObject
611+
parentComprehensionCondition := anObject
612612
]
613613

614614
{ #category : 'navigation' }
615-
FASTPyExpression >> parentComprehensionClauseGroup [
615+
FASTPyExpression >> parentComprehensionConditionGroup [
616616
<generated>
617-
<navigation: 'ParentComprehensionClause'>
618-
^ MooseSpecializedGroup with: self parentComprehensionClause
617+
<navigation: 'ParentComprehensionCondition'>
618+
^ MooseSpecializedGroup with: self parentComprehensionCondition
619619
]
620620

621621
{ #category : 'accessing' }
622-
FASTPyExpression >> parentComprehensionCondition [
623-
"Relation named: #parentComprehensionCondition type: #FASTPyComprehension opposite: #conditions"
622+
FASTPyExpression >> parentComprehensionForClause [
623+
"Relation named: #parentComprehensionForClause type: #FASTPyComprehension opposite: #forClauses"
624624

625625
<generated>
626626
<container>
627-
^ parentComprehensionCondition
627+
^ parentComprehensionForClause
628628
]
629629

630630
{ #category : 'accessing' }
631-
FASTPyExpression >> parentComprehensionCondition: anObject [
631+
FASTPyExpression >> parentComprehensionForClause: anObject [
632632

633633
<generated>
634-
parentComprehensionCondition := anObject
634+
parentComprehensionForClause := anObject
635635
]
636636

637637
{ #category : 'navigation' }
638-
FASTPyExpression >> parentComprehensionConditionGroup [
638+
FASTPyExpression >> parentComprehensionForClauseGroup [
639639
<generated>
640-
<navigation: 'ParentComprehensionCondition'>
641-
^ MooseSpecializedGroup with: self parentComprehensionCondition
640+
<navigation: 'ParentComprehensionForClause'>
641+
^ MooseSpecializedGroup with: self parentComprehensionForClause
642642
]
643643

644644
{ #category : 'accessing' }

0 commit comments

Comments
 (0)