Skip to content

Commit af2abf9

Browse files
jeciscjecisc
committed
Some fixes
- Regenerate MM - fix dependency problem - Move some java methods from FASTTEntity to FASTJavaEntity - Fix method present in two packages Fixes #259 Fixes #258
1 parent 11829a5 commit af2abf9

File tree

64 files changed

+56
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+56
-146
lines changed

‎src/BaselineOfFASTJava/BaselineOfFASTJava.class.st‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,16 @@ BaselineOfFASTJava >> defineDependencies: spec [
5757
BaselineOfFASTJava >> defineGroups: spec [
5858

5959
spec
60-
group: 'core'
61-
with:
62-
#( 'FAST-Java-Model' 'FAST-Java-Model-Extension' 'FAST-Java-Model-Generator' );
63-
group: 'tools'
64-
with: #( 'visitor' 'FAST-Java-Tools' 'FAST-Java-Tools-Tests' );
65-
group: 'smacc' with: #( 'core' 'SmaCC' 'FAST-Java-SmaCC-Importer'
66-
'FAST-Java-SmaCC-Importer-Tests' );
60+
group: 'core' with: #( 'FAST-Java-Model' 'FAST-Java-Model-Extension' 'FAST-Java-Model-Generator' );
61+
group: 'tools' with: #( 'visitor' 'FAST-Java-Tools' 'FAST-Java-Tools-Tests' );
62+
group: 'smacc' with: #( 'core' 'SmaCC' 'FAST-Java-SmaCC-Importer' 'FAST-Java-SmaCC-Importer-Tests' );
6763
group: 'visitor' with: #( 'core' 'FAST-Java-Visitor' );
6864
group: 'highlighter' with: #( 'core' 'FAST-Java-Highlighter' );
6965
group: 'all' with: #( 'smacc' 'visitor' 'highlighter' 'tools' );
7066
group: 'default' with: #( 'core' ).
7167

72-
spec for: #NeedsMoose do: [
73-
spec
74-
group: 'smacc'
75-
with: #( 'core' 'SmaCC' 'FAST-Java-SmaCC-Importer'
76-
'FAST-Java-SmaCC-Importer-Tests'
77-
'TinyLogger' ) ]
68+
spec for: #NeedsMoose do: [ spec group: 'smacc' with: #( 'core' 'SmaCC' 'FAST-Java-SmaCC-Importer' 'FAST-Java-SmaCC-Importer-Tests'
69+
'TinyLogger' ) ]
7870
]
7971

8072
{ #category : 'baselines' }
@@ -83,25 +75,17 @@ BaselineOfFASTJava >> definePackages: spec [
8375
spec
8476
package: 'FAST-Java-Model' with: [ spec requires: #( 'FAST' ) ];
8577
package: 'FAST-Java-Model-Generator';
86-
package: 'FAST-Java-Model-Extension'
87-
with: [ spec requires: #( 'FAST-Java-Model' ) ];
78+
package: 'FAST-Java-Model-Extension' with: [ spec requires: #( 'FAST-Java-Model' ) ];
8879
package: 'FAST-Java-SmaCC-Importer';
89-
package: 'FAST-Java-SmaCC-Importer-Tests'
90-
with: [ spec requires: #( 'FAST-Java-SmaCC-Importer' ) ];
91-
package: 'FAST-Java-Visitor'
92-
with: [ spec requires: #( 'FAST-Java-Model' ) ];
93-
package: 'FAST-Java-Highlighter'
94-
with: [ spec requires: #( 'FAST-Java-Model' ) ].
80+
package: 'FAST-Java-SmaCC-Importer-Tests' with: [ spec requires: #( 'FAST-Java-SmaCC-Importer' ) ];
81+
package: 'FAST-Java-Visitor' with: [ spec requires: #( 'FAST-Java-Model' ) ];
82+
package: 'FAST-Java-Highlighter' with: [ spec requires: #( 'FAST-Java-Model' 'FASTTool' ) ].
83+
9584
"Tools"
9685
spec
97-
package: 'FAST-Java-Tools'
98-
with: [ spec requires: #( 'FAST-Java-Visitor' 'FASTTool' ) ];
99-
package: 'FAST-Java-Tools-Tests'
100-
with: [ spec requires: #( 'FAST-Java-Tools' ) ].
101-
86+
package: 'FAST-Java-Tools' with: [ spec requires: #( 'FAST-Java-Visitor' 'FASTTool' ) ];
87+
package: 'FAST-Java-Tools-Tests' with: [ spec requires: #( 'FAST-Java-Tools' ) ].
88+
10289
"In case of no Famix loaded"
103-
spec for: #NeedsMoose do: [
104-
spec
105-
package: 'FAST-Java-Model'
106-
with: [ spec requires: #( 'FAST' 'Famix' ) ] ]
90+
spec for: #NeedsMoose do: [ spec package: 'FAST-Java-Model' with: [ spec requires: #( 'FAST' 'Famix' ) ] ]
10791
]

‎src/FAST-Java-Model-Generator/FASTJavaMetamodelGenerator.class.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ FASTJavaMetamodelGenerator >> defineRelations [
13691369

13701370
((javaLambdaExpression property: #expression) comment:
13711371
'Expression to be executed as part of the lambda.')
1372-
<>- ((tEntity property: #javaLambdaExpressionOwner) comment:
1372+
<>- ((javaEntity property: #javaLambdaExpressionOwner) comment:
13731373
'The expression owner (if possible)').
13741374

13751375
((javaMethodReference property: #receiver) comment:

‎src/FAST-Java-Model/FASTJavaAnnotation.class.st‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ example:
1313
|---|
1414
| `arrayOwner` | `FASTJavaTAnnotationElement` | `values` | `FASTJavaArrayAnnotationElement` | The ArrayAnnotationElement I am an element of|
1515
| `invokedIn` | `FASTTNamedEntity` | `invoked` | `FASTTInvocation` | Optional invocation where this name is used|
16-
| `javaLambdaExpressionOwner` | `FASTTEntity` | `expression` | `FASTJavaLambdaExpression` | The expression owner (if possible)|
1716
| `javaModifierOwner` | `FASTJavaTModifier` | `modifiers` | `FASTJavaTWithModifiers` | The owner of the modifier|
1817
| `parentAnnotation` | `FASTJavaTAnnotationElement` | `elements` | `FASTJavaAnnotation` | An ""argument"" of an annotation, eg. ""unchecked"" in the following annotation: @SuppressWarnings(value=""unchecked"")|
1918

‎src/FAST-Java-Model/FASTJavaArrayAccess.class.st‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ liste[i]
2828
| `javaCastExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaCastExpression` | The javaCastExpression owner (if possible)|
2929
| `javaForEachStatementOwner` | `FASTTExpression` | `list` | `FASTJavaForEachStatement` | The javaForEachStatement owner (if possible)|
3030
| `javaLabeledCaseStatementOwner` | `FASTTExpression` | `label` | `FASTJavaLabeledCaseStatement` | The javaLabeledCaseStatement owner (if possible)|
31-
| `javaLambdaExpressionOwner` | `FASTTEntity` | `expression` | `FASTJavaLambdaExpression` | The expression owner (if possible)|
3231
| `javaNewArrayInitialOwner` | `FASTTExpression` | `initializer` | `FASTJavaNewArray` | I belong to a new array initialization|
3332
| `javaStringAssertStatementOwner` | `FASTTExpression` | `message` | `FASTJavaAssertStatement` | The assertion which I describe|
3433
| `javaSynchronizedStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaSynchronizedStatement` | The owner of the synchronized block (if possible)|

‎src/FAST-Java-Model/FASTJavaArrayAnnotationElement.class.st‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ I represent an array as argument of an annotationExpression
2525
| `javaCastExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaCastExpression` | The javaCastExpression owner (if possible)|
2626
| `javaForEachStatementOwner` | `FASTTExpression` | `list` | `FASTJavaForEachStatement` | The javaForEachStatement owner (if possible)|
2727
| `javaLabeledCaseStatementOwner` | `FASTTExpression` | `label` | `FASTJavaLabeledCaseStatement` | The javaLabeledCaseStatement owner (if possible)|
28-
| `javaLambdaExpressionOwner` | `FASTTEntity` | `expression` | `FASTJavaLambdaExpression` | The expression owner (if possible)|
2928
| `javaNewArrayInitialOwner` | `FASTTExpression` | `initializer` | `FASTJavaNewArray` | I belong to a new array initialization|
3029
| `javaStringAssertStatementOwner` | `FASTTExpression` | `message` | `FASTJavaAssertStatement` | The assertion which I describe|
3130
| `javaSynchronizedStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaSynchronizedStatement` | The owner of the synchronized block (if possible)|

‎src/FAST-Java-Model/FASTJavaArrayInitializer.class.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ My initializers are
3434
| `javaCastExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaCastExpression` | The javaCastExpression owner (if possible)|
3535
| `javaForEachStatementOwner` | `FASTTExpression` | `list` | `FASTJavaForEachStatement` | The javaForEachStatement owner (if possible)|
3636
| `javaLabeledCaseStatementOwner` | `FASTTExpression` | `label` | `FASTJavaLabeledCaseStatement` | The javaLabeledCaseStatement owner (if possible)|
37-
| `javaLambdaExpressionOwner` | `FASTTEntity` | `expression` | `FASTJavaLambdaExpression` | The expression owner (if possible)|
3837
| `javaNewArrayInitialOwner` | `FASTTExpression` | `initializer` | `FASTJavaNewArray` | I belong to a new array initialization|
3938
| `javaStringAssertStatementOwner` | `FASTTExpression` | `message` | `FASTJavaAssertStatement` | The assertion which I describe|
4039
| `javaSynchronizedStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaSynchronizedStatement` | The owner of the synchronized block (if possible)|
@@ -97,6 +96,7 @@ FASTJavaArrayInitializer >> initializers [
9796
<FMComment: 'My initializers'>
9897
<derived>
9998
<FMProperty: #initializers type: #FASTTExpression opposite: #javaArrayInitializers>
99+
<multivalued>
100100
^ self attributeAt: #initializers ifAbsentPut: [ FMMultivalueLink on: self opposite: #javaArrayInitializers: ]
101101
]
102102

‎src/FAST-Java-Model/FASTJavaAssertStatement.class.st‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ void method (){
1818
| `forIninitializerOwner` | `FASTTStatement` | `initializer` | `FASTJavaForStatement` | I am the initializer of the for|
1919
| `ifElsePartOwner` | `FASTTStatement` | `elsePart` | `FASTJavaIfStatement` | The if owner (if possible)|
2020
| `ifThenPartOwner` | `FASTTStatement` | `thenPart` | `FASTJavaIfStatement` | The if owner (if possible)|
21-
| `javaLambdaExpressionOwner` | `FASTTEntity` | `expression` | `FASTJavaLambdaExpression` | The expression owner (if possible)|
2221
| `labelStatementOwner` | `FASTTStatement` | `labeledStatement` | `FASTJavaLabeledStatement` | Label Statement entity containing this statement|
2322
| `parentLoopStatement` | `FASTTStatement` | `body` | `FASTTLoopStatement` | Optional loop of which this statement is the body|
2423
| `statementContainer` | `FASTTStatement` | `statements` | `FASTTStatementBlock` | Block containing this statement.|

‎src/FAST-Java-Model/FASTJavaAssignmentExpression.class.st‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Contains a referances to an assignee assignee and the expression that's being as
2727
| `javaCastExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaCastExpression` | The javaCastExpression owner (if possible)|
2828
| `javaForEachStatementOwner` | `FASTTExpression` | `list` | `FASTJavaForEachStatement` | The javaForEachStatement owner (if possible)|
2929
| `javaLabeledCaseStatementOwner` | `FASTTExpression` | `label` | `FASTJavaLabeledCaseStatement` | The javaLabeledCaseStatement owner (if possible)|
30-
| `javaLambdaExpressionOwner` | `FASTTEntity` | `expression` | `FASTJavaLambdaExpression` | The expression owner (if possible)|
3130
| `javaNewArrayInitialOwner` | `FASTTExpression` | `initializer` | `FASTJavaNewArray` | I belong to a new array initialization|
3231
| `javaStringAssertStatementOwner` | `FASTTExpression` | `message` | `FASTJavaAssertStatement` | The assertion which I describe|
3332
| `javaSynchronizedStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaSynchronizedStatement` | The owner of the synchronized block (if possible)|

‎src/FAST-Java-Model/FASTJavaBooleanLiteral.class.st‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ I represent a boolean literal node.
2424
| `javaCastExpressionOwner` | `FASTTExpression` | `expression` | `FASTJavaCastExpression` | The javaCastExpression owner (if possible)|
2525
| `javaForEachStatementOwner` | `FASTTExpression` | `list` | `FASTJavaForEachStatement` | The javaForEachStatement owner (if possible)|
2626
| `javaLabeledCaseStatementOwner` | `FASTTExpression` | `label` | `FASTJavaLabeledCaseStatement` | The javaLabeledCaseStatement owner (if possible)|
27-
| `javaLambdaExpressionOwner` | `FASTTEntity` | `expression` | `FASTJavaLambdaExpression` | The expression owner (if possible)|
2827
| `javaNewArrayInitialOwner` | `FASTTExpression` | `initializer` | `FASTJavaNewArray` | I belong to a new array initialization|
2928
| `javaStringAssertStatementOwner` | `FASTTExpression` | `message` | `FASTJavaAssertStatement` | The assertion which I describe|
3029
| `javaSynchronizedStatementOwner` | `FASTTExpression` | `expression` | `FASTJavaSynchronizedStatement` | The owner of the synchronized block (if possible)|

‎src/FAST-Java-Model/FASTJavaBreakStatement.class.st‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ A node representing break statement in java
1111
| `forIninitializerOwner` | `FASTTStatement` | `initializer` | `FASTJavaForStatement` | I am the initializer of the for|
1212
| `ifElsePartOwner` | `FASTTStatement` | `elsePart` | `FASTJavaIfStatement` | The if owner (if possible)|
1313
| `ifThenPartOwner` | `FASTTStatement` | `thenPart` | `FASTJavaIfStatement` | The if owner (if possible)|
14-
| `javaLambdaExpressionOwner` | `FASTTEntity` | `expression` | `FASTJavaLambdaExpression` | The expression owner (if possible)|
1514
| `labelStatementOwner` | `FASTTStatement` | `labeledStatement` | `FASTJavaLabeledStatement` | Label Statement entity containing this statement|
1615
| `parentLoopStatement` | `FASTTStatement` | `body` | `FASTTLoopStatement` | Optional loop of which this statement is the body|
1716
| `statementContainer` | `FASTTStatement` | `statements` | `FASTTStatementBlock` | Block containing this statement.|

0 commit comments

Comments
 (0)