Merge pull request #5 from ModelDriven/ST6RI-8

ST6RI-8 Implement computation of derived meta-attributes

Author: seidewitz

org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/AlfParser.java

@@ -2,7 +2,7 @@
 ')'=55
 '*'=22
 '+'=20
-','=43
+','=44
 '-'=21
 '.'=16
 '..'=50
@@ -17,13 +17,13 @@
 '['=48
 ']'=49
 '^'=24
-'abstract'=58
+'abstract'=60
 'any'=19
 'as'=35
 'assoc'=41
 'class'=40
 'compose'=61
-'connector'=44
+'connector'=42
 'e'=25
 'end'=45
 'feature'=17
@@ -37,13 +37,13 @@
 'out'=32
 'package'=36
 'packaged'=30
-'part'=59
-'port'=60
+'part'=58
+'port'=59
 'private'=28
 'protected'=29
 'public'=27
 'redefines'=52
-'specializes'=42
+'specializes'=43
 'subsets'=51
 'to'=53
 '{'=37

org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/internal/InternalAlf.g

@@ -147,8 +147,8 @@ helper SysML::Element::mapToDeclarations() {
 }
 
 mapping SysML::Element::toEntity(): OWL::Entity disjuncts
-	SysML::Class::toClass,
-	SysML::Feature::toObjectProperty;
+	SysML::Feature::toObjectProperty,
+	SysML::Class::toClass;
 
 // Namespace
 
@@ -157,7 +157,7 @@ query SysML::Package::URL(): String {
 }
 
 helper SysML::Package::mapToDeclarations() {
-	self.membership.ownedMemberElement->mapToDeclarations();
+	self.ownedMembership.ownedMemberElement->mapToDeclarations();
 }
 
 //mapping SysML::Package::toDeclaration(): Declaration {
@@ -206,7 +206,7 @@ query SysML::Class::IRI(): String {
 }
 
 query SysML::Class::ownedFeatures(): List(SysML::Feature) {
-	return self.membership.ownedMemberElement[SysML::Feature];
+	return self.ownedMembership.ownedMemberElement[SysML::Feature];
 }
 
 query SysML::Class::implicitSuperclass(): SysML::Class {
@@ -227,7 +227,7 @@ query SysML::Class::superclasses(): Bag(SysML::Class) {
 }
 
 query SysML::Class::feature(featureName: String): SysML::Feature {
-	var members := self.membership.ownedMemberElement->union(self.membership.memberElement);
+	var members := self.ownedMembership.ownedMemberElement->union(self.ownedMembership.memberElement);
 	var namedFeature := members[SysML::Feature]![name = featureName];
 	if namedFeature = null then {
 		namedFeature := self.superclasses().feature(featureName)![true];
@@ -237,7 +237,10 @@ query SysML::Class::feature(featureName: String): SysML::Feature {
 
 helper SysML::Class::mapToDeclarations() {
 	self.map toDeclaration();
-	self.membership.ownedMemberElement->mapToDeclarations();
+	self.ownedMembership.ownedMemberElement->forEach(element) {
+//		log('  ownedMember: ' + valueOf(element.name));
+		element.mapToDeclarations();
+	};
 }
 
 mapping SysML::Class::toClass(): OWL::Class 
@@ -276,16 +279,19 @@ query SysML::Feature::IRI(): String {
 
 query SysML::Feature::redefinedFeature(): SysML::Feature {
 	log('Feature ' + valueOf(self.name));
-	var feature := self.ownedRedefinition.redefinedFeature![true];
-	if feature = null and self.name <> null then {
+	var redefinedFeature := self.ownedElement[Redefinition].redefinedFeature![true];
+	if redefinedFeature = null and self.name <> null then {
 		var owner := self.owner();
 		if (owner <> null and owner.oclIsKindOf(SysML::Class)) then {
-			 feature := 
+			 redefinedFeature := 
 			 	owner.oclAsType(SysML::Class).superclasses().feature(self.name)![true];		
 	    } endif;
 	} endif;
-	log('  redefinedFeature: ' + if feature.oclIsInvalid() then "<invalid>" else if feature = null then "<none>" else valueOf(feature.name) endif endif);
-	return feature;
+	log('  redefinedFeature: ' + 
+			if redefinedFeature.oclIsInvalid() then "<invalid>" 
+			else if redefinedFeature = null then "<none>" 
+			else valueOf(redefinedFeature.name) endif endif);
+	return redefinedFeature;
 }
 
 query SysML::Feature::type(): SysML::Class {
@@ -313,6 +319,7 @@ query SysML::Feature::range(): SysML::Class {
 helper SysML::Feature::mapToDeclarations() {
 	self.map toDeclaration();
 	self.ownedType->mapToDeclarations();
+	self.ownedMembership.ownedMemberElement->mapToDeclarations();
 }
 
 helper newMinCardinality(cardinality: Integer, objectProperty: OWL::ObjectProperty, domain: OWL::Class) {

org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/internal/InternalAlf.tokens

@@ -162,14 +162,14 @@ class Dependency {
 			
 			public class c_Public_alias{
 				public class c_public{}
-				private alias_private is c_public;
-				public alias_public is c_public;
+				private class alias_private is c_public;
+				public class alias_public is c_public;
 			}
 			
 			private class c_Private_alias{
 				public class c_public{}
-				private alias_private is c_public;
-				public alias_public is c_public;
+				private class alias_private is c_public;
+				public class alias_public is c_public;
 			}
 			
 			public class c_clazz{

org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/internal/InternalAlfLexer.java

@@ -110,7 +110,7 @@ class MemberNameTests {
 		EcoreUtil2.resolveAll(result)
 		Assert.assertNotNull(result)
 		Assert.assertTrue(result.eResource.errors.length == 1)
-		result.assertError(SysMLPackage.eINSTANCE.class_, XtextSyntaxDiagnostic.LINKING_DIAGNOSTIC)
+		result.assertError(SysMLPackage.eINSTANCE.category, XtextSyntaxDiagnostic.LINKING_DIAGNOSTIC)
 	}
 
 	@Test
@@ -252,8 +252,7 @@ class MemberNameTests {
 					feature a{}
 				}
 				feature B is A;
-				feature C;
-				C redefines B::a;
+				feature C redefines B::a;
 			}
 		''')