Skip to content

Commit 786c489

Browse files
committed
Merge pull request #705 from Systems-Modeling/ST6RI-888
ST6RI-888 Owned cross feature implied type not being set
2 parents 0d5552b + 413d42b commit 786c489

31 files changed

Lines changed: 100 additions & 33 deletions

File tree

kerml/src/examples/Simple Tests/Associations.kerml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,12 @@ package Associations {
1111
end x1;
1212
end [0..*] feature y1 redefines y;
1313
}
14+
15+
metaclass M;
16+
assoc XY {
17+
end [0..1] feature x : X {
18+
@M;
19+
}
20+
end feature y : Y;
21+
}
1422
}

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.52.0.qualifier
7+
Bundle-Version: 0.52.1.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.52.0.qualifier
7+
Bundle-Version: 0.52.1.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.52.0.qualifier
6+
Bundle-Version: 0.52.1.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.52.0.qualifier
6+
Bundle-Version: 0.52.1.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.52.0.qualifier
6+
Bundle-Version: 0.52.1.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.52.0.qualifier
6+
Bundle-Version: 0.52.1.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.52.0.qualifier
7+
Bundle-Version: 0.52.1.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)",
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
//*
2+
XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
3+
ResourceSet {
4+
ThisFile {}
5+
File {from ="/library/Base.kerml"}
6+
File {from ="/library/Links.kerml"}
7+
File {from ="/library/Occurrences.kerml"}
8+
File {from ="/library/Performances.kerml"}
9+
File {from ="/library/Objects.kerml"}
10+
File {from ="/library/Metaobjects.kerml"}
11+
}
12+
Workspace {
13+
JavaProject {
14+
SrcFolder {
15+
ThisFile {}
16+
File {from ="/library/Base.kerml"}
17+
File {from ="/library/Links.kerml"}
18+
File {from ="/library/Occurrences.kerml"}
19+
File {from ="/library/Performances.kerml"}
20+
File {from ="/library/Objects.kerml"}
21+
File {from ="/library/Metaobjects.kerml"}
22+
}
23+
}
24+
}
25+
END_SETUP
26+
*/
27+
28+
// XPECT noErrors ---> ""
29+
package Associations {
30+
datatype X;
31+
class Y;
32+
33+
assoc A {
34+
end x_cross [1..1] feature x : X;
35+
end y_cross [1..*] feature y : Y;
36+
}
37+
38+
assoc B specializes A {
39+
end x1;
40+
end [0..*] feature y1 redefines y;
41+
}
42+
43+
metaclass M;
44+
assoc XY {
45+
// Ensure that the owned cross feature is typed correctly,
46+
// even though getting type of end feature requires resolving
47+
// metadata nam to check if it is SemanticMetadata, which
48+
// requires getting supertypes of end feature, including its types.
49+
end [0..1] #M feature x : X;
50+
end [0..1] #M feature y : Y;
51+
}
52+
}

org.omg.kerml.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.52.0.qualifier
7+
Bundle-Version: 0.52.1.qualifier
88
Bundle-SymbolicName: org.omg.kerml.xtext.ide; singleton:=true
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.omg.kerml.xtext,

0 commit comments

Comments
 (0)