ST6RI-67 Corrected the Xpect parsing tests.

seidewitz · seidewitz · commit 028ac5fe1854 · 2019-05-15T01:55:41.000-04:00
diff --git a/org.omg.sysml.xpect.tests/library/Base.alf b/org.omg.sysml.xpect.tests/library/Base.alf
@@ -57,39 +57,41 @@ package Base {
 	/*  
 	 * Occurrence is the most general class of entities that may occur over time.
 	 * BehaviorOccurrence and FunctionOccurrence are specializations representing the
-	 * occurrence (execution/evaluation) of behaviors and functions.
+	 * occurrence (execution/evaluation) of behaviors and functions. LiteralEvaluation
+	 * and NullEvaluation are further specializations of FunctionOccurrence representing
+	 * literal and null expressions.
 	 */
 	abstract class Occurrence specializes Anything;
 	abstract behavior BehaviorOccurrence() specializes Occurrence;
-	abstract function FunctionEvaluation(): Anything[0..*] specializes BehaviorOccurrence;
-				
+	abstract function FunctionEvaluation(): Anything[0..*] specializes BehaviorOccurrence;				
 	function LiteralEvaluation(): Anything specializes FunctionEvaluation;
 	function NullEvaluation(): Anything[0..0] specializes FunctionEvaluation;
 
 	/*
-	 * property is the top-level feature in the language.
-	 * referenceProperty and valueProperty are specializations that restrict the feature type
-	 * to Objects and Values, respectively.
+	 * things is the top-level feature in the language.
+	 * objects and values are specializations that restrict the feature type
+	 * to Object and Value, respectively.
 	 */
-	feature property: Anything[0..*] nonunique;
-	feature referenceProperty: Object[0..*] nonunique subsets property;
-	feature valueProperty: Value[0..*] nonunique subsets property;
+	abstract feature things: Anything[0..*] nonunique;
+	abstract feature objects: Object[0..*] nonunique subsets things;
+	abstract feature values: Value[0..*] nonunique subsets things;
 	
 	/*
-	 * connection is the most general feature of links between individuals.
-	 * binaryConnection and binding are specializations of binary links and self links.
-	 */
-	feature connection: Link[0..*] nonunique subsets property;
-	feature binaryConnection: BinaryLink[0..*] nonunique subsets connection;
-	feature binding: SelfLink[0..*] nonunique subsets binaryConnection;
+	 * links is the most general feature of links between individuals.
+	 * binaryLinks and selfLinks are specializations of binary links and self links.
+	 */	
+	abstract feature links: Link[0..*] nonunique subsets objects;
+	abstract feature binaryLinks: BinaryLink[0..*] nonunique subsets links;
+	abstract feature selfLinks: SelfLink[0..*] nonunique subsets binaryLinks;
 	
 	/*
-	 * execution is the most general feature of occurrences of behaviors.
-	 * evaluation is a specialization for occurrences of functions.
+	 * behaviorOccurrences is the most general feature of occurrences of behaviors.
+	 * functionEvaluations is a specialization for occurrences of functions.
+	 * literalEvaluations and nullEvaluations are specializations of functionEvaluations
+	 * that restrict the feature type to LiteralEvaluation and NullEvaluation, respectively.
 	 */
-	feature execution: BehaviorOccurrence[0..*] nonunique subsets property;
-	feature evaluation: FunctionEvaluation[0..*] nonunique subsets execution;
-	
-	feature literalEvaluation: LiteralEvaluation[0..*] nonunique subsets evaluation;
-	feature nullEvaluation: NullEvaluation[0..*] nonunique subsets evaluation;
+	abstract step behaviorOccurrences: BehaviorOccurrence[0..*] nonunique subsets things;
+	abstract expr functionEvaluations: FunctionEvaluation[0..*] nonunique subsets behaviorOccurrences;	
+	abstract expr literalEvaluations: LiteralEvaluation[0..*] nonunique subsets functionEvaluations;
+	abstract expr nullEvaluations: NullEvaluation[0..*] nonunique subsets functionEvaluations;
 }
diff --git a/org.omg.sysml.xpect.tests/library/BooleanFunctions.alf b/org.omg.sysml.xpect.tests/library/BooleanFunctions.alf
@@ -11,6 +11,7 @@ package BooleanFunctions {
 	function '/='(x: Boolean, y: Boolean): Boolean specializes BaseFunctions::'/=';
 	
 	function ToString(x: Boolean): String specializes BaseFunctions::ToString;
-	function ToBoolean(x: String): Boolean;	
+	function ToBoolean(x: String): Boolean;
+	
 }
 	
diff --git a/org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/parser/ScopeWithOnlyDot.alf.xt b/org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/parser/ScopeWithOnlyDot.alf.xt
@@ -19,35 +19,38 @@ END_SETUP
 
 /* XPECT ast ---
 Package {
-  ownedMembership = [
+  ownedRelationship = [
     Membership {
-      ownedMemberElement = ObjectClass {
-        ownedRelationship = [
-          Superclassing {
-            superclass -> ObjectClass Base.alf#//@ownedMembership.1/@ownedMemberElement
-            subclass -> ObjectClass //@ownedMembership.0/@ownedMemberElement
-          }
-        ]
-        ownedMembership = [
-          FeatureMembership {
-            memberName = 'c'
-            ownedMemberFeature = Feature {
-              ownedRelationship = [
-                FeatureTyping {
-                  type -> Feature DependencyOuterPackage.alf#//@ownedMembership.1/@ownedMemberElement/@ownedMembership.0/@ownedMemberFeature
-                }
-                Subsetting {
-                  subsettedFeature -> Feature Base.alf#//@ownedMembership.12/@ownedMemberElement
-                  subsettingFeature -> Feature //@ownedMembership.0/@ownedMemberElement/@ownedMembership.0/@ownedMemberFeature
+      ownedRelatedElement = [
+        ObjectClass {
+          ownedRelationship = [
+            FeatureMembership {
+              ownedRelatedElement = [
+                Feature {
+                  ownedRelationship = [
+                    FeatureTyping {
+                      type -> Feature DependencyOuterPackage.alf#//@ownedRelationship.1/@ownedRelatedElement.0/@ownedRelationship.0/@ownedRelatedElement.0
+                      typedFeature -> Feature //@ownedRelationship.0/@ownedRelatedElement.0/@ownedRelationship.0/@ownedRelatedElement.0
+                    }
+                    Subsetting {
+                      subsettedFeature -> Feature Base.alf#//@ownedRelationship.12/@ownedRelatedElement.0
+                      subsettingFeature -> Feature //@ownedRelationship.0/@ownedRelatedElement.0/@ownedRelationship.0/@ownedRelatedElement.0
+                    }
+                  ]
                 }
               ]
+              memberName = 'c'
+              memberFeature -> Feature //@ownedRelationship.0/@ownedRelatedElement.0/@ownedRelationship.0/@ownedRelatedElement.0
+            }
+            Superclassing {
+              superclass -> ObjectClass Base.alf#//@ownedRelationship.1/@ownedRelatedElement.0
+              subclass -> ObjectClass //@ownedRelationship.0/@ownedRelatedElement.0
             }
-            memberFeature -> Feature //@ownedMembership.0/@ownedMemberElement/@ownedMembership.0/@ownedMemberFeature
-          }
-        ]
-      }
+          ]
+        }
+      ]
       memberName = 'C'
-      memberElement -> ObjectClass //@ownedMembership.0/@ownedMemberElement
+      memberElement -> ObjectClass //@ownedRelationship.0/@ownedRelatedElement.0
     }
   ]
 }
diff --git a/org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/parser/Test_package.alf.xt2 b/org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/parser/Test_package.alf.xt2
@@ -40,7 +40,7 @@ END_SETUP
 Package {
   ownedMembership = [
     Membership {
-      ownedMemberElement = ObjectClass {
+      ownedRelatedElement = ObjectClass {
         ownedRelationship = [
           Superclassing {
             superclass -> ObjectClass Base.alf#//@ownedMembership.1/@ownedMemberElement
@@ -52,7 +52,7 @@ Package {
       memberElement -> ObjectClass //@ownedMembership.0/@ownedMemberElement
     }
     Membership {
-      ownedMemberElement = ObjectClass {
+      ownedRelatedElement = ObjectClass {
         ownedRelationship = [
           Superclassing {
             superclass -> ObjectClass //@ownedMembership.0/@ownedMemberElement
diff --git a/org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/parser/UseFQN1.alf.xt b/org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/parser/UseFQN1.alf.xt
@@ -17,30 +17,34 @@ END_SETUP
 
 /* XPECT ast ---
 Package {
-  ownedMembership = [
+  ownedRelationship = [
     Membership {
-      ownedMemberElement = ObjectClass {
-        ownedRelationship = [
-          Superclassing {
-            superclass -> ObjectClass Base.alf#//@ownedMembership.1/@ownedMemberElement
-            subclass -> ObjectClass //@ownedMembership.0/@ownedMemberElement
-          }
-        ]
-      }
+      ownedRelatedElement = [
+        ObjectClass {
+          ownedRelationship = [
+            Superclassing {
+              superclass -> ObjectClass Base.alf#//@ownedRelationship.1/@ownedRelatedElement.0
+              subclass -> ObjectClass //@ownedRelationship.0/@ownedRelatedElement.0
+            }
+          ]
+        }
+      ]
       memberName = 'A'
-      memberElement -> ObjectClass //@ownedMembership.0/@ownedMemberElement
+      memberElement -> ObjectClass //@ownedRelationship.0/@ownedRelatedElement.0
     }
     Membership {
-      ownedMemberElement = ObjectClass {
-        ownedRelationship = [
-          Superclassing {
-            superclass -> ObjectClass //@ownedMembership.0/@ownedMemberElement
-            subclass -> ObjectClass //@ownedMembership.1/@ownedMemberElement
-          }
-        ]
-      }
+      ownedRelatedElement = [
+        ObjectClass {
+          ownedRelationship = [
+            Superclassing {
+              superclass -> ObjectClass //@ownedRelationship.0/@ownedRelatedElement.0
+              subclass -> ObjectClass //@ownedRelationship.1/@ownedRelatedElement.0
+            }
+          ]
+        }
+      ]
       memberName = 'B'
-      memberElement -> ObjectClass //@ownedMembership.1/@ownedMemberElement
+      memberElement -> ObjectClass //@ownedRelationship.1/@ownedRelatedElement.0
     }
   ]
 }
diff --git a/org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/parser/UseFQNFourDot.alf.xt b/org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/parser/UseFQNFourDot.alf.xt
@@ -19,35 +19,38 @@ END_SETUP
 
 /* XPECT ast ---
 Package {
-  ownedMembership = [
+  ownedRelationship = [
     Membership {
-      ownedMemberElement = ObjectClass {
-        ownedRelationship = [
-          Superclassing {
-            superclass -> ObjectClass Base.alf#//@ownedMembership.1/@ownedMemberElement
-            subclass -> ObjectClass //@ownedMembership.0/@ownedMemberElement
-          }
-        ]
-        ownedMembership = [
-          FeatureMembership {
-            memberName = 'c'
-            ownedMemberFeature = Feature {
-              ownedRelationship = [
-                FeatureTyping {
-                  type -> Feature DependencyOuterPackage.alf#//@ownedMembership.1/@ownedMemberElement/@ownedMembership.0/@ownedMemberFeature
-                }
-                Subsetting {
-                  subsettedFeature -> Feature Base.alf#//@ownedMembership.12/@ownedMemberElement
-                  subsettingFeature -> Feature //@ownedMembership.0/@ownedMemberElement/@ownedMembership.0/@ownedMemberFeature
+      ownedRelatedElement = [
+      	ObjectClass {
+      	  ownedRelationship = [
+            FeatureMembership {
+              ownedRelatedElement = [
+                Feature {
+                  ownedRelationship = [
+                    FeatureTyping {
+                      type -> Feature DependencyOuterPackage.alf#//@ownedRelationship.1/@ownedRelatedElement.0/@ownedRelationship.0/@ownedRelatedElement.0
+                      typedFeature -> Feature //@ownedRelationship.0/@ownedRelatedElement.0/@ownedRelationship.0/@ownedRelatedElement.0
+                    }
+                    Subsetting {
+                      subsettedFeature -> Feature Base.alf#//@ownedRelationship.12/@ownedRelatedElement.0
+                      subsettingFeature -> Feature //@ownedRelationship.0/@ownedRelatedElement.0/@ownedRelationship.0/@ownedRelatedElement.0
+                    }
+                  ]
                 }
               ]
+              memberName = 'c'
+              memberFeature -> Feature //@ownedRelationship.0/@ownedRelatedElement.0/@ownedRelationship.0/@ownedRelatedElement.0
+            }
+            Superclassing {
+              superclass -> ObjectClass Base.alf#//@ownedRelationship.1/@ownedRelatedElement.0
+              subclass -> ObjectClass //@ownedRelationship.0/@ownedRelatedElement.0
             }
-            memberFeature -> Feature //@ownedMembership.0/@ownedMemberElement/@ownedMembership.0/@ownedMemberFeature
-          }
-        ]
-      }
+          ]
+        }
+      ]
       memberName = 'C'
-      memberElement -> ObjectClass //@ownedMembership.0/@ownedMemberElement
+      memberElement -> ObjectClass //@ownedRelationship.0/@ownedRelatedElement.0
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ package BooleanFunctions {`
`11`	`11`	`function '/='(x: Boolean, y: Boolean): Boolean specializes BaseFunctions::'/=';`
`12`	`12`
`13`	`13`	`function ToString(x: Boolean): String specializes BaseFunctions::ToString;`
`14`		`- function ToBoolean(x: String): Boolean;`
	`14`	`+ function ToBoolean(x: String): Boolean;`
	`15`	`+`
`15`	`16`	`}`
`16`	`17`