Merge pull request #359 from Systems-Modeling/ST6RI-533

ST6RI-533 Update implementation for 2022-04 baseline
Systems-Modeling · May 12, 2022 · f02e06e · f02e06e
2 parents 5925959 + ca69393
commit f02e06e
Show file tree

Hide file tree

Showing 189 changed files with 82,064 additions and 78,280 deletions.
diff --git a/kerml/src/examples/Mass Roll-up Example/MassRollup_2.kerml b/kerml/src/examples/Mass Roll-up Example/MassRollup_2.kerml
@@ -7,7 +7,7 @@ package MassRollup_2 {
 		feature totalMass subsets ISQ::mass =
 			mass + sum(subcomponents.totalMass);
 
-		feature subcomponents is massedThings;	
+		feature subcomponents redefines massedThings;	
 	}
 
 	feature massedThings: MassedThing[0..*];

diff --git a/kerml/src/examples/Mass Roll-up Example/Vehicles_3.kerml b/kerml/src/examples/Mass Roll-up Example/Vehicles_3.kerml
@@ -6,16 +6,16 @@ package Vehicles_3 {
 		feature serialNumber: String;
 		feature m redefines MassedThing::mass;
 
-		feature subparts is carParts;	
+		feature subparts redefines carParts;	
 	}
 
 	composite feature carParts: CarPart[0..*] subsets massedThings;
 
 	feature vehicle subsets carParts {	
 		feature vin redefines serialNumber;
 
-		feature is engine;
-		feature is transmission;
+		feature redefines engine;
+		feature redefines transmission;
 	}
 
 	composite feature engine subsets carParts {

diff --git a/kerml/src/examples/Packet Example/Packets.kerml b/kerml/src/examples/Packet Example/Packets.kerml
@@ -5,7 +5,7 @@ package Packets {
 	feature 'packet header' { }
 
 	feature 'packet data field' {	
-		feature 'packet secondary header' is 'packet header';
+		feature 'packet secondary header' redefines 'packet header';
 		feature 'user data field';
 	}
 
@@ -15,7 +15,7 @@ package Packets {
 			feature 'packet identification': String;
 			feature 'packet data length': Integer;
 		}
-		feature is 'packet data field';
+		feature redefines 'packet data field';
 	}
 
 	class 'Thermal Data Packet' specializes 'Data Packet' {

diff --git a/kerml/src/examples/Simple Tests/Classes.kerml b/kerml/src/examples/Simple Tests/Classes.kerml
@@ -14,7 +14,7 @@ package Classes {
 
 	private class C specializes Classes::'2' {
 		private y: A, '2'[0..*];
-		z is y;
+		alias z for y;
 	}
 
 }
diff --git a/kerml/src/examples/Simple Tests/Inheritance.kerml b/kerml/src/examples/Simple Tests/Inheritance.kerml
@@ -8,7 +8,7 @@ package Inheritance {
 	}
 
 	feature y: A {
-		feature x is B::f;
+		alias x for B::f;
 		feature g redefines f;
 	}
 

diff --git a/kerml/src/examples/Vehicle Example/VehicleDefinitions.kerml b/kerml/src/examples/Vehicle Example/VehicleDefinitions.kerml
@@ -16,7 +16,7 @@ package VehicleDefinitions {
 	class Axle;	
 	class Wheel;
 	class Lugbolt {
-		tighteningTorque is ISQ::torque;
+		tighteningTorque[1] subsets ISQ::torque;
 	}
 
 	/* INTERFACE BLOCKS */

diff --git a/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.kerml.xtext.ide
 Bundle-Vendor: SysML v2 Submission Team
-Bundle-Version: 0.22.1.qualifier
+Bundle-Version: 0.23.0.qualifier
 Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.expressions.xtext,

diff --git a/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.kerml.xtext.ui
 Bundle-Vendor: SysML v2 Submission Team
-Bundle-Version: 0.22.1.qualifier
+Bundle-Version: 0.23.0.qualifier
 Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.expressions.xtext,

diff --git a/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.omg.kerml.expressions.xtext
 Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.kerml.xtext
-Bundle-Version: 0.22.1.qualifier
+Bundle-Version: 0.23.0.qualifier
 Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,

diff --git a/...kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/KerMLExpressions.xtextbin b/...kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/KerMLExpressions.xtextbin