Merge pull request #709 from Systems-Modeling/ST6RI-891

ST6RI-891 Feature chain name resolution allows protected names

Author: seidewitz

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/visibility/VisibilityTests_Protected_FeatureChaining.kerml.xt

@@ -0,0 +1,48 @@
+//* 
+XPECT_SETUP org.omg.kerml.xpect.tests.visibility.KerMLVisibilityTest
+	ResourceSet {
+		ThisFile {}
+		File {from = "/library/Base.kerml"}
+        File {from = "/library/Occurrences.kerml"}
+        File {from = "/library/Performances.kerml"}
+        File {from = "/library/ControlFunctions.kerml"}
+	}
+	Workspace {
+		JavaProject {
+			SrcFolder {
+				ThisFile {}
+				File {from = "/library/Base.kerml"}
+				File {from = "/library/Occurrences.kerml"}
+                File {from = "/library/Performances.kerml"}
+                File {from = "/library/ControlFunctions.kerml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+package Visibility_Protected_FeatureChaining {
+    feature x {
+        feature a;
+        protected feature b;
+        private feature c;
+    }
+    
+    feature y subsets x {
+        feature redefines a;
+        feature redefines b;
+        // XPECT errors --> "Couldn't resolve reference to Feature 'c'." at "c"        
+        feature redefines c;
+    }
+    
+    feature redefines x.a;
+    // XPECT errors --> "Couldn't resolve reference to Feature 'b'." at "b"        
+    feature redefines x.b;
+    // XPECT errors --> "Couldn't resolve reference to Feature 'c'." at "c"
+    feature redefines x.c;
+    
+    feature x1 = x.a;
+    // XPECT errors --> "Couldn't resolve reference to Element 'b'." at "b"
+    feature x2 = x.b;
+    // XPECT errors --> "Couldn't resolve reference to Element 'c'." at "c"
+    feature x3 = x.c;
+}

org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend

@@ -214,7 +214,7 @@ class KerMLScope extends AbstractScope implements ISysMLScope {
 			ns.gen(QualifiedName.create(), newHashSet, null, true, true)
 		} else {
 			val includeAll = referenceType === SysMLPackage.eINSTANCE.membership && element instanceof Import && (element as Import).isImportAll
-			ns.resolve(QualifiedName.create(), newHashSet, newHashSet, newHashSet, false, isInsideScope, true, true, includeAll)
+			ns.resolve(QualifiedName.create(), newHashSet, newHashSet, newHashSet, false, isInsideScope, isInsideScope, true, includeAll)
 		}
 		if (targetqn !== null && skip !== null) {
 			scopeProvider.removeVisited(skip)

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/invalid/AssignmentActionUsage_invalid.sysml.xt

@@ -0,0 +1,44 @@
+//*
+XPECT_SETUP org.omg.sysml.xpect.tests.validation.invalid.SysMLTests
+	ResourceSet {
+		ThisFile {}
+		File {from ="/library.kernel/Base.kerml"}
+		File {from ="/library.kernel/Occurrences.kerml"}
+		File {from ="/library.kernel/Objects.kerml"}
+		File {from ="/library.kernel/Performances.kerml"}
+		File {from ="/library.kernel/FeatureReferencingPerformances.kerml"}
+		File {from ="/library.systems/Attributes.sysml"}
+		File {from ="/library.systems/Items.sysml"}
+		File {from ="/library.systems/Actions.sysml"}
+	}
+	Workspace {
+		JavaProject {
+			SrcFolder {
+				ThisFile {}
+				File {from ="/library.kernel/Base.kerml"}
+				File {from ="/library.kernel/Occurrences.kerml"}
+				File {from ="/library.kernel/Objects.kerml"}
+				File {from ="/library.kernel/Performances.kerml"}
+				File {from ="/library.kernel/FeatureReferencingPerformances.kerml"}
+                File {from ="/library.systems/Attributes.sysml"}
+				File {from ="/library.systems/Items.sysml"}
+				File {from ="/library.systems/Actions.sysml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+package AssignmentActionUsage_invalid {
+    item i {
+        attribute a;
+        protected attribute b;
+        private attribute c;
+    }
+	action def A {
+        assign i.a := null;
+        // XPECT errors --> "Couldn't resolve reference to Element 'b'." at "b"
+        assign i.b := null;
+        // XPECT errors --> "Couldn't resolve reference to Element 'c'." at "c"
+        assign i.c := null;
+	}
+}