Added new connection patterns to metamodel. Updated editors. Bug

correction in MWE2 generation scripts of XText editors.

eclipse/features/com.irtsaintexupery.pseim.feature/feature.xml

@@ -361,4 +361,11 @@ version(s), and exceptions or additional permissions here}."
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.irtsaintexupery.sirius.pseim"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

eclipse/plugins/com.irtsaintexupery.pseim.edit/plugin.properties

@@ -103,3 +103,11 @@ _UI_PatternPortDirection_UNSPECIFIED_literal = UNSPECIFIED
 _UI_PatternPortDirection_IN_literal = IN
 _UI_PatternPortDirection_OUT_literal = OUT
 _UI_PatternPortDirection_INOUT_literal = INOUT
+_UI_LinkType_SHIFTC_literal = SHIFTC
+_UI_LinkType_JOINC_literal = JOINC
+_UI_LinkType_JOINP_literal = JOINP
+_UI_LinkType_FORKC_literal = FORKC
+_UI_LinkType_FORKP_literal = FORKP
+_UI_LinkType_SHIFTP_literal = SHIFTP
+_UI_LinkType_FLATTENC_literal = FLATTENC
+_UI_LinkType_LAST_literal = LAST

eclipse/plugins/com.irtsaintexupery.pseim/model/pseim.ecore

@@ -67,11 +67,18 @@
         eType="ecore:EClass seim.ecore#//PropertyHolder"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="LinkType">
-    <eLiterals name="TRANSPOSE"/>
-    <eLiterals name="IDENTITY" value="1"/>
-    <eLiterals name="SHIFT" value="2"/>
-    <eLiterals name="FIRST" value="3"/>
-    <eLiterals name="ROTATE" value="4"/>
+    <eLiterals name="TRANSPOSE" value="4"/>
+    <eLiterals name="IDENTITY"/>
+    <eLiterals name="SHIFTC" value="9"/>
+    <eLiterals name="FIRST" value="1"/>
+    <eLiterals name="ROTATE" value="3"/>
+    <eLiterals name="JOINC" value="7"/>
+    <eLiterals name="JOINP" value="8"/>
+    <eLiterals name="FORKC" value="5"/>
+    <eLiterals name="FORKP" value="6"/>
+    <eLiterals name="SHIFTP" value="10"/>
+    <eLiterals name="FLATTENC" value="11"/>
+    <eLiterals name="LAST" value="2"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PatternComponent" eSuperTypes="#//MultiplicityElement #//IdentifiedElement seim.ecore#//Component">
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

eclipse/plugins/com.irtsaintexupery.pseim/model/pseim.genmodel

@@ -39,9 +39,16 @@
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="pseim.ecore#//LinkType">
       <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/TRANSPOSE"/>
       <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/IDENTITY"/>
-      <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/SHIFT"/>
+      <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/SHIFTC"/>
       <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/FIRST"/>
       <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/ROTATE"/>
+      <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/JOINC"/>
+      <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/JOINP"/>
+      <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/FORKC"/>
+      <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/FORKP"/>
+      <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/SHIFTP"/>
+      <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/FLATTENC"/>
+      <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//LinkType/LAST"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="pseim.ecore#//PatternPortDirection">
       <genEnumLiterals ecoreEnumLiteral="pseim.ecore#//PatternPortDirection/UNSPECIFIED"/>

eclipse/plugins/com.irtsaintexupery.pseim/src-gen/com/irtsaintexupery/pseim/pseim/LinkType.java

@@ -36,7 +36,7 @@ public enum LinkType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	TRANSPOSE(0, "TRANSPOSE", "TRANSPOSE"),
+	TRANSPOSE(4, "TRANSPOSE", "TRANSPOSE"),
 
 	/**
 	 * The '<em><b>IDENTITY</b></em>' literal object.
@@ -46,18 +46,17 @@ public enum LinkType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	IDENTITY(1, "IDENTITY", "IDENTITY"),
+	IDENTITY(0, "IDENTITY", "IDENTITY"),
 
 	/**
-	 * The '<em><b>SHIFT</b></em>' literal object.
+	 * The '<em><b>SHIFTC</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #SHIFT_VALUE
+	 * @see #SHIFTC_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	SHIFT(2, "SHIFT", "SHIFT"),
-
+	SHIFTC(9, "SHIFTC", "SHIFTC"),
 	/**
 	* The '<em><b>FIRST</b></em>' literal object.
 	* <!-- begin-user-doc -->
@@ -66,7 +65,7 @@ public enum LinkType implements Enumerator {
 	* @generated
 	* @ordered
 	*/
-	FIRST(3, "FIRST", "FIRST"),
+	FIRST(1, "FIRST", "FIRST"),
 
 	/**
 	 * The '<em><b>ROTATE</b></em>' literal object.
@@ -76,7 +75,70 @@ public enum LinkType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	ROTATE(4, "ROTATE", "ROTATE");
+	ROTATE(3, "ROTATE", "ROTATE"),
+	/**
+	* The '<em><b>JOINC</b></em>' literal object.
+	* <!-- begin-user-doc -->
+	* <!-- end-user-doc -->
+	* @see #JOINC_VALUE
+	* @generated
+	* @ordered
+	*/
+	JOINC(7, "JOINC", "JOINC"),
+	/**
+	* The '<em><b>JOINP</b></em>' literal object.
+	* <!-- begin-user-doc -->
+	* <!-- end-user-doc -->
+	* @see #JOINP_VALUE
+	* @generated
+	* @ordered
+	*/
+	JOINP(8, "JOINP", "JOINP"),
+	/**
+	* The '<em><b>FORKC</b></em>' literal object.
+	* <!-- begin-user-doc -->
+	* <!-- end-user-doc -->
+	* @see #FORKC_VALUE
+	* @generated
+	* @ordered
+	*/
+	FORKC(5, "FORKC", "FORKC"),
+	/**
+	* The '<em><b>FORKP</b></em>' literal object.
+	* <!-- begin-user-doc -->
+	* <!-- end-user-doc -->
+	* @see #FORKP_VALUE
+	* @generated
+	* @ordered
+	*/
+	FORKP(6, "FORKP", "FORKP"),
+	/**
+	* The '<em><b>SHIFTP</b></em>' literal object.
+	* <!-- begin-user-doc -->
+	* <!-- end-user-doc -->
+	* @see #SHIFTP_VALUE
+	* @generated
+	* @ordered
+	*/
+	SHIFTP(10, "SHIFTP", "SHIFTP"),
+	/**
+	* The '<em><b>FLATTENC</b></em>' literal object.
+	* <!-- begin-user-doc -->
+	* <!-- end-user-doc -->
+	* @see #FLATTENC_VALUE
+	* @generated
+	* @ordered
+	*/
+	FLATTENC(11, "FLATTENC", "FLATTENC"),
+	/**
+	* The '<em><b>LAST</b></em>' literal object.
+	* <!-- begin-user-doc -->
+	* <!-- end-user-doc -->
+	* @see #LAST_VALUE
+	* @generated
+	* @ordered
+	*/
+	LAST(2, "LAST", "LAST");
 
 	/**
 	 * The '<em><b>TRANSPOSE</b></em>' literal value.
@@ -91,7 +153,7 @@ public enum LinkType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int TRANSPOSE_VALUE = 0;
+	public static final int TRANSPOSE_VALUE = 4;
 
 	/**
 	 * The '<em><b>IDENTITY</b></em>' literal value.
@@ -106,22 +168,22 @@ public enum LinkType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int IDENTITY_VALUE = 1;
+	public static final int IDENTITY_VALUE = 0;
 
 	/**
-	 * The '<em><b>SHIFT</b></em>' literal value.
+	 * The '<em><b>SHIFTC</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>SHIFT</b></em>' literal object isn't clear,
+	 * If the meaning of '<em><b>SHIFTC</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #SHIFT
+	 * @see #SHIFTC
 	 * @model
 	 * @generated
 	 * @ordered
 	 */
-	public static final int SHIFT_VALUE = 2;
+	public static final int SHIFTC_VALUE = 9;
 
 	/**
 	 * The '<em><b>FIRST</b></em>' literal value.
@@ -136,7 +198,7 @@ public enum LinkType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int FIRST_VALUE = 3;
+	public static final int FIRST_VALUE = 1;
 
 	/**
 	 * The '<em><b>ROTATE</b></em>' literal value.
@@ -151,7 +213,112 @@ public enum LinkType implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int ROTATE_VALUE = 4;
+	public static final int ROTATE_VALUE = 3;
+
+	/**
+	 * The '<em><b>JOINC</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>JOINC</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #JOINC
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int JOINC_VALUE = 7;
+
+	/**
+	 * The '<em><b>JOINP</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>JOINP</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #JOINP
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int JOINP_VALUE = 8;
+
+	/**
+	 * The '<em><b>FORKC</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>FORKC</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #FORKC
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int FORKC_VALUE = 5;
+
+	/**
+	 * The '<em><b>FORKP</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>FORKP</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #FORKP
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int FORKP_VALUE = 6;
+
+	/**
+	 * The '<em><b>SHIFTP</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>SHIFTP</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #SHIFTP
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int SHIFTP_VALUE = 10;
+
+	/**
+	 * The '<em><b>FLATTENC</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>FLATTENC</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #FLATTENC
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int FLATTENC_VALUE = 11;
+
+	/**
+	 * The '<em><b>LAST</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>LAST</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #LAST
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int LAST_VALUE = 2;
 
 	/**
 	 * An array of all the '<em><b>Link Type</b></em>' enumerators.
@@ -159,7 +326,8 @@ public enum LinkType implements Enumerator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private static final LinkType[] VALUES_ARRAY = new LinkType[] { TRANSPOSE, IDENTITY, SHIFT, FIRST, ROTATE, };
+	private static final LinkType[] VALUES_ARRAY = new LinkType[] { TRANSPOSE, IDENTITY, SHIFTC, FIRST, ROTATE, JOINC,
+			JOINP, FORKC, FORKP, SHIFTP, FLATTENC, LAST, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Link Type</b></em>' enumerators.
@@ -219,12 +387,26 @@ public enum LinkType implements Enumerator {
 			return TRANSPOSE;
 		case IDENTITY_VALUE:
 			return IDENTITY;
-		case SHIFT_VALUE:
-			return SHIFT;
+		case SHIFTC_VALUE:
+			return SHIFTC;
 		case FIRST_VALUE:
 			return FIRST;
 		case ROTATE_VALUE:
 			return ROTATE;
+		case JOINC_VALUE:
+			return JOINC;
+		case JOINP_VALUE:
+			return JOINP;
+		case FORKC_VALUE:
+			return FORKC;
+		case FORKP_VALUE:
+			return FORKP;
+		case SHIFTP_VALUE:
+			return SHIFTP;
+		case FLATTENC_VALUE:
+			return FLATTENC;
+		case LAST_VALUE:
+			return LAST;
 		}
 		return null;
 	}

eclipse/plugins/com.irtsaintexupery.pseim/src-gen/com/irtsaintexupery/pseim/pseim/impl/PseimFactoryImpl.java

@@ -13,8 +13,6 @@
 package com.irtsaintexupery.pseim.pseim.impl;
 
 import com.irtsaintexupery.pseim.pseim.*;
-import com.irtsaintexupery.pseim.seim.Model;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;

eclipse/plugins/com.irtsaintexupery.pseim/src-gen/com/irtsaintexupery/pseim/pseim/impl/PseimPackageImpl.java

@@ -705,9 +705,16 @@ public class PseimPackageImpl extends EPackageImpl implements PseimPackage {
 		initEEnum(linkTypeEEnum, LinkType.class, "LinkType");
 		addEEnumLiteral(linkTypeEEnum, LinkType.TRANSPOSE);
 		addEEnumLiteral(linkTypeEEnum, LinkType.IDENTITY);
-		addEEnumLiteral(linkTypeEEnum, LinkType.SHIFT);
+		addEEnumLiteral(linkTypeEEnum, LinkType.SHIFTC);
 		addEEnumLiteral(linkTypeEEnum, LinkType.FIRST);
 		addEEnumLiteral(linkTypeEEnum, LinkType.ROTATE);
+		addEEnumLiteral(linkTypeEEnum, LinkType.JOINC);
+		addEEnumLiteral(linkTypeEEnum, LinkType.JOINP);
+		addEEnumLiteral(linkTypeEEnum, LinkType.FORKC);
+		addEEnumLiteral(linkTypeEEnum, LinkType.FORKP);
+		addEEnumLiteral(linkTypeEEnum, LinkType.SHIFTP);
+		addEEnumLiteral(linkTypeEEnum, LinkType.FLATTENC);
+		addEEnumLiteral(linkTypeEEnum, LinkType.LAST);
 
 		initEEnum(patternPortDirectionEEnum, PatternPortDirection.class, "PatternPortDirection");
 		addEEnumLiteral(patternPortDirectionEEnum, PatternPortDirection.UNSPECIFIED);

eclipse/plugins/com.irtsaintexupery.xtext.pseim.pattern.ide/src-gen/com/irtsaintexupery/xtext/pseim/ide/contentassist/antlr/internal/InternalPattern.g

@@ -378,9 +378,51 @@ rule__LinkType__Alternatives
 	)
 	|
 	(
-		{ before(grammarAccess.getLinkTypeAccess().getSHIFTEnumLiteralDeclaration_4()); }
-		('-{Shift}->')
-		{ after(grammarAccess.getLinkTypeAccess().getSHIFTEnumLiteralDeclaration_4()); }
+		{ before(grammarAccess.getLinkTypeAccess().getSHIFTCEnumLiteralDeclaration_4()); }
+		('-{ShiftC}->')
+		{ after(grammarAccess.getLinkTypeAccess().getSHIFTCEnumLiteralDeclaration_4()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getLinkTypeAccess().getSHIFTPEnumLiteralDeclaration_5()); }
+		('-{ShiftP}->')
+		{ after(grammarAccess.getLinkTypeAccess().getSHIFTPEnumLiteralDeclaration_5()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getLinkTypeAccess().getFLATTENCEnumLiteralDeclaration_6()); }
+		('-{FlattenC}->')
+		{ after(grammarAccess.getLinkTypeAccess().getFLATTENCEnumLiteralDeclaration_6()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getLinkTypeAccess().getFORKCEnumLiteralDeclaration_7()); }
+		('-{ForkC}->')
+		{ after(grammarAccess.getLinkTypeAccess().getFORKCEnumLiteralDeclaration_7()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getLinkTypeAccess().getFORKPEnumLiteralDeclaration_8()); }
+		('-{ForkP}->')
+		{ after(grammarAccess.getLinkTypeAccess().getFORKPEnumLiteralDeclaration_8()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getLinkTypeAccess().getJOINCEnumLiteralDeclaration_9()); }
+		('-{JoinC}->')
+		{ after(grammarAccess.getLinkTypeAccess().getJOINCEnumLiteralDeclaration_9()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getLinkTypeAccess().getJOINPEnumLiteralDeclaration_10()); }
+		('-{JoinP}->')
+		{ after(grammarAccess.getLinkTypeAccess().getJOINPEnumLiteralDeclaration_10()); }
+	)
+	|
+	(
+		{ before(grammarAccess.getLinkTypeAccess().getLASTEnumLiteralDeclaration_11()); }
+		('-{Last}->')
+		{ after(grammarAccess.getLinkTypeAccess().getLASTEnumLiteralDeclaration_11()); }
 	)
 ;
 finally {

eclipse/plugins/com.irtsaintexupery.xtext.pseim.pattern.ide/src-gen/com/irtsaintexupery/xtext/pseim/ide/contentassist/antlr/internal/InternalPattern.tokens

-'('=21
-')'=22
-','=23
+'('=28
+')'=29
+','=30
 '-{First}->'=17
+'-{FlattenC}->'=21
+'-{ForkC}->'=22
+'-{ForkP}->'=23
 '-{Identity}->'=16
+'-{JoinC}->'=24
+'-{JoinP}->'=25
+'-{Last}->'=26
 '-{Rotate}->'=18
-'-{Shift}->'=19
+'-{ShiftC}->'=19
+'-{ShiftP}->'=20
 '-{Transpose}->'=15
-'.'=29
-'['=27
-']'=28
-'component'=26
+'.'=36
+'['=34
+']'=35
+'component'=33
 'in'=12
 'inout'=14
 'out'=13
-'pattern'=20
+'pattern'=27
 'unspec'=11
-'{'=24
-'}'=25
+'{'=31
+'}'=32
 RULE_ANY_OTHER=10
 RULE_ID=4
 RULE_INT=5
@@ -43,3 +50,10 @@ T__26=26
 T__27=27
 T__28=28
 T__29=29
+T__30=30
+T__31=31
+T__32=32
+T__33=33
+T__34=34
+T__35=35
+T__36=36

eclipse/plugins/com.irtsaintexupery.xtext.pseim.pattern/src-gen/com/irtsaintexupery/xtext/pseim/parser/antlr/internal/InternalPattern.g

@@ -727,10 +727,66 @@ ruleLinkType returns [Enumerator current=null]
 		)
 		    |
 		(
-			enumLiteral_4='-{Shift}->'
+			enumLiteral_4='-{ShiftC}->'
 			{
-				$current = grammarAccess.getLinkTypeAccess().getSHIFTEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
-				newLeafNode(enumLiteral_4, grammarAccess.getLinkTypeAccess().getSHIFTEnumLiteralDeclaration_4());
+				$current = grammarAccess.getLinkTypeAccess().getSHIFTCEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
+				newLeafNode(enumLiteral_4, grammarAccess.getLinkTypeAccess().getSHIFTCEnumLiteralDeclaration_4());
+			}
+		)
+		    |
+		(
+			enumLiteral_5='-{ShiftP}->'
+			{
+				$current = grammarAccess.getLinkTypeAccess().getSHIFTPEnumLiteralDeclaration_5().getEnumLiteral().getInstance();
+				newLeafNode(enumLiteral_5, grammarAccess.getLinkTypeAccess().getSHIFTPEnumLiteralDeclaration_5());
+			}
+		)
+		    |
+		(
+			enumLiteral_6='-{FlattenC}->'
+			{
+				$current = grammarAccess.getLinkTypeAccess().getFLATTENCEnumLiteralDeclaration_6().getEnumLiteral().getInstance();
+				newLeafNode(enumLiteral_6, grammarAccess.getLinkTypeAccess().getFLATTENCEnumLiteralDeclaration_6());
+			}
+		)
+		    |
+		(
+			enumLiteral_7='-{ForkC}->'
+			{
+				$current = grammarAccess.getLinkTypeAccess().getFORKCEnumLiteralDeclaration_7().getEnumLiteral().getInstance();
+				newLeafNode(enumLiteral_7, grammarAccess.getLinkTypeAccess().getFORKCEnumLiteralDeclaration_7());
+			}
+		)
+		    |
+		(
+			enumLiteral_8='-{ForkP}->'
+			{
+				$current = grammarAccess.getLinkTypeAccess().getFORKPEnumLiteralDeclaration_8().getEnumLiteral().getInstance();
+				newLeafNode(enumLiteral_8, grammarAccess.getLinkTypeAccess().getFORKPEnumLiteralDeclaration_8());
+			}
+		)
+		    |
+		(
+			enumLiteral_9='-{JoinC}->'
+			{
+				$current = grammarAccess.getLinkTypeAccess().getJOINCEnumLiteralDeclaration_9().getEnumLiteral().getInstance();
+				newLeafNode(enumLiteral_9, grammarAccess.getLinkTypeAccess().getJOINCEnumLiteralDeclaration_9());
+			}
+		)
+		    |
+		(
+			enumLiteral_10='-{JoinP}->'
+			{
+				$current = grammarAccess.getLinkTypeAccess().getJOINPEnumLiteralDeclaration_10().getEnumLiteral().getInstance();
+				newLeafNode(enumLiteral_10, grammarAccess.getLinkTypeAccess().getJOINPEnumLiteralDeclaration_10());
+			}
+		)
+		    |
+		(
+			enumLiteral_11='-{Last}->'
+			{
+				$current = grammarAccess.getLinkTypeAccess().getLASTEnumLiteralDeclaration_11().getEnumLiteral().getInstance();
+				newLeafNode(enumLiteral_11, grammarAccess.getLinkTypeAccess().getLASTEnumLiteralDeclaration_11());
 			}
 		)
 	)

eclipse/plugins/com.irtsaintexupery.xtext.pseim.pattern/src-gen/com/irtsaintexupery/xtext/pseim/parser/antlr/internal/InternalPattern.tokens

@@ -2,9 +2,16 @@
 ')'=14
 ','=13
 '-{First}->'=27
+'-{FlattenC}->'=31
+'-{ForkC}->'=32
+'-{ForkP}->'=33
 '-{Identity}->'=26
+'-{JoinC}->'=34
+'-{JoinP}->'=35
+'-{Last}->'=36
 '-{Rotate}->'=28
-'-{Shift}->'=29
+'-{ShiftC}->'=29
+'-{ShiftP}->'=30
 '-{Transpose}->'=25
 '.'=20
 '['=18
@@ -43,3 +50,10 @@ T__26=26
 T__27=27
 T__28=28
 T__29=29
+T__30=30
+T__31=31
+T__32=32
+T__33=33
+T__34=34
+T__35=35
+T__36=36

eclipse/plugins/com.irtsaintexupery.xtext.pseim.pattern/src-gen/com/irtsaintexupery/xtext/pseim/serializer/PatternSemanticSequencer.java

@@ -3,8 +3,16 @@
  */
 package com.irtsaintexupery.xtext.pseim.serializer;
 
+import com.google.inject.Inject;
+import com.irtsaintexupery.pseim.pseim.CardinalityElement;
+import com.irtsaintexupery.pseim.pseim.Pattern;
+import com.irtsaintexupery.pseim.pseim.PatternComponent;
+import com.irtsaintexupery.pseim.pseim.PatternLink;
+import com.irtsaintexupery.pseim.pseim.PatternPort;
+import com.irtsaintexupery.pseim.pseim.PseimPackage;
+import com.irtsaintexupery.pseim.seim.SeimPackage;
+import com.irtsaintexupery.xtext.pseim.services.PatternGrammarAccess;
 import java.util.Set;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.xtext.Action;
@@ -15,16 +23,6 @@ import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
 import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
 import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
-import com.google.inject.Inject;
-import com.irtsaintexupery.pseim.pseim.CardinalityElement;
-import com.irtsaintexupery.pseim.pseim.Pattern;
-import com.irtsaintexupery.pseim.pseim.PatternComponent;
-import com.irtsaintexupery.pseim.pseim.PatternLink;
-import com.irtsaintexupery.pseim.pseim.PatternPort;
-import com.irtsaintexupery.pseim.pseim.PseimPackage;
-import com.irtsaintexupery.pseim.seim.SeimPackage;
-import com.irtsaintexupery.xtext.pseim.services.PatternGrammarAccess;
-
 @SuppressWarnings("all")
 public class PatternSemanticSequencer extends AbstractDelegatingSemanticSequencer {
 

eclipse/plugins/com.irtsaintexupery.xtext.pseim.pattern/src-gen/com/irtsaintexupery/xtext/pseim/services/PatternGrammarAccess.java

@@ -453,15 +453,32 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cFIRSTFirstKeyword_2_0 = (Keyword)cFIRSTEnumLiteralDeclaration_2.eContents().get(0);
 		private final EnumLiteralDeclaration cROTATEEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
 		private final Keyword cROTATERotateKeyword_3_0 = (Keyword)cROTATEEnumLiteralDeclaration_3.eContents().get(0);
-		private final EnumLiteralDeclaration cSHIFTEnumLiteralDeclaration_4 = (EnumLiteralDeclaration)cAlternatives.eContents().get(4);
-		private final Keyword cSHIFTShiftKeyword_4_0 = (Keyword)cSHIFTEnumLiteralDeclaration_4.eContents().get(0);
+		private final EnumLiteralDeclaration cSHIFTCEnumLiteralDeclaration_4 = (EnumLiteralDeclaration)cAlternatives.eContents().get(4);
+		private final Keyword cSHIFTCShiftCKeyword_4_0 = (Keyword)cSHIFTCEnumLiteralDeclaration_4.eContents().get(0);
+		private final EnumLiteralDeclaration cSHIFTPEnumLiteralDeclaration_5 = (EnumLiteralDeclaration)cAlternatives.eContents().get(5);
+		private final Keyword cSHIFTPShiftPKeyword_5_0 = (Keyword)cSHIFTPEnumLiteralDeclaration_5.eContents().get(0);
+		private final EnumLiteralDeclaration cFLATTENCEnumLiteralDeclaration_6 = (EnumLiteralDeclaration)cAlternatives.eContents().get(6);
+		private final Keyword cFLATTENCFlattenCKeyword_6_0 = (Keyword)cFLATTENCEnumLiteralDeclaration_6.eContents().get(0);
+		private final EnumLiteralDeclaration cFORKCEnumLiteralDeclaration_7 = (EnumLiteralDeclaration)cAlternatives.eContents().get(7);
+		private final Keyword cFORKCForkCKeyword_7_0 = (Keyword)cFORKCEnumLiteralDeclaration_7.eContents().get(0);
+		private final EnumLiteralDeclaration cFORKPEnumLiteralDeclaration_8 = (EnumLiteralDeclaration)cAlternatives.eContents().get(8);
+		private final Keyword cFORKPForkPKeyword_8_0 = (Keyword)cFORKPEnumLiteralDeclaration_8.eContents().get(0);
+		private final EnumLiteralDeclaration cJOINCEnumLiteralDeclaration_9 = (EnumLiteralDeclaration)cAlternatives.eContents().get(9);
+		private final Keyword cJOINCJoinCKeyword_9_0 = (Keyword)cJOINCEnumLiteralDeclaration_9.eContents().get(0);
+		private final EnumLiteralDeclaration cJOINPEnumLiteralDeclaration_10 = (EnumLiteralDeclaration)cAlternatives.eContents().get(10);
+		private final Keyword cJOINPJoinPKeyword_10_0 = (Keyword)cJOINPEnumLiteralDeclaration_10.eContents().get(0);
+		private final EnumLiteralDeclaration cLASTEnumLiteralDeclaration_11 = (EnumLiteralDeclaration)cAlternatives.eContents().get(11);
+		private final Keyword cLASTLastKeyword_11_0 = (Keyword)cLASTEnumLiteralDeclaration_11.eContents().get(0);
 		
 		//enum LinkType:
-		//	TRANSPOSE='-{Transpose}->' | IDENTITY='-{Identity}->' | FIRST='-{First}->' | ROTATE='-{Rotate}->' |
-		//	SHIFT='-{Shift}->';
+		//	TRANSPOSE='-{Transpose}->' | IDENTITY='-{Identity}->' | FIRST='-{First}->' | ROTATE='-{Rotate}->'
+		//	| SHIFTC='-{ShiftC}->' | SHIFTP='-{ShiftP}->' | FLATTENC='-{FlattenC}->' | FORKC='-{ForkC}->' | FORKP='-{ForkP}->'
+		//	| JOINC='-{JoinC}->' | JOINP='-{JoinP}->' | LAST='-{Last}->';
 		public EnumRule getRule() { return rule; }
 		
-		//TRANSPOSE='-{Transpose}->' | IDENTITY='-{Identity}->' | FIRST='-{First}->' | ROTATE='-{Rotate}->' | SHIFT='-{Shift}->'
+		//TRANSPOSE='-{Transpose}->' | IDENTITY='-{Identity}->' | FIRST='-{First}->' | ROTATE='-{Rotate}->' | SHIFTC='-{ShiftC}->'
+		//| SHIFTP='-{ShiftP}->' | FLATTENC='-{FlattenC}->' | FORKC='-{ForkC}->' | FORKP='-{ForkP}->' | JOINC='-{JoinC}->' |
+		//JOINP='-{JoinP}->' | LAST='-{Last}->'
 		public Alternatives getAlternatives() { return cAlternatives; }
 		
 		//TRANSPOSE='-{Transpose}->'
@@ -488,11 +505,53 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder {
 		//'-{Rotate}->'
 		public Keyword getROTATERotateKeyword_3_0() { return cROTATERotateKeyword_3_0; }
 		
-		//SHIFT='-{Shift}->'
-		public EnumLiteralDeclaration getSHIFTEnumLiteralDeclaration_4() { return cSHIFTEnumLiteralDeclaration_4; }
+		//SHIFTC='-{ShiftC}->'
+		public EnumLiteralDeclaration getSHIFTCEnumLiteralDeclaration_4() { return cSHIFTCEnumLiteralDeclaration_4; }
 		
-		//'-{Shift}->'
-		public Keyword getSHIFTShiftKeyword_4_0() { return cSHIFTShiftKeyword_4_0; }
+		//'-{ShiftC}->'
+		public Keyword getSHIFTCShiftCKeyword_4_0() { return cSHIFTCShiftCKeyword_4_0; }
+		
+		//SHIFTP='-{ShiftP}->'
+		public EnumLiteralDeclaration getSHIFTPEnumLiteralDeclaration_5() { return cSHIFTPEnumLiteralDeclaration_5; }
+		
+		//'-{ShiftP}->'
+		public Keyword getSHIFTPShiftPKeyword_5_0() { return cSHIFTPShiftPKeyword_5_0; }
+		
+		//FLATTENC='-{FlattenC}->'
+		public EnumLiteralDeclaration getFLATTENCEnumLiteralDeclaration_6() { return cFLATTENCEnumLiteralDeclaration_6; }
+		
+		//'-{FlattenC}->'
+		public Keyword getFLATTENCFlattenCKeyword_6_0() { return cFLATTENCFlattenCKeyword_6_0; }
+		
+		//FORKC='-{ForkC}->'
+		public EnumLiteralDeclaration getFORKCEnumLiteralDeclaration_7() { return cFORKCEnumLiteralDeclaration_7; }
+		
+		//'-{ForkC}->'
+		public Keyword getFORKCForkCKeyword_7_0() { return cFORKCForkCKeyword_7_0; }
+		
+		//FORKP='-{ForkP}->'
+		public EnumLiteralDeclaration getFORKPEnumLiteralDeclaration_8() { return cFORKPEnumLiteralDeclaration_8; }
+		
+		//'-{ForkP}->'
+		public Keyword getFORKPForkPKeyword_8_0() { return cFORKPForkPKeyword_8_0; }
+		
+		//JOINC='-{JoinC}->'
+		public EnumLiteralDeclaration getJOINCEnumLiteralDeclaration_9() { return cJOINCEnumLiteralDeclaration_9; }
+		
+		//'-{JoinC}->'
+		public Keyword getJOINCJoinCKeyword_9_0() { return cJOINCJoinCKeyword_9_0; }
+		
+		//JOINP='-{JoinP}->'
+		public EnumLiteralDeclaration getJOINPEnumLiteralDeclaration_10() { return cJOINPEnumLiteralDeclaration_10; }
+		
+		//'-{JoinP}->'
+		public Keyword getJOINPJoinPKeyword_10_0() { return cJOINPJoinPKeyword_10_0; }
+		
+		//LAST='-{Last}->'
+		public EnumLiteralDeclaration getLASTEnumLiteralDeclaration_11() { return cLASTEnumLiteralDeclaration_11; }
+		
+		//'-{Last}->'
+		public Keyword getLASTLastKeyword_11_0() { return cLASTLastKeyword_11_0; }
 	}
 	public class PortDirectionElements extends AbstractEnumRuleElementFinder {
 		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "com.irtsaintexupery.xtext.pseim.Pattern.PortDirection");
@@ -660,8 +719,9 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder {
 	}
 	
 	//enum LinkType:
-	//	TRANSPOSE='-{Transpose}->' | IDENTITY='-{Identity}->' | FIRST='-{First}->' | ROTATE='-{Rotate}->' |
-	//	SHIFT='-{Shift}->';
+	//	TRANSPOSE='-{Transpose}->' | IDENTITY='-{Identity}->' | FIRST='-{First}->' | ROTATE='-{Rotate}->'
+	//	| SHIFTC='-{ShiftC}->' | SHIFTP='-{ShiftP}->' | FLATTENC='-{FlattenC}->' | FORKC='-{ForkC}->' | FORKP='-{ForkP}->'
+	//	| JOINC='-{JoinC}->' | JOINP='-{JoinP}->' | LAST='-{Last}->';
 	public LinkTypeElements getLinkTypeAccess() {
 		return eLinkType;
 	}

eclipse/plugins/com.irtsaintexupery.xtext.pseim.pattern/src/com/irtsaintexupery/xtext/pseim/GeneratePattern.mwe2

@@ -26,8 +26,8 @@ Workflow {
 		language = StandardLanguage {
 			name = "com.irtsaintexupery.xtext.pseim.Pattern"
 			fileExtensions = "pseimx"
-			referencedResource = "platform:/resource/com.irtsaintexupery.modelpattern/model/pseim.genmodel"
-			referencedResource = "platform:/resource/com.irtsaintexupery.modelpattern/model/seim.genmodel"
+			referencedResource = "platform:/resource/com.irtsaintexupery.pseim/model/pseim.genmodel"
+			referencedResource = "platform:/resource/com.irtsaintexupery.pseim/model/seim.genmodel"
 			
 			fragment = ecore2xtext.Ecore2XtextValueConverterServiceFragment2 auto-inject {}
 

eclipse/plugins/com.irtsaintexupery.xtext.pseim.pattern/src/com/irtsaintexupery/xtext/pseim/Pattern.xtext

@@ -38,7 +38,9 @@ PatternLink returns PatternLink:
 	;
 	
 enum LinkType returns LinkType:
-	TRANSPOSE = '-{Transpose}->' | IDENTITY = '-{Identity}->' | FIRST = '-{First}->' | ROTATE = '-{Rotate}->' | SHIFT = '-{Shift}->'
+	TRANSPOSE = '-{Transpose}->' | IDENTITY = '-{Identity}->' | FIRST = '-{First}->' | ROTATE = '-{Rotate}->' 
+	| SHIFTC = '-{ShiftC}->' | SHIFTP = '-{ShiftP}->' | FLATTENC = '-{FlattenC}->' | FORKC = '-{ForkC}->' | FORKP = '-{ForkP}->'
+	| JOINC = '-{JoinC}->' | JOINP = '-{JoinP}->' | LAST = '-{Last}->'  
 ;
 
 enum PortDirection returns seim::PortDirection:

eclipse/plugins/com.irtsaintexupery.xtext.pseim/src-gen/com/irtsaintexupery/xtext/serializer/PseimSemanticSequencer.java

@@ -3,18 +3,6 @@
  */
 package com.irtsaintexupery.xtext.serializer;
 
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.Action;
-import org.eclipse.xtext.Parameter;
-import org.eclipse.xtext.ParserRule;
-import org.eclipse.xtext.serializer.ISerializationContext;
-import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
-
 import com.google.inject.Inject;
 import com.irtsaintexupery.pseim.seim.BooleanProperty;
 import com.irtsaintexupery.pseim.seim.Component;
@@ -26,6 +14,16 @@ import com.irtsaintexupery.pseim.seim.ReferenceProperty;
 import com.irtsaintexupery.pseim.seim.SeimPackage;
 import com.irtsaintexupery.pseim.seim.StringProperty;
 import com.irtsaintexupery.xtext.services.PseimGrammarAccess;
+import java.util.Set;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.Action;
+import org.eclipse.xtext.Parameter;
+import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.serializer.ISerializationContext;
+import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
+import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
+import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
 
 @SuppressWarnings("all")
 public class PseimSemanticSequencer extends AbstractDelegatingSemanticSequencer {

eclipse/plugins/com.irtsaintexupery.xtext.pseim/src/com/irtsaintexupery/xtext/GeneratePseim.mwe2

@@ -12,15 +12,9 @@ Workflow {
 			project = StandardProjectConfig {
 				baseName = "com.irtsaintexupery.xtext.pseim"
 				rootPath = rootPath
-				runtimeTest = {
-					enabled = true
-				}
 				eclipsePlugin = {
 					enabled = true
 				}
-				eclipsePluginTest = {
-					enabled = true
-				}
 				createEclipseMetaData = true
 			}
 			code = {
@@ -32,7 +26,7 @@ Workflow {
 		language = StandardLanguage {
 			name = "com.irtsaintexupery.xtext.Pseim"
 			fileExtensions = "seimx"
-			referencedResource = "platform:/resource/com.irtsaintexupery.modelpattern/model/seim.genmodel"
+			referencedResource = "platform:/resource/com.irtsaintexupery.pseim/model/seim.genmodel"
 			
 			fragment = ecore2xtext.Ecore2XtextValueConverterServiceFragment2 auto-inject {}