Merge pull request #635 from Systems-Modeling/ST6RI-830

ST6RI-830 Global scope notation (KERML_-101)

Author: seidewitz

kerml/src/examples/Simple Tests/Scoping.kerml

@@ -0,0 +1,40 @@
+package Scoping {
+    package P1 {
+        class A {
+            feature f;
+        }
+        package P2 {
+            class A {
+                feature g;
+            }
+            package P3 {
+                class B :> A {
+                    feature :>> g;
+                }
+            }
+        }
+        package Objects {
+            class Object {
+                feature test1;
+            }
+        }
+        package '$' {
+            class Objects {
+                class Object {
+                    feature test2;
+                }
+            }
+        }
+        package P4 {
+            class C :> Objects::Object {
+                feature :>> test1;
+            }
+            class D :> '$'::Objects::Object {
+                feature :>> test2;
+            }
+            class E :> $::Objects::Object {
+                feature :>> subobjects;
+            }
+        }
+    }
+}

org.omg.kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/KerMLExpressions.xtextbin

@@ -4877,6 +4877,35 @@ ruleName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
 	)
 ;
 
+// Entry rule entryRuleGlobalQualification
+entryRuleGlobalQualification returns [String current=null]:
+	{ newCompositeNode(grammarAccess.getGlobalQualificationRule()); }
+	iv_ruleGlobalQualification=ruleGlobalQualification
+	{ $current=$iv_ruleGlobalQualification.current.getText(); }
+	EOF;
+
+// Rule GlobalQualification
+ruleGlobalQualification returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
+@init {
+	enterRule();
+}
+@after {
+	leaveRule();
+}:
+	(
+		kw='$'
+		{
+			$current.merge(kw);
+			newLeafNode(kw, grammarAccess.getGlobalQualificationAccess().getDollarSignKeyword_0());
+		}
+		kw='::'
+		{
+			$current.merge(kw);
+			newLeafNode(kw, grammarAccess.getGlobalQualificationAccess().getColonColonKeyword_1());
+		}
+	)
+;
+
 // Entry rule entryRuleQualification
 entryRuleQualification returns [String current=null]:
 	{ newCompositeNode(grammarAccess.getQualificationRule()); }
@@ -4929,22 +4958,34 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
 	(
 		(
 			{
-				newCompositeNode(grammarAccess.getQualifiedNameAccess().getQualificationParserRuleCall_0());
+				newCompositeNode(grammarAccess.getQualifiedNameAccess().getGlobalQualificationParserRuleCall_0());
+			}
+			this_GlobalQualification_0=ruleGlobalQualification
+			{
+				$current.merge(this_GlobalQualification_0);
+			}
+			{
+				afterParserOrEnumRuleCall();
+			}
+		)?
+		(
+			{
+				newCompositeNode(grammarAccess.getQualifiedNameAccess().getQualificationParserRuleCall_1());
 			}
-			this_Qualification_0=ruleQualification
+			this_Qualification_1=ruleQualification
 			{
-				$current.merge(this_Qualification_0);
+				$current.merge(this_Qualification_1);
 			}
 			{
 				afterParserOrEnumRuleCall();
 			}
 		)?
 		{
-			newCompositeNode(grammarAccess.getQualifiedNameAccess().getNameParserRuleCall_1());
+			newCompositeNode(grammarAccess.getQualifiedNameAccess().getNameParserRuleCall_2());
 		}
-		this_Name_1=ruleName
+		this_Name_2=ruleName
 		{
-			$current.merge(this_Name_1);
+			$current.merge(this_Name_2);
 		}
 		{
 			afterParserOrEnumRuleCall();

org.omg.kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/parser/antlr/internal/InternalKerMLExpressions.g

@@ -1,6 +1,7 @@
 '!='=24
 '!=='=26
 '#'=49
+'$'=66
 '%'=42
 '&'=21
 '('=50
@@ -15,7 +16,7 @@
 '..'=37
 '.?'=55
 '/'=41
-'::'=66
+'::'=67
 ';'=57
 '<'=33
 '<='=35
@@ -115,3 +116,4 @@ T__63=63
 T__64=64
 T__65=65
 T__66=66
+T__67=67