Skip to content

Commit 91e6c06

Browse files
vytautas-astrauskas-sensmetryvytautas-astrauskas-sensmetry
committed
Merge remote-tracking branch 'origin/master' into ST6RI-898
2 parents 52a602e + 5694b8a commit 91e6c06

56 files changed

Lines changed: 287 additions & 164 deletions

File tree

Some content is hidden

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

‎kerml/src/examples/Simple Tests/Filtering.kerml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@ package Filtering {
2323

2424
package UpperLevelApprovals {
2525
private import DesignModel::**;
26-
filter Annotations::ApprovalAnnotation::approved and
27-
Annotations::ApprovalAnnotation::level > 1;
26+
filter (as Annotations::ApprovalAnnotation).approved and
27+
(as Annotations::ApprovalAnnotation).level > 1;
2828

2929
struct Test :> System;
3030
}
3131

3232
package UpperLevelApprovals1 {
3333
private import Annotations::**;
34-
private import DesignModel::**[@Structure][approved and level > 1];
34+
private import DesignModel::**[@Structure]
35+
[(as Annotations::ApprovalAnnotation).approved and
36+
(as Annotations::ApprovalAnnotation).level > 1];
3537

3638
struct Test :> System;
3739
}

‎org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ide
55
Bundle-RequiredExecutionEnvironment: JavaSE-21
66
Bundle-Vendor: SysML v2 Submission Team
7-
Bundle-Version: 0.58.0.qualifier
7+
Bundle-Version: 0.59.0.qualifier
88
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.omg.kerml.expressions.xtext,

‎org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ui
55
Bundle-RequiredExecutionEnvironment: JavaSE-21
66
Bundle-Vendor: SysML v2 Submission Team
7-
Bundle-Version: 0.58.0.qualifier
7+
Bundle-Version: 0.59.0.qualifier
88
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.omg.kerml.expressions.xtext,

‎org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext
33
Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext
55
Bundle-RequiredExecutionEnvironment: JavaSE-21
6-
Bundle-Version: 0.58.0.qualifier
6+
Bundle-Version: 0.59.0.qualifier
77
Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.eclipse.xtext,

‎org.omg.kerml.owl.ide/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.kerml.owl.ide
44
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-Vendor: My Company
6-
Bundle-Version: 0.58.0.qualifier
6+
Bundle-Version: 0.59.0.qualifier
77
Bundle-SymbolicName: org.omg.kerml.owl.ide;singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.omg.kerml.owl,

‎org.omg.kerml.owl.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.kerml.owl.ui
44
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-Vendor: My Company
6-
Bundle-Version: 0.58.0.qualifier
6+
Bundle-Version: 0.59.0.qualifier
77
Bundle-SymbolicName: org.omg.kerml.owl.ui;singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.omg.kerml.owl,

‎org.omg.kerml.owl/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.sysml.owl
44
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-Vendor: My Company
6-
Bundle-Version: 0.58.0.qualifier
6+
Bundle-Version: 0.59.0.qualifier
77
Bundle-SymbolicName: org.omg.kerml.owl;singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.eclipse.xtext,

‎org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: org.omg.kerml.xpect.tests
44
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-SymbolicName: org.omg.kerml.xpect.tests;singleton:=true
66
Bundle-Vendor: SysML v2 Submission Team
7-
Bundle-Version: 0.58.0.qualifier
7+
Bundle-Version: 0.59.0.qualifier
88
Require-Bundle: org.eclipse.core.runtime,
99
org.eclipse.xpect.xtext.lib;bundle-version="[0.3.0,0.4.0)",
1010
org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)",

‎org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/imports/local/Import_Filtered.kerml.xt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ package Import_Filtered {
237237
}
238238

239239
package 'Mandatory Features_true_1' {
240-
public import vehicle1_c1::**[Safety::isMandatory];
240+
public import vehicle1_c1::**[(as Safety).isMandatory];
241241
classifier b :> seatBelt;
242242

243243
// XPECT errors --> "Couldn't resolve reference to Classifier 'alarm'." at "alarm"
@@ -259,7 +259,7 @@ package Import_Filtered {
259259
}
260260

261261
package 'Mandatory Features_true_2' {
262-
public import vehicle1_c1::**[Safety::isMandatory == true];
262+
public import vehicle1_c1::**[(as Safety).isMandatory == true];
263263
classifier b :> seatBelt;
264264

265265
// XPECT errors --> "Couldn't resolve reference to Classifier 'alarm'." at "alarm"
@@ -281,7 +281,7 @@ package Import_Filtered {
281281
}
282282

283283
package 'Mandatory Features_false' {
284-
public import vehicle1_c1::**[Safety::isMandatory == false];
284+
public import vehicle1_c1::**[(as Safety).isMandatory == false];
285285
classifier j :> antilockBrakes;
286286

287287
// XPECT errors --> "Couldn't resolve reference to Classifier 'alarm'." at "alarm"

‎org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_SemanticMetadata.kerml.xt‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
//* XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
2+
ResourceSet {
3+
ThisFile {}
4+
File {from ="/library/Base.kerml"}
5+
File {from ="/library/Links.kerml"}
6+
File {from ="/library/Occurrences.kerml"}
7+
File {from ="/library/Objects.kerml"}
8+
File {from ="/library/Performances.kerml"}
9+
File {from ="/library/Metaobjects.kerml"}
10+
File {from ="/library/KerML.kerml"}
11+
File {from ="/library/BaseFunctions.kerml"}
12+
}
13+
Workspace {
14+
JavaProject {
15+
SrcFolder {
16+
ThisFile {}
17+
File {from ="/library/Base.kerml"}
18+
File {from ="/library/Links.kerml"}
19+
File {from ="/library/Occurrences.kerml"}
20+
File {from ="/library/Objects.kerml"}
21+
File {from ="/library/Performances.kerml"}
22+
File {from ="/library/Metaobjects.kerml"}
23+
File {from ="/library/KerML.kerml"}
24+
File {from ="/library/BaseFunctions.kerml"}
25+
}
26+
}
27+
}
28+
END_SETUP
29+
*/
30+
31+
// XPECT noErrors ---> ""
32+
package SemanticMetadataTest {
33+
private import Metaobjects::SemanticMetadata;
34+
35+
classifier P {
36+
feature a;
37+
}
38+
feature p : P;
39+
40+
metaclass M :> SemanticMetadata {
41+
:>> baseType = p meta KerML::Feature;
42+
}
43+
44+
classifier Q {
45+
feature a = 1;
46+
#M feature p1 {
47+
// This feature should redefine P::a, not Q::a.
48+
// Redefining Q::a will causes a feature value override error.
49+
feature :>> a = 2;
50+
}
51+
}
52+
}

0 commit comments

Comments
 (0)