Partial implementation of expression mapping, but still with problems.

Change-Id: I3d39ab31faa33e7b03ec8a39efa0439fd8cab42b Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com> Reviewed-on: https://git.eclipse.org/r/46657 Tested-by: Hudson CI Reviewed-by: Jeremie Tatibouet <jeremie.tatibouet@cea.fr> Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
author: Ed Seidewitz 2015-04-28 07:53:08 +0000
committer: Arnaud Cuccuru 2015-04-29 08:58:42 +0000
commit: c5dac60734d576f42e173137aac8cbcaa7ef5b8f (patch)
tree: 8e6e5e4151b7b24c8277e0d5090054ccc7f9e34a /plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen
parent: 8ac267f2e5f3452dab22f0cac2958e6757b30654 (diff)
download: org.eclipse.papyrus-c5dac60734d576f42e173137aac8cbcaa7ef5b8f.tar.gz
org.eclipse.papyrus-c5dac60734d576f42e173137aac8cbcaa7ef5b8f.tar.xz
org.eclipse.papyrus-c5dac60734d576f42e173137aac8cbcaa7ef5b8f.zip
27 files changed, 2533 insertions, 386 deletions
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AlfFactory.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AlfFactory.java
index 1b32bb39f7b..8cdcb545f5e 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AlfFactory.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AlfFactory.java
@@ -85,6 +85,15 @@ public interface AlfFactory extends EFactory {
 	AssignableElementReference createAssignableElementReference();
 
 	/**
+	 * Returns a new object of class '<em>Expression Reference</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Expression Reference</em>'.
+	 * @generated
+	 */
+	ExpressionReference createExpressionReference();
+
+	/**
 	 * Returns a new object of class '<em>Extent Or Expression</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AlfPackage.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AlfPackage.java
index f7ea0169f8d..bd4486a8f61 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AlfPackage.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/AlfPackage.java
@@ -6892,13 +6892,22 @@ public interface AlfPackage extends EPackage {
 	int EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = ASSIGNABLE_ELEMENT___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION___REFERENCE = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXPRESSION___NEW_ASSIGNMENTS = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 0;
+	int EXPRESSION___NEW_ASSIGNMENTS = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 1;
 
 	/**
 	 * The operation id for the '<em>Update Assignments</em>' operation.
@@ -6907,7 +6916,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EXPRESSION___UPDATE_ASSIGNMENTS = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 1;
+	int EXPRESSION___UPDATE_ASSIGNMENTS = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 2;
 
 	/**
 	 * The operation id for the '<em>Expression update Assignments</em>' operation.
@@ -6916,7 +6925,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EXPRESSION___EXPRESSION_UPDATE_ASSIGNMENTS = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 2;
+	int EXPRESSION___EXPRESSION_UPDATE_ASSIGNMENTS = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 3;
 
 	/**
 	 * The operation id for the '<em>Update Assignments Cached</em>' operation.
@@ -6925,7 +6934,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EXPRESSION___UPDATE_ASSIGNMENTS_CACHED = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 3;
+	int EXPRESSION___UPDATE_ASSIGNMENTS_CACHED = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 4;
 
 	/**
 	 * The operation id for the '<em>Resolve</em>' operation.
@@ -6934,7 +6943,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EXPRESSION___RESOLVE__STRING = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 4;
+	int EXPRESSION___RESOLVE__STRING = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 5;
 
 	/**
 	 * The operation id for the '<em>Is Add Target</em>' operation.
@@ -6943,7 +6952,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EXPRESSION___IS_ADD_TARGET__EXPRESSION = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 5;
+	int EXPRESSION___IS_ADD_TARGET__EXPRESSION = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 6;
 
 	/**
 	 * The operation id for the '<em>Expression Assignment After Derivation</em>' operation.
@@ -6952,7 +6961,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EXPRESSION___EXPRESSION_ASSIGNMENT_AFTER_DERIVATION__DIAGNOSTICCHAIN_MAP = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 6;
+	int EXPRESSION___EXPRESSION_ASSIGNMENT_AFTER_DERIVATION__DIAGNOSTICCHAIN_MAP = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 7;
 
 	/**
 	 * The operation id for the '<em>Expression Unique Assignments</em>' operation.
@@ -6961,7 +6970,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EXPRESSION___EXPRESSION_UNIQUE_ASSIGNMENTS__DIAGNOSTICCHAIN_MAP = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 7;
+	int EXPRESSION___EXPRESSION_UNIQUE_ASSIGNMENTS__DIAGNOSTICCHAIN_MAP = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 8;
 
 	/**
 	 * The number of operations of the '<em>Expression</em>' class.
@@ -6970,7 +6979,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int EXPRESSION_OPERATION_COUNT = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 8;
+	int EXPRESSION_OPERATION_COUNT = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 9;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.alf.impl.SequenceExpansionExpressionImpl <em>Sequence Expansion Expression</em>}' class.
@@ -7496,6 +7505,15 @@ public interface AlfPackage extends EPackage {
 	int SEQUENCE_EXPANSION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SEQUENCE_EXPANSION_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -8289,6 +8307,583 @@ public interface AlfPackage extends EPackage {
 	int ASSIGNABLE_ELEMENT_REFERENCE_OPERATION_COUNT = ASSIGNABLE_ELEMENT_OPERATION_COUNT + 3;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.alf.impl.ExpressionReferenceImpl <em>Expression Reference</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.uml.alf.impl.ExpressionReferenceImpl
+	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getExpressionReference()
+	 * @generated
+	 */
+	int EXPRESSION_REFERENCE = 12;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE__OWNER = EXPRESSION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Upper</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE__UPPER = EXPRESSION__UPPER;
+
+	/**
+	 * The feature id for the '<em><b>Lower</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE__LOWER = EXPRESSION__LOWER;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE__TYPE = EXPRESSION__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Assignment Before</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE__ASSIGNMENT_BEFORE = EXPRESSION__ASSIGNMENT_BEFORE;
+
+	/**
+	 * The feature id for the '<em><b>Assignment After</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE__ASSIGNMENT_AFTER = EXPRESSION__ASSIGNMENT_AFTER;
+
+	/**
+	 * The feature id for the '<em><b>Expression</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE__EXPRESSION = EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Expression Reference</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>To Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___TO_REFERENCE = EXPRESSION___TO_REFERENCE;
+
+	/**
+	 * The operation id for the '<em>Owner</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___OWNER = EXPRESSION___OWNER;
+
+	/**
+	 * The operation id for the '<em>Syntax Element owner</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___SYNTAX_ELEMENT_OWNER = EXPRESSION___SYNTAX_ELEMENT_OWNER;
+
+	/**
+	 * The operation id for the '<em>Current Scope</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___CURRENT_SCOPE = EXPRESSION___CURRENT_SCOPE;
+
+	/**
+	 * The operation id for the '<em>Syntax Element current Scope</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___SYNTAX_ELEMENT_CURRENT_SCOPE = EXPRESSION___SYNTAX_ELEMENT_CURRENT_SCOPE;
+
+	/**
+	 * The operation id for the '<em>Enclosing Statement</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___ENCLOSING_STATEMENT = EXPRESSION___ENCLOSING_STATEMENT;
+
+	/**
+	 * The operation id for the '<em>Enclosing Expression</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___ENCLOSING_EXPRESSION = EXPRESSION___ENCLOSING_EXPRESSION;
+
+	/**
+	 * The operation id for the '<em>Syntax Element assignments Before</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___SYNTAX_ELEMENT_ASSIGNMENTS_BEFORE = EXPRESSION___SYNTAX_ELEMENT_ASSIGNMENTS_BEFORE;
+
+	/**
+	 * The operation id for the '<em>Syntax Element assignments Before base</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___SYNTAX_ELEMENT_ASSIGNMENTS_BEFORE_BASE = EXPRESSION___SYNTAX_ELEMENT_ASSIGNMENTS_BEFORE_BASE;
+
+	/**
+	 * The operation id for the '<em>Assignments Before</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___ASSIGNMENTS_BEFORE__SYNTAXELEMENT = EXPRESSION___ASSIGNMENTS_BEFORE__SYNTAXELEMENT;
+
+	/**
+	 * The operation id for the '<em>Update All</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___UPDATE_ALL__ELIST_ELIST = EXPRESSION___UPDATE_ALL__ELIST_ELIST;
+
+	/**
+	 * The operation id for the '<em>Common Ancestor</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___COMMON_ANCESTOR__ELIST = EXPRESSION___COMMON_ANCESTOR__ELIST;
+
+	/**
+	 * The operation id for the '<em>Common Ancestors</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___COMMON_ANCESTORS__ELIST = EXPRESSION___COMMON_ANCESTORS__ELIST;
+
+	/**
+	 * The operation id for the '<em>Remove Duplicate Elements</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___REMOVE_DUPLICATE_ELEMENTS__ELIST = EXPRESSION___REMOVE_DUPLICATE_ELEMENTS__ELIST;
+
+	/**
+	 * The operation id for the '<em>Resolve In Library</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___RESOLVE_IN_LIBRARY__STRING = EXPRESSION___RESOLVE_IN_LIBRARY__STRING;
+
+	/**
+	 * The operation id for the '<em>Primitive Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___PRIMITIVE_TYPE__STRING = EXPRESSION___PRIMITIVE_TYPE__STRING;
+
+	/**
+	 * The operation id for the '<em>Primitive Type </em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___PRIMITIVE_TYPE____STRING = EXPRESSION___PRIMITIVE_TYPE____STRING;
+
+	/**
+	 * The operation id for the '<em>Boolean Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___BOOLEAN_TYPE = EXPRESSION___BOOLEAN_TYPE;
+
+	/**
+	 * The operation id for the '<em>Is Boolean Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_BOOLEAN_TYPE__ELEMENTREFERENCE = EXPRESSION___IS_BOOLEAN_TYPE__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Integer Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___INTEGER_TYPE = EXPRESSION___INTEGER_TYPE;
+
+	/**
+	 * The operation id for the '<em>Is Integer Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_INTEGER_TYPE__ELEMENTREFERENCE = EXPRESSION___IS_INTEGER_TYPE__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>String Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___STRING_TYPE = EXPRESSION___STRING_TYPE;
+
+	/**
+	 * The operation id for the '<em>Is String Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_STRING_TYPE__ELEMENTREFERENCE = EXPRESSION___IS_STRING_TYPE__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Unlimited Natural Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___UNLIMITED_NATURAL_TYPE = EXPRESSION___UNLIMITED_NATURAL_TYPE;
+
+	/**
+	 * The operation id for the '<em>Is Unlimited Natural Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_UNLIMITED_NATURAL_TYPE__ELEMENTREFERENCE = EXPRESSION___IS_UNLIMITED_NATURAL_TYPE__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Bit String Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___BIT_STRING_TYPE = EXPRESSION___BIT_STRING_TYPE;
+
+	/**
+	 * The operation id for the '<em>Is Bit String Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_BIT_STRING_TYPE__ELEMENTREFERENCE = EXPRESSION___IS_BIT_STRING_TYPE__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Natural Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___NATURAL_TYPE = EXPRESSION___NATURAL_TYPE;
+
+	/**
+	 * The operation id for the '<em>Is Natural Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_NATURAL_TYPE__ELEMENTREFERENCE = EXPRESSION___IS_NATURAL_TYPE__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Is Numeric Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_NUMERIC_TYPE__ELEMENTREFERENCE = EXPRESSION___IS_NUMERIC_TYPE__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Collection Function Add</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___COLLECTION_FUNCTION_ADD = EXPRESSION___COLLECTION_FUNCTION_ADD;
+
+	/**
+	 * The operation id for the '<em>Is Collection Class</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_COLLECTION_CLASS__ELEMENTREFERENCE = EXPRESSION___IS_COLLECTION_CLASS__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Is Integer Collection Class</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_INTEGER_COLLECTION_CLASS__ELEMENTREFERENCE = EXPRESSION___IS_INTEGER_COLLECTION_CLASS__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Is Bit String Collection Class</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_BIT_STRING_COLLECTION_CLASS__ELEMENTREFERENCE = EXPRESSION___IS_BIT_STRING_COLLECTION_CLASS__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Type Cached</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___TYPE_CACHED = EXPRESSION___TYPE_CACHED;
+
+	/**
+	 * The operation id for the '<em>Is Null</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_NULL = EXPRESSION___IS_NULL;
+
+	/**
+	 * The operation id for the '<em>Is Assignable From Element</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_ASSIGNABLE_FROM_ELEMENT__ELEMENTREFERENCE = EXPRESSION___IS_ASSIGNABLE_FROM_ELEMENT__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Is Assignable From</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_ASSIGNABLE_FROM__ASSIGNABLEELEMENT = EXPRESSION___IS_ASSIGNABLE_FROM__ASSIGNABLEELEMENT;
+
+	/**
+	 * The operation id for the '<em>Is Type Conformant With</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_TYPE_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_TYPE_CONFORMANT_WITH__ASSIGNABLEELEMENT;
+
+	/**
+	 * The operation id for the '<em>Is Conformant With Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_CONFORMANT_WITH_TYPE__ELEMENTREFERENCE = EXPRESSION___IS_CONFORMANT_WITH_TYPE__ELEMENTREFERENCE;
+
+	/**
+	 * The operation id for the '<em>Is Multiplicity Conformant With</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
+
+	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
+	 * The operation id for the '<em>New Assignments</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___NEW_ASSIGNMENTS = EXPRESSION___NEW_ASSIGNMENTS;
+
+	/**
+	 * The operation id for the '<em>Expression update Assignments</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___EXPRESSION_UPDATE_ASSIGNMENTS = EXPRESSION___EXPRESSION_UPDATE_ASSIGNMENTS;
+
+	/**
+	 * The operation id for the '<em>Update Assignments Cached</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___UPDATE_ASSIGNMENTS_CACHED = EXPRESSION___UPDATE_ASSIGNMENTS_CACHED;
+
+	/**
+	 * The operation id for the '<em>Resolve</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___RESOLVE__STRING = EXPRESSION___RESOLVE__STRING;
+
+	/**
+	 * The operation id for the '<em>Expression Assignment After Derivation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___EXPRESSION_ASSIGNMENT_AFTER_DERIVATION__DIAGNOSTICCHAIN_MAP = EXPRESSION___EXPRESSION_ASSIGNMENT_AFTER_DERIVATION__DIAGNOSTICCHAIN_MAP;
+
+	/**
+	 * The operation id for the '<em>Expression Unique Assignments</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___EXPRESSION_UNIQUE_ASSIGNMENTS__DIAGNOSTICCHAIN_MAP = EXPRESSION___EXPRESSION_UNIQUE_ASSIGNMENTS__DIAGNOSTICCHAIN_MAP;
+
+	/**
+	 * The operation id for the '<em>Type</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___TYPE = EXPRESSION_OPERATION_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Lower</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___LOWER = EXPRESSION_OPERATION_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Upper</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___UPPER = EXPRESSION_OPERATION_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Is Add Target</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___IS_ADD_TARGET__EXPRESSION = EXPRESSION_OPERATION_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Assignments Before</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___ASSIGNMENTS_BEFORE = EXPRESSION_OPERATION_COUNT + 4;
+
+	/**
+	 * The operation id for the '<em>Update Assignments</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE___UPDATE_ASSIGNMENTS = EXPRESSION_OPERATION_COUNT + 5;
+
+	/**
+	 * The number of operations of the '<em>Expression Reference</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_REFERENCE_OPERATION_COUNT = EXPRESSION_OPERATION_COUNT + 6;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.alf.impl.ExtentOrExpressionImpl <em>Extent Or Expression</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -8296,7 +8891,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getExtentOrExpression()
 	 * @generated
 	 */
-	int EXTENT_OR_EXPRESSION = 12;
+	int EXTENT_OR_EXPRESSION = 13;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -8794,6 +9389,15 @@ public interface AlfPackage extends EPackage {
 	int EXTENT_OR_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENT_OR_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -8909,7 +9513,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getQualifiedName()
 	 * @generated
 	 */
-	int QUALIFIED_NAME = 13;
+	int QUALIFIED_NAME = 14;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -9513,7 +10117,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getFeatureReference()
 	 * @generated
 	 */
-	int FEATURE_REFERENCE = 14;
+	int FEATURE_REFERENCE = 15;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -10011,6 +10615,15 @@ public interface AlfPackage extends EPackage {
 	int FEATURE_REFERENCE___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_REFERENCE___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -10153,7 +10766,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNameBinding()
 	 * @generated
 	 */
-	int NAME_BINDING = 15;
+	int NAME_BINDING = 16;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -10586,7 +11199,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getTemplateBinding()
 	 * @generated
 	 */
-	int TEMPLATE_BINDING = 16;
+	int TEMPLATE_BINDING = 17;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -10974,7 +11587,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNamedTemplateBinding()
 	 * @generated
 	 */
-	int NAMED_TEMPLATE_BINDING = 17;
+	int NAMED_TEMPLATE_BINDING = 18;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -11380,7 +11993,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getTemplateParameterSubstitution()
 	 * @generated
 	 */
-	int TEMPLATE_PARAMETER_SUBSTITUTION = 18;
+	int TEMPLATE_PARAMETER_SUBSTITUTION = 19;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -11786,7 +12399,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getUnaryExpression()
 	 * @generated
 	 */
-	int UNARY_EXPRESSION = 20;
+	int UNARY_EXPRESSION = 21;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -12275,6 +12888,15 @@ public interface AlfPackage extends EPackage {
 	int UNARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNARY_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -12372,7 +12994,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNumericUnaryExpression()
 	 * @generated
 	 */
-	int NUMERIC_UNARY_EXPRESSION = 19;
+	int NUMERIC_UNARY_EXPRESSION = 20;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -12834,6 +13456,15 @@ public interface AlfPackage extends EPackage {
 	int NUMERIC_UNARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = UNARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NUMERIC_UNARY_EXPRESSION___REFERENCE = UNARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -12994,7 +13625,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getForAllOrExistsOrOneExpression()
 	 * @generated
 	 */
-	int FOR_ALL_OR_EXISTS_OR_ONE_EXPRESSION = 21;
+	int FOR_ALL_OR_EXISTS_OR_ONE_EXPRESSION = 22;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -13510,6 +14141,15 @@ public interface AlfPackage extends EPackage {
 	int FOR_ALL_OR_EXISTS_OR_ONE_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = SEQUENCE_EXPANSION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_ALL_OR_EXISTS_OR_ONE_EXPRESSION___REFERENCE = SEQUENCE_EXPANSION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -13832,7 +14472,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getIsolationExpression()
 	 * @generated
 	 */
-	int ISOLATION_EXPRESSION = 22;
+	int ISOLATION_EXPRESSION = 23;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -14294,6 +14934,15 @@ public interface AlfPackage extends EPackage {
 	int ISOLATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = UNARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ISOLATION_EXPRESSION___REFERENCE = UNARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -14445,7 +15094,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getBinaryExpression()
 	 * @generated
 	 */
-	int BINARY_EXPRESSION = 23;
+	int BINARY_EXPRESSION = 24;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -14943,6 +15592,15 @@ public interface AlfPackage extends EPackage {
 	int BINARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BINARY_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -15067,7 +15725,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getBooleanUnaryExpression()
 	 * @generated
 	 */
-	int BOOLEAN_UNARY_EXPRESSION = 24;
+	int BOOLEAN_UNARY_EXPRESSION = 25;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -15529,6 +16187,15 @@ public interface AlfPackage extends EPackage {
 	int BOOLEAN_UNARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = UNARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_UNARY_EXPRESSION___REFERENCE = UNARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -15689,7 +16356,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getCastExpression()
 	 * @generated
 	 */
-	int CAST_EXPRESSION = 25;
+	int CAST_EXPRESSION = 26;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -16160,6 +16827,15 @@ public interface AlfPackage extends EPackage {
 	int CAST_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAST_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -16320,7 +16996,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getTuple()
 	 * @generated
 	 */
-	int TUPLE = 27;
+	int TUPLE = 28;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -16737,13 +17413,22 @@ public interface AlfPackage extends EPackage {
 	int TUPLE___OUTPUT_FOR__ELIST = SYNTAX_ELEMENT_OPERATION_COUNT + 6;
 
 	/**
+	 * The operation id for the '<em>Output For Expression</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TUPLE___OUTPUT_FOR_EXPRESSION__EXPRESSION = SYNTAX_ELEMENT_OPERATION_COUNT + 7;
+
+	/**
 	 * The operation id for the '<em>Assignments Before</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___ASSIGNMENTS_BEFORE__SYNTAXELEMENT = SYNTAX_ELEMENT_OPERATION_COUNT + 7;
+	int TUPLE___ASSIGNMENTS_BEFORE__SYNTAXELEMENT = SYNTAX_ELEMENT_OPERATION_COUNT + 8;
 
 	/**
 	 * The operation id for the '<em>Assignments After</em>' operation.
@@ -16752,7 +17437,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___ASSIGNMENTS_AFTER = SYNTAX_ELEMENT_OPERATION_COUNT + 8;
+	int TUPLE___ASSIGNMENTS_AFTER = SYNTAX_ELEMENT_OPERATION_COUNT + 9;
 
 	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
@@ -16761,7 +17446,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___NEW_ASSIGNMENTS = SYNTAX_ELEMENT_OPERATION_COUNT + 9;
+	int TUPLE___NEW_ASSIGNMENTS = SYNTAX_ELEMENT_OPERATION_COUNT + 10;
 
 	/**
 	 * The operation id for the '<em>Update For</em>' operation.
@@ -16770,7 +17455,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___UPDATE_FOR__ELIST_OUTPUTNAMEDEXPRESSION = SYNTAX_ELEMENT_OPERATION_COUNT + 10;
+	int TUPLE___UPDATE_FOR__ELIST_OUTPUTNAMEDEXPRESSION = SYNTAX_ELEMENT_OPERATION_COUNT + 11;
 
 	/**
 	 * The operation id for the '<em>Tuple Input Derivation</em>' operation.
@@ -16779,7 +17464,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___TUPLE_INPUT_DERIVATION__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 11;
+	int TUPLE___TUPLE_INPUT_DERIVATION__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 12;
 
 	/**
 	 * The operation id for the '<em>Tuple Output Derivation</em>' operation.
@@ -16788,7 +17473,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___TUPLE_OUTPUT_DERIVATION__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 12;
+	int TUPLE___TUPLE_OUTPUT_DERIVATION__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 13;
 
 	/**
 	 * The operation id for the '<em>Tuple Null Inputs</em>' operation.
@@ -16797,7 +17482,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___TUPLE_NULL_INPUTS__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 13;
+	int TUPLE___TUPLE_NULL_INPUTS__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 14;
 
 	/**
 	 * The operation id for the '<em>Tuple Outputs</em>' operation.
@@ -16806,7 +17491,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___TUPLE_OUTPUTS__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 14;
+	int TUPLE___TUPLE_OUTPUTS__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 15;
 
 	/**
 	 * The operation id for the '<em>Tuple Assignments Before</em>' operation.
@@ -16815,7 +17500,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___TUPLE_ASSIGNMENTS_BEFORE__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 15;
+	int TUPLE___TUPLE_ASSIGNMENTS_BEFORE__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 16;
 
 	/**
 	 * The operation id for the '<em>Tuple Assignments After</em>' operation.
@@ -16824,7 +17509,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE___TUPLE_ASSIGNMENTS_AFTER__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 16;
+	int TUPLE___TUPLE_ASSIGNMENTS_AFTER__DIAGNOSTICCHAIN_MAP = SYNTAX_ELEMENT_OPERATION_COUNT + 17;
 
 	/**
 	 * The number of operations of the '<em>Tuple</em>' class.
@@ -16833,7 +17518,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TUPLE_OPERATION_COUNT = SYNTAX_ELEMENT_OPERATION_COUNT + 17;
+	int TUPLE_OPERATION_COUNT = SYNTAX_ELEMENT_OPERATION_COUNT + 18;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.alf.impl.PositionalTupleImpl <em>Positional Tuple</em>}' class.
@@ -16843,7 +17528,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getPositionalTuple()
 	 * @generated
 	 */
-	int POSITIONAL_TUPLE = 26;
+	int POSITIONAL_TUPLE = 27;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -17359,13 +18044,22 @@ public interface AlfPackage extends EPackage {
 	int POSITIONAL_TUPLE___OUTPUT_FOR__ELIST = TUPLE_OPERATION_COUNT + 2;
 
 	/**
+	 * The operation id for the '<em>Output For Expression</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int POSITIONAL_TUPLE___OUTPUT_FOR_EXPRESSION__EXPRESSION = TUPLE_OPERATION_COUNT + 3;
+
+	/**
 	 * The operation id for the '<em>Positional Tuple Arguments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int POSITIONAL_TUPLE___POSITIONAL_TUPLE_ARGUMENTS__DIAGNOSTICCHAIN_MAP = TUPLE_OPERATION_COUNT + 3;
+	int POSITIONAL_TUPLE___POSITIONAL_TUPLE_ARGUMENTS__DIAGNOSTICCHAIN_MAP = TUPLE_OPERATION_COUNT + 4;
 
 	/**
 	 * The number of operations of the '<em>Positional Tuple</em>' class.
@@ -17374,7 +18068,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int POSITIONAL_TUPLE_OPERATION_COUNT = TUPLE_OPERATION_COUNT + 4;
+	int POSITIONAL_TUPLE_OPERATION_COUNT = TUPLE_OPERATION_COUNT + 5;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.alf.impl.NamedExpressionImpl <em>Named Expression</em>}' class.
@@ -17384,7 +18078,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNamedExpression()
 	 * @generated
 	 */
-	int NAMED_EXPRESSION = 28;
+	int NAMED_EXPRESSION = 29;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -17772,7 +18466,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getInputNamedExpression()
 	 * @generated
 	 */
-	int INPUT_NAMED_EXPRESSION = 29;
+	int INPUT_NAMED_EXPRESSION = 30;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -18196,7 +18890,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getInvocationExpression()
 	 * @generated
 	 */
-	int INVOCATION_EXPRESSION = 30;
+	int INVOCATION_EXPRESSION = 31;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -18721,6 +19415,15 @@ public interface AlfPackage extends EPackage {
 	int INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVOCATION_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -19115,7 +19818,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getOutputNamedExpression()
 	 * @generated
 	 */
-	int OUTPUT_NAMED_EXPRESSION = 31;
+	int OUTPUT_NAMED_EXPRESSION = 32;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -19575,7 +20278,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getLeftHandSide()
 	 * @generated
 	 */
-	int LEFT_HAND_SIDE = 32;
+	int LEFT_HAND_SIDE = 33;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -20179,7 +20882,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSequenceAccessExpression()
 	 * @generated
 	 */
-	int SEQUENCE_ACCESS_EXPRESSION = 33;
+	int SEQUENCE_ACCESS_EXPRESSION = 34;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -20641,6 +21344,15 @@ public interface AlfPackage extends EPackage {
 	int SEQUENCE_ACCESS_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SEQUENCE_ACCESS_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -20801,7 +21513,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getLiteralExpression()
 	 * @generated
 	 */
-	int LITERAL_EXPRESSION = 35;
+	int LITERAL_EXPRESSION = 36;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -21254,6 +21966,15 @@ public interface AlfPackage extends EPackage {
 	int LITERAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LITERAL_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -21378,7 +22099,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getStringLiteralExpression()
 	 * @generated
 	 */
-	int STRING_LITERAL_EXPRESSION = 34;
+	int STRING_LITERAL_EXPRESSION = 35;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -21831,6 +22552,15 @@ public interface AlfPackage extends EPackage {
 	int STRING_LITERAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = LITERAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LITERAL_EXPRESSION___REFERENCE = LITERAL_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -21973,7 +22703,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSequenceOperationExpression()
 	 * @generated
 	 */
-	int SEQUENCE_OPERATION_EXPRESSION = 36;
+	int SEQUENCE_OPERATION_EXPRESSION = 37;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -22543,6 +23273,15 @@ public interface AlfPackage extends EPackage {
 	int SEQUENCE_OPERATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SEQUENCE_OPERATION_EXPRESSION___REFERENCE = INVOCATION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23045,7 +23784,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSelectOrRejectExpression()
 	 * @generated
 	 */
-	int SELECT_OR_REJECT_EXPRESSION = 37;
+	int SELECT_OR_REJECT_EXPRESSION = 38;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -23561,6 +24300,15 @@ public interface AlfPackage extends EPackage {
 	int SELECT_OR_REJECT_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = SEQUENCE_EXPANSION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SELECT_OR_REJECT_EXPRESSION___REFERENCE = SEQUENCE_EXPANSION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -23883,7 +24631,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getClassExtentExpression()
 	 * @generated
 	 */
-	int CLASS_EXTENT_EXPRESSION = 38;
+	int CLASS_EXTENT_EXPRESSION = 39;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -24336,6 +25084,15 @@ public interface AlfPackage extends EPackage {
 	int CLASS_EXTENT_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLASS_EXTENT_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -24496,7 +25253,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getPositionalTemplateBinding()
 	 * @generated
 	 */
-	int POSITIONAL_TEMPLATE_BINDING = 39;
+	int POSITIONAL_TEMPLATE_BINDING = 40;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -24902,7 +25659,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getConditionalLogicalExpression()
 	 * @generated
 	 */
-	int CONDITIONAL_LOGICAL_EXPRESSION = 40;
+	int CONDITIONAL_LOGICAL_EXPRESSION = 41;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -25364,6 +26121,15 @@ public interface AlfPackage extends EPackage {
 	int CONDITIONAL_LOGICAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = BINARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_LOGICAL_EXPRESSION___REFERENCE = BINARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -25560,7 +26326,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getLinkOperationExpression()
 	 * @generated
 	 */
-	int LINK_OPERATION_EXPRESSION = 41;
+	int LINK_OPERATION_EXPRESSION = 42;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -26121,6 +26887,15 @@ public interface AlfPackage extends EPackage {
 	int LINK_OPERATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LINK_OPERATION_EXPRESSION___REFERENCE = INVOCATION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -26569,7 +27344,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getEqualityExpression()
 	 * @generated
 	 */
-	int EQUALITY_EXPRESSION = 42;
+	int EQUALITY_EXPRESSION = 43;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -27049,6 +27824,15 @@ public interface AlfPackage extends EPackage {
 	int EQUALITY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = BINARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EQUALITY_EXPRESSION___REFERENCE = BINARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -27236,7 +28020,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getAssignmentExpression()
 	 * @generated
 	 */
-	int ASSIGNMENT_EXPRESSION = 43;
+	int ASSIGNMENT_EXPRESSION = 44;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -27824,6 +28608,15 @@ public interface AlfPackage extends EPackage {
 	int ASSIGNMENT_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ASSIGNMENT_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -28128,7 +28921,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getLogicalExpression()
 	 * @generated
 	 */
-	int LOGICAL_EXPRESSION = 44;
+	int LOGICAL_EXPRESSION = 45;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -28626,6 +29419,15 @@ public interface AlfPackage extends EPackage {
 	int LOGICAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = BINARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOGICAL_EXPRESSION___REFERENCE = BINARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -28840,7 +29642,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSequenceConstructionExpression()
 	 * @generated
 	 */
-	int SEQUENCE_CONSTRUCTION_EXPRESSION = 45;
+	int SEQUENCE_CONSTRUCTION_EXPRESSION = 46;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -29320,6 +30122,15 @@ public interface AlfPackage extends EPackage {
 	int SEQUENCE_CONSTRUCTION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SEQUENCE_CONSTRUCTION_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -29498,7 +30309,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSequenceElements()
 	 * @generated
 	 */
-	int SEQUENCE_ELEMENTS = 46;
+	int SEQUENCE_ELEMENTS = 47;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -29904,7 +30715,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getCollectOrIterateExpression()
 	 * @generated
 	 */
-	int COLLECT_OR_ITERATE_EXPRESSION = 47;
+	int COLLECT_OR_ITERATE_EXPRESSION = 48;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -30420,6 +31231,15 @@ public interface AlfPackage extends EPackage {
 	int COLLECT_OR_ITERATE_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = SEQUENCE_EXPANSION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECT_OR_ITERATE_EXPRESSION___REFERENCE = SEQUENCE_EXPANSION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -30742,7 +31562,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getIsUniqueExpression()
 	 * @generated
 	 */
-	int IS_UNIQUE_EXPRESSION = 48;
+	int IS_UNIQUE_EXPRESSION = 49;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -31258,6 +32078,15 @@ public interface AlfPackage extends EPackage {
 	int IS_UNIQUE_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = SEQUENCE_EXPANSION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IS_UNIQUE_EXPRESSION___REFERENCE = SEQUENCE_EXPANSION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -31580,7 +32409,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getArithmeticExpression()
 	 * @generated
 	 */
-	int ARITHMETIC_EXPRESSION = 49;
+	int ARITHMETIC_EXPRESSION = 50;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -32060,6 +32889,15 @@ public interface AlfPackage extends EPackage {
 	int ARITHMETIC_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = BINARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARITHMETIC_EXPRESSION___REFERENCE = BINARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -32256,7 +33094,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getFeatureLeftHandSide()
 	 * @generated
 	 */
-	int FEATURE_LEFT_HAND_SIDE = 50;
+	int FEATURE_LEFT_HAND_SIDE = 51;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -32835,13 +33673,22 @@ public interface AlfPackage extends EPackage {
 	int FEATURE_LEFT_HAND_SIDE___FEATURE = LEFT_HAND_SIDE_OPERATION_COUNT + 1;
 
 	/**
+	 * The operation id for the '<em>Primary</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_LEFT_HAND_SIDE___PRIMARY = LEFT_HAND_SIDE_OPERATION_COUNT + 2;
+
+	/**
 	 * The operation id for the '<em>Index</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___INDEX = LEFT_HAND_SIDE_OPERATION_COUNT + 2;
+	int FEATURE_LEFT_HAND_SIDE___INDEX = LEFT_HAND_SIDE_OPERATION_COUNT + 3;
 
 	/**
 	 * The operation id for the '<em>Local Name</em>' operation.
@@ -32850,7 +33697,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___LOCAL_NAME = LEFT_HAND_SIDE_OPERATION_COUNT + 3;
+	int FEATURE_LEFT_HAND_SIDE___LOCAL_NAME = LEFT_HAND_SIDE_OPERATION_COUNT + 4;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Assignment Before Derivation</em>' operation.
@@ -32859,7 +33706,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_ASSIGNMENT_BEFORE_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 4;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_ASSIGNMENT_BEFORE_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 5;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Assignment After Derivation</em>' operation.
@@ -32868,7 +33715,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_ASSIGNMENT_AFTER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 5;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_ASSIGNMENT_AFTER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 6;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Feature Expression</em>' operation.
@@ -32877,7 +33724,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_FEATURE_EXPRESSION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 6;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_FEATURE_EXPRESSION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 7;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Assignments Before</em>' operation.
@@ -32886,7 +33733,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_ASSIGNMENTS_BEFORE__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 7;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_ASSIGNMENTS_BEFORE__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 8;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Referent Derivation</em>' operation.
@@ -32895,7 +33742,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_REFERENT_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 8;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_REFERENT_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 9;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Type Derivation</em>' operation.
@@ -32904,7 +33751,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_TYPE_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 9;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_TYPE_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 10;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Lower Derivation</em>' operation.
@@ -32913,7 +33760,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_LOWER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 10;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_LOWER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 11;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Upper Derivation</em>' operation.
@@ -32922,7 +33769,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_UPPER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 11;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_UPPER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 12;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Referent Constraint</em>' operation.
@@ -32931,7 +33778,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_REFERENT_CONSTRAINT__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 12;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_REFERENT_CONSTRAINT__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 13;
 
 	/**
 	 * The operation id for the '<em>Feature Left Hand Side Indexed Feature</em>' operation.
@@ -32940,7 +33787,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_INDEXED_FEATURE__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 13;
+	int FEATURE_LEFT_HAND_SIDE___FEATURE_LEFT_HAND_SIDE_INDEXED_FEATURE__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 14;
 
 	/**
 	 * The number of operations of the '<em>Feature Left Hand Side</em>' class.
@@ -32949,7 +33796,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_LEFT_HAND_SIDE_OPERATION_COUNT = LEFT_HAND_SIDE_OPERATION_COUNT + 14;
+	int FEATURE_LEFT_HAND_SIDE_OPERATION_COUNT = LEFT_HAND_SIDE_OPERATION_COUNT + 15;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.alf.impl.ConditionalTestExpressionImpl <em>Conditional Test Expression</em>}' class.
@@ -32959,7 +33806,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getConditionalTestExpression()
 	 * @generated
 	 */
-	int CONDITIONAL_TEST_EXPRESSION = 51;
+	int CONDITIONAL_TEST_EXPRESSION = 52;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -33421,6 +34268,15 @@ public interface AlfPackage extends EPackage {
 	int CONDITIONAL_TEST_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_TEST_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -33599,7 +34455,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getInstanceCreationExpression()
 	 * @generated
 	 */
-	int INSTANCE_CREATION_EXPRESSION = 52;
+	int INSTANCE_CREATION_EXPRESSION = 53;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -34151,6 +35007,15 @@ public interface AlfPackage extends EPackage {
 	int INSTANCE_CREATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INSTANCE_CREATION_EXPRESSION___REFERENCE = INVOCATION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -34617,7 +35482,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getPropertyAccessExpression()
 	 * @generated
 	 */
-	int PROPERTY_ACCESS_EXPRESSION = 53;
+	int PROPERTY_ACCESS_EXPRESSION = 54;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -35079,6 +35944,15 @@ public interface AlfPackage extends EPackage {
 	int PROPERTY_ACCESS_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROPERTY_ACCESS_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -35248,7 +36122,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNameExpression()
 	 * @generated
 	 */
-	int NAME_EXPRESSION = 54;
+	int NAME_EXPRESSION = 55;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -35728,6 +36602,15 @@ public interface AlfPackage extends EPackage {
 	int NAME_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAME_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -35845,13 +36728,13 @@ public interface AlfPackage extends EPackage {
 	int NAME_EXPRESSION___ASSIGNMENT_FOR____STRING = EXPRESSION_OPERATION_COUNT + 5;
 
 	/**
-	 * The operation id for the '<em>Is Add Target</em>' operation.
+	 * The operation id for the '<em>Is Add Target Name</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_EXPRESSION___IS_ADD_TARGET = EXPRESSION_OPERATION_COUNT + 6;
+	int NAME_EXPRESSION___IS_ADD_TARGET_NAME = EXPRESSION_OPERATION_COUNT + 6;
 
 	/**
 	 * The operation id for the '<em>Name Expression Assignment Derivation</em>' operation.
@@ -35951,7 +36834,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getBitStringUnaryExpression()
 	 * @generated
 	 */
-	int BIT_STRING_UNARY_EXPRESSION = 55;
+	int BIT_STRING_UNARY_EXPRESSION = 56;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -36422,6 +37305,15 @@ public interface AlfPackage extends EPackage {
 	int BIT_STRING_UNARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = UNARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BIT_STRING_UNARY_EXPRESSION___REFERENCE = UNARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -36591,7 +37483,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getFeatureInvocationExpression()
 	 * @generated
 	 */
-	int FEATURE_INVOCATION_EXPRESSION = 56;
+	int FEATURE_INVOCATION_EXPRESSION = 57;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -37125,6 +38017,15 @@ public interface AlfPackage extends EPackage {
 	int FEATURE_INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_INVOCATION_EXPRESSION___REFERENCE = INVOCATION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -37564,7 +38465,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getBehaviorInvocationExpression()
 	 * @generated
 	 */
-	int BEHAVIOR_INVOCATION_EXPRESSION = 57;
+	int BEHAVIOR_INVOCATION_EXPRESSION = 58;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -38098,6 +38999,15 @@ public interface AlfPackage extends EPackage {
 	int BEHAVIOR_INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BEHAVIOR_INVOCATION_EXPRESSION___REFERENCE = INVOCATION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -38555,7 +39465,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getShiftExpression()
 	 * @generated
 	 */
-	int SHIFT_EXPRESSION = 58;
+	int SHIFT_EXPRESSION = 59;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -39035,6 +39945,15 @@ public interface AlfPackage extends EPackage {
 	int SHIFT_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = BINARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SHIFT_EXPRESSION___REFERENCE = BINARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -39231,7 +40150,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getUnboundedLiteralExpression()
 	 * @generated
 	 */
-	int UNBOUNDED_LITERAL_EXPRESSION = 59;
+	int UNBOUNDED_LITERAL_EXPRESSION = 60;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -39675,6 +40594,15 @@ public interface AlfPackage extends EPackage {
 	int UNBOUNDED_LITERAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = LITERAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNBOUNDED_LITERAL_EXPRESSION___REFERENCE = LITERAL_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -39817,7 +40745,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getThisExpression()
 	 * @generated
 	 */
-	int THIS_EXPRESSION = 60;
+	int THIS_EXPRESSION = 61;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -40261,6 +41189,15 @@ public interface AlfPackage extends EPackage {
 	int THIS_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int THIS_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -40403,7 +41340,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getClassificationExpression()
 	 * @generated
 	 */
-	int CLASSIFICATION_EXPRESSION = 61;
+	int CLASSIFICATION_EXPRESSION = 62;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -40892,6 +41829,15 @@ public interface AlfPackage extends EPackage {
 	int CLASSIFICATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = UNARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLASSIFICATION_EXPRESSION___REFERENCE = UNARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -41079,7 +42025,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSuperInvocationExpression()
 	 * @generated
 	 */
-	int SUPER_INVOCATION_EXPRESSION = 62;
+	int SUPER_INVOCATION_EXPRESSION = 63;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -41613,6 +42559,15 @@ public interface AlfPackage extends EPackage {
 	int SUPER_INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = INVOCATION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SUPER_INVOCATION_EXPRESSION___REFERENCE = INVOCATION_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -42079,7 +43034,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getIncrementOrDecrementExpression()
 	 * @generated
 	 */
-	int INCREMENT_OR_DECREMENT_EXPRESSION = 63;
+	int INCREMENT_OR_DECREMENT_EXPRESSION = 64;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -42604,6 +43559,15 @@ public interface AlfPackage extends EPackage {
 	int INCREMENT_OR_DECREMENT_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCREMENT_OR_DECREMENT_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -42818,7 +43782,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getBooleanLiteralExpression()
 	 * @generated
 	 */
-	int BOOLEAN_LITERAL_EXPRESSION = 64;
+	int BOOLEAN_LITERAL_EXPRESSION = 65;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -43271,6 +44235,15 @@ public interface AlfPackage extends EPackage {
 	int BOOLEAN_LITERAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = LITERAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LITERAL_EXPRESSION___REFERENCE = LITERAL_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -43413,7 +44386,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNamedTuple()
 	 * @generated
 	 */
-	int NAMED_TUPLE = 65;
+	int NAMED_TUPLE = 66;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -43929,13 +44902,22 @@ public interface AlfPackage extends EPackage {
 	int NAMED_TUPLE___OUTPUT_FOR__ELIST = TUPLE_OPERATION_COUNT + 2;
 
 	/**
+	 * The operation id for the '<em>Output For Expression</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMED_TUPLE___OUTPUT_FOR_EXPRESSION__EXPRESSION = TUPLE_OPERATION_COUNT + 3;
+
+	/**
 	 * The operation id for the '<em>Named Tuple Argument Names</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_TUPLE___NAMED_TUPLE_ARGUMENT_NAMES__DIAGNOSTICCHAIN_MAP = TUPLE_OPERATION_COUNT + 3;
+	int NAMED_TUPLE___NAMED_TUPLE_ARGUMENT_NAMES__DIAGNOSTICCHAIN_MAP = TUPLE_OPERATION_COUNT + 4;
 
 	/**
 	 * The number of operations of the '<em>Named Tuple</em>' class.
@@ -43944,7 +44926,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_TUPLE_OPERATION_COUNT = TUPLE_OPERATION_COUNT + 4;
+	int NAMED_TUPLE_OPERATION_COUNT = TUPLE_OPERATION_COUNT + 5;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.alf.impl.NaturalLiteralExpressionImpl <em>Natural Literal Expression</em>}' class.
@@ -43954,7 +44936,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNaturalLiteralExpression()
 	 * @generated
 	 */
-	int NATURAL_LITERAL_EXPRESSION = 66;
+	int NATURAL_LITERAL_EXPRESSION = 67;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -44407,6 +45389,15 @@ public interface AlfPackage extends EPackage {
 	int NATURAL_LITERAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = LITERAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NATURAL_LITERAL_EXPRESSION___REFERENCE = LITERAL_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -44549,7 +45540,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSequenceRange()
 	 * @generated
 	 */
-	int SEQUENCE_RANGE = 67;
+	int SEQUENCE_RANGE = 68;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -45009,7 +46000,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNameLeftHandSide()
 	 * @generated
 	 */
-	int NAME_LEFT_HAND_SIDE = 68;
+	int NAME_LEFT_HAND_SIDE = 69;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -45525,15 +46516,6 @@ public interface AlfPackage extends EPackage {
 	int NAME_LEFT_HAND_SIDE___ASSIGNED_NAME = LEFT_HAND_SIDE___ASSIGNED_NAME;
 
 	/**
-	 * The operation id for the '<em>Expression</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAME_LEFT_HAND_SIDE___EXPRESSION = LEFT_HAND_SIDE___EXPRESSION;
-
-	/**
 	 * The operation id for the '<em>Is Data Value Update</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -45633,13 +46615,31 @@ public interface AlfPackage extends EPackage {
 	int NAME_LEFT_HAND_SIDE___FEATURE = LEFT_HAND_SIDE_OPERATION_COUNT + 8;
 
 	/**
+	 * The operation id for the '<em>Expression</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAME_LEFT_HAND_SIDE___EXPRESSION = LEFT_HAND_SIDE_OPERATION_COUNT + 9;
+
+	/**
+	 * The operation id for the '<em>Primary</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAME_LEFT_HAND_SIDE___PRIMARY = LEFT_HAND_SIDE_OPERATION_COUNT + 10;
+
+	/**
 	 * The operation id for the '<em>Local Name</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___LOCAL_NAME = LEFT_HAND_SIDE_OPERATION_COUNT + 9;
+	int NAME_LEFT_HAND_SIDE___LOCAL_NAME = LEFT_HAND_SIDE_OPERATION_COUNT + 11;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Assignment After Derivation</em>' operation.
@@ -45648,7 +46648,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_ASSIGNMENT_AFTER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 10;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_ASSIGNMENT_AFTER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 12;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Target Assignment</em>' operation.
@@ -45657,7 +46657,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_TARGET_ASSIGNMENT__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 11;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_TARGET_ASSIGNMENT__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 13;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Assignments Before</em>' operation.
@@ -45666,7 +46666,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_ASSIGNMENTS_BEFORE__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 12;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_ASSIGNMENTS_BEFORE__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 14;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Referent Derivation</em>' operation.
@@ -45675,7 +46675,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_REFERENT_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 13;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_REFERENT_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 15;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Lower Derivation</em>' operation.
@@ -45684,7 +46684,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_LOWER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 14;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_LOWER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 16;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Upper Derivation</em>' operation.
@@ -45693,7 +46693,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_UPPER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 15;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_UPPER_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 17;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Type Derivation</em>' operation.
@@ -45702,7 +46702,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_TYPE_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 16;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_TYPE_DERIVATION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 18;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Target Resolution</em>' operation.
@@ -45711,7 +46711,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_TARGET_RESOLUTION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 17;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_TARGET_RESOLUTION__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 19;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Indexed Feature</em>' operation.
@@ -45720,7 +46720,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_INDEXED_FEATURE__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 18;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_INDEXED_FEATURE__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 20;
 
 	/**
 	 * The operation id for the '<em>Name Left Hand Side Nontemplate Target</em>' operation.
@@ -45729,7 +46729,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_NONTEMPLATE_TARGET__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 19;
+	int NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_NONTEMPLATE_TARGET__DIAGNOSTICCHAIN_MAP = LEFT_HAND_SIDE_OPERATION_COUNT + 21;
 
 	/**
 	 * The number of operations of the '<em>Name Left Hand Side</em>' class.
@@ -45738,7 +46738,7 @@ public interface AlfPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int NAME_LEFT_HAND_SIDE_OPERATION_COUNT = LEFT_HAND_SIDE_OPERATION_COUNT + 20;
+	int NAME_LEFT_HAND_SIDE_OPERATION_COUNT = LEFT_HAND_SIDE_OPERATION_COUNT + 22;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.alf.impl.EffectiveLeftHandSideImpl <em>Effective Left Hand Side</em>}' class.
@@ -45748,7 +46748,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getEffectiveLeftHandSide()
 	 * @generated
 	 */
-	int EFFECTIVE_LEFT_HAND_SIDE = 69;
+	int EFFECTIVE_LEFT_HAND_SIDE = 70;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -46273,15 +47273,6 @@ public interface AlfPackage extends EPackage {
 	int EFFECTIVE_LEFT_HAND_SIDE___ASSIGNED_NAME = NAME_LEFT_HAND_SIDE___ASSIGNED_NAME;
 
 	/**
-	 * The operation id for the '<em>Expression</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EFFECTIVE_LEFT_HAND_SIDE___EXPRESSION = NAME_LEFT_HAND_SIDE___EXPRESSION;
-
-	/**
 	 * The operation id for the '<em>Is Data Value Update</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -46489,13 +47480,22 @@ public interface AlfPackage extends EPackage {
 	int EFFECTIVE_LEFT_HAND_SIDE___PRIMARY = NAME_LEFT_HAND_SIDE_OPERATION_COUNT + 3;
 
 	/**
+	 * The operation id for the '<em>Expression</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EFFECTIVE_LEFT_HAND_SIDE___EXPRESSION = NAME_LEFT_HAND_SIDE_OPERATION_COUNT + 4;
+
+	/**
 	 * The number of operations of the '<em>Effective Left Hand Side</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EFFECTIVE_LEFT_HAND_SIDE_OPERATION_COUNT = NAME_LEFT_HAND_SIDE_OPERATION_COUNT + 4;
+	int EFFECTIVE_LEFT_HAND_SIDE_OPERATION_COUNT = NAME_LEFT_HAND_SIDE_OPERATION_COUNT + 5;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.uml.alf.impl.SequenceReductionExpressionImpl <em>Sequence Reduction Expression</em>}' class.
@@ -46505,7 +47505,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSequenceReductionExpression()
 	 * @generated
 	 */
-	int SEQUENCE_REDUCTION_EXPRESSION = 70;
+	int SEQUENCE_REDUCTION_EXPRESSION = 71;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -46985,6 +47985,15 @@ public interface AlfPackage extends EPackage {
 	int SEQUENCE_REDUCTION_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SEQUENCE_REDUCTION_EXPRESSION___REFERENCE = EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -47163,7 +48172,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSequenceExpressionList()
 	 * @generated
 	 */
-	int SEQUENCE_EXPRESSION_LIST = 71;
+	int SEQUENCE_EXPRESSION_LIST = 72;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -47596,7 +48605,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getRelationalExpression()
 	 * @generated
 	 */
-	int RELATIONAL_EXPRESSION = 72;
+	int RELATIONAL_EXPRESSION = 73;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -48076,6 +49085,15 @@ public interface AlfPackage extends EPackage {
 	int RELATIONAL_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT = BINARY_EXPRESSION___IS_MULTIPLICITY_CONFORMANT_WITH__ASSIGNABLEELEMENT;
 
 	/**
+	 * The operation id for the '<em>Reference</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONAL_EXPRESSION___REFERENCE = BINARY_EXPRESSION___REFERENCE;
+
+	/**
 	 * The operation id for the '<em>New Assignments</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -48272,7 +49290,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getStatement()
 	 * @generated
 	 */
-	int STATEMENT = 75;
+	int STATEMENT = 76;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -48795,7 +49813,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getLocalNameDeclarationStatement()
 	 * @generated
 	 */
-	int LOCAL_NAME_DECLARATION_STATEMENT = 73;
+	int LOCAL_NAME_DECLARATION_STATEMENT = 74;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -49453,7 +50471,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getAssignableLocalNameDeclaration()
 	 * @generated
 	 */
-	int ASSIGNABLE_LOCAL_NAME_DECLARATION = 74;
+	int ASSIGNABLE_LOCAL_NAME_DECLARATION = 75;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -49931,7 +50949,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getAnnotation()
 	 * @generated
 	 */
-	int ANNOTATION = 76;
+	int ANNOTATION = 77;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -50328,7 +51346,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getQualifiedNameList()
 	 * @generated
 	 */
-	int QUALIFIED_NAME_LIST = 77;
+	int QUALIFIED_NAME_LIST = 78;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -50689,7 +51707,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNonFinalClause()
 	 * @generated
 	 */
-	int NON_FINAL_CLAUSE = 78;
+	int NON_FINAL_CLAUSE = 79;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -51095,7 +52113,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getBlock()
 	 * @generated
 	 */
-	int BLOCK = 79;
+	int BLOCK = 80;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -51510,7 +52528,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getBlockStatement()
 	 * @generated
 	 */
-	int BLOCK_STATEMENT = 80;
+	int BLOCK_STATEMENT = 81;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -52096,7 +53114,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getDoStatement()
 	 * @generated
 	 */
-	int DO_STATEMENT = 81;
+	int DO_STATEMENT = 82;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -52673,7 +53691,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getConcurrentClauses()
 	 * @generated
 	 */
-	int CONCURRENT_CLAUSES = 82;
+	int CONCURRENT_CLAUSES = 83;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -53052,7 +54070,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getBreakStatement()
 	 * @generated
 	 */
-	int BREAK_STATEMENT = 83;
+	int BREAK_STATEMENT = 84;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -53602,7 +54620,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getExpressionStatement()
 	 * @generated
 	 */
-	int EXPRESSION_STATEMENT = 84;
+	int EXPRESSION_STATEMENT = 85;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -54152,7 +55170,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getClassifyStatement()
 	 * @generated
 	 */
-	int CLASSIFY_STATEMENT = 85;
+	int CLASSIFY_STATEMENT = 86;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -54801,7 +55819,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getForStatement()
 	 * @generated
 	 */
-	int FOR_STATEMENT = 86;
+	int FOR_STATEMENT = 87;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -55441,7 +56459,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getLoopVariableDefinition()
 	 * @generated
 	 */
-	int LOOP_VARIABLE_DEFINITION = 87;
+	int LOOP_VARIABLE_DEFINITION = 88;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -55982,7 +57000,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getIfStatement()
 	 * @generated
 	 */
-	int IF_STATEMENT = 88;
+	int IF_STATEMENT = 89;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -56586,7 +57604,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSwitchStatement()
 	 * @generated
 	 */
-	int SWITCH_STATEMENT = 89;
+	int SWITCH_STATEMENT = 90;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -57226,7 +58244,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSwitchClause()
 	 * @generated
 	 */
-	int SWITCH_CLAUSE = 90;
+	int SWITCH_CLAUSE = 91;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -57632,7 +58650,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getWhileStatement()
 	 * @generated
 	 */
-	int WHILE_STATEMENT = 91;
+	int WHILE_STATEMENT = 92;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -58209,7 +59227,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getReturnStatement()
 	 * @generated
 	 */
-	int RETURN_STATEMENT = 92;
+	int RETURN_STATEMENT = 93;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -58777,7 +59795,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getInLineStatement()
 	 * @generated
 	 */
-	int IN_LINE_STATEMENT = 93;
+	int IN_LINE_STATEMENT = 94;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -59327,7 +60345,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getAcceptStatement()
 	 * @generated
 	 */
-	int ACCEPT_STATEMENT = 94;
+	int ACCEPT_STATEMENT = 95;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -60003,7 +61021,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getAcceptBlock()
 	 * @generated
 	 */
-	int ACCEPT_BLOCK = 95;
+	int ACCEPT_BLOCK = 96;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -60418,7 +61436,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getEmptyStatement()
 	 * @generated
 	 */
-	int EMPTY_STATEMENT = 96;
+	int EMPTY_STATEMENT = 97;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -60950,7 +61968,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getMemberDefinition()
 	 * @generated
 	 */
-	int MEMBER_DEFINITION = 99;
+	int MEMBER_DEFINITION = 100;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -61572,7 +62590,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNamespaceDefinition()
 	 * @generated
 	 */
-	int NAMESPACE_DEFINITION = 98;
+	int NAMESPACE_DEFINITION = 99;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -62437,7 +63455,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getPackageDefinition()
 	 * @generated
 	 */
-	int PACKAGE_DEFINITION = 113;
+	int PACKAGE_DEFINITION = 114;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -63329,7 +64347,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getModelNamespace()
 	 * @generated
 	 */
-	int MODEL_NAMESPACE = 97;
+	int MODEL_NAMESPACE = 98;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -64266,7 +65284,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getStereotypeAnnotation()
 	 * @generated
 	 */
-	int STEREOTYPE_ANNOTATION = 100;
+	int STEREOTYPE_ANNOTATION = 101;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -64726,7 +65744,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getTaggedValueList()
 	 * @generated
 	 */
-	int TAGGED_VALUE_LIST = 101;
+	int TAGGED_VALUE_LIST = 102;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -65087,7 +66105,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getTaggedValue()
 	 * @generated
 	 */
-	int TAGGED_VALUE = 102;
+	int TAGGED_VALUE = 103;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -65466,7 +66484,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getUnitDefinition()
 	 * @generated
 	 */
-	int UNIT_DEFINITION = 103;
+	int UNIT_DEFINITION = 104;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -65962,7 +66980,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getImportReference()
 	 * @generated
 	 */
-	int IMPORT_REFERENCE = 104;
+	int IMPORT_REFERENCE = 105;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -66377,7 +67395,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getImportedMember()
 	 * @generated
 	 */
-	int IMPORTED_MEMBER = 105;
+	int IMPORTED_MEMBER = 106;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -67026,7 +68044,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getEnumerationLiteralName()
 	 * @generated
 	 */
-	int ENUMERATION_LITERAL_NAME = 106;
+	int ENUMERATION_LITERAL_NAME = 107;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -67648,7 +68666,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getOperationDefinition()
 	 * @generated
 	 */
-	int OPERATION_DEFINITION = 107;
+	int OPERATION_DEFINITION = 108;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -68684,7 +69702,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getClassifierDefinition()
 	 * @generated
 	 */
-	int CLASSIFIER_DEFINITION = 109;
+	int CLASSIFIER_DEFINITION = 110;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -69639,7 +70657,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getAssociationDefinition()
 	 * @generated
 	 */
-	int ASSOCIATION_DEFINITION = 108;
+	int ASSOCIATION_DEFINITION = 109;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -70603,7 +71621,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getClassDefinition()
 	 * @generated
 	 */
-	int CLASS_DEFINITION = 110;
+	int CLASS_DEFINITION = 111;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -71612,7 +72630,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getTypedElementDefinition()
 	 * @generated
 	 */
-	int TYPED_ELEMENT_DEFINITION = 111;
+	int TYPED_ELEMENT_DEFINITION = 112;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -72216,7 +73234,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getDataTypeDefinition()
 	 * @generated
 	 */
-	int DATA_TYPE_DEFINITION = 112;
+	int DATA_TYPE_DEFINITION = 113;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -73189,7 +74207,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getPropertyDefinition()
 	 * @generated
 	 */
-	int PROPERTY_DEFINITION = 114;
+	int PROPERTY_DEFINITION = 115;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -73892,7 +74910,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSignalDefinition()
 	 * @generated
 	 */
-	int SIGNAL_DEFINITION = 115;
+	int SIGNAL_DEFINITION = 116;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -74856,7 +75874,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getActiveClassDefinition()
 	 * @generated
 	 */
-	int ACTIVE_CLASS_DEFINITION = 116;
+	int ACTIVE_CLASS_DEFINITION = 117;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -75883,7 +76901,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getActivityDefinition()
 	 * @generated
 	 */
-	int ACTIVITY_DEFINITION = 117;
+	int ACTIVITY_DEFINITION = 118;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -76865,7 +77883,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getElementImportReference()
 	 * @generated
 	 */
-	int ELEMENT_IMPORT_REFERENCE = 118;
+	int ELEMENT_IMPORT_REFERENCE = 119;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -77298,7 +78316,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getSignalReceptionDefinition()
 	 * @generated
 	 */
-	int SIGNAL_RECEPTION_DEFINITION = 119;
+	int SIGNAL_RECEPTION_DEFINITION = 120;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -78271,7 +79289,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getEnumerationDefinition()
 	 * @generated
 	 */
-	int ENUMERATION_DEFINITION = 120;
+	int ENUMERATION_DEFINITION = 121;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -79235,7 +80253,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getPackageImportReference()
 	 * @generated
 	 */
-	int PACKAGE_IMPORT_REFERENCE = 121;
+	int PACKAGE_IMPORT_REFERENCE = 122;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -79659,7 +80677,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getClassifierTemplateParameter()
 	 * @generated
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER = 122;
+	int CLASSIFIER_TEMPLATE_PARAMETER = 123;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -80623,7 +81641,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getFormalParameter()
 	 * @generated
 	 */
-	int FORMAL_PARAMETER = 123;
+	int FORMAL_PARAMETER = 124;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -81299,7 +82317,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getReceptionDefinition()
 	 * @generated
 	 */
-	int RECEPTION_DEFINITION = 124;
+	int RECEPTION_DEFINITION = 125;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -81966,7 +82984,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getMember()
 	 * @generated
 	 */
-	int MEMBER = 125;
+	int MEMBER = 126;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -82372,7 +83390,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getAnnotatedStatement()
 	 * @generated
 	 */
-	int ANNOTATED_STATEMENT = 126;
+	int ANNOTATED_STATEMENT = 127;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -82760,7 +83778,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getBoundClassifier()
 	 * @generated
 	 */
-	int BOUND_CLASSIFIER = 127;
+	int BOUND_CLASSIFIER = 128;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -83733,7 +84751,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getReturnParameter()
 	 * @generated
 	 */
-	int RETURN_PARAMETER = 128;
+	int RETURN_PARAMETER = 129;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -84409,7 +85427,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getNonReturnParameter()
 	 * @generated
 	 */
-	int NON_RETURN_PARAMETER = 129;
+	int NON_RETURN_PARAMETER = 130;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -85086,7 +86104,7 @@ public interface AlfPackage extends EPackage {
 	 * @see org.eclipse.papyrus.uml.alf.impl.AlfPackageImpl#getAnyType()
 	 * @generated
 	 */
-	int ANY_TYPE = 130;
+	int ANY_TYPE = 131;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -90874,6 +91892,16 @@ public interface AlfPackage extends EPackage {
 	EReference getExpression_AssignmentAfter();
 
 	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.Expression#reference() <em>Reference</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Reference</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.Expression#reference()
+	 * @generated
+	 */
+	EOperation getExpression__Reference();
+
+	/**
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.Expression#newAssignments() <em>New Assignments</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -90954,6 +91982,87 @@ public interface AlfPackage extends EPackage {
 	EOperation getExpression__ExpressionUniqueAssignments__DiagnosticChain_Map();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.alf.ExpressionReference <em>Expression Reference</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Expression Reference</em>'.
+	 * @see org.eclipse.papyrus.uml.alf.ExpressionReference
+	 * @generated
+	 */
+	EClass getExpressionReference();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.uml.alf.ExpressionReference#getExpression <em>Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Expression</em>'.
+	 * @see org.eclipse.papyrus.uml.alf.ExpressionReference#getExpression()
+	 * @see #getExpressionReference()
+	 * @generated
+	 */
+	EReference getExpressionReference_Expression();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.ExpressionReference#type() <em>Type</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Type</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.ExpressionReference#type()
+	 * @generated
+	 */
+	EOperation getExpressionReference__Type();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.ExpressionReference#lower() <em>Lower</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Lower</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.ExpressionReference#lower()
+	 * @generated
+	 */
+	EOperation getExpressionReference__Lower();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.ExpressionReference#upper() <em>Upper</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Upper</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.ExpressionReference#upper()
+	 * @generated
+	 */
+	EOperation getExpressionReference__Upper();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.ExpressionReference#isAddTarget(org.eclipse.papyrus.uml.alf.Expression) <em>Is Add Target</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Is Add Target</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.ExpressionReference#isAddTarget(org.eclipse.papyrus.uml.alf.Expression)
+	 * @generated
+	 */
+	EOperation getExpressionReference__IsAddTarget__Expression();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.ExpressionReference#assignmentsBefore() <em>Assignments Before</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Assignments Before</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.ExpressionReference#assignmentsBefore()
+	 * @generated
+	 */
+	EOperation getExpressionReference__AssignmentsBefore();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.ExpressionReference#updateAssignments() <em>Update Assignments</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Update Assignments</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.ExpressionReference#updateAssignments()
+	 * @generated
+	 */
+	EOperation getExpressionReference__UpdateAssignments();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.alf.ExtentOrExpression <em>Extent Or Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -92354,6 +93463,16 @@ public interface AlfPackage extends EPackage {
 	EOperation getPositionalTuple__OutputFor__EList();
 
 	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.PositionalTuple#outputForExpression(org.eclipse.papyrus.uml.alf.Expression) <em>Output For Expression</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Output For Expression</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.PositionalTuple#outputForExpression(org.eclipse.papyrus.uml.alf.Expression)
+	 * @generated
+	 */
+	EOperation getPositionalTuple__OutputForExpression__Expression();
+
+	/**
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.PositionalTuple#positionalTupleArguments(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Positional Tuple Arguments</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -92477,6 +93596,16 @@ public interface AlfPackage extends EPackage {
 	EOperation getTuple__OutputFor__EList();
 
 	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.Tuple#outputForExpression(org.eclipse.papyrus.uml.alf.Expression) <em>Output For Expression</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Output For Expression</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.Tuple#outputForExpression(org.eclipse.papyrus.uml.alf.Expression)
+	 * @generated
+	 */
+	EOperation getTuple__OutputForExpression__Expression();
+
+	/**
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.Tuple#assignmentsBefore(org.eclipse.papyrus.uml.alf.SyntaxElement) <em>Assignments Before</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -95532,6 +96661,16 @@ public interface AlfPackage extends EPackage {
 	EOperation getFeatureLeftHandSide__Feature();
 
 	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.FeatureLeftHandSide#primary() <em>Primary</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Primary</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.FeatureLeftHandSide#primary()
+	 * @generated
+	 */
+	EOperation getFeatureLeftHandSide__Primary();
+
+	/**
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.FeatureLeftHandSide#index() <em>Index</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -96234,14 +97373,14 @@ public interface AlfPackage extends EPackage {
 	EOperation getNameExpression__AssignmentFor___String();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.NameExpression#isAddTarget() <em>Is Add Target</em>}' operation.
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.NameExpression#isAddTargetName() <em>Is Add Target Name</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the '<em>Is Add Target</em>' operation.
-	 * @see org.eclipse.papyrus.uml.alf.NameExpression#isAddTarget()
+	 * @return the meta object for the '<em>Is Add Target Name</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.NameExpression#isAddTargetName()
 	 * @generated
 	 */
-	EOperation getNameExpression__IsAddTarget();
+	EOperation getNameExpression__IsAddTargetName();
 
 	/**
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.NameExpression#nameExpressionAssignmentDerivation(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Name Expression Assignment Derivation</em>}' operation.
@@ -97463,6 +98602,16 @@ public interface AlfPackage extends EPackage {
 	EOperation getNamedTuple__OutputFor__EList();
 
 	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.NamedTuple#outputForExpression(org.eclipse.papyrus.uml.alf.Expression) <em>Output For Expression</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Output For Expression</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.NamedTuple#outputForExpression(org.eclipse.papyrus.uml.alf.Expression)
+	 * @generated
+	 */
+	EOperation getNamedTuple__OutputForExpression__Expression();
+
+	/**
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.NamedTuple#namedTupleArgumentNames(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Named Tuple Argument Names</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -97748,6 +98897,26 @@ public interface AlfPackage extends EPackage {
 	EOperation getNameLeftHandSide__Feature();
 
 	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.NameLeftHandSide#expression() <em>Expression</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Expression</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.NameLeftHandSide#expression()
+	 * @generated
+	 */
+	EOperation getNameLeftHandSide__Expression();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.NameLeftHandSide#primary() <em>Primary</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Primary</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.NameLeftHandSide#primary()
+	 * @generated
+	 */
+	EOperation getNameLeftHandSide__Primary();
+
+	/**
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.NameLeftHandSide#localName() <em>Local Name</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -97919,6 +99088,16 @@ public interface AlfPackage extends EPackage {
 	EOperation getEffectiveLeftHandSide__Primary();
 
 	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.uml.alf.EffectiveLeftHandSide#expression() <em>Expression</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Expression</em>' operation.
+	 * @see org.eclipse.papyrus.uml.alf.EffectiveLeftHandSide#expression()
+	 * @generated
+	 */
+	EOperation getEffectiveLeftHandSide__Expression();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.alf.SequenceReductionExpression <em>Sequence Reduction Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/EffectiveLeftHandSide.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/EffectiveLeftHandSide.java
index 2f7a9bcf86e..5666dd28993 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/EffectiveLeftHandSide.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/EffectiveLeftHandSide.java
@@ -78,4 +78,12 @@ public interface EffectiveLeftHandSide extends NameLeftHandSide {
 	 */
 	Expression primary();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression'"
+	 * @generated
+	 */
+	Expression expression();
+
 } // EffectiveLeftHandSide
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/Expression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/Expression.java
index 6f577cfc4bf..2d76cd316a9 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/Expression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/Expression.java
@@ -70,6 +70,15 @@ public interface Expression extends AssignableElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @model required="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='ExpressionReference{expression = self}'"
+	 * @generated
+	 */
+	ExpressionReference reference();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * Get the assigned sources for assignments made within this expression.
 	 * <!-- end-model-doc -->
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/ExpressionReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/ExpressionReference.java
new file mode 100644
index 00000000000..a7d4a017fb9
--- /dev/null
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/ExpressionReference.java
@@ -0,0 +1,109 @@
+/**
+ */
+package org.eclipse.papyrus.uml.alf;
+
+import java.math.BigInteger;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Expression Reference</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Provides a non-composition reference to an expression that is owned elsewhere.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.uml.alf.ExpressionReference#getExpression <em>Expression</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.uml.alf.AlfPackage#getExpressionReference()
+ * @model
+ * @generated
+ */
+public interface ExpressionReference extends Expression {
+	/**
+	 * Returns the value of the '<em><b>Expression</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Expression</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Expression</em>' reference.
+	 * @see #setExpression(Expression)
+	 * @see org.eclipse.papyrus.uml.alf.AlfPackage#getExpressionReference_Expression()
+	 * @model required="true"
+	 * @generated
+	 */
+	Expression getExpression();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.alf.ExpressionReference#getExpression <em>Expression</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Expression</em>' reference.
+	 * @see #getExpression()
+	 * @generated
+	 */
+	void setExpression(Expression value);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.type()'"
+	 * @generated
+	 */
+	ElementReference type();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model required="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.lower()'"
+	 * @generated
+	 */
+	BigInteger lower();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model required="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.upper()'"
+	 * @generated
+	 */
+	BigInteger upper();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model required="true" targetExpressionRequired="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.isAddTarget(targetExpression)'"
+	 * @generated
+	 */
+	boolean isAddTarget(Expression targetExpression);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model ordered="false"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.assignmentBefore'"
+	 * @generated
+	 */
+	EList<AssignedSource> assignmentsBefore();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model ordered="false"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='self.expression.assignmentAfter'"
+	 * @generated
+	 */
+	EList<AssignedSource> updateAssignments();
+
+} // ExpressionReference
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/FeatureLeftHandSide.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/FeatureLeftHandSide.java
index 854869b2d74..837e602111b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/FeatureLeftHandSide.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/FeatureLeftHandSide.java
@@ -74,6 +74,14 @@ public interface FeatureLeftHandSide extends LeftHandSide {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n\t\t\t\tPropertyAccessExpression{\n\t\t\t\t\tfeatureReference = self.feature(),\n\t\t\t\t\towner = self.owner()\n\t\t\t\t}'"
+	 * @generated
+	 */
+	Expression primary();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n        if not self.expression.oclIsKindOf(SequenceAccessExpression) then null\n        else self.expression.oclAsType(SequenceAccessExpression).index\n        endif'"
 	 * @generated
 	 */
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NameExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NameExpression.java
index 550183fa6c5..3d88d24c91b 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NameExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NameExpression.java
@@ -150,7 +150,7 @@ public interface NameExpression extends Expression {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n       let assignment = self.assignment in\n          if assignment <> null then assignment.upper\n          else\n            let enumerationLiteral = self.enumerationLiteral in\n              if enumerationLiteral <> null then 1\n              else\n                let propertyAccess = self.propertyAccess in\n                  if propertyAccess <> null then propertyAccess.upper\n                  else 0\n                  endif\n              endif\n          endif'"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n       let assignment = self.assignment in\n          if assignment <> null then assignment.upper\n          else\n            let enumerationLiteral = self.enumerationLiteral in\n              if enumerationLiteral <> null then 1\n              else\n                let propertyAccess = self.propertyAccess in\n                  if propertyAccess <> null then propertyAccess.upper\n                  else 1 -- Note: This ensures a name defined as an \"out\" argument is not considered null.\n                  endif\n              endif\n          endif'"
 	 * @generated
 	 */
 	BigInteger upper();
@@ -189,7 +189,7 @@ public interface NameExpression extends Expression {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @model localNameRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n      let assignments = self.assignmentBefore->select(name = localName) in\n        if assignments->isEmpty() or \n           assignments->forAll(isParallelLocalName) and not self.isAddTarget()\n        then \n          null\n        else \n          assignments->any(true)\n        endif'"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n      let assignments = self.assignmentBefore->select(name = localName) in\n        if assignments->isEmpty() or \n           assignments->forAll(isParallelLocalName) and not self.isAddTargetName()\n        then \n          null\n        else \n          assignments->any(true)\n        endif'"
 	 * @generated
 	 */
 	AssignedSource assignmentFor_(String localName);
@@ -201,7 +201,7 @@ public interface NameExpression extends Expression {
 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n      let expression = self.enclosingExpression() in\n        if expression = null then false\n        else expression.isAddTarget(self)\n        endif'"
 	 * @generated
 	 */
-	boolean isAddTarget();
+	boolean isAddTargetName();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NameLeftHandSide.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NameLeftHandSide.java
index 62abffef9b4..1ae10f8dc5c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NameLeftHandSide.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NameLeftHandSide.java
@@ -157,6 +157,24 @@ public interface NameLeftHandSide extends LeftHandSide {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @model required="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n\t\t\t\tlet expression = self.primary() in\n\t\t\t\t\tif self.index = null then expression\n\t\t\t\t\telse\n\t\t\t\t\t\tSequenceAccessExpression{\n\t\t\t\t\t\t\tprimary = expression,\n\t\t\t\t\t\t\tindex = index.reference(),\n\t\t\t\t\t\t\towner = self\n\t\t\t\t\t\t}\n\t\t\t\t\tendif'"
+	 * @generated
+	 */
+	Expression expression();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model required="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n\t\t\t\tlet feature = self.feature() in\n\t\t\t\tif feature = null then\n\t\t\t\t\tNameExpression{\n\t\t\t\t\t\tname = self.target.copy(),\n\t\t\t\t\t\towner = self\n\t\t\t\t\t}\n\t\t\t\telse\n\t\t\t\t\tPropertyAccessExpression{\n\t\t\t\t\t\tfeature = feature,\n\t\t\t\t\t\towner = self\n\t\t\t\t\t}\n\t\t\t\tendif'"
+	 * @generated
+	 */
+	Expression primary();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n        if self.feature() <> null then null\n        else self.target().unqualifiedName.toName()\n        endif'"
 	 * @generated
 	 */
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NamedTuple.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NamedTuple.java
index e120e1e4b2f..a668bc0e7c1 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NamedTuple.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/NamedTuple.java
@@ -58,7 +58,7 @@ public interface NamedTuple extends Tuple {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @model ordered="false" parametersMany="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n        parameters->select(\n          let direction = direction() in\n            direction = \'in\' or direction = \'inout\' \n        )->collect(parameter |\n          let parameterName = parameter.name() in\n          let arguments = self.namedExpression->select(actualName() = parameterName) in\n            if arguments->isEmpty() then\n              InputNamedExpression{\n                name = parameterName,\n                expression = SequenceConstructionExpression{\n                  hasMultiplicity = true\n                },\n                owner = self\n              }\n            else\n              let argument : NamedExpression = arguments->any(true) in\n                InputNamedExpression{\n                  name = parameterName,\n                  expression = argument.expression,\n                  index = argument.index\n                }\n            endif\n        )->asSet()'"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n        parameters->select(\n          let direction = direction() in\n            direction = \'in\' or direction = \'inout\' \n        )->collect(parameter |\n          let parameterName = parameter.name() in\n          let arguments = self.namedExpression->select(actualName() = parameterName) in\n            if arguments->isEmpty() then\n              InputNamedExpression{\n                name = parameterName,\n                expression = SequenceConstructionExpression{\n                  hasMultiplicity = true\n                },\n                owner = self\n              }\n            else\n              let argument : NamedExpression = arguments->any(true) in\n                InputNamedExpression{\n                  name = parameterName,\n                  expression = argument.expression,\n                  index = argument.index,\n                  owner = self\n                }\n            endif\n        )->asSet()'"
 	 * @generated
 	 */
 	EList<InputNamedExpression> inputFor(EList<ElementReference> parameters);
@@ -75,8 +75,16 @@ public interface NamedTuple extends Tuple {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @model expressionRequired="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n\t\t\t\tlet arguments = self.namedExpression->select(a | a.expression = expression) in\n\t\t\t\t\tif arguments->isEmpty() then null\n\t\t\t\t\telse\n\t\t\t\t\t\tlet argument = arguments->any(true) in\n\t\t\t\t\t\t\tOutputNamedExpression{\n\t\t\t\t\t\t\t\tname = argument.name,\n\t\t\t\t\t\t\t\tindex = argument.index,\n\t\t\t\t\t\t\t\texpression = expression,\n\t\t\t\t\t\t\t\towner = self\n\t\t\t\t\t\t\t}\n\t\t\t\t\tendif'"
+	 * @generated
+	 */
+	OutputNamedExpression outputForExpression(Expression expression);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * /*
 	 * The name of a named expression of a named tuple must be the name of a
 	 * parameter of the invocation the tuple is for. No two named expressions
 	 * may have the same name.
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/PositionalTuple.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/PositionalTuple.java
index 058d601ef40..dfbcb086fcc 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/PositionalTuple.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/PositionalTuple.java
@@ -74,6 +74,15 @@ public interface PositionalTuple extends Tuple {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @model expressionRequired="true"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n\t\t\t\t\tif self.expression->excludes(expression) then null\n\t\t\t\t\telse\n\t\t\t\t\t\tlet i = self.expression->indexOf(expression) in\n\t\t\t\t\t\tlet parameter = self.invocation.parameter->at(i) in\n\t\t\t\t\t\t\tOutputNamedExpression{\n\t\t\t\t\t\t\t\tname = parameter.name(),\n\t\t\t\t\t\t\t\texpression = expression,\n\t\t\t\t\t\t\t\towner = self\n\t\t\t\t\t\t\t}\n\t\t\t\t\tendif'"
+	 * @generated
+	 */
+	OutputNamedExpression outputForExpression(Expression expression);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * A positional tuple must not have more arguments than the invocation it is for has parameters.
 	 * <!-- end-model-doc -->
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/SequenceOperationExpression.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/SequenceOperationExpression.java
index ca4bafdf3dd..6be2c648582 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/SequenceOperationExpression.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/SequenceOperationExpression.java
@@ -204,7 +204,7 @@ public interface SequenceOperationExpression extends InvocationExpression {
 	 * sequence operation expression.
 	 * <!-- end-model-doc -->
 	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n\t\t\t\tlet firstParameter = self.firstParameter() in\n\t\t\t\tlet namedExpression = NamedExpression{\n\t\t\t\t\tname = if firstParameter = null then null else firstParameter.name() endif,\n\t\t\t\t\texpression = self.primary.expression\n\t\t\t\t} in\n\t\t\t\tlet namedTuple = NamedTuple{\n\t\t\t\t\tnamedExpression = OrderedSet{namedExpression}->\n\t\t\t\t\t\tincludingAll(self.tuple.input)->includingAll(self.tuple.output)\n\t\t\t\t} in\n\t\t\t\t\tBehaviorInvocationExpression{\n\t\t\t\t\t\ttarget = self.operation,\n\t\t\t\t\t\treferent = self.referent,\n\t\t\t\t\t\ttuple = namedTuple,\n\t\t\t\t\t\towner = self.owner()\n\t\t\t\t\t}'"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n\t\t\t\tlet firstParameter = self.firstParameter() in\n\t\t\t\tlet namedExpression = NamedExpression{\n\t\t\t\t\tname = if firstParameter = null then null else firstParameter.name() endif,\n\t\t\t\t\texpression = self.primary.expression.reference()\n\t\t\t\t} in\n\t\t\t\tlet namedTuple = NamedTuple{\n\t\t\t\t\tnamedExpression = OrderedSet{namedExpression}->\n\t\t\t\t\t\tincludingAll(self.tuple.input)->includingAll(self.tuple.output)\n\t\t\t\t} in\n\t\t\t\t\tBehaviorInvocationExpression{\n\t\t\t\t\t\ttarget = self.operation.copy(),\n\t\t\t\t\t\treferent = self.referent,\n\t\t\t\t\t\ttuple = namedTuple,\n\t\t\t\t\t\towner = self\n\t\t\t\t\t}'"
 	 * @generated
 	 */
 	BehaviorInvocationExpression invocation();
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/Tuple.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/Tuple.java
index 845c679c275..55a3d4e727a 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/Tuple.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/Tuple.java
@@ -157,8 +157,16 @@ public interface Tuple extends SyntaxElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @model expressionRequired="true"
+	 * @generated
+	 */
+	OutputNamedExpression outputForExpression(Expression expression);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @model ordered="false" elementRequired="true"
-	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n--        let assignmentsBefore = self.assignmentsBefore() in\n--          if not element.oclIsKindOf(NameExpression) then assignmentsBefore\n--          else\n--            let outputs : Set = self.output->select(expression = element) in\n--              if outputs->isEmpty() then assignmentsBefore\n--              else self.updateFor(assignmentsBefore, \n--                outputs->any(true).oclAsType(OutputNamedExpression)\n--              )\n--              endif\n--          endif\n          self.assignmentsBefore()'"
+	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n--        let assignmentsBefore = self.assignmentsBefore() in\n--          if not element.oclIsKindOf(NameExpression) then assignmentsBefore\n--          else\n--            let output = self.outputForExpression(element.oclAsType(NameExpression)) in\n--              if output = null then assignmentsBefore\n--              else self.updateFor(assignmentsBefore, output)\n--              endif\n--          endif;\n        self.assignmentsBefore()'"
 	 * @generated
 	 */
 	EList<AssignedSource> assignmentsBefore(SyntaxElement element);
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/AlfFactoryImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/AlfFactoryImpl.java
index 37c3f292a1a..88d95c92604 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/AlfFactoryImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/AlfFactoryImpl.java
@@ -63,6 +63,7 @@ public class AlfFactoryImpl extends EFactoryImpl implements AlfFactory {
 			case AlfPackage.BOUND_ELEMENT_REFERENCE: return createBoundElementReference();
 			case AlfPackage.SEQUENCE_EXPANSION_EXPRESSION: return createSequenceExpansionExpression();
 			case AlfPackage.ASSIGNABLE_ELEMENT_REFERENCE: return createAssignableElementReference();
+			case AlfPackage.EXPRESSION_REFERENCE: return createExpressionReference();
 			case AlfPackage.EXTENT_OR_EXPRESSION: return createExtentOrExpression();
 			case AlfPackage.QUALIFIED_NAME: return createQualifiedName();
 			case AlfPackage.FEATURE_REFERENCE: return createFeatureReference();
@@ -250,6 +251,16 @@ public class AlfFactoryImpl extends EFactoryImpl implements AlfFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public ExpressionReference createExpressionReference() {
+		ExpressionReferenceImpl expressionReference = new ExpressionReferenceImpl();
+		return expressionReference;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ExtentOrExpression createExtentOrExpression() {
 		ExtentOrExpressionImpl extentOrExpression = new ExtentOrExpressionImpl();
 		return extentOrExpression;
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/AlfPackageImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/AlfPackageImpl.java
index c0ef03835be..048c338a114 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/AlfPackageImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/AlfPackageImpl.java
@@ -123,6 +123,13 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass expressionReferenceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass extentOrExpressionEClass = null;
 
 	/**
@@ -5387,7 +5394,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getExpression__NewAssignments() {
+	public EOperation getExpression__Reference() {
         return getExpression().getEOperations().get(0);
 	}
 
@@ -5396,8 +5403,17 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getExpression__NewAssignments() {
+        return getExpression().getEOperations().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EOperation getExpression__ExpressionAssignmentAfterDerivation__DiagnosticChain_Map() {
-        return getExpression().getEOperations().get(6);
+        return getExpression().getEOperations().get(7);
 	}
 
 	/**
@@ -5406,7 +5422,82 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * @generated
 	 */
 	public EOperation getExpression__ExpressionUniqueAssignments__DiagnosticChain_Map() {
-        return getExpression().getEOperations().get(7);
+        return getExpression().getEOperations().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getExpressionReference() {
+		if (expressionReferenceEClass == null) {
+			expressionReferenceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(12);
+		}
+		return expressionReferenceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExpressionReference_Expression() {
+        return (EReference)getExpressionReference().getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getExpressionReference__Type() {
+        return getExpressionReference().getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getExpressionReference__Lower() {
+        return getExpressionReference().getEOperations().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getExpressionReference__Upper() {
+        return getExpressionReference().getEOperations().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getExpressionReference__IsAddTarget__Expression() {
+        return getExpressionReference().getEOperations().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getExpressionReference__AssignmentsBefore() {
+        return getExpressionReference().getEOperations().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getExpressionReference__UpdateAssignments() {
+        return getExpressionReference().getEOperations().get(5);
 	}
 
 	/**
@@ -5415,7 +5506,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * @generated
 	 */
 	public EOperation getExpression__UpdateAssignments() {
-        return getExpression().getEOperations().get(1);
+        return getExpression().getEOperations().get(2);
 	}
 
 	/**
@@ -5424,7 +5515,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * @generated
 	 */
 	public EOperation getExpression__Expression_updateAssignments() {
-        return getExpression().getEOperations().get(2);
+        return getExpression().getEOperations().get(3);
 	}
 
 	/**
@@ -5433,7 +5524,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * @generated
 	 */
 	public EOperation getExpression__UpdateAssignmentsCached() {
-        return getExpression().getEOperations().get(3);
+        return getExpression().getEOperations().get(4);
 	}
 
 	/**
@@ -5442,7 +5533,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * @generated
 	 */
 	public EOperation getExpression__Resolve__String() {
-        return getExpression().getEOperations().get(4);
+        return getExpression().getEOperations().get(5);
 	}
 
 	/**
@@ -5451,7 +5542,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * @generated
 	 */
 	public EOperation getExpression__IsAddTarget__Expression() {
-        return getExpression().getEOperations().get(5);
+        return getExpression().getEOperations().get(6);
 	}
 
 	/**
@@ -5461,7 +5552,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getExtentOrExpression() {
 		if (extentOrExpressionEClass == null) {
-			extentOrExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(12);
+			extentOrExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(13);
 		}
 		return extentOrExpressionEClass;
 	}
@@ -5536,7 +5627,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getQualifiedName() {
 		if (qualifiedNameEClass == null) {
-			qualifiedNameEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(13);
+			qualifiedNameEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(14);
 		}
 		return qualifiedNameEClass;
 	}
@@ -5800,7 +5891,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getFeatureReference() {
 		if (featureReferenceEClass == null) {
-			featureReferenceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(14);
+			featureReferenceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(15);
 		}
 		return featureReferenceEClass;
 	}
@@ -5902,7 +5993,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getNameBinding() {
 		if (nameBindingEClass == null) {
-			nameBindingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(15);
+			nameBindingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(16);
 		}
 		return nameBindingEClass;
 	}
@@ -5995,7 +6086,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getTemplateBinding() {
 		if (templateBindingEClass == null) {
-			templateBindingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(16);
+			templateBindingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(17);
 		}
 		return templateBindingEClass;
 	}
@@ -6043,7 +6134,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getNamedTemplateBinding() {
 		if (namedTemplateBindingEClass == null) {
-			namedTemplateBindingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(17);
+			namedTemplateBindingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(18);
 		}
 		return namedTemplateBindingEClass;
 	}
@@ -6109,7 +6200,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getTemplateParameterSubstitution() {
 		if (templateParameterSubstitutionEClass == null) {
-			templateParameterSubstitutionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(18);
+			templateParameterSubstitutionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(19);
 		}
 		return templateParameterSubstitutionEClass;
 	}
@@ -6175,7 +6266,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getNumericUnaryExpression() {
 		if (numericUnaryExpressionEClass == null) {
-			numericUnaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(19);
+			numericUnaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(20);
 		}
 		return numericUnaryExpressionEClass;
 	}
@@ -6250,7 +6341,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getUnaryExpression() {
 		if (unaryExpressionEClass == null) {
-			unaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(20);
+			unaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(21);
 		}
 		return unaryExpressionEClass;
 	}
@@ -6298,7 +6389,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getForAllOrExistsOrOneExpression() {
 		if (forAllOrExistsOrOneExpressionEClass == null) {
-			forAllOrExistsOrOneExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(21);
+			forAllOrExistsOrOneExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(22);
 		}
 		return forAllOrExistsOrOneExpressionEClass;
 	}
@@ -6346,7 +6437,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getIsolationExpression() {
 		if (isolationExpressionEClass == null) {
-			isolationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(22);
+			isolationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(23);
 		}
 		return isolationExpressionEClass;
 	}
@@ -6412,7 +6503,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getBinaryExpression() {
 		if (binaryExpressionEClass == null) {
-			binaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(23);
+			binaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(24);
 		}
 		return binaryExpressionEClass;
 	}
@@ -6496,7 +6587,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getBooleanUnaryExpression() {
 		if (booleanUnaryExpressionEClass == null) {
-			booleanUnaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(24);
+			booleanUnaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(25);
 		}
 		return booleanUnaryExpressionEClass;
 	}
@@ -6571,7 +6662,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getCastExpression() {
 		if (castExpressionEClass == null) {
-			castExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(25);
+			castExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(26);
 		}
 		return castExpressionEClass;
 	}
@@ -6691,7 +6782,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getPositionalTuple() {
 		if (positionalTupleEClass == null) {
-			positionalTupleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(26);
+			positionalTupleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(27);
 		}
 		return positionalTupleEClass;
 	}
@@ -6737,7 +6828,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getPositionalTuple__PositionalTupleArguments__DiagnosticChain_Map() {
+	public EOperation getPositionalTuple__OutputForExpression__Expression() {
         return getPositionalTuple().getEOperations().get(3);
 	}
 
@@ -6746,9 +6837,18 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getPositionalTuple__PositionalTupleArguments__DiagnosticChain_Map() {
+        return getPositionalTuple().getEOperations().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getTuple() {
 		if (tupleEClass == null) {
-			tupleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(27);
+			tupleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(28);
 		}
 		return tupleEClass;
 	}
@@ -6848,7 +6948,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__AssignmentsBefore__SyntaxElement() {
+	public EOperation getTuple__OutputForExpression__Expression() {
         return getTuple().getEOperations().get(7);
 	}
 
@@ -6857,7 +6957,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__AssignmentsAfter() {
+	public EOperation getTuple__AssignmentsBefore__SyntaxElement() {
         return getTuple().getEOperations().get(8);
 	}
 
@@ -6866,7 +6966,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__NewAssignments() {
+	public EOperation getTuple__AssignmentsAfter() {
         return getTuple().getEOperations().get(9);
 	}
 
@@ -6875,7 +6975,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__UpdateFor__EList_OutputNamedExpression() {
+	public EOperation getTuple__NewAssignments() {
         return getTuple().getEOperations().get(10);
 	}
 
@@ -6884,7 +6984,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__TupleInputDerivation__DiagnosticChain_Map() {
+	public EOperation getTuple__UpdateFor__EList_OutputNamedExpression() {
         return getTuple().getEOperations().get(11);
 	}
 
@@ -6893,7 +6993,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__TupleOutputDerivation__DiagnosticChain_Map() {
+	public EOperation getTuple__TupleInputDerivation__DiagnosticChain_Map() {
         return getTuple().getEOperations().get(12);
 	}
 
@@ -6902,7 +7002,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__TupleNullInputs__DiagnosticChain_Map() {
+	public EOperation getTuple__TupleOutputDerivation__DiagnosticChain_Map() {
         return getTuple().getEOperations().get(13);
 	}
 
@@ -6911,7 +7011,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__TupleOutputs__DiagnosticChain_Map() {
+	public EOperation getTuple__TupleNullInputs__DiagnosticChain_Map() {
         return getTuple().getEOperations().get(14);
 	}
 
@@ -6920,7 +7020,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__TupleAssignmentsBefore__DiagnosticChain_Map() {
+	public EOperation getTuple__TupleOutputs__DiagnosticChain_Map() {
         return getTuple().getEOperations().get(15);
 	}
 
@@ -6929,7 +7029,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getTuple__TupleAssignmentsAfter__DiagnosticChain_Map() {
+	public EOperation getTuple__TupleAssignmentsBefore__DiagnosticChain_Map() {
         return getTuple().getEOperations().get(16);
 	}
 
@@ -6938,9 +7038,18 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getTuple__TupleAssignmentsAfter__DiagnosticChain_Map() {
+        return getTuple().getEOperations().get(17);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getNamedExpression() {
 		if (namedExpressionEClass == null) {
-			namedExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(28);
+			namedExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(29);
 		}
 		return namedExpressionEClass;
 	}
@@ -6988,7 +7097,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getInputNamedExpression() {
 		if (inputNamedExpressionEClass == null) {
-			inputNamedExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(29);
+			inputNamedExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(30);
 		}
 		return inputNamedExpressionEClass;
 	}
@@ -7072,7 +7181,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getInvocationExpression() {
 		if (invocationExpressionEClass == null) {
-			invocationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(30);
+			invocationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(31);
 		}
 		return invocationExpressionEClass;
 	}
@@ -7489,7 +7598,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getOutputNamedExpression() {
 		if (outputNamedExpressionEClass == null) {
-			outputNamedExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(31);
+			outputNamedExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(32);
 		}
 		return outputNamedExpressionEClass;
 	}
@@ -7537,7 +7646,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getLeftHandSide() {
 		if (leftHandSideEClass == null) {
-			leftHandSideEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(32);
+			leftHandSideEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(33);
 		}
 		return leftHandSideEClass;
 	}
@@ -7720,7 +7829,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSequenceAccessExpression() {
 		if (sequenceAccessExpressionEClass == null) {
-			sequenceAccessExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(33);
+			sequenceAccessExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(34);
 		}
 		return sequenceAccessExpressionEClass;
 	}
@@ -7831,7 +7940,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getStringLiteralExpression() {
 		if (stringLiteralExpressionEClass == null) {
-			stringLiteralExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(34);
+			stringLiteralExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(35);
 		}
 		return stringLiteralExpressionEClass;
 	}
@@ -7870,7 +7979,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getLiteralExpression() {
 		if (literalExpressionEClass == null) {
-			literalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(35);
+			literalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(36);
 		}
 		return literalExpressionEClass;
 	}
@@ -7918,7 +8027,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSequenceOperationExpression() {
 		if (sequenceOperationExpressionEClass == null) {
-			sequenceOperationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(36);
+			sequenceOperationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(37);
 		}
 		return sequenceOperationExpressionEClass;
 	}
@@ -8128,7 +8237,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSelectOrRejectExpression() {
 		if (selectOrRejectExpressionEClass == null) {
-			selectOrRejectExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(37);
+			selectOrRejectExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(38);
 		}
 		return selectOrRejectExpressionEClass;
 	}
@@ -8176,7 +8285,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getClassExtentExpression() {
 		if (classExtentExpressionEClass == null) {
-			classExtentExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(38);
+			classExtentExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(39);
 		}
 		return classExtentExpressionEClass;
 	}
@@ -8269,7 +8378,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getPositionalTemplateBinding() {
 		if (positionalTemplateBindingEClass == null) {
-			positionalTemplateBindingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(39);
+			positionalTemplateBindingEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(40);
 		}
 		return positionalTemplateBindingEClass;
 	}
@@ -8335,7 +8444,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getConditionalLogicalExpression() {
 		if (conditionalLogicalExpressionEClass == null) {
-			conditionalLogicalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(40);
+			conditionalLogicalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(41);
 		}
 		return conditionalLogicalExpressionEClass;
 	}
@@ -8437,7 +8546,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getLinkOperationExpression() {
 		if (linkOperationExpressionEClass == null) {
-			linkOperationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(41);
+			linkOperationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(42);
 		}
 		return linkOperationExpressionEClass;
 	}
@@ -8566,7 +8675,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getEqualityExpression() {
 		if (equalityExpressionEClass == null) {
-			equalityExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(42);
+			equalityExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(43);
 		}
 		return equalityExpressionEClass;
 	}
@@ -8659,7 +8768,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getAssignmentExpression() {
 		if (assignmentExpressionEClass == null) {
-			assignmentExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(43);
+			assignmentExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(44);
 		}
 		return assignmentExpressionEClass;
 	}
@@ -9049,7 +9158,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getLogicalExpression() {
 		if (logicalExpressionEClass == null) {
-			logicalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(44);
+			logicalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(45);
 		}
 		return logicalExpressionEClass;
 	}
@@ -9178,7 +9287,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSequenceConstructionExpression() {
 		if (sequenceConstructionExpressionEClass == null) {
-			sequenceConstructionExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(45);
+			sequenceConstructionExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(46);
 		}
 		return sequenceConstructionExpressionEClass;
 	}
@@ -9325,7 +9434,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSequenceElements() {
 		if (sequenceElementsEClass == null) {
-			sequenceElementsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(46);
+			sequenceElementsEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(47);
 		}
 		return sequenceElementsEClass;
 	}
@@ -9391,7 +9500,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getCollectOrIterateExpression() {
 		if (collectOrIterateExpressionEClass == null) {
-			collectOrIterateExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(47);
+			collectOrIterateExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(48);
 		}
 		return collectOrIterateExpressionEClass;
 	}
@@ -9430,7 +9539,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getIsUniqueExpression() {
 		if (isUniqueExpressionEClass == null) {
-			isUniqueExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(48);
+			isUniqueExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(49);
 		}
 		return isUniqueExpressionEClass;
 	}
@@ -9478,7 +9587,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getArithmeticExpression() {
 		if (arithmeticExpressionEClass == null) {
-			arithmeticExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(49);
+			arithmeticExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(50);
 		}
 		return arithmeticExpressionEClass;
 	}
@@ -9571,7 +9680,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getFeatureLeftHandSide() {
 		if (featureLeftHandSideEClass == null) {
-			featureLeftHandSideEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(50);
+			featureLeftHandSideEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(51);
 		}
 		return featureLeftHandSideEClass;
 	}
@@ -9608,7 +9717,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__Index() {
+	public EOperation getFeatureLeftHandSide__Primary() {
         return getFeatureLeftHandSide().getEOperations().get(2);
 	}
 
@@ -9617,7 +9726,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__LocalName() {
+	public EOperation getFeatureLeftHandSide__Index() {
         return getFeatureLeftHandSide().getEOperations().get(3);
 	}
 
@@ -9626,7 +9735,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideAssignmentBeforeDerivation__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__LocalName() {
         return getFeatureLeftHandSide().getEOperations().get(4);
 	}
 
@@ -9635,7 +9744,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideAssignmentAfterDerivation__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideAssignmentBeforeDerivation__DiagnosticChain_Map() {
         return getFeatureLeftHandSide().getEOperations().get(5);
 	}
 
@@ -9644,7 +9753,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideFeatureExpression__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideAssignmentAfterDerivation__DiagnosticChain_Map() {
         return getFeatureLeftHandSide().getEOperations().get(6);
 	}
 
@@ -9653,7 +9762,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideAssignmentsBefore__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideFeatureExpression__DiagnosticChain_Map() {
         return getFeatureLeftHandSide().getEOperations().get(7);
 	}
 
@@ -9662,7 +9771,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideReferentDerivation__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideAssignmentsBefore__DiagnosticChain_Map() {
         return getFeatureLeftHandSide().getEOperations().get(8);
 	}
 
@@ -9671,7 +9780,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideTypeDerivation__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideReferentDerivation__DiagnosticChain_Map() {
         return getFeatureLeftHandSide().getEOperations().get(9);
 	}
 
@@ -9680,7 +9789,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideLowerDerivation__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideTypeDerivation__DiagnosticChain_Map() {
         return getFeatureLeftHandSide().getEOperations().get(10);
 	}
 
@@ -9689,7 +9798,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideUpperDerivation__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideLowerDerivation__DiagnosticChain_Map() {
         return getFeatureLeftHandSide().getEOperations().get(11);
 	}
 
@@ -9698,7 +9807,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideReferentConstraint__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideUpperDerivation__DiagnosticChain_Map() {
         return getFeatureLeftHandSide().getEOperations().get(12);
 	}
 
@@ -9707,7 +9816,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideIndexedFeature__DiagnosticChain_Map() {
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideReferentConstraint__DiagnosticChain_Map() {
         return getFeatureLeftHandSide().getEOperations().get(13);
 	}
 
@@ -9716,9 +9825,18 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getFeatureLeftHandSide__FeatureLeftHandSideIndexedFeature__DiagnosticChain_Map() {
+        return getFeatureLeftHandSide().getEOperations().get(14);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getConditionalTestExpression() {
 		if (conditionalTestExpressionEClass == null) {
-			conditionalTestExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(51);
+			conditionalTestExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(52);
 		}
 		return conditionalTestExpressionEClass;
 	}
@@ -9856,7 +9974,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getInstanceCreationExpression() {
 		if (instanceCreationExpressionEClass == null) {
-			instanceCreationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(52);
+			instanceCreationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(53);
 		}
 		return instanceCreationExpressionEClass;
 	}
@@ -10021,7 +10139,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getPropertyAccessExpression() {
 		if (propertyAccessExpressionEClass == null) {
-			propertyAccessExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(53);
+			propertyAccessExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(54);
 		}
 		return propertyAccessExpressionEClass;
 	}
@@ -10141,7 +10259,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getNameExpression() {
 		if (nameExpressionEClass == null) {
-			nameExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(54);
+			nameExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(55);
 		}
 		return nameExpressionEClass;
 	}
@@ -10241,7 +10359,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameExpression__IsAddTarget() {
+	public EOperation getNameExpression__IsAddTargetName() {
         return getNameExpression().getEOperations().get(6);
 	}
 
@@ -10333,7 +10451,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getBitStringUnaryExpression() {
 		if (bitStringUnaryExpressionEClass == null) {
-			bitStringUnaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(55);
+			bitStringUnaryExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(56);
 		}
 		return bitStringUnaryExpressionEClass;
 	}
@@ -10426,7 +10544,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getFeatureInvocationExpression() {
 		if (featureInvocationExpressionEClass == null) {
-			featureInvocationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(56);
+			featureInvocationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(57);
 		}
 		return featureInvocationExpressionEClass;
 	}
@@ -10510,7 +10628,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getBehaviorInvocationExpression() {
 		if (behaviorInvocationExpressionEClass == null) {
-			behaviorInvocationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(57);
+			behaviorInvocationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(58);
 		}
 		return behaviorInvocationExpressionEClass;
 	}
@@ -10621,7 +10739,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getShiftExpression() {
 		if (shiftExpressionEClass == null) {
-			shiftExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(58);
+			shiftExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(59);
 		}
 		return shiftExpressionEClass;
 	}
@@ -10714,7 +10832,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getUnboundedLiteralExpression() {
 		if (unboundedLiteralExpressionEClass == null) {
-			unboundedLiteralExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(59);
+			unboundedLiteralExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(60);
 		}
 		return unboundedLiteralExpressionEClass;
 	}
@@ -10744,7 +10862,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getThisExpression() {
 		if (thisExpressionEClass == null) {
-			thisExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(60);
+			thisExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(61);
 		}
 		return thisExpressionEClass;
 	}
@@ -10810,7 +10928,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getClassificationExpression() {
 		if (classificationExpressionEClass == null) {
-			classificationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(61);
+			classificationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(62);
 		}
 		return classificationExpressionEClass;
 	}
@@ -10939,7 +11057,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSuperInvocationExpression() {
 		if (superInvocationExpressionEClass == null) {
-			superInvocationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(62);
+			superInvocationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(63);
 		}
 		return superInvocationExpressionEClass;
 	}
@@ -11050,7 +11168,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getIncrementOrDecrementExpression() {
 		if (incrementOrDecrementExpressionEClass == null) {
-			incrementOrDecrementExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(63);
+			incrementOrDecrementExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(64);
 		}
 		return incrementOrDecrementExpressionEClass;
 	}
@@ -11278,7 +11396,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getBooleanLiteralExpression() {
 		if (booleanLiteralExpressionEClass == null) {
-			booleanLiteralExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(64);
+			booleanLiteralExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(65);
 		}
 		return booleanLiteralExpressionEClass;
 	}
@@ -11317,7 +11435,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getNamedTuple() {
 		if (namedTupleEClass == null) {
-			namedTupleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(65);
+			namedTupleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(66);
 		}
 		return namedTupleEClass;
 	}
@@ -11363,7 +11481,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNamedTuple__NamedTupleArgumentNames__DiagnosticChain_Map() {
+	public EOperation getNamedTuple__OutputForExpression__Expression() {
         return getNamedTuple().getEOperations().get(3);
 	}
 
@@ -11372,9 +11490,18 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getNamedTuple__NamedTupleArgumentNames__DiagnosticChain_Map() {
+        return getNamedTuple().getEOperations().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getNaturalLiteralExpression() {
 		if (naturalLiteralExpressionEClass == null) {
-			naturalLiteralExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(66);
+			naturalLiteralExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(67);
 		}
 		return naturalLiteralExpressionEClass;
 	}
@@ -11413,7 +11540,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSequenceRange() {
 		if (sequenceRangeEClass == null) {
-			sequenceRangeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(67);
+			sequenceRangeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(68);
 		}
 		return sequenceRangeEClass;
 	}
@@ -11515,7 +11642,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getNameLeftHandSide() {
 		if (nameLeftHandSideEClass == null) {
-			nameLeftHandSideEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(68);
+			nameLeftHandSideEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(69);
 		}
 		return nameLeftHandSideEClass;
 	}
@@ -11624,7 +11751,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__LocalName() {
+	public EOperation getNameLeftHandSide__Expression() {
         return getNameLeftHandSide().getEOperations().get(9);
 	}
 
@@ -11633,7 +11760,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideAssignmentAfterDerivation__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__Primary() {
         return getNameLeftHandSide().getEOperations().get(10);
 	}
 
@@ -11642,7 +11769,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideTargetAssignment__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__LocalName() {
         return getNameLeftHandSide().getEOperations().get(11);
 	}
 
@@ -11651,7 +11778,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideAssignmentsBefore__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__NameLeftHandSideAssignmentAfterDerivation__DiagnosticChain_Map() {
         return getNameLeftHandSide().getEOperations().get(12);
 	}
 
@@ -11660,7 +11787,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideReferentDerivation__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__NameLeftHandSideTargetAssignment__DiagnosticChain_Map() {
         return getNameLeftHandSide().getEOperations().get(13);
 	}
 
@@ -11669,7 +11796,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideLowerDerivation__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__NameLeftHandSideAssignmentsBefore__DiagnosticChain_Map() {
         return getNameLeftHandSide().getEOperations().get(14);
 	}
 
@@ -11678,7 +11805,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideUpperDerivation__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__NameLeftHandSideReferentDerivation__DiagnosticChain_Map() {
         return getNameLeftHandSide().getEOperations().get(15);
 	}
 
@@ -11687,7 +11814,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideTypeDerivation__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__NameLeftHandSideLowerDerivation__DiagnosticChain_Map() {
         return getNameLeftHandSide().getEOperations().get(16);
 	}
 
@@ -11696,7 +11823,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideTargetResolution__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__NameLeftHandSideUpperDerivation__DiagnosticChain_Map() {
         return getNameLeftHandSide().getEOperations().get(17);
 	}
 
@@ -11705,7 +11832,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideIndexedFeature__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__NameLeftHandSideTypeDerivation__DiagnosticChain_Map() {
         return getNameLeftHandSide().getEOperations().get(18);
 	}
 
@@ -11714,7 +11841,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getNameLeftHandSide__NameLeftHandSideNontemplateTarget__DiagnosticChain_Map() {
+	public EOperation getNameLeftHandSide__NameLeftHandSideTargetResolution__DiagnosticChain_Map() {
         return getNameLeftHandSide().getEOperations().get(19);
 	}
 
@@ -11723,9 +11850,27 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getNameLeftHandSide__NameLeftHandSideIndexedFeature__DiagnosticChain_Map() {
+        return getNameLeftHandSide().getEOperations().get(20);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getNameLeftHandSide__NameLeftHandSideNontemplateTarget__DiagnosticChain_Map() {
+        return getNameLeftHandSide().getEOperations().get(21);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getEffectiveLeftHandSide() {
 		if (effectiveLeftHandSideEClass == null) {
-			effectiveLeftHandSideEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(69);
+			effectiveLeftHandSideEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(70);
 		}
 		return effectiveLeftHandSideEClass;
 	}
@@ -11780,9 +11925,18 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getEffectiveLeftHandSide__Expression() {
+        return getEffectiveLeftHandSide().getEOperations().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getSequenceReductionExpression() {
 		if (sequenceReductionExpressionEClass == null) {
-			sequenceReductionExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(70);
+			sequenceReductionExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(71);
 		}
 		return sequenceReductionExpressionEClass;
 	}
@@ -11929,7 +12083,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSequenceExpressionList() {
 		if (sequenceExpressionListEClass == null) {
-			sequenceExpressionListEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(71);
+			sequenceExpressionListEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(72);
 		}
 		return sequenceExpressionListEClass;
 	}
@@ -12013,7 +12167,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getRelationalExpression() {
 		if (relationalExpressionEClass == null) {
-			relationalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(72);
+			relationalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(73);
 		}
 		return relationalExpressionEClass;
 	}
@@ -12106,7 +12260,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getLocalNameDeclarationStatement() {
 		if (localNameDeclarationStatementEClass == null) {
-			localNameDeclarationStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(73);
+			localNameDeclarationStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(74);
 		}
 		return localNameDeclarationStatementEClass;
 	}
@@ -12262,7 +12416,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getAssignableLocalNameDeclaration() {
 		if (assignableLocalNameDeclarationEClass == null) {
-			assignableLocalNameDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(74);
+			assignableLocalNameDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(75);
 		}
 		return assignableLocalNameDeclarationEClass;
 	}
@@ -12310,7 +12464,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getStatement() {
 		if (statementEClass == null) {
-			statementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(75);
+			statementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(76);
 		}
 		return statementEClass;
 	}
@@ -12493,7 +12647,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getAnnotation() {
 		if (annotationEClass == null) {
-			annotationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(76);
+			annotationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(77);
 		}
 		return annotationEClass;
 	}
@@ -12550,7 +12704,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getQualifiedNameList() {
 		if (qualifiedNameListEClass == null) {
-			qualifiedNameListEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(77);
+			qualifiedNameListEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(78);
 		}
 		return qualifiedNameListEClass;
 	}
@@ -12580,7 +12734,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getNonFinalClause() {
 		if (nonFinalClauseEClass == null) {
-			nonFinalClauseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(78);
+			nonFinalClauseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(79);
 		}
 		return nonFinalClauseEClass;
 	}
@@ -12664,7 +12818,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getBlock() {
 		if (blockEClass == null) {
-			blockEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(79);
+			blockEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(80);
 		}
 		return blockEClass;
 	}
@@ -12748,7 +12902,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getBlockStatement() {
 		if (blockStatementEClass == null) {
-			blockStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(80);
+			blockStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(81);
 		}
 		return blockStatementEClass;
 	}
@@ -12841,7 +12995,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getDoStatement() {
 		if (doStatementEClass == null) {
-			doStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(81);
+			doStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(82);
 		}
 		return doStatementEClass;
 	}
@@ -12934,7 +13088,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getConcurrentClauses() {
 		if (concurrentClausesEClass == null) {
-			concurrentClausesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(82);
+			concurrentClausesEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(83);
 		}
 		return concurrentClausesEClass;
 	}
@@ -12973,7 +13127,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getBreakStatement() {
 		if (breakStatementEClass == null) {
-			breakStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(83);
+			breakStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(84);
 		}
 		return breakStatementEClass;
 	}
@@ -13021,7 +13175,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getExpressionStatement() {
 		if (expressionStatementEClass == null) {
-			expressionStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(84);
+			expressionStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(85);
 		}
 		return expressionStatementEClass;
 	}
@@ -13069,7 +13223,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getClassifyStatement() {
 		if (classifyStatementEClass == null) {
-			classifyStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(85);
+			classifyStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(86);
 		}
 		return classifyStatementEClass;
 	}
@@ -13207,7 +13361,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getForStatement() {
 		if (forStatementEClass == null) {
-			forStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(86);
+			forStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(87);
 		}
 		return forStatementEClass;
 	}
@@ -13372,7 +13526,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getLoopVariableDefinition() {
 		if (loopVariableDefinitionEClass == null) {
-			loopVariableDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(87);
+			loopVariableDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(88);
 		}
 		return loopVariableDefinitionEClass;
 	}
@@ -13573,7 +13727,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getIfStatement() {
 		if (ifStatementEClass == null) {
-			ifStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(88);
+			ifStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(89);
 		}
 		return ifStatementEClass;
 	}
@@ -13684,7 +13838,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSwitchStatement() {
 		if (switchStatementEClass == null) {
-			switchStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(89);
+			switchStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(90);
 		}
 		return switchStatementEClass;
 	}
@@ -13840,7 +13994,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSwitchClause() {
 		if (switchClauseEClass == null) {
-			switchClauseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(90);
+			switchClauseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(91);
 		}
 		return switchClauseEClass;
 	}
@@ -13924,7 +14078,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getWhileStatement() {
 		if (whileStatementEClass == null) {
-			whileStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(91);
+			whileStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(92);
 		}
 		return whileStatementEClass;
 	}
@@ -14017,7 +14171,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getReturnStatement() {
 		if (returnStatementEClass == null) {
-			returnStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(92);
+			returnStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(93);
 		}
 		return returnStatementEClass;
 	}
@@ -14083,7 +14237,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getInLineStatement() {
 		if (inLineStatementEClass == null) {
-			inLineStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(93);
+			inLineStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(94);
 		}
 		return inLineStatementEClass;
 	}
@@ -14122,7 +14276,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getAcceptStatement() {
 		if (acceptStatementEClass == null) {
-			acceptStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(94);
+			acceptStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(95);
 		}
 		return acceptStatementEClass;
 	}
@@ -14296,7 +14450,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getAcceptBlock() {
 		if (acceptBlockEClass == null) {
-			acceptBlockEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(95);
+			acceptBlockEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(96);
 		}
 		return acceptBlockEClass;
 	}
@@ -14380,7 +14534,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getEmptyStatement() {
 		if (emptyStatementEClass == null) {
-			emptyStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(96);
+			emptyStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(97);
 		}
 		return emptyStatementEClass;
 	}
@@ -14401,7 +14555,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getModelNamespace() {
 		if (modelNamespaceEClass == null) {
-			modelNamespaceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(97);
+			modelNamespaceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(98);
 		}
 		return modelNamespaceEClass;
 	}
@@ -14512,7 +14666,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getNamespaceDefinition() {
 		if (namespaceDefinitionEClass == null) {
-			namespaceDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(98);
+			namespaceDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(99);
 		}
 		return namespaceDefinitionEClass;
 	}
@@ -14803,7 +14957,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getMemberDefinition() {
 		if (memberDefinitionEClass == null) {
-			memberDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(99);
+			memberDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(100);
 		}
 		return memberDefinitionEClass;
 	}
@@ -15085,7 +15239,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getStereotypeAnnotation() {
 		if (stereotypeAnnotationEClass == null) {
-			stereotypeAnnotationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(100);
+			stereotypeAnnotationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(101);
 		}
 		return stereotypeAnnotationEClass;
 	}
@@ -15205,7 +15359,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getTaggedValueList() {
 		if (taggedValueListEClass == null) {
-			taggedValueListEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(101);
+			taggedValueListEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(102);
 		}
 		return taggedValueListEClass;
 	}
@@ -15226,7 +15380,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getTaggedValue() {
 		if (taggedValueEClass == null) {
-			taggedValueEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(102);
+			taggedValueEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(103);
 		}
 		return taggedValueEClass;
 	}
@@ -15265,7 +15419,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getUnitDefinition() {
 		if (unitDefinitionEClass == null) {
-			unitDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(103);
+			unitDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(104);
 		}
 		return unitDefinitionEClass;
 	}
@@ -15412,7 +15566,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getImportReference() {
 		if (importReferenceEClass == null) {
-			importReferenceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(104);
+			importReferenceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(105);
 		}
 		return importReferenceEClass;
 	}
@@ -15487,7 +15641,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getImportedMember() {
 		if (importedMemberEClass == null) {
-			importedMemberEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(105);
+			importedMemberEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(106);
 		}
 		return importedMemberEClass;
 	}
@@ -15571,7 +15725,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getEnumerationLiteralName() {
 		if (enumerationLiteralNameEClass == null) {
-			enumerationLiteralNameEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(106);
+			enumerationLiteralNameEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(107);
 		}
 		return enumerationLiteralNameEClass;
 	}
@@ -15592,7 +15746,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getOperationDefinition() {
 		if (operationDefinitionEClass == null) {
-			operationDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(107);
+			operationDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(108);
 		}
 		return operationDefinitionEClass;
 	}
@@ -15820,7 +15974,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getAssociationDefinition() {
 		if (associationDefinitionEClass == null) {
-			associationDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(108);
+			associationDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(109);
 		}
 		return associationDefinitionEClass;
 	}
@@ -15868,7 +16022,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getClassifierDefinition() {
 		if (classifierDefinitionEClass == null) {
-			classifierDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(109);
+			classifierDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(110);
 		}
 		return classifierDefinitionEClass;
 	}
@@ -15988,7 +16142,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getClassDefinition() {
 		if (classDefinitionEClass == null) {
-			classDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(110);
+			classDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(111);
 		}
 		return classDefinitionEClass;
 	}
@@ -16090,7 +16244,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getTypedElementDefinition() {
 		if (typedElementDefinitionEClass == null) {
-			typedElementDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(111);
+			typedElementDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(112);
 		}
 		return typedElementDefinitionEClass;
 	}
@@ -16264,7 +16418,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getDataTypeDefinition() {
 		if (dataTypeDefinitionEClass == null) {
-			dataTypeDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(112);
+			dataTypeDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(113);
 		}
 		return dataTypeDefinitionEClass;
 	}
@@ -16321,7 +16475,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getPackageDefinition() {
 		if (packageDefinitionEClass == null) {
-			packageDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(113);
+			packageDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(114);
 		}
 		return packageDefinitionEClass;
 	}
@@ -16396,7 +16550,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getPropertyDefinition() {
 		if (propertyDefinitionEClass == null) {
-			propertyDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(114);
+			propertyDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(115);
 		}
 		return propertyDefinitionEClass;
 	}
@@ -16525,7 +16679,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSignalDefinition() {
 		if (signalDefinitionEClass == null) {
-			signalDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(115);
+			signalDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(116);
 		}
 		return signalDefinitionEClass;
 	}
@@ -16573,7 +16727,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getActiveClassDefinition() {
 		if (activeClassDefinitionEClass == null) {
-			activeClassDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(116);
+			activeClassDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(117);
 		}
 		return activeClassDefinitionEClass;
 	}
@@ -16612,7 +16766,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getActivityDefinition() {
 		if (activityDefinitionEClass == null) {
-			activityDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(117);
+			activityDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(118);
 		}
 		return activityDefinitionEClass;
 	}
@@ -16696,7 +16850,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getElementImportReference() {
 		if (elementImportReferenceEClass == null) {
-			elementImportReferenceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(118);
+			elementImportReferenceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(119);
 		}
 		return elementImportReferenceEClass;
 	}
@@ -16735,7 +16889,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getSignalReceptionDefinition() {
 		if (signalReceptionDefinitionEClass == null) {
-			signalReceptionDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(119);
+			signalReceptionDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(120);
 		}
 		return signalReceptionDefinitionEClass;
 	}
@@ -16765,7 +16919,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getEnumerationDefinition() {
 		if (enumerationDefinitionEClass == null) {
-			enumerationDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(120);
+			enumerationDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(121);
 		}
 		return enumerationDefinitionEClass;
 	}
@@ -16813,7 +16967,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getPackageImportReference() {
 		if (packageImportReferenceEClass == null) {
-			packageImportReferenceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(121);
+			packageImportReferenceEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(122);
 		}
 		return packageImportReferenceEClass;
 	}
@@ -16843,7 +16997,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getClassifierTemplateParameter() {
 		if (classifierTemplateParameterEClass == null) {
-			classifierTemplateParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(122);
+			classifierTemplateParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(123);
 		}
 		return classifierTemplateParameterEClass;
 	}
@@ -16891,7 +17045,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getFormalParameter() {
 		if (formalParameterEClass == null) {
-			formalParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(123);
+			formalParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(124);
 		}
 		return formalParameterEClass;
 	}
@@ -16984,7 +17138,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getReceptionDefinition() {
 		if (receptionDefinitionEClass == null) {
-			receptionDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(124);
+			receptionDefinitionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(125);
 		}
 		return receptionDefinitionEClass;
 	}
@@ -17077,7 +17231,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getMember() {
 		if (memberEClass == null) {
-			memberEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(125);
+			memberEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(126);
 		}
 		return memberEClass;
 	}
@@ -17143,7 +17297,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getAnnotatedStatement() {
 		if (annotatedStatementEClass == null) {
-			annotatedStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(126);
+			annotatedStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(127);
 		}
 		return annotatedStatementEClass;
 	}
@@ -17182,7 +17336,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getBoundClassifier() {
 		if (boundClassifierEClass == null) {
-			boundClassifierEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(127);
+			boundClassifierEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(128);
 		}
 		return boundClassifierEClass;
 	}
@@ -17221,7 +17375,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getReturnParameter() {
 		if (returnParameterEClass == null) {
-			returnParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(128);
+			returnParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(129);
 		}
 		return returnParameterEClass;
 	}
@@ -17233,7 +17387,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getNonReturnParameter() {
 		if (nonReturnParameterEClass == null) {
-			nonReturnParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(129);
+			nonReturnParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(130);
 		}
 		return nonReturnParameterEClass;
 	}
@@ -17245,7 +17399,7 @@ public class AlfPackageImpl extends EPackageImpl implements AlfPackage {
 	 */
 	public EClass getAnyType() {
 		if (anyTypeEClass == null) {
-			anyTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(130);
+			anyTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(AlfPackage.eNS_URI).getEClassifiers().get(131);
 		}
 		return anyTypeEClass;
 	}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/EffectiveLeftHandSideImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/EffectiveLeftHandSideImpl.java
index 53c87b2de59..7db5bdaca7f 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/EffectiveLeftHandSideImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/EffectiveLeftHandSideImpl.java
@@ -166,6 +166,30 @@ public class EffectiveLeftHandSideImpl extends NameLeftHandSideImpl implements E
 	}
 
 	/**
+	 * The cached invocation delegate for the '{@link #expression() <em>Expression</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #expression()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate EXPRESSION__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getEffectiveLeftHandSide__Expression()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Expression expression() {
+		try {
+			return (Expression)EXPRESSION__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -175,6 +199,7 @@ public class EffectiveLeftHandSideImpl extends NameLeftHandSideImpl implements E
 		if (baseClass == LeftHandSide.class) {
 			switch (baseOperationID) {
 				case AlfPackage.LEFT_HAND_SIDE___FEATURE: return AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___FEATURE;
+				case AlfPackage.LEFT_HAND_SIDE___EXPRESSION: return AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___EXPRESSION;
 				case AlfPackage.LEFT_HAND_SIDE___INDEX: return AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___INDEX;
 				default: return super.eDerivedOperationID(baseOperationID, baseClass);
 			}
@@ -184,6 +209,8 @@ public class EffectiveLeftHandSideImpl extends NameLeftHandSideImpl implements E
 				case AlfPackage.NAME_LEFT_HAND_SIDE___TARGET: return AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___TARGET;
 				case AlfPackage.NAME_LEFT_HAND_SIDE___INDEX: return AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___INDEX;
 				case AlfPackage.NAME_LEFT_HAND_SIDE___FEATURE: return AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___FEATURE;
+				case AlfPackage.NAME_LEFT_HAND_SIDE___EXPRESSION: return AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___EXPRESSION;
+				case AlfPackage.NAME_LEFT_HAND_SIDE___PRIMARY: return AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___PRIMARY;
 				default: return super.eDerivedOperationID(baseOperationID, baseClass);
 			}
 		}
@@ -206,6 +233,8 @@ public class EffectiveLeftHandSideImpl extends NameLeftHandSideImpl implements E
 				return feature();
 			case AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___PRIMARY:
 				return primary();
+			case AlfPackage.EFFECTIVE_LEFT_HAND_SIDE___EXPRESSION:
+				return expression();
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/ExpressionImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/ExpressionImpl.java
index b976c105126..23bec705daf 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/ExpressionImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/ExpressionImpl.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.util.EObjectValidator;
 import org.eclipse.papyrus.uml.alf.AlfPackage;
 import org.eclipse.papyrus.uml.alf.AssignedSource;
 import org.eclipse.papyrus.uml.alf.Expression;
+import org.eclipse.papyrus.uml.alf.ExpressionReference;
 import org.eclipse.papyrus.uml.alf.SyntaxElement;
 import org.eclipse.papyrus.uml.alf.util.AlfValidator;
 
@@ -81,6 +82,30 @@ public abstract class ExpressionImpl extends AssignableElementImpl implements Ex
 	}
 
 	/**
+	 * The cached invocation delegate for the '{@link #reference() <em>Reference</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #reference()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate REFERENCE__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getExpression__Reference()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ExpressionReference reference() {
+		try {
+			return (ExpressionReference)REFERENCE__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
 	 * The cached invocation delegate for the '{@link #newAssignments() <em>New Assignments</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -281,6 +306,8 @@ public abstract class ExpressionImpl extends AssignableElementImpl implements Ex
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
+			case AlfPackage.EXPRESSION___REFERENCE:
+				return reference();
 			case AlfPackage.EXPRESSION___NEW_ASSIGNMENTS:
 				return newAssignments();
 			case AlfPackage.EXPRESSION___UPDATE_ASSIGNMENTS:
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/ExpressionReferenceImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/ExpressionReferenceImpl.java
new file mode 100644
index 00000000000..8d91a020b2b
--- /dev/null
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/ExpressionReferenceImpl.java
@@ -0,0 +1,276 @@
+/**
+ */
+package org.eclipse.papyrus.uml.alf.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import java.math.BigInteger;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.WrappedException;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+
+import org.eclipse.papyrus.uml.alf.AlfPackage;
+import org.eclipse.papyrus.uml.alf.AssignableElement;
+import org.eclipse.papyrus.uml.alf.AssignedSource;
+import org.eclipse.papyrus.uml.alf.ElementReference;
+import org.eclipse.papyrus.uml.alf.Expression;
+import org.eclipse.papyrus.uml.alf.ExpressionReference;
+import org.eclipse.papyrus.uml.alf.SyntaxElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Expression Reference</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.uml.alf.impl.ExpressionReferenceImpl#getExpression <em>Expression</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExpressionReferenceImpl extends ExpressionImpl implements ExpressionReference {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ExpressionReferenceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return AlfPackage.eINSTANCE.getExpressionReference();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Expression getExpression() {
+		return (Expression)eGet(AlfPackage.eINSTANCE.getExpressionReference_Expression(), true);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExpression(Expression newExpression) {
+		eSet(AlfPackage.eINSTANCE.getExpressionReference_Expression(), newExpression);
+	}
+
+	/**
+	 * The cached invocation delegate for the '{@link #type() <em>Type</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #type()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate TYPE__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getExpressionReference__Type()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ElementReference type() {
+		try {
+			return (ElementReference)TYPE__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
+	 * The cached invocation delegate for the '{@link #lower() <em>Lower</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #lower()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate LOWER__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getExpressionReference__Lower()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public BigInteger lower() {
+		try {
+			return (BigInteger)LOWER__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
+	 * The cached invocation delegate for the '{@link #upper() <em>Upper</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #upper()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate UPPER__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getExpressionReference__Upper()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public BigInteger upper() {
+		try {
+			return (BigInteger)UPPER__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
+	 * The cached invocation delegate for the '{@link #isAddTarget(org.eclipse.papyrus.uml.alf.Expression) <em>Is Add Target</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isAddTarget(org.eclipse.papyrus.uml.alf.Expression)
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate IS_ADD_TARGET_EXPRESSION__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getExpressionReference__IsAddTarget__Expression()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isAddTarget(Expression targetExpression) {
+		try {
+			return (Boolean)IS_ADD_TARGET_EXPRESSION__EINVOCATION_DELEGATE.dynamicInvoke(this, new BasicEList.UnmodifiableEList<Object>(1, new Object[]{targetExpression}));
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
+	 * The cached invocation delegate for the '{@link #assignmentsBefore() <em>Assignments Before</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #assignmentsBefore()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate ASSIGNMENTS_BEFORE__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getExpressionReference__AssignmentsBefore()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	public EList<AssignedSource> assignmentsBefore() {
+		try {
+			return (EList<AssignedSource>)ASSIGNMENTS_BEFORE__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
+	 * The cached invocation delegate for the '{@link #updateAssignments() <em>Update Assignments</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #updateAssignments()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate UPDATE_ASSIGNMENTS__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getExpressionReference__UpdateAssignments()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	public EList<AssignedSource> updateAssignments() {
+		try {
+			return (EList<AssignedSource>)UPDATE_ASSIGNMENTS__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedOperationID(int baseOperationID, Class<?> baseClass) {
+		if (baseClass == SyntaxElement.class) {
+			switch (baseOperationID) {
+				case AlfPackage.SYNTAX_ELEMENT___ASSIGNMENTS_BEFORE: return AlfPackage.EXPRESSION_REFERENCE___ASSIGNMENTS_BEFORE;
+				default: return super.eDerivedOperationID(baseOperationID, baseClass);
+			}
+		}
+		if (baseClass == AssignableElement.class) {
+			switch (baseOperationID) {
+				case AlfPackage.ASSIGNABLE_ELEMENT___TYPE: return AlfPackage.EXPRESSION_REFERENCE___TYPE;
+				case AlfPackage.ASSIGNABLE_ELEMENT___LOWER: return AlfPackage.EXPRESSION_REFERENCE___LOWER;
+				case AlfPackage.ASSIGNABLE_ELEMENT___UPPER: return AlfPackage.EXPRESSION_REFERENCE___UPPER;
+				default: return super.eDerivedOperationID(baseOperationID, baseClass);
+			}
+		}
+		if (baseClass == Expression.class) {
+			switch (baseOperationID) {
+				case AlfPackage.EXPRESSION___UPDATE_ASSIGNMENTS: return AlfPackage.EXPRESSION_REFERENCE___UPDATE_ASSIGNMENTS;
+				case AlfPackage.EXPRESSION___IS_ADD_TARGET__EXPRESSION: return AlfPackage.EXPRESSION_REFERENCE___IS_ADD_TARGET__EXPRESSION;
+				default: return super.eDerivedOperationID(baseOperationID, baseClass);
+			}
+		}
+		return super.eDerivedOperationID(baseOperationID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case AlfPackage.EXPRESSION_REFERENCE___TYPE:
+				return type();
+			case AlfPackage.EXPRESSION_REFERENCE___LOWER:
+				return lower();
+			case AlfPackage.EXPRESSION_REFERENCE___UPPER:
+				return upper();
+			case AlfPackage.EXPRESSION_REFERENCE___IS_ADD_TARGET__EXPRESSION:
+				return isAddTarget((Expression)arguments.get(0));
+			case AlfPackage.EXPRESSION_REFERENCE___ASSIGNMENTS_BEFORE:
+				return assignmentsBefore();
+			case AlfPackage.EXPRESSION_REFERENCE___UPDATE_ASSIGNMENTS:
+				return updateAssignments();
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+} //ExpressionReferenceImpl
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/FeatureLeftHandSideImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/FeatureLeftHandSideImpl.java
index 68b25b967a5..cb90cf66f82 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/FeatureLeftHandSideImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/FeatureLeftHandSideImpl.java
@@ -127,6 +127,30 @@ public class FeatureLeftHandSideImpl extends LeftHandSideImpl implements Feature
 	}
 
 	/**
+	 * The cached invocation delegate for the '{@link #primary() <em>Primary</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #primary()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate PRIMARY__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getFeatureLeftHandSide__Primary()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Expression primary() {
+		try {
+			return (Expression)PRIMARY__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
 	 * The cached invocation delegate for the '{@link #index() <em>Index</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -461,6 +485,8 @@ public class FeatureLeftHandSideImpl extends LeftHandSideImpl implements Feature
 				return referent();
 			case AlfPackage.FEATURE_LEFT_HAND_SIDE___FEATURE:
 				return feature();
+			case AlfPackage.FEATURE_LEFT_HAND_SIDE___PRIMARY:
+				return primary();
 			case AlfPackage.FEATURE_LEFT_HAND_SIDE___INDEX:
 				return index();
 			case AlfPackage.FEATURE_LEFT_HAND_SIDE___LOCAL_NAME:
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NameExpressionImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NameExpressionImpl.java
index bee61320118..be6fe963ac9 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NameExpressionImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NameExpressionImpl.java
@@ -254,33 +254,23 @@ public class NameExpressionImpl extends ExpressionImpl implements NameExpression
 	}
 
 	/**
+	 * The cached invocation delegate for the '{@link #isAddTargetName() <em>Is Add Target Name</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @generated NOT
-	 */
-	public AssignedSource assignmentFor(String localName) {
-		return this.assignmentFor_(localName);
-	}
-
-	/**
-	 * The cached invocation delegate for the '{@link #isAddTarget() <em>Is Add Target</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAddTarget()
+	 * @see #isAddTargetName()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final EOperation.Internal.InvocationDelegate IS_ADD_TARGET__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getNameExpression__IsAddTarget()).getInvocationDelegate();
+	protected static final EOperation.Internal.InvocationDelegate IS_ADD_TARGET_NAME__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getNameExpression__IsAddTargetName()).getInvocationDelegate();
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isAddTarget() {
+	public boolean isAddTargetName() {
 		try {
-			return (Boolean)IS_ADD_TARGET__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+			return (Boolean)IS_ADD_TARGET_NAME__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
 		}
 		catch (InvocationTargetException ite) {
 			throw new WrappedException(ite);
@@ -290,6 +280,16 @@ public class NameExpressionImpl extends ExpressionImpl implements NameExpression
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public AssignedSource assignmentFor(String localName) {
+		return this.assignmentFor_(localName);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	public boolean nameExpressionAssignmentDerivation(DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -561,8 +561,8 @@ public class NameExpressionImpl extends ExpressionImpl implements NameExpression
 				return assignmentFor((String)arguments.get(0));
 			case AlfPackage.NAME_EXPRESSION___ASSIGNMENT_FOR____STRING:
 				return assignmentFor_((String)arguments.get(0));
-			case AlfPackage.NAME_EXPRESSION___IS_ADD_TARGET:
-				return isAddTarget();
+			case AlfPackage.NAME_EXPRESSION___IS_ADD_TARGET_NAME:
+				return isAddTargetName();
 			case AlfPackage.NAME_EXPRESSION___NAME_EXPRESSION_ASSIGNMENT_DERIVATION__DIAGNOSTICCHAIN_MAP:
 				return nameExpressionAssignmentDerivation((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 			case AlfPackage.NAME_EXPRESSION___NAME_EXPRESSION_ENUMERATION_LITERAL_DERIVATION__DIAGNOSTICCHAIN_MAP:
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NameLeftHandSideImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NameLeftHandSideImpl.java
index e60b7833c02..e0fd6ab8227 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NameLeftHandSideImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NameLeftHandSideImpl.java
@@ -319,6 +319,54 @@ public class NameLeftHandSideImpl extends LeftHandSideImpl implements NameLeftHa
 	}
 
 	/**
+	 * The cached invocation delegate for the '{@link #expression() <em>Expression</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #expression()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate EXPRESSION__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getNameLeftHandSide__Expression()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Expression expression() {
+		try {
+			return (Expression)EXPRESSION__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
+	 * The cached invocation delegate for the '{@link #primary() <em>Primary</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #primary()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate PRIMARY__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getNameLeftHandSide__Primary()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Expression primary() {
+		try {
+			return (Expression)PRIMARY__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
 	 * The cached invocation delegate for the '{@link #localName() <em>Local Name</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -667,6 +715,7 @@ public class NameLeftHandSideImpl extends LeftHandSideImpl implements NameLeftHa
 				case AlfPackage.LEFT_HAND_SIDE___REFERENT: return AlfPackage.NAME_LEFT_HAND_SIDE___REFERENT;
 				case AlfPackage.LEFT_HAND_SIDE___LOCAL_NAME: return AlfPackage.NAME_LEFT_HAND_SIDE___LOCAL_NAME;
 				case AlfPackage.LEFT_HAND_SIDE___FEATURE: return AlfPackage.NAME_LEFT_HAND_SIDE___FEATURE;
+				case AlfPackage.LEFT_HAND_SIDE___EXPRESSION: return AlfPackage.NAME_LEFT_HAND_SIDE___EXPRESSION;
 				case AlfPackage.LEFT_HAND_SIDE___INDEX: return AlfPackage.NAME_LEFT_HAND_SIDE___INDEX;
 				default: return super.eDerivedOperationID(baseOperationID, baseClass);
 			}
@@ -701,6 +750,10 @@ public class NameLeftHandSideImpl extends LeftHandSideImpl implements NameLeftHa
 				return oldAssignment();
 			case AlfPackage.NAME_LEFT_HAND_SIDE___FEATURE:
 				return feature();
+			case AlfPackage.NAME_LEFT_HAND_SIDE___EXPRESSION:
+				return expression();
+			case AlfPackage.NAME_LEFT_HAND_SIDE___PRIMARY:
+				return primary();
 			case AlfPackage.NAME_LEFT_HAND_SIDE___LOCAL_NAME:
 				return localName();
 			case AlfPackage.NAME_LEFT_HAND_SIDE___NAME_LEFT_HAND_SIDE_ASSIGNMENT_AFTER_DERIVATION__DIAGNOSTICCHAIN_MAP:
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NamedTupleImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NamedTupleImpl.java
index b41d548281a..82fd0c306cb 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NamedTupleImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/NamedTupleImpl.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.papyrus.uml.alf.AlfPackage;
 import org.eclipse.papyrus.uml.alf.ElementReference;
+import org.eclipse.papyrus.uml.alf.Expression;
 import org.eclipse.papyrus.uml.alf.InputNamedExpression;
 import org.eclipse.papyrus.uml.alf.NamedExpression;
 import org.eclipse.papyrus.uml.alf.NamedTuple;
@@ -138,6 +139,30 @@ public class NamedTupleImpl extends TupleImpl implements NamedTuple {
 	}
 
 	/**
+	 * The cached invocation delegate for the '{@link #outputForExpression(org.eclipse.papyrus.uml.alf.Expression) <em>Output For Expression</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #outputForExpression(org.eclipse.papyrus.uml.alf.Expression)
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate OUTPUT_FOR_EXPRESSION_EXPRESSION__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getNamedTuple__OutputForExpression__Expression()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OutputNamedExpression outputForExpression(Expression expression) {
+		try {
+			return (OutputNamedExpression)OUTPUT_FOR_EXPRESSION_EXPRESSION__EINVOCATION_DELEGATE.dynamicInvoke(this, new BasicEList.UnmodifiableEList<Object>(1, new Object[]{expression}));
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
 	 * The cached validation expression for the '{@link #namedTupleArgumentNames(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Named Tuple Argument Names</em>}' invariant operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -185,6 +210,8 @@ public class NamedTupleImpl extends TupleImpl implements NamedTuple {
 				return inputFor((EList<ElementReference>)arguments.get(0));
 			case AlfPackage.NAMED_TUPLE___OUTPUT_FOR__ELIST:
 				return outputFor((EList<ElementReference>)arguments.get(0));
+			case AlfPackage.NAMED_TUPLE___OUTPUT_FOR_EXPRESSION__EXPRESSION:
+				return outputForExpression((Expression)arguments.get(0));
 			case AlfPackage.NAMED_TUPLE___NAMED_TUPLE_ARGUMENT_NAMES__DIAGNOSTICCHAIN_MAP:
 				return namedTupleArgumentNames((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/PositionalTupleImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/PositionalTupleImpl.java
index f83d0ad2e2b..0f1ccff12d9 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/PositionalTupleImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/PositionalTupleImpl.java
@@ -138,6 +138,30 @@ public class PositionalTupleImpl extends TupleImpl implements PositionalTuple {
 	}
 
 	/**
+	 * The cached invocation delegate for the '{@link #outputForExpression(org.eclipse.papyrus.uml.alf.Expression) <em>Output For Expression</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #outputForExpression(org.eclipse.papyrus.uml.alf.Expression)
+	 * @generated
+	 * @ordered
+	 */
+	protected static final EOperation.Internal.InvocationDelegate OUTPUT_FOR_EXPRESSION_EXPRESSION__EINVOCATION_DELEGATE = ((EOperation.Internal)AlfPackage.eINSTANCE.getPositionalTuple__OutputForExpression__Expression()).getInvocationDelegate();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OutputNamedExpression outputForExpression(Expression expression) {
+		try {
+			return (OutputNamedExpression)OUTPUT_FOR_EXPRESSION_EXPRESSION__EINVOCATION_DELEGATE.dynamicInvoke(this, new BasicEList.UnmodifiableEList<Object>(1, new Object[]{expression}));
+		}
+		catch (InvocationTargetException ite) {
+			throw new WrappedException(ite);
+		}
+	}
+
+	/**
 	 * The cached validation expression for the '{@link #positionalTupleArguments(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Positional Tuple Arguments</em>}' invariant operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -182,6 +206,8 @@ public class PositionalTupleImpl extends TupleImpl implements PositionalTuple {
 				return inputFor((EList<ElementReference>)arguments.get(0));
 			case AlfPackage.POSITIONAL_TUPLE___OUTPUT_FOR__ELIST:
 				return outputFor((EList<ElementReference>)arguments.get(0));
+			case AlfPackage.POSITIONAL_TUPLE___OUTPUT_FOR_EXPRESSION__EXPRESSION:
+				return outputForExpression((Expression)arguments.get(0));
 			case AlfPackage.POSITIONAL_TUPLE___POSITIONAL_TUPLE_ARGUMENTS__DIAGNOSTICCHAIN_MAP:
 				return positionalTupleArguments((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/TupleImpl.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/TupleImpl.java
index 651c1fccee3..cf239d93cd0 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/TupleImpl.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/TupleImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.util.EObjectValidator;
 import org.eclipse.papyrus.uml.alf.AlfPackage;
 import org.eclipse.papyrus.uml.alf.AssignedSource;
 import org.eclipse.papyrus.uml.alf.ElementReference;
+import org.eclipse.papyrus.uml.alf.Expression;
 import org.eclipse.papyrus.uml.alf.InputNamedExpression;
 import org.eclipse.papyrus.uml.alf.InvocationExpression;
 import org.eclipse.papyrus.uml.alf.OutputNamedExpression;
@@ -221,6 +222,17 @@ public abstract class TupleImpl extends SyntaxElementImpl implements Tuple {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OutputNamedExpression outputForExpression(Expression expression) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
 	 * The cached invocation delegate for the '{@link #assignmentsBefore(org.eclipse.papyrus.uml.alf.SyntaxElement) <em>Assignments Before</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -534,6 +546,8 @@ public abstract class TupleImpl extends SyntaxElementImpl implements Tuple {
 				return output();
 			case AlfPackage.TUPLE___OUTPUT_FOR__ELIST:
 				return outputFor((EList<ElementReference>)arguments.get(0));
+			case AlfPackage.TUPLE___OUTPUT_FOR_EXPRESSION__EXPRESSION:
+				return outputForExpression((Expression)arguments.get(0));
 			case AlfPackage.TUPLE___ASSIGNMENTS_BEFORE__SYNTAXELEMENT:
 				return assignmentsBefore((SyntaxElement)arguments.get(0));
 			case AlfPackage.TUPLE___ASSIGNMENTS_AFTER:
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore
index 90a03511591..42af271f7e0 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore
@@ -2174,6 +2174,11 @@
         eType="#//ElementReference"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Expression" abstract="true" eSuperTypes="#//AssignableElement">
+    <eOperations name="reference" lowerBound="1" eType="#//ExpressionReference">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="ExpressionReference{expression = self}"/>
+      </eAnnotations>
+    </eOperations>
     <eOperations name="newAssignments" ordered="false" upperBound="-1" eType="#//AssignedSource">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="body" value="&#xA;        let assignmentsBefore = self.assignmentBefore in&#xA;          self.assignmentAfter->select(isNew(assignmentsBefore))"/>
@@ -2239,6 +2244,41 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ExpressionReference" eSuperTypes="#//Expression">
+    <eOperations name="type" eType="#//ElementReference">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="self.expression.type()"/>
+      </eAnnotations>
+    </eOperations>
+    <eOperations name="lower" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="self.expression.lower()"/>
+      </eAnnotations>
+    </eOperations>
+    <eOperations name="upper" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="self.expression.upper()"/>
+      </eAnnotations>
+    </eOperations>
+    <eOperations name="isAddTarget" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="self.expression.isAddTarget(targetExpression)"/>
+      </eAnnotations>
+      <eParameters name="targetExpression" lowerBound="1" eType="#//Expression"/>
+    </eOperations>
+    <eOperations name="assignmentsBefore" ordered="false" upperBound="-1" eType="#//AssignedSource">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="self.expression.assignmentBefore"/>
+      </eAnnotations>
+    </eOperations>
+    <eOperations name="updateAssignments" ordered="false" upperBound="-1" eType="#//AssignedSource">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="self.expression.assignmentAfter"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" lowerBound="1"
+        eType="#//Expression"/>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ExtentOrExpression" eSuperTypes="#//Expression">
     <eOperations name="isAddTarget" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
@@ -2996,6 +3036,12 @@
       </eAnnotations>
       <eParameters name="parameters" upperBound="-1" eType="#//ElementReference"/>
     </eOperations>
+    <eOperations name="outputForExpression" eType="#//OutputNamedExpression">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if self.expression->excludes(expression) then null&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;else&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;let i = self.expression->indexOf(expression) in&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;let parameter = self.invocation.parameter->at(i) in&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;OutputNamedExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;name = parameter.name(),&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;expression = expression,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;owner = self&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;endif"/>
+      </eAnnotations>
+      <eParameters name="expression" lowerBound="1" eType="#//Expression"/>
+    </eOperations>
     <eOperations name="positionalTupleArguments" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="body" value="self.size() &lt;= self.invocation.parameterCount()"/>
@@ -3031,9 +3077,12 @@
     <eOperations name="outputFor" ordered="false" upperBound="-1" eType="#//OutputNamedExpression">
       <eParameters name="parameters" upperBound="-1" eType="#//ElementReference"/>
     </eOperations>
+    <eOperations name="outputForExpression" eType="#//OutputNamedExpression">
+      <eParameters name="expression" lowerBound="1" eType="#//Expression"/>
+    </eOperations>
     <eOperations name="assignmentsBefore" ordered="false" upperBound="-1" eType="#//AssignedSource">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-        <details key="body" value="&#xA;--        let assignmentsBefore = self.assignmentsBefore() in&#xA;--          if not element.oclIsKindOf(NameExpression) then assignmentsBefore&#xA;--          else&#xA;--            let outputs : Set = self.output->select(expression = element) in&#xA;--              if outputs->isEmpty() then assignmentsBefore&#xA;--              else self.updateFor(assignmentsBefore, &#xA;--                outputs->any(true).oclAsType(OutputNamedExpression)&#xA;--              )&#xA;--              endif&#xA;--          endif&#xA;          self.assignmentsBefore()"/>
+        <details key="body" value="&#xA;--        let assignmentsBefore = self.assignmentsBefore() in&#xA;--          if not element.oclIsKindOf(NameExpression) then assignmentsBefore&#xA;--          else&#xA;--            let output = self.outputForExpression(element.oclAsType(NameExpression)) in&#xA;--              if output = null then assignmentsBefore&#xA;--              else self.updateFor(assignmentsBefore, output)&#xA;--              endif&#xA;--          endif;&#xA;        self.assignmentsBefore()"/>
       </eAnnotations>
       <eParameters name="element" lowerBound="1" eType="#//SyntaxElement"/>
     </eOperations>
@@ -3750,7 +3799,7 @@
     </eOperations>
     <eOperations name="invocation" lowerBound="1" eType="#//BehaviorInvocationExpression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-        <details key="body" value="&#xA;&#x9;&#x9;&#x9;&#x9;let firstParameter = self.firstParameter() in&#xA;&#x9;&#x9;&#x9;&#x9;let namedExpression = NamedExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;name = if firstParameter = null then null else firstParameter.name() endif,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;expression = self.primary.expression&#xA;&#x9;&#x9;&#x9;&#x9;} in&#xA;&#x9;&#x9;&#x9;&#x9;let namedTuple = NamedTuple{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;namedExpression = OrderedSet{namedExpression}->&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;includingAll(self.tuple.input)->includingAll(self.tuple.output)&#xA;&#x9;&#x9;&#x9;&#x9;} in&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;BehaviorInvocationExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;target = self.operation,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;referent = self.referent,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;tuple = namedTuple,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;owner = self.owner()&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}"/>
+        <details key="body" value="&#xA;&#x9;&#x9;&#x9;&#x9;let firstParameter = self.firstParameter() in&#xA;&#x9;&#x9;&#x9;&#x9;let namedExpression = NamedExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;name = if firstParameter = null then null else firstParameter.name() endif,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;expression = self.primary.expression.reference()&#xA;&#x9;&#x9;&#x9;&#x9;} in&#xA;&#x9;&#x9;&#x9;&#x9;let namedTuple = NamedTuple{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;namedExpression = OrderedSet{namedExpression}->&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;includingAll(self.tuple.input)->includingAll(self.tuple.output)&#xA;&#x9;&#x9;&#x9;&#x9;} in&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;BehaviorInvocationExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;target = self.operation.copy(),&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;referent = self.referent,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;tuple = namedTuple,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;owner = self&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}"/>
       </eAnnotations>
     </eOperations>
     <eOperations name="sequenceOperationExpressionReferentDerivation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -4952,6 +5001,11 @@
         <details key="body" value="&#xA;        if self.expression.oclIsKindOf(PropertyAccessExpression) then&#xA;          self.expression.oclAsType(PropertyAccessExpression).featureReference&#xA;        else if self.expression.oclIsKindOf(SequenceAccessExpression) then&#xA;          let primary = self.expression.oclAsType(SequenceAccessExpression).primary in&#xA;            if primary.oclIsKindOf(PropertyAccessExpression) then&#xA;              primary.oclAsType(PropertyAccessExpression).featureReference&#xA;            else&#xA;              null&#xA;            endif&#xA;        else&#xA;          null&#xA;        endif endif"/>
       </eAnnotations>
     </eOperations>
+    <eOperations name="primary" eType="#//Expression">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="&#xA;&#x9;&#x9;&#x9;&#x9;PropertyAccessExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;featureReference = self.feature(),&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;owner = self.owner()&#xA;&#x9;&#x9;&#x9;&#x9;}"/>
+      </eAnnotations>
+    </eOperations>
     <eOperations name="index" eType="#//Expression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="body" value="&#xA;        if not self.expression.oclIsKindOf(SequenceAccessExpression) then null&#xA;        else self.expression.oclAsType(SequenceAccessExpression).index&#xA;        endif"/>
@@ -5391,7 +5445,7 @@
     </eOperations>
     <eOperations name="upper" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-        <details key="body" value="&#xA;       let assignment = self.assignment in&#xA;          if assignment &lt;> null then assignment.upper&#xA;          else&#xA;            let enumerationLiteral = self.enumerationLiteral in&#xA;              if enumerationLiteral &lt;> null then 1&#xA;              else&#xA;                let propertyAccess = self.propertyAccess in&#xA;                  if propertyAccess &lt;> null then propertyAccess.upper&#xA;                  else 0&#xA;                  endif&#xA;              endif&#xA;          endif"/>
+        <details key="body" value="&#xA;       let assignment = self.assignment in&#xA;          if assignment &lt;> null then assignment.upper&#xA;          else&#xA;            let enumerationLiteral = self.enumerationLiteral in&#xA;              if enumerationLiteral &lt;> null then 1&#xA;              else&#xA;                let propertyAccess = self.propertyAccess in&#xA;                  if propertyAccess &lt;> null then propertyAccess.upper&#xA;                  else 1 -- Note: This ensures a name defined as an &quot;out&quot; argument is not considered null.&#xA;                  endif&#xA;              endif&#xA;          endif"/>
       </eAnnotations>
     </eOperations>
     <eOperations name="lower" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger">
@@ -5409,11 +5463,11 @@
     </eOperations>
     <eOperations name="assignmentFor_" eType="#//AssignedSource">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-        <details key="body" value="&#xA;      let assignments = self.assignmentBefore->select(name = localName) in&#xA;        if assignments->isEmpty() or &#xA;           assignments->forAll(isParallelLocalName) and not self.isAddTarget()&#xA;        then &#xA;          null&#xA;        else &#xA;          assignments->any(true)&#xA;        endif"/>
+        <details key="body" value="&#xA;      let assignments = self.assignmentBefore->select(name = localName) in&#xA;        if assignments->isEmpty() or &#xA;           assignments->forAll(isParallelLocalName) and not self.isAddTargetName()&#xA;        then &#xA;          null&#xA;        else &#xA;          assignments->any(true)&#xA;        endif"/>
       </eAnnotations>
       <eParameters name="localName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eOperations>
-    <eOperations name="isAddTarget" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+    <eOperations name="isAddTargetName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="body" value="&#xA;      let expression = self.enclosingExpression() in&#xA;        if expression = null then false&#xA;        else expression.isAddTarget(self)&#xA;        endif"/>
       </eAnnotations>
@@ -6266,7 +6320,7 @@
     </eOperations>
     <eOperations name="inputFor" ordered="false" upperBound="-1" eType="#//InputNamedExpression">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-        <details key="body" value="&#xA;        parameters->select(&#xA;          let direction = direction() in&#xA;            direction = 'in' or direction = 'inout' &#xA;        )->collect(parameter |&#xA;          let parameterName = parameter.name() in&#xA;          let arguments = self.namedExpression->select(actualName() = parameterName) in&#xA;            if arguments->isEmpty() then&#xA;              InputNamedExpression{&#xA;                name = parameterName,&#xA;                expression = SequenceConstructionExpression{&#xA;                  hasMultiplicity = true&#xA;                },&#xA;                owner = self&#xA;              }&#xA;            else&#xA;              let argument : NamedExpression = arguments->any(true) in&#xA;                InputNamedExpression{&#xA;                  name = parameterName,&#xA;                  expression = argument.expression,&#xA;                  index = argument.index&#xA;                }&#xA;            endif&#xA;        )->asSet()"/>
+        <details key="body" value="&#xA;        parameters->select(&#xA;          let direction = direction() in&#xA;            direction = 'in' or direction = 'inout' &#xA;        )->collect(parameter |&#xA;          let parameterName = parameter.name() in&#xA;          let arguments = self.namedExpression->select(actualName() = parameterName) in&#xA;            if arguments->isEmpty() then&#xA;              InputNamedExpression{&#xA;                name = parameterName,&#xA;                expression = SequenceConstructionExpression{&#xA;                  hasMultiplicity = true&#xA;                },&#xA;                owner = self&#xA;              }&#xA;            else&#xA;              let argument : NamedExpression = arguments->any(true) in&#xA;                InputNamedExpression{&#xA;                  name = parameterName,&#xA;                  expression = argument.expression,&#xA;                  index = argument.index,&#xA;                  owner = self&#xA;                }&#xA;            endif&#xA;        )->asSet()"/>
       </eAnnotations>
       <eParameters name="parameters" upperBound="-1" eType="#//ElementReference"/>
     </eOperations>
@@ -6276,6 +6330,12 @@
       </eAnnotations>
       <eParameters name="parameters" upperBound="-1" eType="#//ElementReference"/>
     </eOperations>
+    <eOperations name="outputForExpression" eType="#//OutputNamedExpression">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="&#xA;&#x9;&#x9;&#x9;&#x9;let arguments = self.namedExpression->select(a | a.expression = expression) in&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if arguments->isEmpty() then null&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;else&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;let argument = arguments->any(true) in&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;OutputNamedExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;name = argument.name,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;index = argument.index,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;expression = expression,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;owner = self&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;endif"/>
+      </eAnnotations>
+      <eParameters name="expression" lowerBound="1" eType="#//Expression"/>
+    </eOperations>
     <eOperations name="namedTupleArgumentNames" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="body" value="&#xA;        let names = self.invocation.parameter.name() in&#xA;          self.namedExpression->forAll(names->includes(actualName())) and&#xA;          self.namedExpression->isUnique(actualName())"/>
@@ -6430,6 +6490,16 @@
         <details key="body" value="self.target().disambiguation"/>
       </eAnnotations>
     </eOperations>
+    <eOperations name="expression" lowerBound="1" eType="#//Expression">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="&#xA;&#x9;&#x9;&#x9;&#x9;let expression = self.primary() in&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;if self.index = null then expression&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;else&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;SequenceAccessExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;primary = expression,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;index = index.reference(),&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;owner = self&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;endif"/>
+      </eAnnotations>
+    </eOperations>
+    <eOperations name="primary" lowerBound="1" eType="#//Expression">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="&#xA;&#x9;&#x9;&#x9;&#x9;let feature = self.feature() in&#xA;&#x9;&#x9;&#x9;&#x9;if feature = null then&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;NameExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;name = self.target.copy(),&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;owner = self&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xA;&#x9;&#x9;&#x9;&#x9;else&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;PropertyAccessExpression{&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;feature = feature,&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;owner = self&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;}&#xA;&#x9;&#x9;&#x9;&#x9;endif"/>
+      </eAnnotations>
+    </eOperations>
     <eOperations name="localName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="body" value="&#xA;        if self.feature() &lt;> null then null&#xA;        else self.target().unqualifiedName.toName()&#xA;        endif"/>
@@ -6566,6 +6636,11 @@
         <details key="body" value="&#xA;        if self.expression.oclIsKindOf(SequenceAccessExpression) then&#xA;          self.expression.oclAsType(SequenceAccessExpression).primary&#xA;        else&#xA;          expression&#xA;        endif"/>
       </eAnnotations>
     </eOperations>
+    <eOperations name="expression" eType="#//Expression">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
+        <details key="body" value="self.expression"/>
+      </eAnnotations>
+    </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="expression" lowerBound="1"
         eType="#//Expression"/>
   </eClassifiers>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfAdapterFactory.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfAdapterFactory.java
index 485b95e5753..2b316dece59 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfAdapterFactory.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfAdapterFactory.java
@@ -116,6 +116,10 @@ public class AlfAdapterFactory extends AdapterFactoryImpl {
 				return createExpressionAdapter();
 			}
 			@Override
+			public Adapter caseExpressionReference(ExpressionReference object) {
+				return createExpressionReferenceAdapter();
+			}
+			@Override
 			public Adapter caseExtentOrExpression(ExtentOrExpression object) {
 				return createExtentOrExpressionAdapter();
 			}
@@ -780,6 +784,20 @@ public class AlfAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.alf.ExpressionReference <em>Expression Reference</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.uml.alf.ExpressionReference
+	 * @generated
+	 */
+	public Adapter createExpressionReferenceAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.alf.ExtentOrExpression <em>Extent Or Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfSwitch.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfSwitch.java
index 822f86e618f..2f0b716b9ce 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfSwitch.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfSwitch.java
@@ -151,6 +151,15 @@ public class AlfSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case AlfPackage.EXPRESSION_REFERENCE: {
+				ExpressionReference expressionReference = (ExpressionReference)theEObject;
+				T result = caseExpressionReference(expressionReference);
+				if (result == null) result = caseExpression(expressionReference);
+				if (result == null) result = caseAssignableElement(expressionReference);
+				if (result == null) result = caseSyntaxElement(expressionReference);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case AlfPackage.EXTENT_OR_EXPRESSION: {
 				ExtentOrExpression extentOrExpression = (ExtentOrExpression)theEObject;
 				T result = caseExtentOrExpression(extentOrExpression);
@@ -1368,6 +1377,21 @@ public class AlfSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Expression Reference</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Expression Reference</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseExpressionReference(ExpressionReference object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Extent Or Expression</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfValidator.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfValidator.java
index 58598629c75..05cb242d5a3 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfValidator.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/util/AlfValidator.java
@@ -3658,6 +3658,8 @@ public class AlfValidator extends EObjectValidator {
 				return validateAssignableElementReference((AssignableElementReference)value, diagnostics, context);
 			case AlfPackage.EXPRESSION:
 				return validateExpression((Expression)value, diagnostics, context);
+			case AlfPackage.EXPRESSION_REFERENCE:
+				return validateExpressionReference((ExpressionReference)value, diagnostics, context);
 			case AlfPackage.EXTENT_OR_EXPRESSION:
 				return validateExtentOrExpression((ExtentOrExpression)value, diagnostics, context);
 			case AlfPackage.QUALIFIED_NAME:
@@ -4287,6 +4289,26 @@ public class AlfValidator extends EObjectValidator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public boolean validateExpressionReference(ExpressionReference expressionReference, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(expressionReference, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(expressionReference, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(expressionReference, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(expressionReference, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(expressionReference, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(expressionReference, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(expressionReference, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(expressionReference, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(expressionReference, diagnostics, context);
+		if (result || diagnostics != null) result &= validateExpression_expressionAssignmentAfterDerivation(expressionReference, diagnostics, context);
+		if (result || diagnostics != null) result &= validateExpression_expressionUniqueAssignments(expressionReference, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public boolean validateExtentOrExpression(ExtentOrExpression extentOrExpression, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(extentOrExpression, diagnostics, context)) return false;
 		boolean result = validate_EveryMultiplicityConforms(extentOrExpression, diagnostics, context);
author	Ed Seidewitz	2015-04-28 07:53:08 +0000
committer	Arnaud Cuccuru	2015-04-29 08:58:42 +0000
commit	c5dac60734d576f42e173137aac8cbcaa7ef5b8f (patch)
tree	8e6e5e4151b7b24c8277e0d5090054ccc7f9e34a /plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen
parent	8ac267f2e5f3452dab22f0cac2958e6757b30654 (diff)
download	org.eclipse.papyrus-c5dac60734d576f42e173137aac8cbcaa7ef5b8f.tar.gz org.eclipse.papyrus-c5dac60734d576f42e173137aac8cbcaa7ef5b8f.tar.xz org.eclipse.papyrus-c5dac60734d576f42e173137aac8cbcaa7ef5b8f.zip