From ae173853be4ce05eac62b523619705f4b93e1afa Mon Sep 17 00:00:00 2001
From: Sophie Coudert <sophie.coudert@telecom-paris.fr>
Date: Tue, 28 May 2024 16:35:09 +0200
Subject: [PATCH] debug in progress, suite ++

---
 .../tosysmlv2/AvatarFromSysML.java            |   16 +-
 .../tosysmlv2/AvatarFromSysMLLexer.java       |    4 +-
 .../tosysmlv2/AvatarFromSysMLParser.java      | 2057 +++++++++--------
 .../tosysmlv2/AvatarFromSysMLSymbols.java     |  313 +--
 .../tosysmlv2/javacup/AvatarFromSysML.jcup    |   10 +-
 5 files changed, 1213 insertions(+), 1187 deletions(-)

diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
index c5a88c8cc7..ba7cdb7f31 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
@@ -47,6 +47,8 @@ import avatartranslator.*;
 import avatartranslator.tosysmlv2.AvatarFromSysMLSyntax.*;
 import java_cup.runtime.ComplexSymbolFactory;
 
+import static java.lang.System.out;
+
 public class AvatarFromSysML {
     private AvatarSpecification avSpec;
     private StxModel stxSpec;
@@ -66,14 +68,18 @@ public class AvatarFromSysML {
     }
     private void addError(AvatarFromSysMLError _err) {
         errors.add(_err);
-        System.out.println(_err.toString());
+        out.println(_err.toString());
     }
     public void sysMLtoSpec(String _txt) {
         AvatarFromSysMLParser parser =
                 new AvatarFromSysMLParser(new AvatarFromSysMLLexer(new StringReader(_txt)),
                         new ComplexSymbolFactory());
-        stxSpec = parser.parseModel();
-        errors = stxSpec.getErrors();
+        try { stxSpec = parser.parseModel(); }
+        catch (java.lang.Exception e) {
+            e.printStackTrace(out);
+            return;
+        }
+/*        errors = stxSpec.getErrors();
         avSpec = new AvatarSpecification("FromSysMLV2_EXAMPLE_SPECIFICATION",null);
         transitionList.clear();
         signalMap.clear();
@@ -81,7 +87,7 @@ public class AvatarFromSysML {
         stateMap.clear();
         buildDataTypes();
         buildBlocks();
-/*        buildRelations();
+        buildRelations();
 */    }
 
     private AvatarBlock getBlock(StxBlock _b) {
@@ -320,7 +326,6 @@ public class AvatarFromSysML {
                         int asize = actions.size();
                         for (int k = 0; k < asize; k++) {
                             StxAction action = actions.get(k);
-                            System.out.println("$$$$ ACTION LINE " + action.getLeft().getLine() + ", TGT = " + action.getTarget() + ";");
                             if(action.getType() == AvatarFromSysMLSyntax.STXASSIGNACTION){
                                 String leftHandStr = extendIdent(action.getTarget(),blk);
                                 String rightHandStr;
@@ -484,7 +489,6 @@ public class AvatarFromSysML {
     }
     private String extendPath(String path, StxBlock b) {
         String type = getStxPathType(path, b);
-        System.out.println("$$$$$$$$ PATH : " + path);
         if (type.equals("Integer") || type.equals("Boolean")) return path;
         AvatarDataType adt = AvatarDataType.dataTypeMap.get(type);
         int size = adt.getFullSize() - 1;
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
index 44121af558..dc0263ef0b 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 28/05/2024 16:03 */
+/* The following code was generated by JFlex 1.4.3 on 28/05/2024 16:29 */
 
 package avatartranslator.tosysmlv2;
 import java_cup.runtime.*;
@@ -9,7 +9,7 @@ import avatartranslator.tosysmlv2.AvatarFromSysMLSyntax.*;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 28/05/2024 16:03 from the specification file
+ * on 28/05/2024 16:29 from the specification file
  * <tt>__AvatarFromSysMLLexer__.jflex</tt>
  */
 public class AvatarFromSysMLLexer implements java_cup.runtime.Scanner {
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
index 291069709a..a1d57a0e01 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
@@ -38,103 +38,103 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
   /** Production table. */
   protected static final short _production_table[][] = 
     unpackFromStrings(new String[] {
-    "\000\u0138\000\002\003\007\000\002\002\004\000\002\003" +
-    "\006\000\002\004\003\000\002\004\004\000\002\005\003" +
-    "\000\002\005\003\000\002\005\003\000\002\005\003\000" +
-    "\002\005\003\000\002\005\003\000\002\005\003\000\002" +
-    "\005\003\000\002\006\003\000\002\006\003\000\002\007" +
-    "\003\000\002\007\003\000\002\010\013\000\002\011\003" +
-    "\000\002\011\005\000\002\012\006\000\002\012\005\000" +
-    "\002\013\007\000\002\014\003\000\002\014\004\000\002" +
-    "\015\007\000\002\002\003\000\002\002\003\000\002\002" +
-    "\003\000\002\016\003\000\002\016\003\000\002\016\003" +
-    "\000\002\017\006\000\002\031\011\000\002\020\006\000" +
-    "\002\032\011\000\002\021\006\000\002\033\011\000\002" +
-    "\022\003\000\002\022\005\000\002\023\003\000\002\023" +
-    "\003\000\002\023\003\000\002\023\003\000\002\023\003" +
-    "\000\002\024\005\000\002\025\005\000\002\026\005\000" +
-    "\002\027\005\000\002\030\005\000\002\034\003\000\002" +
-    "\034\003\000\002\034\003\000\002\035\016\000\002\036" +
-    "\016\000\002\037\016\000\002\040\003\000\002\040\003" +
-    "\000\002\041\014\000\002\041\014\000\002\042\014\000" +
-    "\002\042\014\000\002\043\003\000\002\043\003\000\002" +
-    "\044\004\000\002\052\010\000\002\046\004\000\002\046" +
-    "\005\000\002\046\005\000\002\047\012\000\002\047\010" +
-    "\000\002\045\004\000\002\045\005\000\002\045\005\000" +
-    "\002\053\011\000\002\053\011\000\002\050\004\000\002" +
-    "\050\004\000\002\051\007\000\002\054\004\000\002\054" +
-    "\004\000\002\055\007\000\002\056\004\000\002\056\004" +
-    "\000\002\057\003\000\002\057\003\000\002\057\003\000" +
-    "\002\057\003\000\002\057\003\000\002\057\003\000\002" +
-    "\057\003\000\002\060\004\000\002\060\006\000\002\062" +
-    "\006\000\002\061\004\000\002\061\006\000\002\077\007" +
-    "\000\002\063\003\000\002\063\003\000\002\064\005\000" +
-    "\002\064\006\000\002\075\006\000\002\065\005\000\002" +
-    "\065\006\000\002\076\006\000\002\066\003\000\002\066" +
-    "\004\000\002\067\003\000\002\067\006\000\002\070\007" +
-    "\000\002\070\007\000\002\071\013\000\002\071\007\000" +
-    "\002\072\006\000\002\072\005\000\002\072\004\000\002" +
-    "\166\007\000\002\073\003\000\002\073\004\000\002\074" +
-    "\003\000\002\074\003\000\002\100\003\000\002\100\003" +
-    "\000\002\100\003\000\002\100\003\000\002\100\003\000" +
-    "\002\100\003\000\002\100\003\000\002\100\003\000\002" +
-    "\100\003\000\002\100\003\000\002\100\003\000\002\100" +
-    "\003\000\002\101\004\000\002\101\010\000\002\101\011" +
-    "\000\002\152\007\000\002\102\004\000\002\102\010\000" +
-    "\002\102\011\000\002\153\006\000\002\103\004\000\002" +
-    "\103\010\000\002\154\007\000\002\104\004\000\002\104" +
-    "\010\000\002\104\011\000\002\155\006\000\002\105\004" +
-    "\000\002\105\010\000\002\105\011\000\002\156\006\000" +
-    "\002\106\013\000\002\106\013\000\002\106\011\000\002" +
-    "\157\006\000\002\107\011\000\002\107\013\000\002\107" +
-    "\013\000\002\160\006\000\002\110\011\000\002\161\006" +
-    "\000\002\111\011\000\002\162\006\000\002\112\011\000" +
-    "\002\112\010\000\002\112\004\000\002\163\006\000\002" +
-    "\113\011\000\002\113\010\000\002\113\004\000\002\164" +
-    "\006\000\002\114\011\000\002\114\010\000\002\114\004" +
-    "\000\002\165\006\000\002\115\007\000\002\115\005\000" +
-    "\002\116\005\000\002\117\003\000\002\117\005\000\002" +
-    "\120\013\000\002\120\003\000\002\121\003\000\002\121" +
-    "\003\000\002\121\003\000\002\121\003\000\002\121\003" +
-    "\000\002\121\003\000\002\122\003\000\002\122\005\000" +
-    "\002\144\004\000\002\125\005\000\002\145\004\000\002" +
-    "\126\005\000\002\146\004\000\002\127\005\000\002\147" +
-    "\004\000\002\130\005\000\002\150\004\000\002\131\005" +
-    "\000\002\151\004\000\002\123\003\000\002\123\005\000" +
-    "\002\124\003\000\002\124\003\000\002\124\003\000\002" +
-    "\124\003\000\002\124\003\000\002\124\003\000\002\124" +
-    "\003\000\002\132\005\000\002\133\005\000\002\134\003" +
-    "\000\002\134\003\000\002\136\010\000\002\137\007\000" +
-    "\002\137\006\000\002\137\004\000\002\137\007\000\002" +
-    "\137\006\000\002\167\004\000\002\140\005\000\002\141" +
-    "\007\000\002\142\007\000\002\143\007\000\002\201\003" +
-    "\000\002\201\005\000\002\170\012\000\002\170\012\000" +
-    "\002\171\005\000\002\207\003\000\002\210\003\000\002" +
-    "\210\005\000\002\172\005\000\002\135\010\000\002\173" +
-    "\012\000\002\173\012\000\002\174\011\000\002\175\006" +
-    "\000\002\175\007\000\002\175\007\000\002\175\010\000" +
-    "\002\202\007\000\002\202\013\000\002\176\005\000\002" +
-    "\176\006\000\002\176\005\000\002\176\006\000\002\211" +
-    "\006\000\002\212\006\000\002\204\010\000\002\204\006" +
-    "\000\002\177\007\000\002\177\005\000\002\200\007\000" +
-    "\002\200\006\000\002\206\003\000\002\205\004\000\002" +
-    "\205\004\000\002\213\013\000\002\214\010\000\002\214" +
-    "\006\000\002\215\006\000\002\215\004\000\002\216\012" +
-    "\000\002\203\003\000\002\203\004\000\002\217\003\000" +
-    "\002\217\003\000\002\217\003\000\002\220\010\000\002" +
-    "\221\010\000\002\222\010\000\002\223\003\000\002\223" +
-    "\003\000\002\223\003\000\002\224\003\000\002\226\003" +
-    "\000\002\226\003\000\002\227\005\000\002\227\005\000" +
-    "\002\227\005\000\002\227\005\000\002\227\005\000\002" +
-    "\227\004\000\002\227\005\000\002\227\005\000\002\227" +
-    "\004\000\002\227\005\000\002\227\005\000\002\227\005" +
-    "\000\002\227\005\000\002\227\005\000\002\227\005\000" +
-    "\002\227\005\000\002\227\003\000\002\227\003\000\002" +
-    "\230\003\000\002\230\005\000\002\225\004\000\002\225" +
-    "\005\000\002\231\004\000\002\236\003\000\002\236\005" +
-    "\000\002\233\003\000\002\232\003\000\002\232\003\000" +
-    "\002\232\003\000\002\234\004\000\002\234\005\000\002" +
-    "\235\004" });
+    "\000\u0139\000\002\004\007\000\002\002\004\000\002\004" +
+    "\006\000\002\005\003\000\002\005\004\000\002\006\003" +
+    "\000\002\006\003\000\002\006\003\000\002\006\003\000" +
+    "\002\006\003\000\002\006\003\000\002\006\003\000\002" +
+    "\006\003\000\002\007\003\000\002\007\003\000\002\010" +
+    "\003\000\002\010\003\000\002\011\013\000\002\012\003" +
+    "\000\002\012\005\000\002\013\006\000\002\013\005\000" +
+    "\002\014\007\000\002\015\003\000\002\015\004\000\002" +
+    "\016\007\000\002\002\003\000\002\002\003\000\002\002" +
+    "\003\000\002\017\003\000\002\017\003\000\002\017\003" +
+    "\000\002\020\006\000\002\032\011\000\002\021\006\000" +
+    "\002\033\011\000\002\022\006\000\002\034\011\000\002" +
+    "\023\003\000\002\023\005\000\002\024\003\000\002\024" +
+    "\003\000\002\024\003\000\002\024\003\000\002\024\003" +
+    "\000\002\025\005\000\002\026\005\000\002\027\005\000" +
+    "\002\030\005\000\002\031\005\000\002\035\003\000\002" +
+    "\035\003\000\002\035\003\000\002\036\016\000\002\037" +
+    "\016\000\002\040\016\000\002\041\003\000\002\041\003" +
+    "\000\002\042\014\000\002\042\014\000\002\043\014\000" +
+    "\002\043\014\000\002\044\003\000\002\044\003\000\002" +
+    "\045\004\000\002\053\010\000\002\047\004\000\002\047" +
+    "\005\000\002\047\005\000\002\050\012\000\002\050\010" +
+    "\000\002\046\004\000\002\046\005\000\002\046\005\000" +
+    "\002\054\011\000\002\054\011\000\002\051\004\000\002" +
+    "\051\004\000\002\052\007\000\002\055\004\000\002\055" +
+    "\004\000\002\056\007\000\002\057\004\000\002\057\004" +
+    "\000\002\060\003\000\002\060\003\000\002\060\003\000" +
+    "\002\060\003\000\002\060\003\000\002\060\003\000\002" +
+    "\060\003\000\002\061\004\000\002\061\006\000\002\063" +
+    "\006\000\002\062\004\000\002\062\006\000\002\100\007" +
+    "\000\002\064\003\000\002\064\003\000\002\065\005\000" +
+    "\002\065\006\000\002\076\006\000\002\066\005\000\002" +
+    "\066\006\000\002\077\006\000\002\067\003\000\002\067" +
+    "\004\000\002\070\003\000\002\070\006\000\002\071\007" +
+    "\000\002\071\007\000\002\072\013\000\002\072\007\000" +
+    "\002\073\006\000\002\073\005\000\002\073\004\000\002" +
+    "\167\007\000\002\074\003\000\002\074\004\000\002\075" +
+    "\003\000\002\075\003\000\002\101\003\000\002\101\003" +
+    "\000\002\101\003\000\002\101\003\000\002\101\003\000" +
+    "\002\101\003\000\002\101\003\000\002\101\003\000\002" +
+    "\101\003\000\002\101\003\000\002\101\003\000\002\101" +
+    "\003\000\002\102\004\000\002\102\010\000\002\102\011" +
+    "\000\002\153\007\000\002\103\004\000\002\103\010\000" +
+    "\002\103\011\000\002\154\006\000\002\104\004\000\002" +
+    "\104\010\000\002\155\007\000\002\105\004\000\002\105" +
+    "\010\000\002\105\011\000\002\156\006\000\002\106\004" +
+    "\000\002\106\010\000\002\106\011\000\002\157\006\000" +
+    "\002\107\013\000\002\107\013\000\002\107\011\000\002" +
+    "\160\006\000\002\110\011\000\002\110\013\000\002\110" +
+    "\013\000\002\161\006\000\002\111\011\000\002\162\006" +
+    "\000\002\112\011\000\002\163\006\000\002\113\011\000" +
+    "\002\113\010\000\002\113\004\000\002\164\006\000\002" +
+    "\114\011\000\002\114\010\000\002\114\004\000\002\165" +
+    "\006\000\002\115\011\000\002\115\010\000\002\115\004" +
+    "\000\002\166\006\000\002\116\007\000\002\116\005\000" +
+    "\002\117\005\000\002\120\003\000\002\120\005\000\002" +
+    "\121\013\000\002\121\003\000\002\122\003\000\002\122" +
+    "\003\000\002\122\003\000\002\122\003\000\002\122\003" +
+    "\000\002\122\003\000\002\123\003\000\002\123\005\000" +
+    "\002\145\004\000\002\126\005\000\002\146\004\000\002" +
+    "\127\005\000\002\147\004\000\002\130\005\000\002\150" +
+    "\004\000\002\131\005\000\002\151\004\000\002\132\005" +
+    "\000\002\152\004\000\002\124\003\000\002\124\005\000" +
+    "\002\125\003\000\002\125\003\000\002\125\003\000\002" +
+    "\125\003\000\002\125\003\000\002\125\003\000\002\125" +
+    "\003\000\002\133\005\000\002\134\005\000\002\135\003" +
+    "\000\002\135\003\000\002\137\010\000\002\140\007\000" +
+    "\002\140\006\000\002\140\004\000\002\140\007\000\002" +
+    "\140\006\000\002\170\004\000\002\141\005\000\002\142" +
+    "\007\000\002\143\007\000\002\144\007\000\002\202\003" +
+    "\000\002\202\005\000\002\171\012\000\002\171\012\000" +
+    "\002\172\005\000\002\210\003\000\002\211\003\000\002" +
+    "\211\005\000\002\173\005\000\002\136\010\000\002\174" +
+    "\012\000\002\174\012\000\002\175\011\000\002\176\006" +
+    "\000\002\176\007\000\002\176\007\000\002\176\010\000" +
+    "\002\203\007\000\002\203\013\000\002\177\005\000\002" +
+    "\177\006\000\002\177\005\000\002\177\006\000\002\212" +
+    "\006\000\002\213\006\000\002\205\010\000\002\205\006" +
+    "\000\002\200\007\000\002\200\005\000\002\201\007\000" +
+    "\002\201\006\000\002\003\003\000\002\207\003\000\002" +
+    "\206\004\000\002\206\004\000\002\214\013\000\002\215" +
+    "\010\000\002\215\006\000\002\216\006\000\002\216\004" +
+    "\000\002\217\012\000\002\204\003\000\002\204\004\000" +
+    "\002\220\003\000\002\220\003\000\002\220\003\000\002" +
+    "\221\010\000\002\222\010\000\002\223\010\000\002\224" +
+    "\003\000\002\224\003\000\002\224\003\000\002\225\003" +
+    "\000\002\227\003\000\002\227\003\000\002\230\005\000" +
+    "\002\230\005\000\002\230\005\000\002\230\005\000\002" +
+    "\230\005\000\002\230\004\000\002\230\005\000\002\230" +
+    "\005\000\002\230\004\000\002\230\005\000\002\230\005" +
+    "\000\002\230\005\000\002\230\005\000\002\230\005\000" +
+    "\002\230\005\000\002\230\005\000\002\230\003\000\002" +
+    "\230\003\000\002\231\003\000\002\231\005\000\002\226" +
+    "\004\000\002\226\005\000\002\232\004\000\002\237\003" +
+    "\000\002\237\005\000\002\234\003\000\002\233\003\000" +
+    "\002\233\003\000\002\233\003\000\002\235\004\000\002" +
+    "\235\005\000\002\236\004" });
 
   /** Access to production table. */
   @Override
@@ -143,7 +143,7 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
   /** Parse-action table. */
   protected static final short[][] _action_table = 
     unpackFromStrings(new String[] {
-    "\000\u0317\000\004\260\005\001\002\000\004\002\u0319\001" +
+    "\000\u0318\000\004\260\005\001\002\000\004\002\u031a\001" +
     "\002\000\004\141\006\001\002\000\004\014\007\001\002" +
     "\000\014\015\030\164\020\166\040\232\010\262\046\001" +
     "\002\000\014\015\ufffc\164\ufffc\166\ufffc\232\ufffc\262\ufffc" +
@@ -152,11 +152,11 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\262\ufff5\001\002\000\014\015\uffe2\164\uffe2\166\uffe2\232" +
     "\uffe2\262\uffe2\001\002\000\014\015\uffe3\164\uffe3\166\uffe3" +
     "\232\uffe3\262\uffe3\001\002\000\014\015\uffc3\164\uffc3\166" +
-    "\uffc3\232\uffc3\262\uffc3\001\002\000\014\025\u02fc\026\u02ff" +
-    "\027\u02f6\031\u02fd\032\u02f5\001\002\000\014\015\uffc9\164" +
-    "\uffc9\166\uffc9\232\uffc9\262\uffc9\001\002\000\004\201\u0312" +
-    "\001\002\000\014\025\u02fc\026\u02ff\027\u02f6\031\u02fd\032" +
-    "\u02f5\001\002\000\014\015\ufffe\164\020\166\040\232\010" +
+    "\uffc3\232\uffc3\262\uffc3\001\002\000\014\025\u02fd\026\u0300" +
+    "\027\u02f7\031\u02fe\032\u02f6\001\002\000\014\015\uffc9\164" +
+    "\uffc9\166\uffc9\232\uffc9\262\uffc9\001\002\000\004\201\u0313" +
+    "\001\002\000\014\025\u02fd\026\u0300\027\u02f7\031\u02fe\032" +
+    "\u02f6\001\002\000\014\015\ufffe\164\020\166\040\232\010" +
     "\262\046\001\002\000\014\015\uffce\164\uffce\166\uffce\232" +
     "\uffce\262\uffce\001\002\000\014\015\ufffa\164\ufffa\166\ufffa" +
     "\232\ufffa\262\ufffa\001\002\000\014\015\uffcf\164\uffcf\166" +
@@ -164,12 +164,12 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\166\uffc8\232\uffc8\262\uffc8\001\002\000\014\015\uffcd\164" +
     "\uffcd\166\uffcd\232\uffcd\262\uffcd\001\002\000\004\002\uffff" +
     "\001\002\000\014\015\uffc2\164\uffc2\166\uffc2\232\uffc2\262" +
-    "\uffc2\001\002\000\014\025\u02fc\026\u02ff\027\u02f6\031\u02fd" +
-    "\032\u02f5\001\002\000\006\014\u02e9\017\u02e8\001\002\000" +
+    "\uffc2\001\002\000\014\025\u02fd\026\u0300\027\u02f7\031\u02fe" +
+    "\032\u02f6\001\002\000\006\014\u02ea\017\u02e9\001\002\000" +
     "\014\015\ufff7\164\ufff7\166\ufff7\232\ufff7\262\ufff7\001\002" +
-    "\000\006\164\275\265\u02d8\001\002\000\014\015\ufffb\164" +
-    "\ufffb\166\ufffb\232\ufffb\262\ufffb\001\002\000\004\014\u02d1" +
-    "\001\002\000\004\020\u02b6\001\002\000\020\015\163\145" +
+    "\000\006\164\275\265\u02d9\001\002\000\014\015\ufffb\164" +
+    "\ufffb\166\ufffb\232\ufffb\262\ufffb\001\002\000\004\014\u02d2" +
+    "\001\002\000\004\020\u02b7\001\002\000\020\015\163\145" +
     "\172\164\156\171\162\215\153\262\200\270\155\001\002" +
     "\000\004\015\151\001\002\000\014\015\ufff6\164\ufff6\166" +
     "\ufff6\232\ufff6\262\ufff6\001\002\000\014\015\uffe4\164\uffe4" +
@@ -216,23 +216,23 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\054\147\001\002\000\006\014\uffb6\017\uffb6\001\002\000" +
     "\006\164\uffc0\265\uffc0\001\002\000\004\002\001\001\002" +
     "\000\020\015\uff9f\145\uff9f\164\uff9f\171\uff9f\215\uff9f\262" +
-    "\uff9f\270\uff9f\001\002\000\004\307\u02b2\001\002\000\020" +
+    "\uff9f\270\uff9f\001\002\000\004\307\u02b3\001\002\000\020" +
     "\015\uffa8\145\uffa8\164\uffa8\171\uffa8\215\uffa8\262\uffa8\270" +
-    "\uffa8\001\002\000\004\164\u02ae\001\002\000\004\141\u02ab" +
+    "\uffa8\001\002\000\004\164\u02af\001\002\000\004\141\u02ac" +
     "\001\002\000\020\015\uffa9\145\uffa9\164\uffa9\171\uffa9\215" +
-    "\uffa9\262\uffa9\270\uffa9\001\002\000\006\017\u02a7\023\u02a8" +
+    "\uffa9\262\uffa9\270\uffa9\001\002\000\006\017\u02a8\023\u02a9" +
     "\001\002\000\020\015\uffac\145\uffac\164\uffac\171\uffac\215" +
-    "\uffac\262\uffac\270\uffac\001\002\000\004\141\u02a4\001\002" +
+    "\uffac\262\uffac\270\uffac\001\002\000\004\141\u02a5\001\002" +
     "\000\024\015\uffb2\145\uffb2\164\uffb2\166\uffb2\171\uffb2\215" +
-    "\uffb2\232\uffb2\262\uffb2\270\uffb2\001\002\000\004\014\u0299" +
-    "\001\002\000\020\015\u0297\145\172\164\156\171\162\215" +
+    "\uffb2\232\uffb2\262\uffb2\270\uffb2\001\002\000\004\014\u029a" +
+    "\001\002\000\020\015\u0298\145\172\164\156\171\162\215" +
     "\153\262\200\270\155\001\002\000\020\015\uffab\145\uffab" +
     "\164\uffab\171\uffab\215\uffab\262\uffab\270\uffab\001\002\000" +
     "\024\015\uffb1\145\uffb1\164\uffb1\166\uffb1\171\uffb1\215\uffb1" +
     "\232\uffb1\262\uffb1\270\uffb1\001\002\000\020\015\uffa0\145" +
     "\uffa0\164\uffa0\171\uffa0\215\uffa0\262\uffa0\270\uffa0\001\002" +
     "\000\020\015\uffaa\145\uffaa\164\uffaa\171\uffaa\215\uffaa\262" +
-    "\uffaa\270\uffaa\001\002\000\004\141\u0294\001\002\000\006" +
+    "\uffaa\270\uffaa\001\002\000\004\141\u0295\001\002\000\006" +
     "\014\312\017\311\001\002\000\004\014\273\001\002\000" +
     "\020\015\uffad\145\uffad\164\uffad\171\uffad\215\uffad\262\uffad" +
     "\270\uffad\001\002\000\006\017\217\023\220\001\002\000" +
@@ -250,96 +250,96 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\001\002\000\020\015\uff94\145\uff94\164\uff94\171\uff94\215" +
     "\uff94\262\uff94\270\uff94\001\002\000\020\015\uffa3\145\uffa3" +
     "\164\uffa3\171\uffa3\215\uffa3\262\uffa3\270\uffa3\001\002\000" +
-    "\016\004\222\005\225\012\226\141\223\251\231\335\221" +
-    "\001\002\000\016\004\222\005\225\012\226\141\223\251" +
-    "\231\335\221\001\002\000\044\011\ufed9\013\ufed9\016\ufed9" +
-    "\017\ufed9\024\ufed9\155\ufed9\255\ufed9\334\ufed9\335\ufed9\336" +
-    "\ufed9\337\ufed9\340\ufed9\341\ufed9\342\ufed9\343\ufed9\344\ufed9" +
-    "\345\ufed9\001\002\000\046\011\ufed7\013\ufed7\016\ufed7\017" +
-    "\ufed7\021\270\024\ufed7\155\ufed7\255\ufed7\334\ufed7\335\ufed7" +
-    "\336\ufed7\337\ufed7\340\ufed7\341\ufed7\342\ufed7\343\ufed7\344" +
-    "\ufed7\345\ufed7\001\002\000\044\011\ufeea\013\ufeea\016\ufeea" +
-    "\017\ufeea\024\ufeea\155\ufeea\255\ufeea\334\ufeea\335\ufeea\336" +
-    "\ufeea\337\ufeea\340\ufeea\341\ufeea\342\ufeea\343\ufeea\344\ufeea" +
-    "\345\ufeea\001\002\000\044\011\ufed8\013\ufed8\016\ufed8\017" +
-    "\ufed8\024\ufed8\155\ufed8\255\ufed8\334\ufed8\335\ufed8\336\ufed8" +
-    "\337\ufed8\340\ufed8\341\ufed8\342\ufed8\343\ufed8\344\ufed8\345" +
-    "\ufed8\001\002\000\016\004\222\005\225\012\226\141\223" +
-    "\251\231\335\221\001\002\000\036\011\241\017\265\155" +
-    "\234\255\246\334\240\335\233\336\235\337\242\340\236" +
-    "\341\237\342\245\343\243\344\247\345\244\001\002\000" +
-    "\044\011\ufeeb\013\ufeeb\016\ufeeb\017\ufeeb\024\ufeeb\155\ufeeb" +
-    "\255\ufeeb\334\ufeeb\335\ufeeb\336\ufeeb\337\ufeeb\340\ufeeb\341" +
-    "\ufeeb\342\ufeeb\343\ufeeb\344\ufeeb\345\ufeeb\001\002\000\016" +
-    "\004\222\005\225\012\226\141\223\251\231\335\221\001" +
-    "\002\000\044\011\241\013\ufee1\016\ufee1\017\ufee1\024\ufee1" +
-    "\155\ufee1\255\ufee1\334\240\335\233\336\235\337\242\340" +
-    "\236\341\237\342\245\343\243\344\247\345\244\001\002" +
-    "\000\016\004\222\005\225\012\226\141\223\251\231\335" +
-    "\221\001\002\000\016\004\222\005\225\012\226\141\223" +
-    "\251\231\335\221\001\002\000\016\004\222\005\225\012" +
-    "\226\141\223\251\231\335\221\001\002\000\016\004\222" +
-    "\005\225\012\226\141\223\251\231\335\221\001\002\000" +
-    "\016\004\222\005\225\012\226\141\223\251\231\335\221" +
-    "\001\002\000\016\004\222\005\225\012\226\141\223\251" +
-    "\231\335\221\001\002\000\016\004\222\005\225\012\226" +
-    "\141\223\251\231\335\221\001\002\000\016\004\222\005" +
-    "\225\012\226\141\223\251\231\335\221\001\002\000\016" +
-    "\004\222\005\225\012\226\141\223\251\231\335\221\001" +
-    "\002\000\016\004\222\005\225\012\226\141\223\251\231" +
-    "\335\221\001\002\000\016\004\222\005\225\012\226\141" +
-    "\223\251\231\335\221\001\002\000\016\004\222\005\225" +
-    "\012\226\141\223\251\231\335\221\001\002\000\016\004" +
-    "\222\005\225\012\226\141\223\251\231\335\221\001\002" +
-    "\000\034\011\ufede\013\ufede\016\ufede\017\ufede\024\ufede\155" +
-    "\ufede\255\ufede\334\240\335\233\336\235\337\242\340\236" +
-    "\341\ufede\001\002\000\044\011\241\013\ufee3\016\ufee3\017" +
-    "\ufee3\024\ufee3\155\234\255\ufee3\334\240\335\233\336\235" +
-    "\337\242\340\236\341\237\342\245\343\243\344\247\345" +
-    "\244\001\002\000\034\011\ufee0\013\ufee0\016\ufee0\017\ufee0" +
-    "\024\ufee0\155\ufee0\255\ufee0\334\240\335\233\336\235\337" +
-    "\242\340\236\341\ufee0\001\002\000\034\011\ufedd\013\ufedd" +
-    "\016\ufedd\017\ufedd\024\ufedd\155\ufedd\255\ufedd\334\240\335" +
-    "\233\336\235\337\242\340\236\341\ufedd\001\002\000\034" +
-    "\011\ufedf\013\ufedf\016\ufedf\017\ufedf\024\ufedf\155\ufedf\255" +
-    "\ufedf\334\240\335\233\336\235\337\242\340\236\341\ufedf" +
-    "\001\002\000\044\011\ufee6\013\ufee6\016\ufee6\017\ufee6\024" +
-    "\ufee6\155\ufee6\255\ufee6\334\ufee6\335\ufee6\336\ufee6\337\ufee6" +
-    "\340\ufee6\341\ufee6\342\ufee6\343\ufee6\344\ufee6\345\ufee6\001" +
-    "\002\000\044\011\ufedc\013\ufedc\016\ufedc\017\ufedc\024\ufedc" +
-    "\155\ufedc\255\ufedc\334\240\335\233\336\235\337\242\340" +
-    "\236\341\ufedc\342\245\343\243\344\247\345\244\001\002" +
-    "\000\044\011\ufee9\013\ufee9\016\ufee9\017\ufee9\024\ufee9\155" +
-    "\ufee9\255\ufee9\334\ufee9\335\ufee9\336\235\337\242\340\236" +
-    "\341\ufee9\342\ufee9\343\ufee9\344\ufee9\345\ufee9\001\002\000" +
-    "\044\011\ufedb\013\ufedb\016\ufedb\017\ufedb\024\ufedb\155\ufedb" +
-    "\255\ufedb\334\240\335\233\336\235\337\242\340\236\341" +
-    "\ufedb\342\245\343\243\344\247\345\244\001\002\000\044" +
+    "\016\004\222\005\224\012\226\141\223\251\230\335\221" +
+    "\001\002\000\016\004\222\005\224\012\226\141\223\251" +
+    "\230\335\221\001\002\000\044\011\ufed8\013\ufed8\016\ufed8" +
+    "\017\ufed8\024\ufed8\155\ufed8\255\ufed8\334\ufed8\335\ufed8\336" +
+    "\ufed8\337\ufed8\340\ufed8\341\ufed8\342\ufed8\343\ufed8\344\ufed8" +
+    "\345\ufed8\001\002\000\046\011\ufed6\013\ufed6\016\ufed6\017" +
+    "\ufed6\021\270\024\ufed6\155\ufed6\255\ufed6\334\ufed6\335\ufed6" +
+    "\336\ufed6\337\ufed6\340\ufed6\341\ufed6\342\ufed6\343\ufed6\344" +
+    "\ufed6\345\ufed6\001\002\000\044\011\ufed7\013\ufed7\016\ufed7" +
+    "\017\ufed7\024\ufed7\155\ufed7\255\ufed7\334\ufed7\335\ufed7\336" +
+    "\ufed7\337\ufed7\340\ufed7\341\ufed7\342\ufed7\343\ufed7\344\ufed7" +
+    "\345\ufed7\001\002\000\044\011\ufee9\013\ufee9\016\ufee9\017" +
+    "\ufee9\024\ufee9\155\ufee9\255\ufee9\334\ufee9\335\ufee9\336\ufee9" +
+    "\337\ufee9\340\ufee9\341\ufee9\342\ufee9\343\ufee9\344\ufee9\345" +
+    "\ufee9\001\002\000\016\004\222\005\224\012\226\141\223" +
+    "\251\230\335\221\001\002\000\036\011\240\017\265\155" +
+    "\234\255\246\334\241\335\233\336\236\337\243\340\235" +
+    "\341\237\342\245\343\242\344\247\345\244\001\002\000" +
+    "\016\004\222\005\224\012\226\141\223\251\230\335\221" +
+    "\001\002\000\044\011\ufeea\013\ufeea\016\ufeea\017\ufeea\024" +
+    "\ufeea\155\ufeea\255\ufeea\334\ufeea\335\ufeea\336\ufeea\337\ufeea" +
+    "\340\ufeea\341\ufeea\342\ufeea\343\ufeea\344\ufeea\345\ufeea\001" +
+    "\002\000\044\011\240\013\ufee0\016\ufee0\017\ufee0\024\ufee0" +
+    "\155\ufee0\255\ufee0\334\241\335\233\336\236\337\243\340" +
+    "\235\341\237\342\245\343\242\344\247\345\244\001\002" +
+    "\000\016\004\222\005\224\012\226\141\223\251\230\335" +
+    "\221\001\002\000\016\004\222\005\224\012\226\141\223" +
+    "\251\230\335\221\001\002\000\016\004\222\005\224\012" +
+    "\226\141\223\251\230\335\221\001\002\000\016\004\222" +
+    "\005\224\012\226\141\223\251\230\335\221\001\002\000" +
+    "\016\004\222\005\224\012\226\141\223\251\230\335\221" +
+    "\001\002\000\016\004\222\005\224\012\226\141\223\251" +
+    "\230\335\221\001\002\000\016\004\222\005\224\012\226" +
+    "\141\223\251\230\335\221\001\002\000\016\004\222\005" +
+    "\224\012\226\141\223\251\230\335\221\001\002\000\016" +
+    "\004\222\005\224\012\226\141\223\251\230\335\221\001" +
+    "\002\000\016\004\222\005\224\012\226\141\223\251\230" +
+    "\335\221\001\002\000\016\004\222\005\224\012\226\141" +
+    "\223\251\230\335\221\001\002\000\016\004\222\005\224" +
+    "\012\226\141\223\251\230\335\221\001\002\000\016\004" +
+    "\222\005\224\012\226\141\223\251\230\335\221\001\002" +
+    "\000\034\011\ufedd\013\ufedd\016\ufedd\017\ufedd\024\ufedd\155" +
+    "\ufedd\255\ufedd\334\241\335\233\336\236\337\243\340\235" +
+    "\341\ufedd\001\002\000\044\011\240\013\ufee2\016\ufee2\017" +
+    "\ufee2\024\ufee2\155\234\255\ufee2\334\241\335\233\336\236" +
+    "\337\243\340\235\341\237\342\245\343\242\344\247\345" +
+    "\244\001\002\000\034\011\ufedf\013\ufedf\016\ufedf\017\ufedf" +
+    "\024\ufedf\155\ufedf\255\ufedf\334\241\335\233\336\236\337" +
+    "\243\340\235\341\ufedf\001\002\000\034\011\ufedc\013\ufedc" +
+    "\016\ufedc\017\ufedc\024\ufedc\155\ufedc\255\ufedc\334\241\335" +
+    "\233\336\236\337\243\340\235\341\ufedc\001\002\000\044" +
     "\011\ufee5\013\ufee5\016\ufee5\017\ufee5\024\ufee5\155\ufee5\255" +
     "\ufee5\334\ufee5\335\ufee5\336\ufee5\337\ufee5\340\ufee5\341\ufee5" +
-    "\342\ufee5\343\ufee5\344\ufee5\345\ufee5\001\002\000\044\011" +
-    "\ufee7\013\ufee7\016\ufee7\017\ufee7\024\ufee7\155\ufee7\255\ufee7" +
-    "\334\ufee7\335\ufee7\336\ufee7\337\ufee7\340\ufee7\341\ufee7\342" +
-    "\ufee7\343\ufee7\344\ufee7\345\ufee7\001\002\000\044\011\241" +
-    "\013\ufee2\016\ufee2\017\ufee2\024\ufee2\155\ufee2\255\ufee2\334" +
-    "\240\335\233\336\235\337\242\340\236\341\237\342\245" +
-    "\343\243\344\247\345\244\001\002\000\044\011\ufee8\013" +
-    "\ufee8\016\ufee8\017\ufee8\024\ufee8\155\ufee8\255\ufee8\334\ufee8" +
-    "\335\ufee8\336\235\337\242\340\236\341\ufee8\342\ufee8\343" +
-    "\ufee8\344\ufee8\345\ufee8\001\002\000\020\015\uffa2\145\uffa2" +
+    "\342\ufee5\343\ufee5\344\ufee5\345\ufee5\001\002\000\034\011" +
+    "\ufede\013\ufede\016\ufede\017\ufede\024\ufede\155\ufede\255\ufede" +
+    "\334\241\335\233\336\236\337\243\340\235\341\ufede\001" +
+    "\002\000\044\011\ufee8\013\ufee8\016\ufee8\017\ufee8\024\ufee8" +
+    "\155\ufee8\255\ufee8\334\ufee8\335\ufee8\336\236\337\243\340" +
+    "\235\341\ufee8\342\ufee8\343\ufee8\344\ufee8\345\ufee8\001\002" +
+    "\000\044\011\ufedb\013\ufedb\016\ufedb\017\ufedb\024\ufedb\155" +
+    "\ufedb\255\ufedb\334\241\335\233\336\236\337\243\340\235" +
+    "\341\ufedb\342\245\343\242\344\247\345\244\001\002\000" +
+    "\044\011\ufeda\013\ufeda\016\ufeda\017\ufeda\024\ufeda\155\ufeda" +
+    "\255\ufeda\334\241\335\233\336\236\337\243\340\235\341" +
+    "\ufeda\342\245\343\242\344\247\345\244\001\002\000\044" +
+    "\011\ufee6\013\ufee6\016\ufee6\017\ufee6\024\ufee6\155\ufee6\255" +
+    "\ufee6\334\ufee6\335\ufee6\336\ufee6\337\ufee6\340\ufee6\341\ufee6" +
+    "\342\ufee6\343\ufee6\344\ufee6\345\ufee6\001\002\000\044\011" +
+    "\ufee4\013\ufee4\016\ufee4\017\ufee4\024\ufee4\155\ufee4\255\ufee4" +
+    "\334\ufee4\335\ufee4\336\ufee4\337\ufee4\340\ufee4\341\ufee4\342" +
+    "\ufee4\343\ufee4\344\ufee4\345\ufee4\001\002\000\044\011\240" +
+    "\013\ufee1\016\ufee1\017\ufee1\024\ufee1\155\ufee1\255\ufee1\334" +
+    "\241\335\233\336\236\337\243\340\235\341\237\342\245" +
+    "\343\242\344\247\345\244\001\002\000\044\011\ufee7\013" +
+    "\ufee7\016\ufee7\017\ufee7\024\ufee7\155\ufee7\255\ufee7\334\ufee7" +
+    "\335\ufee7\336\236\337\243\340\235\341\ufee7\342\ufee7\343" +
+    "\ufee7\344\ufee7\345\ufee7\001\002\000\020\015\uffa2\145\uffa2" +
     "\164\uffa2\171\uffa2\215\uffa2\262\uffa2\270\uffa2\001\002\000" +
-    "\036\011\241\013\267\155\234\255\246\334\240\335\233" +
-    "\336\235\337\242\340\236\341\237\342\245\343\243\344" +
-    "\247\345\244\001\002\000\044\011\ufeda\013\ufeda\016\ufeda" +
-    "\017\ufeda\024\ufeda\155\ufeda\255\ufeda\334\ufeda\335\ufeda\336" +
-    "\ufeda\337\ufeda\340\ufeda\341\ufeda\342\ufeda\343\ufeda\344\ufeda" +
-    "\345\ufeda\001\002\000\004\141\223\001\002\000\044\011" +
-    "\ufed6\013\ufed6\016\ufed6\017\ufed6\024\ufed6\155\ufed6\255\ufed6" +
-    "\334\ufed6\335\ufed6\336\ufed6\337\ufed6\340\ufed6\341\ufed6\342" +
-    "\ufed6\343\ufed6\344\ufed6\345\ufed6\001\002\000\044\011\ufee4" +
-    "\013\ufee4\016\ufee4\017\ufee4\024\ufee4\155\ufee4\255\ufee4\334" +
-    "\ufee4\335\ufee4\336\ufee4\337\ufee4\340\ufee4\341\ufee4\342\ufee4" +
-    "\343\ufee4\344\ufee4\345\ufee4\001\002\000\006\015\276\164" +
+    "\036\011\240\013\267\155\234\255\246\334\241\335\233" +
+    "\336\236\337\243\340\235\341\237\342\245\343\242\344" +
+    "\247\345\244\001\002\000\044\011\ufed9\013\ufed9\016\ufed9" +
+    "\017\ufed9\024\ufed9\155\ufed9\255\ufed9\334\ufed9\335\ufed9\336" +
+    "\ufed9\337\ufed9\340\ufed9\341\ufed9\342\ufed9\343\ufed9\344\ufed9" +
+    "\345\ufed9\001\002\000\004\141\223\001\002\000\044\011" +
+    "\ufed5\013\ufed5\016\ufed5\017\ufed5\024\ufed5\155\ufed5\255\ufed5" +
+    "\334\ufed5\335\ufed5\336\ufed5\337\ufed5\340\ufed5\341\ufed5\342" +
+    "\ufed5\343\ufed5\344\ufed5\345\ufed5\001\002\000\044\011\ufee3" +
+    "\013\ufee3\016\ufee3\017\ufee3\024\ufee3\155\ufee3\255\ufee3\334" +
+    "\ufee3\335\ufee3\336\ufee3\337\ufee3\340\ufee3\341\ufee3\342\ufee3" +
+    "\343\ufee3\344\ufee3\345\ufee3\001\002\000\006\015\276\164" +
     "\275\001\002\000\004\015\310\001\002\000\004\141\301" +
     "\001\002\000\020\015\uff9e\145\uff9e\164\uff9e\171\uff9e\215" +
     "\uff9e\262\uff9e\270\uff9e\001\002\000\010\015\uffea\164\275" +
@@ -352,12 +352,12 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\171\uff9d\215\uff9d\262\uff9d\270\uff9d\001\002\000\020\015" +
     "\uff8e\145\uff8e\164\uff8e\171\uff8e\215\uff8e\262\uff8e\270\uff8e" +
     "\001\002\000\014\015\333\212\342\216\313\307\345\316" +
-    "\353\001\002\000\004\145\u0290\001\002\000\004\022\u026e" +
+    "\353\001\002\000\004\145\u0291\001\002\000\004\022\u026f" +
     "\001\002\000\014\015\uff83\212\uff83\216\uff83\307\uff83\316" +
     "\uff83\001\002\000\014\015\uff7e\212\uff7e\216\uff7e\307\uff7e" +
-    "\316\uff7e\001\002\000\006\017\u0265\022\u0266\001\002\000" +
+    "\316\uff7e\001\002\000\006\017\u0266\022\u0267\001\002\000" +
     "\014\015\uff86\212\uff86\216\uff86\307\uff86\316\uff86\001\002" +
-    "\000\004\022\u023d\001\002\000\006\017\u0234\022\u0235\001" +
+    "\000\004\022\u023e\001\002\000\006\017\u0235\022\u0236\001" +
     "\002\000\014\015\uff8a\212\uff8a\216\uff8a\307\uff8a\316\uff8a" +
     "\001\002\000\006\206\u01cb\313\u01cd\001\002\000\014\015" +
     "\uff7f\212\uff7f\216\uff7f\307\uff7f\316\uff7f\001\002\000\014" +
@@ -397,7 +397,7 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\012\036\u011e\037\u0121\040\u0118\041\u011f\001\002\000\006" +
     "\013\uff4f\016\uff4f\001\002\000\004\012\u0174\001\002\000" +
     "\010\013\uff44\016\uff44\210\uff44\001\002\000\016\004\222" +
-    "\005\225\012\226\141\223\251\231\335\221\001\002\000" +
+    "\005\224\012\226\141\223\251\230\335\221\001\002\000" +
     "\012\036\u011e\037\u0121\040\u0118\041\u011f\001\002\000\004" +
     "\012\u0169\001\002\000\010\013\uff47\016\uff47\210\uff47\001" +
     "\002\000\012\036\u011e\037\u0121\040\u0118\041\u011f\001\002" +
@@ -416,19 +416,19 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\001\002\000\004\022\u012e\001\002\000\006\013\uff2f\016" +
     "\uff2f\001\002\000\004\022\u0124\001\002\000\006\013\uff30" +
     "\016\uff30\001\002\000\006\013\uff33\016\uff33\001\002\000" +
-    "\020\004\222\005\225\012\226\073\u0126\141\223\251\231" +
+    "\020\004\222\005\224\012\226\073\u0126\141\223\251\230" +
     "\335\221\001\002\000\006\013\uff2d\016\uff2d\001\002\000" +
     "\004\012\u0129\001\002\000\006\013\uff2b\016\uff2b\001\002" +
-    "\000\040\011\241\013\uff2c\016\uff2c\155\234\255\246\334" +
-    "\240\335\233\336\235\337\242\340\236\341\237\342\245" +
-    "\343\243\344\247\345\244\001\002\000\016\004\222\005" +
-    "\225\012\226\141\223\251\231\335\221\001\002\000\036" +
-    "\011\241\016\u012b\155\234\255\246\334\240\335\233\336" +
-    "\235\337\242\340\236\341\237\342\245\343\243\344\247" +
-    "\345\244\001\002\000\016\004\222\005\225\012\226\141" +
-    "\223\251\231\335\221\001\002\000\036\011\241\013\u012d" +
-    "\155\234\255\246\334\240\335\233\336\235\337\242\340" +
-    "\236\341\237\342\245\343\243\344\247\345\244\001\002" +
+    "\000\040\011\240\013\uff2c\016\uff2c\155\234\255\246\334" +
+    "\241\335\233\336\236\337\243\340\235\341\237\342\245" +
+    "\343\242\344\247\345\244\001\002\000\016\004\222\005" +
+    "\224\012\226\141\223\251\230\335\221\001\002\000\036" +
+    "\011\240\016\u012b\155\234\255\246\334\241\335\233\336" +
+    "\236\337\243\340\235\341\237\342\245\343\242\344\247" +
+    "\345\244\001\002\000\016\004\222\005\224\012\226\141" +
+    "\223\251\230\335\221\001\002\000\036\011\240\013\u012d" +
+    "\155\234\255\246\334\241\335\233\336\236\337\243\340" +
+    "\235\341\237\342\245\343\242\344\247\345\244\001\002" +
     "\000\006\013\uff2a\016\uff2a\001\002\000\004\141\u012f\001" +
     "\002\000\010\013\uff23\016\uff23\021\u0130\001\002\000\010" +
     "\134\u0131\135\u0133\136\u0132\001\002\000\006\013\uff22\016" +
@@ -436,49 +436,49 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\013\uff21\016\uff21\001\002\000\004\004\u0135\001\002\000" +
     "\006\013\uff2e\016\uff2e\001\002\000\004\012\u015c\001\002" +
     "\000\004\012\u0158\001\002\000\010\012\u0139\013\uff27\016" +
-    "\uff27\001\002\000\020\004\222\005\225\012\226\013\u0140" +
-    "\141\u013c\251\231\335\221\001\002\000\006\013\uff1f\016" +
-    "\u0156\001\002\000\020\004\222\005\225\012\226\013\u014c" +
-    "\141\u0148\251\231\335\221\001\002\000\046\011\ufed7\012" +
-    "\u0144\013\ufed7\016\ufed7\017\ufed7\021\270\155\ufed7\255\ufed7" +
-    "\334\ufed7\335\ufed7\336\ufed7\337\ufed7\340\ufed7\341\ufed7\342" +
-    "\ufed7\343\ufed7\344\ufed7\345\ufed7\001\002\000\042\011\ufeea" +
-    "\013\ufeed\016\ufeed\017\ufeed\155\ufeea\255\ufeea\334\ufeea\335" +
-    "\ufeea\336\ufeea\337\ufeea\340\ufeea\341\ufeea\342\ufeea\343\ufeea" +
-    "\344\ufeea\345\ufeea\001\002\000\004\013\u0143\001\002\000" +
-    "\034\011\241\155\234\255\246\334\240\335\233\336\235" +
-    "\337\242\340\236\341\237\342\245\343\243\344\247\345" +
+    "\uff27\001\002\000\020\004\222\005\224\012\226\013\u0140" +
+    "\141\u013c\251\230\335\221\001\002\000\020\004\222\005" +
+    "\224\012\226\013\u014d\141\u0148\251\230\335\221\001\002" +
+    "\000\006\013\uff1f\016\u0145\001\002\000\046\011\ufed6\012" +
+    "\u0144\013\ufed6\016\ufed6\017\ufed6\021\270\155\ufed6\255\ufed6" +
+    "\334\ufed6\335\ufed6\336\ufed6\337\ufed6\340\ufed6\341\ufed6\342" +
+    "\ufed6\343\ufed6\344\ufed6\345\ufed6\001\002\000\042\011\ufee9" +
+    "\013\ufeec\016\ufeec\017\ufeec\155\ufee9\255\ufee9\334\ufee9\335" +
+    "\ufee9\336\ufee9\337\ufee9\340\ufee9\341\ufee9\342\ufee9\343\ufee9" +
+    "\344\ufee9\345\ufee9\001\002\000\004\013\u0143\001\002\000" +
+    "\034\011\240\155\234\255\246\334\241\335\233\336\236" +
+    "\337\243\340\235\341\237\342\245\343\242\344\247\345" +
     "\244\001\002\000\006\013\uff28\016\uff28\001\002\000\042" +
-    "\011\ufeeb\013\ufeee\016\ufeee\017\ufeee\155\ufeeb\255\ufeeb\334" +
-    "\ufeeb\335\ufeeb\336\ufeeb\337\ufeeb\340\ufeeb\341\ufeeb\342\ufeeb" +
-    "\343\ufeeb\344\ufeeb\345\ufeeb\001\002\000\010\013\ufeef\016" +
-    "\ufeef\017\ufeef\001\002\000\006\013\uff29\016\uff29\001\002" +
-    "\000\020\004\ufed3\005\ufed3\012\ufed3\013\ufed3\141\ufed3\251" +
-    "\ufed3\335\ufed3\001\002\000\016\004\222\005\225\012\226" +
-    "\141\u0148\251\231\335\221\001\002\000\004\013\u0153\001" +
-    "\002\000\006\013\ufed2\016\u0151\001\002\000\044\011\ufed7" +
-    "\012\u014f\013\ufed7\016\ufed7\021\270\155\ufed7\255\ufed7\334" +
-    "\ufed7\335\ufed7\336\ufed7\337\ufed7\340\ufed7\341\ufed7\342\ufed7" +
-    "\343\ufed7\344\ufed7\345\ufed7\001\002\000\040\011\ufeea\013" +
-    "\ufece\016\ufece\155\ufeea\255\ufeea\334\ufeea\335\ufeea\336\ufeea" +
-    "\337\ufeea\340\ufeea\341\ufeea\342\ufeea\343\ufeea\344\ufeea\345" +
-    "\ufeea\001\002\000\004\013\u014e\001\002\000\040\011\ufeeb" +
-    "\013\ufecf\016\ufecf\155\ufeeb\255\ufeeb\334\ufeeb\335\ufeeb\336" +
-    "\ufeeb\337\ufeeb\340\ufeeb\341\ufeeb\342\ufeeb\343\ufeeb\344\ufeeb" +
-    "\345\ufeeb\001\002\000\010\013\ufed5\016\ufed5\017\ufed5\001" +
-    "\002\000\006\013\ufecd\016\ufecd\001\002\000\010\013\ufed4" +
-    "\016\ufed4\017\ufed4\001\002\000\020\004\ufed3\005\ufed3\012" +
-    "\ufed3\013\ufeca\141\ufed3\251\ufed3\335\ufed3\001\002\000\016" +
-    "\004\222\005\225\012\226\141\u0148\251\231\335\221\001" +
-    "\002\000\016\004\ufed0\005\ufed0\012\ufed0\141\ufed0\251\ufed0" +
-    "\335\ufed0\001\002\000\004\013\ufed1\001\002\000\006\013" +
-    "\ufecc\016\ufecc\001\002\000\004\013\u0155\001\002\000\006" +
-    "\013\ufecb\016\ufecb\001\002\000\016\004\222\005\225\012" +
-    "\226\141\u013c\251\231\335\221\001\002\000\004\013\uff1e" +
-    "\001\002\000\016\004\222\005\225\012\226\141\223\251" +
-    "\231\335\221\001\002\000\036\011\241\013\ufeec\155\234" +
-    "\255\246\334\240\335\233\336\235\337\242\340\236\341" +
-    "\237\342\245\343\243\344\247\345\244\001\002\000\004" +
+    "\011\ufeea\013\ufeed\016\ufeed\017\ufeed\155\ufeea\255\ufeea\334" +
+    "\ufeea\335\ufeea\336\ufeea\337\ufeea\340\ufeea\341\ufeea\342\ufeea" +
+    "\343\ufeea\344\ufeea\345\ufeea\001\002\000\010\013\ufeee\016" +
+    "\ufeee\017\ufeee\001\002\000\006\013\uff29\016\uff29\001\002" +
+    "\000\020\004\ufed2\005\ufed2\012\ufed2\013\ufed2\141\ufed2\251" +
+    "\ufed2\335\ufed2\001\002\000\016\004\222\005\224\012\226" +
+    "\141\u013c\251\230\335\221\001\002\000\004\013\uff1e\001" +
+    "\002\000\016\004\222\005\224\012\226\141\u0148\251\230" +
+    "\335\221\001\002\000\044\011\ufed6\012\u0155\013\ufed6\016" +
+    "\ufed6\021\270\155\ufed6\255\ufed6\334\ufed6\335\ufed6\336\ufed6" +
+    "\337\ufed6\340\ufed6\341\ufed6\342\ufed6\343\ufed6\344\ufed6\345" +
+    "\ufed6\001\002\000\004\013\u0154\001\002\000\006\013\ufed1" +
+    "\016\u0152\001\002\000\040\011\ufee9\013\ufecd\016\ufecd\155" +
+    "\ufee9\255\ufee9\334\ufee9\335\ufee9\336\ufee9\337\ufee9\340\ufee9" +
+    "\341\ufee9\342\ufee9\343\ufee9\344\ufee9\345\ufee9\001\002\000" +
+    "\004\013\u0150\001\002\000\010\013\ufed4\016\ufed4\017\ufed4" +
+    "\001\002\000\040\011\ufeea\013\ufece\016\ufece\155\ufeea\255" +
+    "\ufeea\334\ufeea\335\ufeea\336\ufeea\337\ufeea\340\ufeea\341\ufeea" +
+    "\342\ufeea\343\ufeea\344\ufeea\345\ufeea\001\002\000\006\013" +
+    "\ufecc\016\ufecc\001\002\000\010\013\ufed3\016\ufed3\017\ufed3" +
+    "\001\002\000\016\004\222\005\224\012\226\141\u0148\251" +
+    "\230\335\221\001\002\000\016\004\ufecf\005\ufecf\012\ufecf" +
+    "\141\ufecf\251\ufecf\335\ufecf\001\002\000\004\013\ufed0\001" +
+    "\002\000\006\013\ufecb\016\ufecb\001\002\000\020\004\ufed2" +
+    "\005\ufed2\012\ufed2\013\ufec9\141\ufed2\251\ufed2\335\ufed2\001" +
+    "\002\000\004\013\u0157\001\002\000\006\013\ufeca\016\ufeca" +
+    "\001\002\000\016\004\222\005\224\012\226\141\223\251" +
+    "\230\335\221\001\002\000\036\011\240\013\ufeeb\155\234" +
+    "\255\246\334\241\335\233\336\236\337\243\340\235\341" +
+    "\237\342\245\343\242\344\247\345\244\001\002\000\004" +
     "\013\u015b\001\002\000\006\013\uff26\016\uff26\001\002\000" +
     "\004\013\u015d\001\002\000\006\013\uff25\016\uff25\001\002" +
     "\000\012\036\u011e\037\u0121\040\u0118\041\u011f\001\002\000" +
@@ -491,9 +491,9 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\004\013\u0168\001\002\000\010\013\uff3f\016\uff3f\210\uff3f" +
     "\001\002\000\012\036\uff3e\037\uff3e\040\uff3e\041\uff3e\001" +
     "\002\000\004\013\u016b\001\002\000\010\013\uff43\016\uff43" +
-    "\210\uff43\001\002\000\036\011\241\024\u016d\155\234\255" +
-    "\246\334\240\335\233\336\235\337\242\340\236\341\237" +
-    "\342\245\343\243\344\247\345\244\001\002\000\020\065" +
+    "\210\uff43\001\002\000\036\011\240\024\u016d\155\234\255" +
+    "\246\334\241\335\233\336\236\337\243\340\235\341\237" +
+    "\342\245\343\242\344\247\345\244\001\002\000\020\065" +
     "\u0112\066\u0106\067\u0105\070\u0109\125\u0111\126\u010f\127\u0102" +
     "\001\002\000\004\210\u016f\001\002\000\004\064\u0170\001" +
     "\002\000\004\012\u0171\001\002\000\004\004\u0172\001\002" +
@@ -557,212 +557,213 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\u0106\067\u0105\070\u0109\125\u0111\126\u010f\127\u0102\230\u0107" +
     "\001\002\000\004\013\uff4d\001\002\000\004\017\u01ca\001" +
     "\002\000\014\015\uff76\212\uff76\216\uff76\307\uff76\316\uff76" +
-    "\001\002\000\004\145\u0230\001\002\000\004\014\u020c\001" +
-    "\002\000\004\141\u0208\001\002\000\004\014\u01ea\001\002" +
+    "\001\002\000\004\145\u0231\001\002\000\004\014\u020d\001" +
+    "\002\000\004\141\u0209\001\002\000\004\014\u01ea\001\002" +
     "\000\004\313\u01d0\001\002\000\004\141\u01d1\001\002\000" +
-    "\006\017\u01d3\164\u01d4\001\002\000\006\015\ufef7\164\u01d4" +
+    "\006\017\u01d3\164\u01d4\001\002\000\006\015\ufef6\164\u01d4" +
     "\001\002\000\014\015\uff11\212\uff11\216\uff11\307\uff11\316" +
     "\uff11\001\002\000\010\007\u01dc\137\u01da\140\u01db\001\002" +
-    "\000\004\015\u01d9\001\002\000\006\015\ufef4\164\ufef4\001" +
-    "\002\000\006\015\ufef3\164\ufef3\001\002\000\006\015\ufef5" +
-    "\164\ufef5\001\002\000\014\015\uff0f\212\uff0f\216\uff0f\307" +
+    "\000\004\015\u01d9\001\002\000\006\015\ufef2\164\ufef2\001" +
+    "\002\000\006\015\ufef3\164\ufef3\001\002\000\006\015\ufef4" +
+    "\164\ufef4\001\002\000\014\015\uff0f\212\uff0f\216\uff0f\307" +
     "\uff0f\316\uff0f\001\002\000\004\020\u01e5\001\002\000\004" +
     "\020\u01e1\001\002\000\004\020\u01dd\001\002\000\004\076" +
     "\u01de\001\002\000\004\022\u01df\001\002\000\004\006\u01e0" +
-    "\001\002\000\006\015\ufef0\164\ufef0\001\002\000\004\076" +
+    "\001\002\000\006\015\ufeef\164\ufeef\001\002\000\004\076" +
     "\u01e2\001\002\000\004\022\u01e3\001\002\000\004\010\u01e4" +
-    "\001\002\000\006\015\ufef1\164\ufef1\001\002\000\004\076" +
+    "\001\002\000\006\015\ufef0\164\ufef0\001\002\000\004\076" +
     "\u01e6\001\002\000\004\022\u01e7\001\002\000\004\006\u01e8" +
-    "\001\002\000\006\015\ufef2\164\ufef2\001\002\000\004\015" +
-    "\ufef6\001\002\000\006\015\u01ec\221\u01ed\001\002\000\004" +
-    "\015\u0207\001\002\000\004\313\uff0c\001\002\000\004\045" +
+    "\001\002\000\006\015\ufef1\164\ufef1\001\002\000\004\015" +
+    "\ufef5\001\002\000\006\015\u01ec\221\u01ed\001\002\000\004" +
+    "\015\u0208\001\002\000\004\313\uff0c\001\002\000\004\045" +
     "\u01ee\001\002\000\004\017\u01ef\001\002\000\004\313\u01f0" +
     "\001\002\000\010\046\u01f2\145\u01f5\160\u01f6\001\002\000" +
-    "\004\015\uff05\001\002\000\004\017\u0206\001\002\000\004" +
-    "\313\u0202\001\002\000\004\141\u01fc\001\002\000\004\022" +
-    "\u01f7\001\002\000\004\141\uff00\001\002\000\004\141\u01f8" +
+    "\004\015\uff05\001\002\000\004\017\u0207\001\002\000\004" +
+    "\313\u0203\001\002\000\004\141\u01fc\001\002\000\004\022" +
+    "\u01f7\001\002\000\004\141\ufeff\001\002\000\004\141\u01f8" +
     "\001\002\000\004\012\u0144\001\002\000\004\017\u01fa\001" +
-    "\002\000\004\313\uff01\001\002\000\006\021\u01fd\023\u01fe" +
+    "\002\000\004\313\uff01\001\002\000\006\021\u0201\023\uff00" +
     "\001\002\000\012\013\uff19\016\uff19\021\uff19\023\uff19\001" +
-    "\002\000\004\141\u0201\001\002\000\016\004\222\005\225" +
-    "\012\226\141\u013c\251\231\335\221\001\002\000\004\017" +
-    "\u0200\001\002\000\004\313\uff02\001\002\000\012\013\uff18" +
-    "\016\uff18\021\uff18\023\uff18\001\002\000\010\046\u0204\145" +
-    "\u01f5\160\u01f6\001\002\000\004\015\uff03\001\002\000\004" +
-    "\017\u0205\001\002\000\004\015\uff04\001\002\000\004\015" +
-    "\uff06\001\002\000\004\313\uff0b\001\002\000\006\017\u0209" +
-    "\164\u01d4\001\002\000\014\015\uff12\212\uff12\216\uff12\307" +
-    "\uff12\316\uff12\001\002\000\004\015\u020b\001\002\000\014" +
-    "\015\uff10\212\uff10\216\uff10\307\uff10\316\uff10\001\002\000" +
-    "\010\015\u0210\221\u0212\241\u020d\001\002\000\004\071\u0228" +
-    "\001\002\000\004\221\u0212\001\002\000\004\241\u020d\001" +
-    "\002\000\004\313\uff0a\001\002\000\004\015\u0225\001\002" +
-    "\000\004\045\u0213\001\002\000\004\017\u0214\001\002\000" +
-    "\004\313\u0215\001\002\000\006\046\u0223\160\u01f6\001\002" +
-    "\000\004\313\u0218\001\002\000\006\015\ufefb\241\ufefb\001" +
-    "\002\000\006\046\u021a\160\u01f6\001\002\000\006\015\ufef9" +
-    "\241\ufef9\001\002\000\004\017\u0222\001\002\000\004\141" +
-    "\u01fc\001\002\000\006\021\u01fd\023\u021d\001\002\000\004" +
-    "\071\u021e\001\002\000\004\021\u021f\001\002\000\004\141" +
-    "\u0220\001\002\000\004\017\u0221\001\002\000\004\313\ufef8" +
-    "\001\002\000\006\015\ufefa\241\ufefa\001\002\000\004\017" +
-    "\u0224\001\002\000\006\015\ufefc\241\ufefc\001\002\000\004" +
-    "\313\uff09\001\002\000\004\015\ufefe\001\002\000\004\015" +
-    "\ufeff\001\002\000\004\020\u0229\001\002\000\004\141\u022a" +
+    "\002\000\004\023\u01fe\001\002\000\016\004\222\005\224" +
+    "\012\226\141\u013c\251\230\335\221\001\002\000\004\017" +
+    "\u0200\001\002\000\004\313\uff02\001\002\000\004\141\u0202" +
+    "\001\002\000\012\013\uff18\016\uff18\021\uff18\023\uff18\001" +
+    "\002\000\010\046\u0205\145\u01f5\160\u01f6\001\002\000\004" +
+    "\015\uff03\001\002\000\004\017\u0206\001\002\000\004\015" +
+    "\uff04\001\002\000\004\015\uff06\001\002\000\004\313\uff0b" +
+    "\001\002\000\006\017\u020a\164\u01d4\001\002\000\014\015" +
+    "\uff12\212\uff12\216\uff12\307\uff12\316\uff12\001\002\000\004" +
+    "\015\u020c\001\002\000\014\015\uff10\212\uff10\216\uff10\307" +
+    "\uff10\316\uff10\001\002\000\010\015\u0211\221\u0213\241\u020f" +
+    "\001\002\000\004\221\u0213\001\002\000\004\071\u0228\001" +
+    "\002\000\004\241\u020f\001\002\000\004\313\uff0a\001\002" +
+    "\000\004\015\u0226\001\002\000\004\045\u0214\001\002\000" +
+    "\004\017\u0215\001\002\000\004\313\u0216\001\002\000\006" +
+    "\046\u0224\160\u01f6\001\002\000\004\313\u0219\001\002\000" +
+    "\006\015\ufefa\241\ufefa\001\002\000\006\046\u021b\160\u01f6" +
+    "\001\002\000\006\015\ufef8\241\ufef8\001\002\000\004\017" +
+    "\u0223\001\002\000\004\141\u01fc\001\002\000\006\021\u0201" +
+    "\023\u021e\001\002\000\004\071\u021f\001\002\000\004\021" +
+    "\u0220\001\002\000\004\141\u0221\001\002\000\004\017\u0222" +
+    "\001\002\000\004\313\ufef7\001\002\000\006\015\ufef9\241" +
+    "\ufef9\001\002\000\004\017\u0225\001\002\000\006\015\ufefb" +
+    "\241\ufefb\001\002\000\004\313\uff09\001\002\000\004\015" +
+    "\ufefd\001\002\000\004\020\u0229\001\002\000\004\141\u022a" +
     "\001\002\000\004\022\u022b\001\002\000\004\040\u022c\001" +
     "\002\000\004\156\u022d\001\002\000\004\141\u022e\001\002" +
-    "\000\004\017\u022f\001\002\000\006\015\ufefd\221\ufefd\001" +
-    "\002\000\004\020\u0231\001\002\000\006\117\u0232\120\u0233" +
-    "\001\002\000\004\014\uff07\001\002\000\004\014\uff08\001" +
-    "\002\000\014\015\uff6d\212\uff6d\216\uff6d\307\uff6d\316\uff6d" +
-    "\001\002\000\004\110\u0236\001\002\000\004\012\u0237\001" +
-    "\002\000\006\013\u0239\034\371\001\002\000\004\013\u023b" +
-    "\001\002\000\004\017\u023a\001\002\000\014\015\uff6c\212" +
-    "\uff6c\216\uff6c\307\uff6c\316\uff6c\001\002\000\004\017\u023c" +
-    "\001\002\000\014\015\uff6b\212\uff6b\216\uff6b\307\uff6b\316" +
-    "\uff6b\001\002\000\004\111\u023e\001\002\000\004\012\u023f" +
-    "\001\002\000\006\034\371\035\u0240\001\002\000\004\022" +
-    "\u024d\001\002\000\004\016\u0249\001\002\000\006\013\u0244" +
-    "\016\u0243\001\002\000\004\034\371\001\002\000\004\017" +
-    "\u0245\001\002\000\014\015\uff67\212\uff67\216\uff67\307\uff67" +
-    "\316\uff67\001\002\000\004\013\u0247\001\002\000\004\017" +
-    "\u0248\001\002\000\014\015\uff69\212\uff69\216\uff69\307\uff69" +
-    "\316\uff69\001\002\000\004\035\u0240\001\002\000\004\013" +
-    "\u024b\001\002\000\004\017\u024c\001\002\000\014\015\uff68" +
-    "\212\uff68\216\uff68\307\uff68\316\uff68\001\002\000\004\072" +
-    "\u024e\001\002\000\004\012\u024f\001\002\000\006\042\u0250" +
-    "\043\u0252\001\002\000\004\022\u025d\001\002\000\004\016" +
-    "\u025a\001\002\000\004\022\uff1a\001\002\000\004\016\u0257" +
-    "\001\002\000\004\022\u0255\001\002\000\004\141\u01fc\001" +
-    "\002\000\010\013\uff1b\016\uff1b\021\u01fd\001\002\000\004" +
-    "\042\u0250\001\002\000\004\013\u0259\001\002\000\006\013" +
-    "\uff1d\016\uff1d\001\002\000\004\043\u0252\001\002\000\004" +
-    "\013\u025c\001\002\000\006\013\uff1c\016\uff1c\001\002\000" +
-    "\004\073\u025e\001\002\000\004\012\u0260\001\002\000\006" +
-    "\013\uff17\016\uff17\001\002\000\016\004\222\005\225\012" +
-    "\226\141\223\251\231\335\221\001\002\000\036\011\241" +
-    "\016\u0262\155\234\255\246\334\240\335\233\336\235\337" +
-    "\242\340\236\341\237\342\245\343\243\344\247\345\244" +
-    "\001\002\000\016\004\222\005\225\012\226\141\223\251" +
-    "\231\335\221\001\002\000\036\011\241\013\u0264\155\234" +
-    "\255\246\334\240\335\233\336\235\337\242\340\236\341" +
-    "\237\342\245\343\243\344\247\345\244\001\002\000\006" +
-    "\013\uff16\016\uff16\001\002\000\014\015\uff7c\212\uff7c\216" +
-    "\uff7c\307\uff7c\316\uff7c\001\002\000\004\106\u0267\001\002" +
-    "\000\004\012\u0268\001\002\000\006\013\u026a\034\371\001" +
-    "\002\000\004\013\u026c\001\002\000\004\017\u026b\001\002" +
-    "\000\014\015\uff7b\212\uff7b\216\uff7b\307\uff7b\316\uff7b\001" +
-    "\002\000\004\017\u026d\001\002\000\014\015\uff7a\212\uff7a" +
-    "\216\uff7a\307\uff7a\316\uff7a\001\002\000\004\112\u026f\001" +
-    "\002\000\004\012\u0270\001\002\000\006\034\371\035\u0271" +
-    "\001\002\000\004\022\u027e\001\002\000\006\013\u0279\016" +
-    "\u0278\001\002\000\004\016\u0274\001\002\000\004\035\u0271" +
-    "\001\002\000\004\013\u0276\001\002\000\004\017\u0277\001" +
-    "\002\000\014\015\uff64\212\uff64\216\uff64\307\uff64\316\uff64" +
-    "\001\002\000\004\034\371\001\002\000\004\017\u027a\001" +
-    "\002\000\014\015\uff65\212\uff65\216\uff65\307\uff65\316\uff65" +
-    "\001\002\000\004\013\u027c\001\002\000\004\017\u027d\001" +
-    "\002\000\014\015\uff63\212\uff63\216\uff63\307\uff63\316\uff63" +
-    "\001\002\000\004\072\u027f\001\002\000\004\012\u0280\001" +
-    "\002\000\006\042\u0281\043\u0252\001\002\000\004\022\u028a" +
-    "\001\002\000\004\016\u0287\001\002\000\004\016\u0284\001" +
-    "\002\000\004\043\u0252\001\002\000\004\013\u0286\001\002" +
-    "\000\006\013\uff14\016\uff14\001\002\000\004\042\u0281\001" +
-    "\002\000\004\013\u0289\001\002\000\006\013\uff15\016\uff15" +
-    "\001\002\000\004\141\u028b\001\002\000\004\021\u028c\001" +
-    "\002\000\004\044\u028d\001\002\000\004\012\u028e\001\002" +
-    "\000\004\013\u028f\001\002\000\006\013\uff13\016\uff13\001" +
-    "\002\000\004\141\u0291\001\002\000\004\020\u0292\001\002" +
-    "\000\004\105\u0293\001\002\000\006\017\uff72\022\uff72\001" +
-    "\002\000\004\020\u0295\001\002\000\004\102\u0296\001\002" +
-    "\000\004\014\uff9c\001\002\000\024\015\uffaf\145\uffaf\164" +
-    "\uffaf\166\uffaf\171\uffaf\215\uffaf\232\uffaf\262\uffaf\270\uffaf" +
-    "\001\002\000\024\015\uffae\145\uffae\164\uffae\166\uffae\171" +
-    "\uffae\215\uffae\232\uffae\262\uffae\270\uffae\001\002\000\010" +
-    "\015\u029c\164\275\301\u029b\001\002\000\004\015\u02a3\001" +
-    "\002\000\004\020\u02a0\001\002\000\020\015\uff9b\145\uff9b" +
-    "\164\uff9b\171\uff9b\215\uff9b\262\uff9b\270\uff9b\001\002\000" +
-    "\010\015\uff98\164\275\301\u029b\001\002\000\010\015\uff96" +
-    "\164\uff96\301\uff96\001\002\000\004\015\uff97\001\002\000" +
-    "\010\074\306\075\305\141\303\001\002\000\004\017\u02a2" +
-    "\001\002\000\010\015\uff95\164\uff95\301\uff95\001\002\000" +
-    "\020\015\uff9a\145\uff9a\164\uff9a\171\uff9a\215\uff9a\262\uff9a" +
-    "\270\uff9a\001\002\000\004\020\u02a5\001\002\000\004\103" +
-    "\u02a6\001\002\000\004\014\uff99\001\002\000\020\015\uffa6" +
-    "\145\uffa6\164\uffa6\171\uffa6\215\uffa6\262\uffa6\270\uffa6\001" +
-    "\002\000\016\004\222\005\225\012\226\141\223\251\231" +
-    "\335\221\001\002\000\036\011\241\017\u02aa\155\234\255" +
-    "\246\334\240\335\233\336\235\337\242\340\236\341\237" +
-    "\342\245\343\243\344\247\345\244\001\002\000\020\015" +
-    "\uffa5\145\uffa5\164\uffa5\171\uffa5\215\uffa5\262\uffa5\270\uffa5" +
-    "\001\002\000\004\020\u02ac\001\002\000\010\074\306\075" +
-    "\305\141\303\001\002\000\006\017\uffa4\023\uffa4\001\002" +
-    "\000\004\141\u02af\001\002\000\004\020\u02b0\001\002\000" +
-    "\010\074\306\075\305\141\303\001\002\000\006\017\uffa1" +
-    "\023\uffa1\001\002\000\004\121\u02b3\001\002\000\004\020" +
-    "\u02b4\001\002\000\004\116\u02b5\001\002\000\006\014\uff8d" +
-    "\017\uff8d\001\002\000\006\062\u02b8\063\u02b7\001\002\000" +
-    "\004\165\u02c5\001\002\000\004\165\u02b9\001\002\000\004" +
-    "\141\u02ba\001\002\000\006\021\u02bb\022\u02bc\001\002\000" +
-    "\004\141\u02c1\001\002\000\004\141\u02bd\001\002\000\004" +
-    "\021\u02be\001\002\000\004\141\u02bf\001\002\000\004\017" +
-    "\u02c0\001\002\000\014\015\uffc6\164\uffc6\166\uffc6\232\uffc6" +
-    "\262\uffc6\001\002\000\004\022\u02c2\001\002\000\004\141" +
-    "\u02c3\001\002\000\004\017\u02c4\001\002\000\014\015\uffc7" +
-    "\164\uffc7\166\uffc7\232\uffc7\262\uffc7\001\002\000\004\141" +
-    "\u02c6\001\002\000\006\021\u02c7\022\u02c8\001\002\000\004" +
-    "\141\u02cd\001\002\000\004\141\u02c9\001\002\000\004\021" +
-    "\u02ca\001\002\000\004\141\u02cb\001\002\000\004\017\u02cc" +
-    "\001\002\000\014\015\uffc4\164\uffc4\166\uffc4\232\uffc4\262" +
-    "\uffc4\001\002\000\004\022\u02ce\001\002\000\004\141\u02cf" +
-    "\001\002\000\004\017\u02d0\001\002\000\014\015\uffc5\164" +
-    "\uffc5\166\uffc5\232\uffc5\262\uffc5\001\002\000\006\015\u02d3" +
-    "\164\275\001\002\000\004\015\u02d4\001\002\000\014\015" +
-    "\uffec\164\uffec\166\uffec\232\uffec\262\uffec\001\002\000\014" +
-    "\015\uffed\164\uffed\166\uffed\232\uffed\262\uffed\001\002\000" +
-    "\004\265\u02d8\001\002\000\014\015\uffc1\164\uffc1\166\uffc1" +
-    "\232\uffc1\262\uffc1\001\002\000\006\015\u02e4\164\275\001" +
-    "\002\000\004\262\u02d9\001\002\000\004\041\u02da\001\002" +
-    "\000\006\020\u02dc\022\u02db\001\002\000\004\141\u02e1\001" +
-    "\002\000\004\055\u02dd\001\002\000\004\022\u02de\001\002" +
-    "\000\004\141\u02df\001\002\000\004\017\u02e0\001\002\000" +
-    "\006\015\uffbc\164\uffbc\001\002\000\004\017\u02e2\001\002" +
-    "\000\006\015\uffbb\164\uffbb\001\002\000\004\015\u02e5\001" +
-    "\002\000\014\015\uffbf\164\uffbf\166\uffbf\232\uffbf\262\uffbf" +
-    "\001\002\000\014\015\uffbe\164\uffbe\166\uffbe\232\uffbe\262" +
-    "\uffbe\001\002\000\004\015\u02e7\001\002\000\014\015\uffbd" +
-    "\164\uffbd\166\uffbd\232\uffbd\262\uffbd\001\002\000\014\015" +
-    "\uffba\164\uffba\166\uffba\232\uffba\262\uffba\001\002\000\006" +
-    "\015\u02ec\164\u02ea\001\002\000\004\141\u02f0\001\002\000" +
-    "\014\015\uffb8\164\uffb8\166\uffb8\232\uffb8\262\uffb8\001\002" +
-    "\000\014\015\uffb9\164\uffb9\166\uffb9\232\uffb9\262\uffb9\001" +
-    "\002\000\006\015\u02ef\164\u02ea\001\002\000\014\015\uffb4" +
-    "\164\uffb4\166\uffb4\232\uffb4\262\uffb4\001\002\000\014\015" +
-    "\uffb5\164\uffb5\166\uffb5\232\uffb5\262\uffb5\001\002\000\004" +
-    "\271\u02f1\001\002\000\004\141\u02f2\001\002\000\004\017" +
-    "\u02f3\001\002\000\006\015\uffb3\164\uffb3\001\002\000\006" +
-    "\013\uffd7\016\uffd7\001\002\000\004\022\u030c\001\002\000" +
-    "\004\022\u030a\001\002\000\004\013\u0308\001\002\000\006" +
-    "\013\uffd8\016\uffd8\001\002\000\006\013\uffd5\016\uffd5\001" +
-    "\002\000\006\013\uffdb\016\u0306\001\002\000\006\013\uffd6" +
-    "\016\uffd6\001\002\000\004\022\u0304\001\002\000\004\022" +
-    "\u0302\001\002\000\006\013\uffd9\016\uffd9\001\002\000\004" +
-    "\022\u0300\001\002\000\004\004\u0301\001\002\000\006\013" +
-    "\uffd1\016\uffd1\001\002\000\004\141\u0303\001\002\000\006" +
-    "\013\uffd4\016\uffd4\001\002\000\004\005\u0305\001\002\000" +
-    "\006\013\uffd0\016\uffd0\001\002\000\014\025\u02fc\026\u02ff" +
-    "\027\u02f6\031\u02fd\032\u02f5\001\002\000\004\013\uffda\001" +
-    "\002\000\004\017\u0309\001\002\000\014\015\uffe1\164\uffe1" +
-    "\166\uffe1\232\uffe1\262\uffe1\001\002\000\004\005\u030b\001" +
-    "\002\000\006\013\uffd2\016\uffd2\001\002\000\004\141\u030d" +
-    "\001\002\000\006\013\uffd3\016\uffd3\001\002\000\004\015" +
-    "\ufffd\001\002\000\004\013\u0310\001\002\000\004\017\u0311" +
-    "\001\002\000\014\015\uffdd\164\uffdd\166\uffdd\232\uffdd\262" +
-    "\uffdd\001\002\000\004\141\u0313\001\002\000\006\305\136" +
-    "\333\140\001\002\000\004\100\u0315\001\002\000\004\014" +
-    "\uffeb\001\002\000\004\013\u0317\001\002\000\004\017\u0318" +
-    "\001\002\000\014\015\uffdf\164\uffdf\166\uffdf\232\uffdf\262" +
-    "\uffdf\001\002\000\004\002\000\001\002" });
+    "\000\004\017\u022f\001\002\000\006\015\ufefc\221\ufefc\001" +
+    "\002\000\004\015\ufefe\001\002\000\004\020\u0232\001\002" +
+    "\000\006\117\u0233\120\u0234\001\002\000\004\014\uff07\001" +
+    "\002\000\004\014\uff08\001\002\000\014\015\uff6d\212\uff6d" +
+    "\216\uff6d\307\uff6d\316\uff6d\001\002\000\004\110\u0237\001" +
+    "\002\000\004\012\u0238\001\002\000\006\013\u023a\034\371" +
+    "\001\002\000\004\013\u023c\001\002\000\004\017\u023b\001" +
+    "\002\000\014\015\uff6c\212\uff6c\216\uff6c\307\uff6c\316\uff6c" +
+    "\001\002\000\004\017\u023d\001\002\000\014\015\uff6b\212" +
+    "\uff6b\216\uff6b\307\uff6b\316\uff6b\001\002\000\004\111\u023f" +
+    "\001\002\000\004\012\u0240\001\002\000\006\034\371\035" +
+    "\u0241\001\002\000\004\022\u024e\001\002\000\004\016\u024a" +
+    "\001\002\000\006\013\u0245\016\u0244\001\002\000\004\034" +
+    "\371\001\002\000\004\017\u0246\001\002\000\014\015\uff67" +
+    "\212\uff67\216\uff67\307\uff67\316\uff67\001\002\000\004\013" +
+    "\u0248\001\002\000\004\017\u0249\001\002\000\014\015\uff69" +
+    "\212\uff69\216\uff69\307\uff69\316\uff69\001\002\000\004\035" +
+    "\u0241\001\002\000\004\013\u024c\001\002\000\004\017\u024d" +
+    "\001\002\000\014\015\uff68\212\uff68\216\uff68\307\uff68\316" +
+    "\uff68\001\002\000\004\072\u024f\001\002\000\004\012\u0250" +
+    "\001\002\000\006\042\u0251\043\u0253\001\002\000\004\022" +
+    "\u025e\001\002\000\004\016\u025b\001\002\000\004\022\uff1a" +
+    "\001\002\000\004\016\u0258\001\002\000\004\022\u0256\001" +
+    "\002\000\004\141\u01fc\001\002\000\010\013\uff1b\016\uff1b" +
+    "\021\u0201\001\002\000\004\042\u0251\001\002\000\004\013" +
+    "\u025a\001\002\000\006\013\uff1d\016\uff1d\001\002\000\004" +
+    "\043\u0253\001\002\000\004\013\u025d\001\002\000\006\013" +
+    "\uff1c\016\uff1c\001\002\000\004\073\u025f\001\002\000\004" +
+    "\012\u0261\001\002\000\006\013\uff17\016\uff17\001\002\000" +
+    "\016\004\222\005\224\012\226\141\223\251\230\335\221" +
+    "\001\002\000\036\011\240\016\u0263\155\234\255\246\334" +
+    "\241\335\233\336\236\337\243\340\235\341\237\342\245" +
+    "\343\242\344\247\345\244\001\002\000\016\004\222\005" +
+    "\224\012\226\141\223\251\230\335\221\001\002\000\036" +
+    "\011\240\013\u0265\155\234\255\246\334\241\335\233\336" +
+    "\236\337\243\340\235\341\237\342\245\343\242\344\247" +
+    "\345\244\001\002\000\006\013\uff16\016\uff16\001\002\000" +
+    "\014\015\uff7c\212\uff7c\216\uff7c\307\uff7c\316\uff7c\001\002" +
+    "\000\004\106\u0268\001\002\000\004\012\u0269\001\002\000" +
+    "\006\013\u026b\034\371\001\002\000\004\013\u026d\001\002" +
+    "\000\004\017\u026c\001\002\000\014\015\uff7b\212\uff7b\216" +
+    "\uff7b\307\uff7b\316\uff7b\001\002\000\004\017\u026e\001\002" +
+    "\000\014\015\uff7a\212\uff7a\216\uff7a\307\uff7a\316\uff7a\001" +
+    "\002\000\004\112\u0270\001\002\000\004\012\u0271\001\002" +
+    "\000\006\034\371\035\u0272\001\002\000\004\022\u027f\001" +
+    "\002\000\006\013\u027a\016\u0279\001\002\000\004\016\u0275" +
+    "\001\002\000\004\035\u0272\001\002\000\004\013\u0277\001" +
+    "\002\000\004\017\u0278\001\002\000\014\015\uff64\212\uff64" +
+    "\216\uff64\307\uff64\316\uff64\001\002\000\004\034\371\001" +
+    "\002\000\004\017\u027b\001\002\000\014\015\uff65\212\uff65" +
+    "\216\uff65\307\uff65\316\uff65\001\002\000\004\013\u027d\001" +
+    "\002\000\004\017\u027e\001\002\000\014\015\uff63\212\uff63" +
+    "\216\uff63\307\uff63\316\uff63\001\002\000\004\072\u0280\001" +
+    "\002\000\004\012\u0281\001\002\000\006\042\u0282\043\u0253" +
+    "\001\002\000\004\022\u028b\001\002\000\004\016\u0288\001" +
+    "\002\000\004\016\u0285\001\002\000\004\043\u0253\001\002" +
+    "\000\004\013\u0287\001\002\000\006\013\uff14\016\uff14\001" +
+    "\002\000\004\042\u0282\001\002\000\004\013\u028a\001\002" +
+    "\000\006\013\uff15\016\uff15\001\002\000\004\141\u028c\001" +
+    "\002\000\004\021\u028d\001\002\000\004\044\u028e\001\002" +
+    "\000\004\012\u028f\001\002\000\004\013\u0290\001\002\000" +
+    "\006\013\uff13\016\uff13\001\002\000\004\141\u0292\001\002" +
+    "\000\004\020\u0293\001\002\000\004\105\u0294\001\002\000" +
+    "\006\017\uff72\022\uff72\001\002\000\004\020\u0296\001\002" +
+    "\000\004\102\u0297\001\002\000\004\014\uff9c\001\002\000" +
+    "\024\015\uffaf\145\uffaf\164\uffaf\166\uffaf\171\uffaf\215\uffaf" +
+    "\232\uffaf\262\uffaf\270\uffaf\001\002\000\024\015\uffae\145" +
+    "\uffae\164\uffae\166\uffae\171\uffae\215\uffae\232\uffae\262\uffae" +
+    "\270\uffae\001\002\000\010\015\u029d\164\275\301\u029c\001" +
+    "\002\000\004\015\u02a4\001\002\000\004\020\u02a1\001\002" +
+    "\000\020\015\uff9b\145\uff9b\164\uff9b\171\uff9b\215\uff9b\262" +
+    "\uff9b\270\uff9b\001\002\000\010\015\uff98\164\275\301\u029c" +
+    "\001\002\000\010\015\uff96\164\uff96\301\uff96\001\002\000" +
+    "\004\015\uff97\001\002\000\010\074\306\075\305\141\303" +
+    "\001\002\000\004\017\u02a3\001\002\000\010\015\uff95\164" +
+    "\uff95\301\uff95\001\002\000\020\015\uff9a\145\uff9a\164\uff9a" +
+    "\171\uff9a\215\uff9a\262\uff9a\270\uff9a\001\002\000\004\020" +
+    "\u02a6\001\002\000\004\103\u02a7\001\002\000\004\014\uff99" +
+    "\001\002\000\020\015\uffa6\145\uffa6\164\uffa6\171\uffa6\215" +
+    "\uffa6\262\uffa6\270\uffa6\001\002\000\016\004\222\005\224" +
+    "\012\226\141\223\251\230\335\221\001\002\000\036\011" +
+    "\240\017\u02ab\155\234\255\246\334\241\335\233\336\236" +
+    "\337\243\340\235\341\237\342\245\343\242\344\247\345" +
+    "\244\001\002\000\020\015\uffa5\145\uffa5\164\uffa5\171\uffa5" +
+    "\215\uffa5\262\uffa5\270\uffa5\001\002\000\004\020\u02ad\001" +
+    "\002\000\010\074\306\075\305\141\303\001\002\000\006" +
+    "\017\uffa4\023\uffa4\001\002\000\004\141\u02b0\001\002\000" +
+    "\004\020\u02b1\001\002\000\010\074\306\075\305\141\303" +
+    "\001\002\000\006\017\uffa1\023\uffa1\001\002\000\004\121" +
+    "\u02b4\001\002\000\004\020\u02b5\001\002\000\004\116\u02b6" +
+    "\001\002\000\006\014\uff8d\017\uff8d\001\002\000\006\062" +
+    "\u02b9\063\u02b8\001\002\000\004\165\u02c6\001\002\000\004" +
+    "\165\u02ba\001\002\000\004\141\u02bb\001\002\000\006\021" +
+    "\u02bc\022\u02bd\001\002\000\004\141\u02c2\001\002\000\004" +
+    "\141\u02be\001\002\000\004\021\u02bf\001\002\000\004\141" +
+    "\u02c0\001\002\000\004\017\u02c1\001\002\000\014\015\uffc6" +
+    "\164\uffc6\166\uffc6\232\uffc6\262\uffc6\001\002\000\004\022" +
+    "\u02c3\001\002\000\004\141\u02c4\001\002\000\004\017\u02c5" +
+    "\001\002\000\014\015\uffc7\164\uffc7\166\uffc7\232\uffc7\262" +
+    "\uffc7\001\002\000\004\141\u02c7\001\002\000\006\021\u02c8" +
+    "\022\u02c9\001\002\000\004\141\u02ce\001\002\000\004\141" +
+    "\u02ca\001\002\000\004\021\u02cb\001\002\000\004\141\u02cc" +
+    "\001\002\000\004\017\u02cd\001\002\000\014\015\uffc4\164" +
+    "\uffc4\166\uffc4\232\uffc4\262\uffc4\001\002\000\004\022\u02cf" +
+    "\001\002\000\004\141\u02d0\001\002\000\004\017\u02d1\001" +
+    "\002\000\014\015\uffc5\164\uffc5\166\uffc5\232\uffc5\262\uffc5" +
+    "\001\002\000\006\015\u02d4\164\275\001\002\000\004\015" +
+    "\u02d5\001\002\000\014\015\uffec\164\uffec\166\uffec\232\uffec" +
+    "\262\uffec\001\002\000\014\015\uffed\164\uffed\166\uffed\232" +
+    "\uffed\262\uffed\001\002\000\004\265\u02d9\001\002\000\014" +
+    "\015\uffc1\164\uffc1\166\uffc1\232\uffc1\262\uffc1\001\002\000" +
+    "\006\015\u02e5\164\275\001\002\000\004\262\u02da\001\002" +
+    "\000\004\041\u02db\001\002\000\006\020\u02dd\022\u02dc\001" +
+    "\002\000\004\141\u02e2\001\002\000\004\055\u02de\001\002" +
+    "\000\004\022\u02df\001\002\000\004\141\u02e0\001\002\000" +
+    "\004\017\u02e1\001\002\000\006\015\uffbc\164\uffbc\001\002" +
+    "\000\004\017\u02e3\001\002\000\006\015\uffbb\164\uffbb\001" +
+    "\002\000\004\015\u02e6\001\002\000\014\015\uffbf\164\uffbf" +
+    "\166\uffbf\232\uffbf\262\uffbf\001\002\000\014\015\uffbe\164" +
+    "\uffbe\166\uffbe\232\uffbe\262\uffbe\001\002\000\004\015\u02e8" +
+    "\001\002\000\014\015\uffbd\164\uffbd\166\uffbd\232\uffbd\262" +
+    "\uffbd\001\002\000\014\015\uffba\164\uffba\166\uffba\232\uffba" +
+    "\262\uffba\001\002\000\006\015\u02ed\164\u02eb\001\002\000" +
+    "\004\141\u02f1\001\002\000\014\015\uffb8\164\uffb8\166\uffb8" +
+    "\232\uffb8\262\uffb8\001\002\000\014\015\uffb9\164\uffb9\166" +
+    "\uffb9\232\uffb9\262\uffb9\001\002\000\006\015\u02f0\164\u02eb" +
+    "\001\002\000\014\015\uffb4\164\uffb4\166\uffb4\232\uffb4\262" +
+    "\uffb4\001\002\000\014\015\uffb5\164\uffb5\166\uffb5\232\uffb5" +
+    "\262\uffb5\001\002\000\004\271\u02f2\001\002\000\004\141" +
+    "\u02f3\001\002\000\004\017\u02f4\001\002\000\006\015\uffb3" +
+    "\164\uffb3\001\002\000\006\013\uffd7\016\uffd7\001\002\000" +
+    "\004\022\u030d\001\002\000\004\022\u030b\001\002\000\004" +
+    "\013\u0309\001\002\000\006\013\uffd8\016\uffd8\001\002\000" +
+    "\006\013\uffd5\016\uffd5\001\002\000\006\013\uffdb\016\u0307" +
+    "\001\002\000\006\013\uffd6\016\uffd6\001\002\000\004\022" +
+    "\u0305\001\002\000\004\022\u0303\001\002\000\006\013\uffd9" +
+    "\016\uffd9\001\002\000\004\022\u0301\001\002\000\004\004" +
+    "\u0302\001\002\000\006\013\uffd1\016\uffd1\001\002\000\004" +
+    "\141\u0304\001\002\000\006\013\uffd4\016\uffd4\001\002\000" +
+    "\004\005\u0306\001\002\000\006\013\uffd0\016\uffd0\001\002" +
+    "\000\014\025\u02fd\026\u0300\027\u02f7\031\u02fe\032\u02f6\001" +
+    "\002\000\004\013\uffda\001\002\000\004\017\u030a\001\002" +
+    "\000\014\015\uffe1\164\uffe1\166\uffe1\232\uffe1\262\uffe1\001" +
+    "\002\000\004\005\u030c\001\002\000\006\013\uffd2\016\uffd2" +
+    "\001\002\000\004\141\u030e\001\002\000\006\013\uffd3\016" +
+    "\uffd3\001\002\000\004\015\ufffd\001\002\000\004\013\u0311" +
+    "\001\002\000\004\017\u0312\001\002\000\014\015\uffdd\164" +
+    "\uffdd\166\uffdd\232\uffdd\262\uffdd\001\002\000\004\141\u0314" +
+    "\001\002\000\006\305\136\333\140\001\002\000\004\100" +
+    "\u0316\001\002\000\004\014\uffeb\001\002\000\004\013\u0318" +
+    "\001\002\000\004\017\u0319\001\002\000\014\015\uffdf\164" +
+    "\uffdf\166\uffdf\232\uffdf\262\uffdf\001\002\000\004\002\000" +
+    "\001\002" });
 
   /** Access to parse-action table. */
   @Override
@@ -771,60 +772,60 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
   /** <code>reduce_goto</code> table. */
   protected static final short[][] _reduce_table = 
     unpackFromStrings(new String[] {
-    "\000\u0317\000\004\003\003\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\066\004\041\005\021" +
-    "\010\011\012\035\013\036\016\023\017\043\020\013\021" +
-    "\012\031\031\032\015\033\020\034\044\035\024\036\022" +
-    "\037\026\040\010\041\016\042\025\043\033\044\014\045" +
-    "\030\052\034\053\032\054\042\055\040\001\001\000\002" +
+    "\000\u0318\000\004\004\003\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\066\005\041\006\021" +
+    "\011\011\013\035\014\036\017\023\020\043\021\013\022" +
+    "\012\032\031\033\015\034\020\035\044\036\024\037\022" +
+    "\040\026\041\010\042\016\043\025\044\033\045\014\046" +
+    "\030\053\034\054\032\055\042\056\040\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\020\022\u0315" +
-    "\023\u02f9\024\u02fd\025\u02f7\026\u02f3\027\u02fa\030\u02f8\001" +
-    "\001\000\002\001\001\000\002\001\001\000\020\022\u030e" +
-    "\023\u02f9\024\u02fd\025\u02f7\026\u02f3\027\u02fa\030\u02f8\001" +
-    "\001\000\066\004\u030d\005\021\010\011\012\035\013\036" +
-    "\016\023\017\043\020\013\021\012\031\031\032\015\033" +
-    "\020\034\044\035\024\036\022\037\026\040\010\041\016" +
-    "\042\025\043\033\044\014\045\030\052\034\053\032\054" +
-    "\042\055\040\001\001\000\002\001\001\000\002\001\001" +
+    "\001\000\002\001\001\000\002\001\001\000\020\023\u0316" +
+    "\024\u02fa\025\u02fe\026\u02f8\027\u02f4\030\u02fb\031\u02f9\001" +
+    "\001\000\002\001\001\000\002\001\001\000\020\023\u030f" +
+    "\024\u02fa\025\u02fe\026\u02f8\027\u02f4\030\u02fb\031\u02f9\001" +
+    "\001\000\066\005\u030e\006\021\011\011\013\035\014\036" +
+    "\017\023\020\043\021\013\022\012\032\031\033\015\034" +
+    "\020\035\044\036\024\037\022\040\026\041\010\042\016" +
+    "\043\025\044\033\045\014\046\030\053\034\054\032\055" +
+    "\042\056\040\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\020\022\u02f6\023\u02f9" +
-    "\024\u02fd\025\u02f7\026\u02f3\027\u02fa\030\u02f8\001\001\000" +
-    "\002\001\001\000\002\001\001\000\012\014\u02d4\015\276" +
-    "\046\u02d5\047\u02d6\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\044\054\176\055\040\056\166" +
-    "\057\164\060\174\061\160\062\157\063\165\064\167\065" +
-    "\151\070\170\071\156\072\153\075\173\076\163\077\175" +
-    "\166\172\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\020\023\u02f7\024\u02fa" +
+    "\025\u02fe\026\u02f8\027\u02f4\030\u02fb\031\u02f9\001\001\000" +
+    "\002\001\001\000\002\001\001\000\012\015\u02d5\016\276" +
+    "\047\u02d6\050\u02d7\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\044\055\176\056\040\057\166" +
+    "\060\164\061\174\062\160\063\157\064\165\065\167\066" +
+    "\151\071\170\072\156\073\153\076\173\077\163\100\175" +
+    "\167\172\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\004\007\101\001\001\000\002" +
+    "\001\000\002\001\001\000\004\010\101\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\004\011\105\001\001\000\002\001" +
+    "\000\002\001\001\000\004\012\105\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\004\011\110\001\001\000\002\001" +
-    "\001\000\004\011\112\001\001\000\002\001\001\000\002" +
+    "\000\002\001\001\000\004\012\110\001\001\000\002\001" +
+    "\001\000\004\012\112\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\004\006\136\001\001\000\002\001\001\000\002" +
+    "\001\000\004\007\136\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\044\054\176\055" +
-    "\040\056\u0297\057\164\060\174\061\160\062\157\063\165" +
-    "\064\167\065\151\070\170\071\156\072\153\075\173\076" +
-    "\163\077\175\166\172\001\001\000\002\001\001\000\002" +
+    "\000\002\001\001\000\002\001\001\000\044\055\176\056" +
+    "\040\057\u0298\060\164\061\174\062\160\063\157\064\165" +
+    "\065\167\066\151\071\170\072\156\073\153\076\173\077" +
+    "\163\100\175\167\172\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
@@ -832,124 +833,124 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\010\226\226\227\227" +
-    "\230\223\001\001\000\010\226\271\227\227\230\223\001" +
+    "\002\001\001\000\002\001\001\000\010\227\226\230\230" +
+    "\231\224\001\001\000\010\227\271\230\230\231\224\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\010\226\265\227\227\230\223\001" +
-    "\001\000\002\001\001\000\002\001\001\000\010\226\231" +
-    "\227\227\230\223\001\001\000\002\001\001\000\010\226" +
-    "\263\227\227\230\223\001\001\000\010\226\262\227\227" +
-    "\230\223\001\001\000\010\226\261\227\227\230\223\001" +
-    "\001\000\010\226\260\227\227\230\223\001\001\000\010" +
-    "\226\257\227\227\230\223\001\001\000\010\226\256\227" +
-    "\227\230\223\001\001\000\010\226\255\227\227\230\223" +
-    "\001\001\000\010\226\254\227\227\230\223\001\001\000" +
-    "\010\226\253\227\227\230\223\001\001\000\010\226\252" +
-    "\227\227\230\223\001\001\000\010\226\251\227\227\230" +
-    "\223\001\001\000\010\226\250\227\227\230\223\001\001" +
-    "\000\010\226\247\227\227\230\223\001\001\000\002\001" +
+    "\000\002\001\001\000\010\227\265\230\230\231\224\001" +
+    "\001\000\002\001\001\000\010\227\231\230\230\231\224" +
+    "\001\001\000\002\001\001\000\002\001\001\000\010\227" +
+    "\263\230\230\231\224\001\001\000\010\227\262\230\230" +
+    "\231\224\001\001\000\010\227\261\230\230\231\224\001" +
+    "\001\000\010\227\260\230\230\231\224\001\001\000\010" +
+    "\227\257\230\230\231\224\001\001\000\010\227\256\230" +
+    "\230\231\224\001\001\000\010\227\255\230\230\231\224" +
+    "\001\001\000\010\227\254\230\230\231\224\001\001\000" +
+    "\010\227\253\230\230\231\224\001\001\000\010\227\252" +
+    "\230\230\231\224\001\001\000\010\227\251\230\230\231" +
+    "\224\001\001\000\010\227\250\230\230\231\224\001\001" +
+    "\000\010\227\247\230\230\231\224\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\004\230\270" +
-    "\001\001\000\002\001\001\000\002\001\001\000\006\014" +
-    "\273\015\276\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\006\014\277\015\276\001\001\000" +
+    "\001\000\002\001\001\000\002\001\001\000\004\231\270" +
+    "\001\001\000\002\001\001\000\002\001\001\000\006\015" +
+    "\273\016\276\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\006\015\277\016\276\001\001\000" +
     "\002\001\001\000\002\001\001\000\004\002\303\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\074\073\331\074\340\100\322\101\317\102" +
-    "\326\103\325\104\346\105\343\106\314\107\353\110\342" +
-    "\111\327\112\324\113\315\114\334\152\316\153\330\154" +
-    "\337\155\335\156\321\157\320\160\313\161\350\162\336" +
-    "\163\333\164\347\165\351\175\345\202\323\001\001\000" +
+    "\001\001\000\074\074\331\075\340\101\322\102\317\103" +
+    "\326\104\325\105\346\106\343\107\314\110\353\111\342" +
+    "\112\327\113\324\114\315\115\334\153\316\154\330\155" +
+    "\337\156\335\157\321\160\320\161\313\162\350\163\336" +
+    "\164\333\165\347\166\351\176\345\203\323\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\010\176\u01ce" +
-    "\211\u01cd\212\u01cb\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\010\177\u01ce" +
+    "\212\u01cd\213\u01cb\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\074\073\u0198\074\340\100\322\101\317\102" +
-    "\326\103\325\104\346\105\343\106\314\107\353\110\342" +
-    "\111\327\112\324\113\315\114\334\152\316\153\330\154" +
-    "\337\155\335\156\321\157\320\160\313\161\350\162\336" +
-    "\163\333\164\347\165\351\175\345\202\323\001\001\000" +
+    "\001\001\000\074\074\u0198\075\340\101\322\102\317\103" +
+    "\326\104\325\105\346\106\343\107\314\110\353\111\342" +
+    "\112\327\113\324\114\315\115\334\153\316\154\330\155" +
+    "\337\156\335\157\321\160\320\161\313\162\350\163\336" +
+    "\164\333\165\347\166\351\176\345\203\323\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\004\116\371" +
+    "\001\000\002\001\001\000\002\001\001\000\004\117\371" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\036\120\u0103\121\u010c\122\u010f\125\u0113\126\377\127" +
-    "\u0109\130\u010d\131\u0112\144\u0107\145\u0102\146\u010a\147\u0100" +
-    "\150\u0114\151\u010b\001\001\000\002\001\001\000\026\123" +
-    "\u0177\124\u011a\132\u0118\133\u0115\137\u011c\140\u0122\141\u0116" +
-    "\142\u0121\143\u011f\167\u011b\001\001\000\002\001\001\000" +
-    "\026\123\u0174\124\u011a\132\u0118\133\u0115\137\u011c\140\u0122" +
-    "\141\u0116\142\u0121\143\u011f\167\u011b\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\010\226\u016b" +
-    "\227\227\230\223\001\001\000\026\123\u0169\124\u011a\132" +
-    "\u0118\133\u0115\137\u011c\140\u0122\141\u0116\142\u0121\143\u011f" +
-    "\167\u011b\001\001\000\002\001\001\000\002\001\001\000" +
-    "\026\123\u0166\124\u011a\132\u0118\133\u0115\137\u011c\140\u0122" +
-    "\141\u0116\142\u0121\143\u011f\167\u011b\001\001\000\026\123" +
-    "\u0164\124\u011a\132\u0118\133\u0115\137\u011c\140\u0122\141\u0116" +
-    "\142\u0121\143\u011f\167\u011b\001\001\000\002\001\001\000" +
+    "\000\036\121\u0103\122\u010c\123\u010f\126\u0113\127\377\130" +
+    "\u0109\131\u010d\132\u0112\145\u0107\146\u0102\147\u010a\150\u0100" +
+    "\151\u0114\152\u010b\001\001\000\002\001\001\000\026\124" +
+    "\u0177\125\u011a\133\u0118\134\u0115\140\u011c\141\u0122\142\u0116" +
+    "\143\u0121\144\u011f\170\u011b\001\001\000\002\001\001\000" +
+    "\026\124\u0174\125\u011a\133\u0118\134\u0115\140\u011c\141\u0122" +
+    "\142\u0116\143\u0121\144\u011f\170\u011b\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\010\227\u016b" +
+    "\230\230\231\224\001\001\000\026\124\u0169\125\u011a\133" +
+    "\u0118\134\u0115\140\u011c\141\u0122\142\u0116\143\u0121\144\u011f" +
+    "\170\u011b\001\001\000\002\001\001\000\002\001\001\000" +
+    "\026\124\u0166\125\u011a\133\u0118\134\u0115\140\u011c\141\u0122" +
+    "\142\u0116\143\u0121\144\u011f\170\u011b\001\001\000\026\124" +
+    "\u0164\125\u011a\133\u0118\134\u0115\140\u011c\141\u0122\142\u0116" +
+    "\143\u0121\144\u011f\170\u011b\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\026\123\u0119\124\u011a\132\u0118\133\u0115\137\u011c" +
-    "\140\u0122\141\u0116\142\u0121\143\u011f\167\u011b\001\001\000" +
+    "\001\000\026\124\u0119\125\u011a\133\u0118\134\u0115\140\u011c" +
+    "\141\u0122\142\u0116\143\u0121\144\u011f\170\u011b\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\014\134\u0124\136\u0126\226\u0127\227\227" +
-    "\230\223\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\010\226\u0129\227\227" +
-    "\230\223\001\001\000\002\001\001\000\010\226\u012b\227" +
-    "\227\230\223\001\001\000\002\001\001\000\002\001\001" +
+    "\002\001\001\000\014\135\u0124\137\u0126\227\u0127\230\230" +
+    "\231\224\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\010\227\u0129\230\230" +
+    "\231\224\001\001\000\002\001\001\000\010\227\u012b\230" +
+    "\230\231\224\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\020\201\u013d\223\u0139\225\u0141" +
-    "\226\u013e\227\u0140\230\u013c\231\u013a\001\001\000\002\001" +
-    "\001\000\022\226\u013e\227\u014a\230\u0148\231\u0144\232\u0146" +
-    "\234\u014c\235\u0145\236\u0149\001\001\000\002\001\001\000" +
+    "\001\000\002\001\001\000\020\202\u013d\224\u013a\226\u0141" +
+    "\227\u013e\230\u0140\231\u013c\232\u0139\001\001\000\022\227" +
+    "\u013e\230\u014d\231\u014a\232\u0146\233\u0149\235\u014e\236\u0148" +
+    "\237\u014b\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\022\226\u013e\227\u014a\230\u0148" +
-    "\231\u0144\232\u0146\234\u014c\235\u0145\236\u0153\001\001\000" +
-    "\002\001\001\000\004\233\u014f\001\001\000\002\001\001" +
+    "\001\000\002\001\001\000\020\202\u0145\224\u013a\226\u0141" +
+    "\227\u013e\230\u0140\231\u013c\232\u0139\001\001\000\002\001" +
+    "\001\000\022\227\u013e\230\u014d\231\u014a\232\u0146\233\u0149" +
+    "\235\u014e\236\u0148\237\u0155\001\001\000\002\001\001\000" +
+    "\002\001\001\000\004\234\u0150\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\022\226\u013e\227\u014a\230\u0148\231\u0144\232" +
-    "\u0146\234\u014c\235\u0145\236\u0151\001\001\000\002\001\001" +
+    "\002\001\001\000\002\001\001\000\022\227\u013e\230\u014d" +
+    "\231\u014a\232\u0146\233\u0149\235\u014e\236\u0148\237\u0152\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\020\201\u0156\223\u0139\225\u0141\226\u013e" +
-    "\227\u0140\230\u013c\231\u013a\001\001\000\002\001\001\000" +
-    "\012\224\u0159\226\u0158\227\227\230\223\001\001\000\002" +
+    "\012\225\u0159\227\u0158\230\230\231\224\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\026\123\u015e\124\u011a\132\u0118" +
-    "\133\u0115\137\u011c\140\u0122\141\u0116\142\u0121\143\u011f\167" +
+    "\001\000\002\001\001\000\026\124\u015e\125\u011a\133\u0118" +
+    "\134\u0115\140\u011c\141\u0122\142\u0116\143\u0121\144\u011f\170" +
     "\u011b\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\034\121\u016d\122\u010f" +
-    "\125\u0113\126\377\127\u0109\130\u010d\131\u0112\144\u0107\145" +
-    "\u0102\146\u010a\147\u0100\150\u0114\151\u010b\001\001\000\002" +
+    "\002\001\001\000\002\001\001\000\034\122\u016d\123\u010f" +
+    "\126\u0113\127\377\130\u0109\131\u010d\132\u0112\145\u0107\146" +
+    "\u0102\147\u010a\150\u0100\151\u0114\152\u010b\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\116\u017c\001\001\000\002\001\001\000" +
+    "\001\001\000\004\117\u017c\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\004\116\u0183\001\001\000" +
+    "\001\001\000\002\001\001\000\004\117\u0183\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
@@ -959,30 +960,30 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\116\u01a2\001\001\000\002\001\001\000" +
+    "\001\001\000\004\117\u01a2\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\004\116\u01a9\001\001\000" +
+    "\001\001\000\002\001\001\000\004\117\u01a9\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\004\116\u01b2\001\001\000\002" +
+    "\001\000\002\001\001\000\004\117\u01b2\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\004\115\u01bc\001" +
+    "\000\002\001\001\000\002\001\001\000\004\116\u01bc\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\036\120\u01c1\121\u010c\122\u010f\125" +
-    "\u0113\126\377\127\u0109\130\u010d\131\u0112\144\u0107\145\u0102" +
-    "\146\u010a\147\u0100\150\u0114\151\u010b\001\001\000\002\001" +
-    "\001\000\040\117\u01c4\120\u01c3\121\u010c\122\u010f\125\u0113" +
-    "\126\377\127\u0109\130\u010d\131\u0112\144\u0107\145\u0102\146" +
-    "\u010a\147\u0100\150\u0114\151\u010b\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\040\117\u01c7\120" +
-    "\u01c3\121\u010c\122\u010f\125\u0113\126\377\127\u0109\130\u010d" +
-    "\131\u0112\144\u0107\145\u0102\146\u010a\147\u0100\150\u0114\151" +
+    "\000\002\001\001\000\036\121\u01c1\122\u010c\123\u010f\126" +
+    "\u0113\127\377\130\u0109\131\u010d\132\u0112\145\u0107\146\u0102" +
+    "\147\u010a\150\u0100\151\u0114\152\u010b\001\001\000\002\001" +
+    "\001\000\040\120\u01c4\121\u01c3\122\u010c\123\u010f\126\u0113" +
+    "\127\377\130\u0109\131\u010d\132\u0112\145\u0107\146\u0102\147" +
+    "\u010a\150\u0100\151\u0114\152\u010b\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\040\120\u01c7\121" +
+    "\u01c3\122\u010c\123\u010f\126\u0113\127\377\130\u0109\131\u010d" +
+    "\132\u0112\145\u0107\146\u0102\147\u010a\150\u0100\151\u0114\152" +
     "\u010b\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\014\203\u01d4\217\u01d1\220\u01d7\221\u01d5\222\u01d6\001" +
-    "\001\000\014\203\u01e8\217\u01d1\220\u01d7\221\u01d5\222\u01d6" +
+    "\000\014\204\u01d4\220\u01d1\221\u01d7\222\u01d6\223\u01d5\001" +
+    "\001\000\014\204\u01e8\220\u01d1\221\u01d7\222\u01d6\223\u01d5" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
@@ -990,79 +991,81 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\004\204\u01ea\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\004\177\u01f0\001\001\000\006\200\u01f2\206\u01f3\001\001" +
-    "\000\002\001\001\000\002\001\001\000\004\177\u0202\001" +
-    "\001\000\004\210\u01fa\001\001\000\002\001\001\000\002" +
-    "\001\001\000\006\225\u01f8\231\u013a\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\016\223\u01fe\225" +
-    "\u0141\226\u013e\227\u0140\230\u013c\231\u013a\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\006\200" +
-    "\u01f2\206\u01f3\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\014\203\u0209\217\u01d1\220\u01d7\221\u01d5\222\u01d6\001\001" +
+    "\002\001\001\000\004\205\u01ea\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\010\205\u0210\213\u020d\214\u020e\001\001\000\002\001\001" +
-    "\000\004\214\u0226\001\001\000\004\213\u0225\001\001\000" +
+    "\004\200\u01f0\001\001\000\006\201\u01f2\207\u01f3\001\001" +
+    "\000\002\001\001\000\002\001\001\000\004\200\u0203\001" +
+    "\001\000\006\003\u01fc\211\u01fa\001\001\000\002\001\001" +
+    "\000\002\001\001\000\006\226\u01f8\232\u0139\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\006\215\u0216\216\u0215\001\001\000\004\206" +
-    "\u021a\001\001\000\006\215\u0218\216\u0215\001\001\000\002" +
-    "\001\001\000\004\206\u021a\001\001\000\002\001\001\000" +
-    "\002\001\001\000\004\210\u021b\001\001\000\002\001\001" +
+    "\001\001\000\002\001\001\000\002\001\001\000\016\224" +
+    "\u01fe\226\u0141\227\u013e\230\u0140\231\u013c\232\u0139\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\006\201\u01f2\207\u01f3\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\014\204\u020a\220\u01d1\221\u01d7" +
+    "\222\u01d6\223\u01d5\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\010\206\u0211\214\u020d\215\u020f" +
+    "\001\001\000\004\215\u022f\001\001\000\002\001\001\000" +
+    "\004\214\u0226\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\006\216\u0217\217" +
+    "\u0216\001\001\000\004\207\u021b\001\001\000\006\216\u0219" +
+    "\217\u0216\001\001\000\002\001\001\000\004\207\u021b\001" +
+    "\001\000\002\001\001\000\002\001\001\000\004\211\u021c" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\004\117\u0238\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\006\117\u0241\171\u0242\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\004\117\u0246\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\004\116\u0237\001\001\000\002\001\001\000\002\001" +
+    "\000\002\001\001\000\002\001\001\000\004\171\u024a\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\006\116\u0240\170" +
-    "\u0241\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\116\u0245\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\170\u0249\001\001\000\002\001\001\000" +
+    "\000\002\001\001\000\002\001\001\000\010\172\u0253\173" +
+    "\u0251\210\u0254\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\004\211\u0256\001\001\000\002\001\001\000\004\173\u0258" +
+    "\001\001\000\002\001\001\000\002\001\001\000\006\172" +
+    "\u025b\210\u0254\001\001\000\002\001\001\000\002\001\001" +
+    "\000\004\136\u025f\001\001\000\002\001\001\000\002\001" +
+    "\001\000\010\227\u0261\230\230\231\224\001\001\000\002" +
+    "\001\001\000\010\227\u0263\230\230\231\224\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\010\171\u0252\172\u0250\207\u0253\001\001\000" +
+    "\001\001\000\002\001\001\000\004\117\u0269\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\004\210\u0255\001\001\000" +
-    "\002\001\001\000\004\172\u0257\001\001\000\002\001\001" +
-    "\000\002\001\001\000\006\171\u025a\207\u0253\001\001\000" +
-    "\002\001\001\000\002\001\001\000\004\135\u025e\001\001" +
-    "\000\002\001\001\000\002\001\001\000\010\226\u0260\227" +
-    "\227\230\223\001\001\000\002\001\001\000\010\226\u0262" +
-    "\227\227\230\223\001\001\000\002\001\001\000\002\001" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\006\117\u0273\174\u0272\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\004\174\u0275\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\004\116\u0268\001\001\000\002\001\001\000\002\001" +
+    "\000\004\117\u027b\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\006\116\u0272\173" +
-    "\u0271\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\173\u0274\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\004\116\u027a\001\001" +
+    "\000\002\001\001\000\002\001\001\000\010\172\u0282\175" +
+    "\u0283\210\u0254\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\006\172\u0285\210\u0254\001\001\000" +
+    "\002\001\001\000\002\001\001\000\004\175\u0288\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\010\171\u0281\174\u0282\207\u0253\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\006" +
-    "\171\u0284\207\u0253\001\001\000\002\001\001\000\002\001" +
-    "\001\000\004\174\u0287\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\010\015" +
-    "\u029d\066\u0299\067\u029c\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\010\015\u029d\066\u029e\067" +
-    "\u029c\001\001\000\002\001\001\000\002\001\001\000\004" +
-    "\002\u02a0\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\010\226\u02a8\227\227\230" +
-    "\223\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\004\002\u02ac\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\004\002\u02b0\001\001" +
+    "\002\001\001\000\010\016\u029e\067\u029a\070\u029d\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\010\016\u029e\067\u029f\070\u029d\001\001\000\002\001\001" +
+    "\000\002\001\001\000\004\002\u02a1\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\010\227\u02a9\230\230\231\224\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\004\002\u02ad\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\004\002\u02b1\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
@@ -1071,33 +1074,32 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\006" +
-    "\014\u02d1\015\276\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\004\047\u02e5\001\001\000\002" +
-    "\001\001\000\006\014\u02e2\015\276\001\001\000\002\001" +
+    "\000\002\001\001\000\006\015\u02d2\016\276\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\004" +
+    "\050\u02e6\001\001\000\002\001\001\000\006\015\u02e3\016" +
+    "\276\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\001\000\002\001\001\000\006\051\u02eb\052\u02ed\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\006\050\u02ea\051\u02ec\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\006\050\u02ed\051\u02ec" +
+    "\000\006\051\u02ee\052\u02ed\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\020\023\u0307\024\u02fa\025\u02fe\026\u02f8\027\u02f4\030" +
+    "\u02fb\031\u02f9\001\001\000\002\001\001\000\002\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\020\022\u0306\023\u02f9" +
-    "\024\u02fd\025\u02f7\026\u02f3\027\u02fa\030\u02f8\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\004\006\u0313\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001" });
+    "\001\000\004\007\u0314\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001" });
 
   /** Access to <code>reduce_goto</code> table. */
   @Override
@@ -1326,7 +1328,7 @@ class CUP$AvatarFromSysMLParser$actions {
         RESULT =
         new StxModel(errors,dataTypeMap,relationMap,channelMap,blockMap,signalMap);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("model",1, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("model",2, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1352,7 +1354,7 @@ class CUP$AvatarFromSysMLParser$actions {
         RESULT =
         new StxModel(errors,dataTypeMap,relationMap,channelMap,blockMap,signalMap);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("model",1, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("model",2, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1361,7 +1363,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("featureList",2, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("featureList",3, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1370,7 +1372,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("featureList",2, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("featureList",3, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1379,7 +1381,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",3, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1388,7 +1390,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",3, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1397,7 +1399,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",3, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1406,7 +1408,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",3, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1415,7 +1417,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",3, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1424,7 +1426,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",3, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1433,7 +1435,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",3, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1442,7 +1444,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",3, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("feature",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1451,7 +1453,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("specializes",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("specializes",5, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1460,7 +1462,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("specializes",4, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("specializes",5, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1469,7 +1471,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("subsets",5, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("subsets",6, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1478,7 +1480,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("subsets",5, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("subsets",6, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1487,7 +1489,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockAlias",6, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockAlias",7, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1496,7 +1498,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockChain",7, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockChain",8, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1505,7 +1507,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockChain",7, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockChain",8, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1519,7 +1521,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theStructure.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("datatypeDecl",8, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("datatypeDecl",9, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1533,7 +1535,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theStructure.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("datatypeDecl",8, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("datatypeDecl",9, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1555,7 +1557,7 @@ class CUP$AvatarFromSysMLParser$actions {
     }
     theStructure.setLeft(axleft);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("datatypeDeclHEADER",9, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("datatypeDeclHEADER",10, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1564,7 +1566,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldDecls",10, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldDecls",11, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1573,7 +1575,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldDecls",10, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldDecls",11, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1588,7 +1590,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location tpxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xright;
 		String tp = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1).<String>value();
 		 theStructure.addField(id.getAvatarName(),tp); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldDecl",11, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldDecl",12, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1627,7 +1629,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relationDecl",12, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relationDecl",13, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1636,7 +1638,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relationDecl",12, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relationDecl",13, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1645,7 +1647,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relationDecl",12, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relationDecl",13, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1659,7 +1661,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     theRelation.setRight(xxright);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("syncRelDecl",13, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("syncRelDecl",14, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1680,7 +1682,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theRelation.setLeft(pxleft);
         clearRelationParams();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("syncRelDeclBegin",23, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("syncRelDeclBegin",24, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1694,7 +1696,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     theRelation.setRight(xxright);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("nbfRelDecl",14, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("nbfRelDecl",15, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1715,7 +1717,7 @@ class CUP$AvatarFromSysMLParser$actions {
        theRelation.setLeft(pxleft);
        clearRelationParams();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("nbfRelDeclBegin",24, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("nbfRelDeclBegin",25, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1729,7 +1731,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     theRelation.setRight(xxright);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("bfRelDecl",15, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("bfRelDecl",16, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1750,7 +1752,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theRelation.setLeft(pxleft);
         clearRelationParams();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("bfRelDeclBegin",25, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("bfRelDeclBegin",26, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1759,7 +1761,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParams",16, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParams",17, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1768,7 +1770,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParams",16, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParams",17, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1777,7 +1779,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",17, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",18, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1786,7 +1788,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",17, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",18, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1795,7 +1797,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",17, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",18, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1804,7 +1806,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",17, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",18, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1813,7 +1815,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",17, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("relParam",18, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1832,7 +1834,7 @@ class CUP$AvatarFromSysMLParser$actions {
         addError(new AvatarFromSysMLError(AvatarFromSysMLError.HIGHWARNING,"bloc1 is already set\n"));
     block1ParamFlag = false;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("block1Param",18, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("block1Param",19, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1851,7 +1853,7 @@ class CUP$AvatarFromSysMLParser$actions {
         addError(new AvatarFromSysMLError(AvatarFromSysMLError.HIGHWARNING,"bloc2 is already set\n"));
     block2ParamFlag = false;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("block2Param",19, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("block2Param",20, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1869,7 +1871,7 @@ class CUP$AvatarFromSysMLParser$actions {
         addError(new AvatarFromSysMLError(AvatarFromSysMLError.HIGHWARNING,"private is already set\n"));
     privateParamFlag = false;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("privateParam",20, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("privateParam",21, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1889,7 +1891,7 @@ class CUP$AvatarFromSysMLParser$actions {
         addError(new AvatarFromSysMLError(AvatarFromSysMLError.HIGHWARNING,"maxsize is already set\n"));
     maxsizeParamFlag = false;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("maxsizeParam",21, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("maxsizeParam",22, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1909,7 +1911,7 @@ class CUP$AvatarFromSysMLParser$actions {
         addError(new AvatarFromSysMLError(AvatarFromSysMLError.HIGHWARNING,"maxsize is already set\n"));
     lossyParamFlag = false;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("lossyParam",22, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("lossyParam",23, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1918,7 +1920,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelDecl",26, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelDecl",27, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1927,7 +1929,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelDecl",26, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelDecl",27, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1936,7 +1938,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelDecl",26, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelDecl",27, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1963,7 +1965,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theChannel.setLeft(pxleft);
     theChannel.setRight(sxright);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("syncChDecl",27, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-11), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("syncChDecl",28, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-11), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -1990,7 +1992,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theChannel.setLeft(pxleft);
     theChannel.setRight(sxright);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("nbfChDecl",28, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-11), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("nbfChDecl",29, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-11), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2017,7 +2019,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theChannel.setLeft(pxleft);
     theChannel.setRight(sxright);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("bfChDecl",29, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-11), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("bfChDecl",30, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-11), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2026,7 +2028,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("signalBinding",30, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("signalBinding",31, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2035,7 +2037,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("signalBinding",30, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("signalBinding",31, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2061,7 +2063,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theSignal.setChannel(theChannel);
         theChannel.setSignal(b.getAvatarName(), theSignal);
     
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inSignalBinding",31, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inSignalBinding",32, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2087,7 +2089,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theSignal.setChannel(theChannel);
         theChannel.setSignal(b.getAvatarName(), theSignal);
    
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inSignalBinding",31, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inSignalBinding",32, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2113,7 +2115,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theSignal.setChannel(theChannel);
         theChannel.setSignal(b.getAvatarName(), theSignal);
    
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outSignalBinding",32, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outSignalBinding",33, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2139,7 +2141,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theSignal.setChannel(theChannel);
         theChannel.setSignal(b.getAvatarName(), theSignal);
    
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outSignalBinding",32, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outSignalBinding",33, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2148,7 +2150,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageDecl",33, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageDecl",34, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2157,7 +2159,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageDecl",33, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageDecl",34, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2166,7 +2168,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDecl",34, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDecl",35, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2184,7 +2186,7 @@ class CUP$AvatarFromSysMLParser$actions {
     getInMessage(id.getAvatarName());
     theStructure.setLeft(pxleft);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDeclBegin",40, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDeclBegin",41, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2198,7 +2200,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theStructure.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDeclBODY",36, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDeclBODY",37, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2212,7 +2214,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theStructure.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDeclBODY",36, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDeclBODY",37, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2226,7 +2228,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theStructure.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDeclBODY",36, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("inMessageDeclBODY",37, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2242,7 +2244,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theChannel.setInProfile((StxInMessage)theStructure);
         ((StxInMessage)theStructure).setChannel(theChannel);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageChannel",37, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageChannel",38, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2258,7 +2260,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theChannel.setInProfile((StxInMessage)theStructure);
         ((StxInMessage)theStructure).setChannel(theChannel);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageChannel",37, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageChannel",38, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2272,7 +2274,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theOutMessage.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDecl",35, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDecl",36, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2286,7 +2288,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theOutMessage.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDecl",35, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDecl",36, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2295,7 +2297,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDecl",35, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDecl",36, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2317,7 +2319,7 @@ class CUP$AvatarFromSysMLParser$actions {
         getOutMessage(id.getAvatarName(), (StxInMessage)theStructure);
         theOutMessage.setLeft(pxleft);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDeclBegin",41, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDeclBegin",42, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2339,7 +2341,7 @@ class CUP$AvatarFromSysMLParser$actions {
         getOutMessage(id.getAvatarName(), (StxInMessage)theStructure);
         theOutMessage.setLeft(pxleft);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDeclBegin",41, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDeclBegin",42, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2353,7 +2355,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theOutMessage.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDeclBODY",38, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDeclBODY",39, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2362,7 +2364,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDeclBODY",38, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("outMessageDeclBODY",39, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2379,7 +2381,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theOutMessage.addFieldLink(o.getAvatarName(), i.getAvatarName());
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("redefineField",39, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("redefineField",40, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2388,7 +2390,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 		 popBlock(); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDecl",42, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDecl",43, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2397,7 +2399,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 		 popBlock(); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDecl",42, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDecl",43, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2418,7 +2420,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theBlock.setFather(tmp);
         theBlock.setLeft(pxleft);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDeclBegin",43, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDeclBegin",44, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2432,7 +2434,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theBlock.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDeclBODY",44, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDeclBODY",45, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2441,7 +2443,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDeclBODY",44, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockDeclBODY",45, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2450,7 +2452,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",45, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",46, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2459,7 +2461,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",45, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",46, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2468,7 +2470,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",45, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",46, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2477,7 +2479,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",45, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",46, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2486,7 +2488,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",45, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",46, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2495,7 +2497,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",45, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",46, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2504,7 +2506,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",45, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("blockItem",46, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2518,7 +2520,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theAttribute.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("attributeDecl",46, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("attributeDecl",47, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2536,7 +2538,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theAttribute.setInit(e);
         theAttribute.setRight(qxright);
     
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("attributeDecl",46, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("attributeDecl",47, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2558,7 +2560,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theBlock.addAttribute(theAttribute);
         theAttribute.setLeft(axleft);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("attributeDeclHEADER",48, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("attributeDeclHEADER",49, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2572,7 +2574,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theAttribute.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("constantDecl",47, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("constantDecl",48, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2590,7 +2592,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theAttribute.setInit(e);
         theAttribute.setRight(qxright);
     
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("constantDecl",47, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("constantDecl",48, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2612,7 +2614,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theBlock.addConstant(theAttribute);
         theAttribute.setLeft(rxleft);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("constantDeclHEADER",61, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("constantDeclHEADER",62, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2621,7 +2623,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("methodDecl",49, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("methodDecl",50, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2630,7 +2632,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("methodDecl",49, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("methodDecl",50, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2644,7 +2646,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theStructure.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("voidMethodDecl",50, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("voidMethodDecl",51, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2658,7 +2660,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theStructure.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("voidMethodDecl",50, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("voidMethodDecl",51, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2677,7 +2679,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theBlock.addMethod((StxMethod)theStructure);
     theStructure.setLeft(axleft);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("voidMethodDeclBegin",59, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("voidMethodDeclBegin",60, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2691,7 +2693,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theStructure.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodDecl",51, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodDecl",52, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2705,7 +2707,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theStructure.setRight(bxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodDecl",51, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodDecl",52, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2724,7 +2726,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theBlock.addMethod((StxMethod)theStructure);
     theStructure.setLeft(cxleft);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodDeclBegin",60, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodDeclBegin",61, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2733,7 +2735,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodItems",52, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodItems",53, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2742,7 +2744,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodItems",52, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodItems",53, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2751,7 +2753,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodItem",53, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodItem",54, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2765,7 +2767,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         ((StxMethod)theStructure).setReturnType(tp);
     
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodItem",53, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("calcMethodItem",54, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2788,7 +2790,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theSignal.setLeft(pxleft);
         theSignal.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("signalDecl",54, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("signalDecl",55, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2811,7 +2813,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theSignal.setLeft(pxleft);
         theSignal.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("signalDecl",54, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("signalDecl",55, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2831,7 +2833,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theBlock.addTimer(new StxTimer(pxleft, qxright, id.getAvatarName()));
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("timerDecl",55, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("timerDecl",56, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2851,7 +2853,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theBlock.addTimer(new StxTimer(pxleft, qxright, id.getAvatarName()));
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("timerDecl",55, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("timerDecl",56, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2863,7 +2865,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theBlock.setStates(stateMap.values().toArray(new StxState[0]));
         stateMap = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachine",56, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachine",57, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2875,7 +2877,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theBlock.setStates(stateMap.values().toArray(new StxState[0]));
         stateMap = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachine",56, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachine",57, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2887,7 +2889,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theBlock.setStates(stateMap.values().toArray(new StxState[0]));
         stateMap = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachine",56, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachine",57, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2898,7 +2900,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     stateMap = new HashMap<String, StxState>();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineBegin",116, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineBegin",117, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2907,7 +2909,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineItems",57, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineItems",58, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2916,7 +2918,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineItems",57, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineItems",58, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2925,7 +2927,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineItem",58, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineItem",59, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2934,7 +2936,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineItem",58, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineItem",59, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2943,7 +2945,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2952,7 +2954,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2961,7 +2963,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2970,7 +2972,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2979,7 +2981,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2988,7 +2990,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -2997,7 +2999,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3006,7 +3008,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3015,7 +3017,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3024,7 +3026,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3033,7 +3035,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3042,7 +3044,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",62, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3056,7 +3058,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",63, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",64, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3070,7 +3072,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",63, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",64, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3084,7 +3086,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",63, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",64, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3104,7 +3106,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startStateBegin",104, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startStateBegin",105, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3118,7 +3120,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",64, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3132,7 +3134,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",64, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3146,7 +3148,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",64, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3167,7 +3169,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardStateBegin",105, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardStateBegin",106, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3181,7 +3183,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3195,7 +3197,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3214,7 +3216,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setType(AvatarFromSysMLSyntax.STXSTOPSTATE);
     theState.setLeft(zxright);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopStateBegin",106, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopStateBegin",107, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3228,7 +3230,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3242,7 +3244,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3256,7 +3258,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3276,7 +3278,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendStateBegin",107, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendStateBegin",108, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3290,7 +3292,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3304,7 +3306,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3318,7 +3320,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3338,7 +3340,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveStateBegin",108, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveStateBegin",109, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3352,7 +3354,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3366,7 +3368,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3380,7 +3382,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3400,7 +3402,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomStateBegin",109, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomStateBegin",110, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3414,7 +3416,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3428,7 +3430,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3442,7 +3444,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3462,7 +3464,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countStateBegin",110, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countStateBegin",111, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3476,7 +3478,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("presendState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("presendState",71, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3496,7 +3498,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("presendStateBegin",111, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("presendStateBegin",112, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3510,7 +3512,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("prereceiveState",71, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("prereceiveState",72, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3530,7 +3532,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("prereceiveStateBegin",112, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("prereceiveStateBegin",113, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3544,7 +3546,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",72, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3558,7 +3560,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",72, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3572,7 +3574,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",72, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3592,7 +3594,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerStateBegin",113, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerStateBegin",114, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3606,7 +3608,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3620,7 +3622,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3634,7 +3636,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3654,7 +3656,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerStateBegin",114, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerStateBegin",115, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3668,7 +3670,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3682,7 +3684,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3696,7 +3698,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3716,7 +3718,7 @@ class CUP$AvatarFromSysMLParser$actions {
     theState.setLeft(zxright);
     requestIndex = 0;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerStateBegin",115, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerStateBegin",116, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3725,7 +3727,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("poolParam",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("poolParam",76, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3734,7 +3736,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("poolParam",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("poolParam",76, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3743,7 +3745,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestParam",76, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestParam",77, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3752,7 +3754,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",77, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",78, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3761,7 +3763,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",77, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",78, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3785,7 +3787,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setRright(qxright);
         requestIndex++;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("request",78, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("request",79, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3802,7 +3804,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setRright(ixright);
         requestIndex++;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("request",78, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("request",79, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3811,7 +3813,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",79, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3820,7 +3822,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",79, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3829,7 +3831,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",79, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3838,7 +3840,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",79, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3847,7 +3849,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",79, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3856,7 +3858,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",79, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3868,7 +3870,7 @@ class CUP$AvatarFromSysMLParser$actions {
         getTransition(requestIndex);
         theTransition.setType(AvatarFromSysMLSyntax.STXTRIVIALTRANSITION);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequest",81, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3877,7 +3879,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequest",80, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequest",81, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3889,7 +3891,7 @@ class CUP$AvatarFromSysMLParser$actions {
     getTransition(requestIndex);
     theTransition.setType(AvatarFromSysMLSyntax.STXTRIVIALTRANSITION);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequestBegin",98, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequestBegin",99, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3898,7 +3900,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendRequest",83, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendRequest",84, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3910,7 +3912,7 @@ class CUP$AvatarFromSysMLParser$actions {
     getTransition(requestIndex);
     theTransition.setType(AvatarFromSysMLSyntax.STXSENDTRANSITION);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendRequestBegin",99, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendRequestBegin",100, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3919,7 +3921,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveRequest",84, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveRequest",85, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3931,7 +3933,7 @@ class CUP$AvatarFromSysMLParser$actions {
     getTransition(requestIndex);
     theTransition.setType(AvatarFromSysMLSyntax.STXRECEIVETRANSITION);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveRequestBegin",100, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveRequestBegin",101, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3940,7 +3942,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerRequest",85, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerRequest",86, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3952,7 +3954,7 @@ class CUP$AvatarFromSysMLParser$actions {
     getTransition(requestIndex);
     theTransition.setType(AvatarFromSysMLSyntax.STXSETTIMERTRANSITION);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerRequestBegin",101, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerRequestBegin",102, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3961,7 +3963,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerRequest",86, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerRequest",87, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3973,7 +3975,7 @@ class CUP$AvatarFromSysMLParser$actions {
     getTransition(requestIndex);
     theTransition.setType(AvatarFromSysMLSyntax.STXRESETTIMERTRANSITION);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerRequestBegin",102, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerRequestBegin",103, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3982,7 +3984,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerRequest",87, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerRequest",88, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -3994,7 +3996,7 @@ class CUP$AvatarFromSysMLParser$actions {
     getTransition(requestIndex);
     theTransition.setType(AvatarFromSysMLSyntax.STXEXPIRETIMERTRANSITION);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerRequestBegin",103, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerRequestBegin",104, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4003,7 +4005,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArgs",81, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArgs",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4012,7 +4014,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArgs",81, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArgs",82, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4021,7 +4023,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4030,7 +4032,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4039,7 +4041,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4048,7 +4050,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4057,7 +4059,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4066,7 +4068,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4075,7 +4077,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4084,7 +4086,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("indexParam",88, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("indexParam",89, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4093,7 +4095,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayParam",89, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayParam",90, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4105,7 +4107,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String e = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 theTransition.setMinDelay(e); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayExpr",90, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayExpr",91, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4114,7 +4116,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayExpr",90, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayExpr",91, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4132,7 +4134,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setMinDelay(i);
         theTransition.setMaxDelay(a);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayRandomExpr",92, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayRandomExpr",93, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4144,7 +4146,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setSendPayload(argList);
         argList = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",93, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4153,7 +4155,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",93, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4162,7 +4164,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",93, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4178,7 +4180,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setSendPayload(argList);
         argList = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",93, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4189,7 +4191,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         argList = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",93, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4198,7 +4200,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 		 argList= new ArrayList<StxTerm>(); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParamBegin",117, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParamBegin",118, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4213,7 +4215,7 @@ class CUP$AvatarFromSysMLParser$actions {
     getSignal(theBlock.name,id.getAvatarName());
     theTransition.setSignal(theSignal);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelParam",95, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4227,7 +4229,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		 // '@payload' = '#TimerSetMsg'(10)
     theTransition.setTimer(id.getAvatarName());
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("settimerParam",95, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("settimerParam",96, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4241,7 +4243,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     theTransition.setTimer(id.getAvatarName());
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resettimerParam",96, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resettimerParam",97, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4255,7 +4257,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     theTransition.setTimer(id.getAvatarName());
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expiretimerParam",97, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expiretimerParam",98, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4267,7 +4269,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		StxTerm e = CUP$AvatarFromSysMLParser$stack.peek().<StxTerm>value();
 		 argList.add(e); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("termList",127, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("termList",128, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4279,7 +4281,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xright;
 		StxTerm e = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2).<StxTerm>value();
 		 argList.add(e); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("termList",127, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("termList",128, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4288,7 +4290,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomAction",118, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomAction",119, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4297,7 +4299,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomAction",118, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomAction",119, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4308,7 +4310,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     theState.setVariable(stringAcc.toString());
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("targetParam",119, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("targetParam",120, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4319,7 +4321,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     stringAcc = new StringBuffer();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("target",133, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("target",134, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4333,7 +4335,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         stringAcc.append(id.getAvatarName());
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fullIdent",134, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fullIdent",135, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4347,7 +4349,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         stringAcc.append("__" + id.getAvatarName());
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fullIdent",134, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fullIdent",135, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4356,7 +4358,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomParam",120, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomParam",121, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4374,7 +4376,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theState.setMinValue(i);
         theState.setMaxValue(a);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionRandomExpr",91, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionRandomExpr",92, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4383,7 +4385,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countAction",121, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countAction",122, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4392,7 +4394,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countAction",121, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countAction",122, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4407,7 +4409,7 @@ class CUP$AvatarFromSysMLParser$actions {
     getSignal(theBlock.getName(),id.getAvatarName());
     theState.setSignal(theSignal);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countParam",122, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countParam",123, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4430,7 +4432,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setLeft(txleft);
         theTransition.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",123, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4453,7 +4455,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setLeft(txleft);
         theTransition.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",123, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4478,7 +4480,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setLeft(txleft);
         theTransition.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",123, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4503,7 +4505,7 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setLeft(txleft);
         theTransition.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",123, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4518,7 +4520,7 @@ class CUP$AvatarFromSysMLParser$actions {
         getState(st.getAvatarName());
         getTransition(0);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionBegin",128, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionBegin",129, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4536,7 +4538,7 @@ class CUP$AvatarFromSysMLParser$actions {
        getState(st.getAvatarName());
        getTransition(i-1);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionBegin",128, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionBegin",129, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4545,7 +4547,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4557,7 +4559,7 @@ class CUP$AvatarFromSysMLParser$actions {
             theTransition.setActions(actionList);
             actionList = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4566,7 +4568,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4578,7 +4580,7 @@ class CUP$AvatarFromSysMLParser$actions {
             theTransition.setReceivePayload(receiveMap);
             receiveMap = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4589,7 +4591,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
      actionList = new ArrayList<StxAction>();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionActionBegin",135, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionActionBegin",136, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4600,7 +4602,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
      receiveMap = new HashMap<String,String>();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveActionBegin",136, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveActionBegin",137, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4609,7 +4611,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionAction",130, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionAction",131, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4618,7 +4620,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionAction",130, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionAction",131, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4627,7 +4629,7 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionSeq",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionSeq",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4636,17 +4638,20 @@ class CUP$AvatarFromSysMLParser$actions {
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionSeq",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionSeq",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 255: // act ::= assign fullIdent GETS stxRvalue SEMICOLON 
+          case 255: // act ::= assign fulllIdent GETS stxRvalue SEMICOLON 
             {
               Object RESULT =null;
 		Location axleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
 		Location axright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xright;
 		Object a = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4).<Object>value();
+		Location idxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
+		Location idxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xright;
+		String id = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3).<String>value();
 		Location vxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
 		Location vxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xright;
 		StxTerm v = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1).<StxTerm>value();
@@ -4654,9 +4659,9 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location qxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		Object q = CUP$AvatarFromSysMLParser$stack.peek().<Object>value();
 		
-        actionList.add(new StxAction(axleft, qxright, stringAcc.toString() , v));
+        actionList.add(new StxAction(axleft, qxright, id , v));
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("act",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("act",127, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -4676,86 +4681,98 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         actionList.add(new StxAction(axleft, qxright, c));
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("act",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("act",127, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+            }
+          return CUP$AvatarFromSysMLParser$result;
+
+          /*. . . . . . . . . . . . . . . . . . . .*/
+          case 257: // fulllIdent ::= fullIdent 
+            {
+              String RESULT =null;
+		
+    RESULT = stringAcc.toString();
+    stringAcc.setLength(0);
+
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fulllIdent",1, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 257: // assign ::= ASSIGN 
+          case 258: // assign ::= ASSIGN 
             {
               Object RESULT =null;
 		
     stringAcc = new StringBuffer();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("assign",132, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("assign",133, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 258: // receiveAction ::= messageLine receiveAssigns 
+          case 259: // receiveAction ::= messageLine receiveAssigns 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAction",131, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAction",132, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 259: // receiveAction ::= receiveAssigns messageLine 
+          case 260: // receiveAction ::= receiveAssigns messageLine 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAction",131, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAction",132, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 260: // messageLine ::= ITEM MSG_U COLON IDENT EQUAL PAYLOAD_F AS IDENT SEMICOLON 
+          case 261: // messageLine ::= ITEM MSG_U COLON IDENT EQUAL PAYLOAD_F AS IDENT SEMICOLON 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageLine",137, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageLine",138, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 261: // receiveAssigns ::= FIRST START_U SEMICOLON THEN DONE_U SEMICOLON 
+          case 262: // receiveAssigns ::= FIRST START_U SEMICOLON THEN DONE_U SEMICOLON 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssigns",138, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssigns",139, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 262: // receiveAssigns ::= FIRST START_U SEMICOLON receiveAssignSeq 
+          case 263: // receiveAssigns ::= FIRST START_U SEMICOLON receiveAssignSeq 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssigns",138, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssigns",139, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 263: // receiveAssignSeq ::= receiveAssign THEN DONE_U SEMICOLON 
+          case 264: // receiveAssignSeq ::= receiveAssign THEN DONE_U SEMICOLON 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssignSeq",139, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssignSeq",140, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 264: // receiveAssignSeq ::= receiveAssign receiveAssignSeq 
+          case 265: // receiveAssignSeq ::= receiveAssign receiveAssignSeq 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssignSeq",139, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssignSeq",140, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 265: // receiveAssign ::= THEN assign fullIdent GETS MSG_U POINT IDENT SEMICOLON 
+          case 266: // receiveAssign ::= THEN assign fullIdent GETS MSG_U POINT IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location idxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -4764,57 +4781,57 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     receiveMap.put(id.getAvatarName(),stringAcc.toString());
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssign",140, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssign",141, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 266: // transitionLabels ::= transitionLabel 
+          case 267: // transitionLabels ::= transitionLabel 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabels",129, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabels",130, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 267: // transitionLabels ::= transitionLabel transitionLabels 
+          case 268: // transitionLabels ::= transitionLabel transitionLabels 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabels",129, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabels",130, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 268: // transitionLabel ::= distributionLabel 
+          case 269: // transitionLabel ::= distributionLabel 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",141, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",142, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 269: // transitionLabel ::= weightLabel 
+          case 270: // transitionLabel ::= weightLabel 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",141, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",142, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 270: // transitionLabel ::= extraLabel 
+          case 271: // transitionLabel ::= extraLabel 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",141, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",142, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 271: // distributionLabel ::= ATTRIBUTE DISTRIBUTION_A COLON STRING_T EQUAL STRING 
+          case 272: // distributionLabel ::= ATTRIBUTE DISTRIBUTION_A COLON STRING_T EQUAL STRING 
             {
               Object RESULT =null;
 		Location sxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -4823,12 +4840,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     theTransition.setDelayDistributionLaw(s);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("distributionLabel",142, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("distributionLabel",143, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 272: // weightLabel ::= ATTRIBUTE WEIGHT_A COLON STRING_T EQUAL REAL 
+          case 273: // weightLabel ::= ATTRIBUTE WEIGHT_A COLON STRING_T EQUAL REAL 
             {
               Object RESULT =null;
 		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -4837,12 +4854,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     theTransition.setProbability(r);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("weightLabel",143, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("weightLabel",144, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 273: // extraLabel ::= ATTRIBUTE ANYNAME COLON STRING_T EQUAL STRING 
+          case 274: // extraLabel ::= ATTRIBUTE ANYNAME COLON STRING_T EQUAL STRING 
             {
               Object RESULT =null;
 		Location nxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -4856,84 +4873,84 @@ class CUP$AvatarFromSysMLParser$actions {
         delayExtraMap = new HashMap<String,String>();
     delayExtraMap.put(n,s);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("extraLabel",144, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("extraLabel",145, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 274: // stxRvalue ::= stxCall 
+          case 275: // stxRvalue ::= stxCall 
             {
               StxTerm RESULT =null;
 		Location cxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location cxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		StxCall c = CUP$AvatarFromSysMLParser$stack.peek().<StxCall>value();
 		 RESULT = c; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxRvalue",145, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxRvalue",146, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 275: // stxRvalue ::= expr 
+          case 276: // stxRvalue ::= expr 
             {
               StxTerm RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String e = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = new StxExpr(e); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxRvalue",145, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxRvalue",146, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 276: // stxRvalue ::= complexIdent 
+          case 277: // stxRvalue ::= complexIdent 
             {
               StxTerm RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location ixright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String i = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = new StxId(i); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxRvalue",145, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxRvalue",146, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 277: // stxExpr ::= iexpr 
+          case 278: // stxExpr ::= iexpr 
             {
               StxExpr RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String e = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = new StxExpr(e); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxExpr",146, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxExpr",147, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 278: // iexpr ::= expr 
+          case 279: // iexpr ::= expr 
             {
               String RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String e = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = e; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("iexpr",148, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("iexpr",149, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 279: // iexpr ::= complexIdent 
+          case 280: // iexpr ::= complexIdent 
             {
               String RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location ixright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String i = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = i; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("iexpr",148, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("iexpr",149, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 280: // expr ::= iexpr PLUS iexpr 
+          case 281: // expr ::= iexpr PLUS iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -4943,12 +4960,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " + " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 281: // expr ::= iexpr MINUS iexpr 
+          case 282: // expr ::= iexpr MINUS iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -4958,12 +4975,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " - " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 282: // expr ::= iexpr MULT iexpr 
+          case 283: // expr ::= iexpr MULT iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -4973,12 +4990,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " * " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 283: // expr ::= iexpr DIV iexpr 
+          case 284: // expr ::= iexpr DIV iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -4988,12 +5005,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " / " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 284: // expr ::= iexpr MOD iexpr 
+          case 285: // expr ::= iexpr MOD iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5003,24 +5020,24 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " % " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 285: // expr ::= MINUS iexpr 
+          case 286: // expr ::= MINUS iexpr 
             {
               String RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String e = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = "-" + e; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 286: // expr ::= iexpr OR iexpr 
+          case 287: // expr ::= iexpr OR iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5030,12 +5047,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " || " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 287: // expr ::= iexpr AND iexpr 
+          case 288: // expr ::= iexpr AND iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5045,24 +5062,24 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " && " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 288: // expr ::= NOT iexpr 
+          case 289: // expr ::= NOT iexpr 
             {
               String RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String e = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = "!" + e; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 289: // expr ::= iexpr LT iexpr 
+          case 290: // expr ::= iexpr LT iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5072,12 +5089,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " < " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 290: // expr ::= iexpr GT iexpr 
+          case 291: // expr ::= iexpr GT iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5087,12 +5104,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " > " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 291: // expr ::= iexpr LEQ iexpr 
+          case 292: // expr ::= iexpr LEQ iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5102,12 +5119,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " <= " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 292: // expr ::= iexpr GEQ iexpr 
+          case 293: // expr ::= iexpr GEQ iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5117,12 +5134,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " >= " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 293: // expr ::= iexpr EQ iexpr 
+          case 294: // expr ::= iexpr EQ iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5132,12 +5149,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " == " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 294: // expr ::= iexpr DIF iexpr 
+          case 295: // expr ::= iexpr DIF iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5147,70 +5164,55 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String r = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 RESULT = l + " != " + r; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 295: // expr ::= LPAR iexpr RPAR 
+          case 296: // expr ::= LPAR iexpr RPAR 
             {
               String RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xright;
 		String e = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1).<String>value();
 		 RESULT = "(" + e + ")"; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 296: // expr ::= INT 
+          case 297: // expr ::= INT 
             {
               String RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location ixright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		Integer i = CUP$AvatarFromSysMLParser$stack.peek().<Integer>value();
 		 RESULT = "" + i; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 297: // expr ::= BOOL 
+          case 298: // expr ::= BOOL 
             {
               String RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location bxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		Boolean b = CUP$AvatarFromSysMLParser$stack.peek().<Boolean>value();
 		 RESULT = ( b ? "true" : "false" ); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",149, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",150, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 298: // complexIdent ::= IDENT 
+          case 299: // complexIdent ::= IDENT 
             {
               String RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		Ident e = CUP$AvatarFromSysMLParser$stack.peek().<Ident>value();
 		 RESULT = e.getAvatarName(); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("complexIdent",150, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
-            }
-          return CUP$AvatarFromSysMLParser$result;
-
-          /*. . . . . . . . . . . . . . . . . . . .*/
-          case 299: // complexIdent ::= IDENT POINT complexIdent 
-            {
-              String RESULT =null;
-		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
-		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xright;
-		Ident e = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2).<Ident>value();
-		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
-		Location ixright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
-		String i = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
-		 RESULT = e.getAvatarName() + "__" + i; 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("complexIdent",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("complexIdent",151, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
@@ -5236,19 +5238,34 @@ class CUP$AvatarFromSysMLParser$actions {
       switch (CUP$AvatarFromSysMLParser$act_num)
         {
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 300: // stxCall ::= stxCallBegin RPAR 
+          case 300: // complexIdent ::= IDENT POINT complexIdent 
+            {
+              String RESULT =null;
+		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
+		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xright;
+		Ident e = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2).<Ident>value();
+		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
+		Location ixright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
+		String i = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
+		 RESULT = e.getAvatarName() + "__" + i; 
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("complexIdent",151, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+            }
+          return CUP$AvatarFromSysMLParser$result;
+
+          /*. . . . . . . . . . . . . . . . . . . .*/
+          case 301: // stxCall ::= stxCallBegin RPAR 
             {
               StxCall RESULT =null;
 		
         theCall.addSegment(stringAcc.toString() + ")");
         RESULT = theCall;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCall",147, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCall",148, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 301: // stxCall ::= stxCallBegin stxCallParams RPAR 
+          case 302: // stxCall ::= stxCallBegin stxCallParams RPAR 
             {
               StxCall RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -5258,12 +5275,12 @@ class CUP$AvatarFromSysMLParser$actions {
         theCall.addSegment(stringAcc.toString() + ")");
         RESULT = theCall;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCall",147, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCall",148, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 302: // stxCallBegin ::= IDENT LPAR 
+          case 303: // stxCallBegin ::= IDENT LPAR 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -5273,51 +5290,51 @@ class CUP$AvatarFromSysMLParser$actions {
     theCall = new StxCall();
     stringAcc = new StringBuffer(i.getAvatarName() + "(");
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallBegin",151, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallBegin",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 303: // stxCallParams ::= stxCallParam 
+          case 304: // stxCallParams ::= stxCallParam 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParams",156, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParams",157, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 304: // stxCallParams ::= stxCallParam comma stxCallParams 
+          case 305: // stxCallParams ::= stxCallParam comma stxCallParams 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParams",156, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParams",157, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 305: // comma ::= COMMA 
+          case 306: // comma ::= COMMA 
             {
               Object RESULT =null;
 		 stringAcc.append(", "); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("comma",153, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("comma",154, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 306: // stxCallParam ::= expr 
+          case 307: // stxCallParam ::= expr 
             {
               Object RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
 		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		String e = CUP$AvatarFromSysMLParser$stack.peek().<String>value();
 		 stringAcc.append(e); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",152, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",153, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 307: // stxCallParam ::= complexIdent 
+          case 308: // stxCallParam ::= complexIdent 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -5328,42 +5345,42 @@ class CUP$AvatarFromSysMLParser$actions {
         theCall.addIdent(i);
         stringAcc.setLength(0);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",152, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",153, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 308: // stxCallParam ::= call 
+          case 309: // stxCallParam ::= call 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",152, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",153, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 309: // call ::= callBegin RPAR 
+          case 310: // call ::= callBegin RPAR 
             {
               Object RESULT =null;
 		 stringAcc.append(")"); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("call",154, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("call",155, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 310: // call ::= stxCallBegin stxCallParams RPAR 
+          case 311: // call ::= stxCallBegin stxCallParams RPAR 
             {
               Object RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
 		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xright;
 		Object l = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1).<Object>value();
 		 stringAcc.append(")"); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("call",154, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("call",155, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 311: // callBegin ::= IDENT LPAR 
+          case 312: // callBegin ::= IDENT LPAR 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -5372,7 +5389,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     stringAcc.append(i.getAvatarName() + "(");
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("callBegin",155, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("callBegin",156, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSymbols.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSymbols.java
index dd34289295..301926d03c 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSymbols.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSymbols.java
@@ -470,162 +470,163 @@ public class AvatarFromSysMLSymbols {
   };
 
   /* non terminals */
-  static final int receiveRequestBegin = 100;
-  static final int privateParam = 20;
-  static final int startStateBegin = 104;
-  static final int call = 154;
-  static final int receiveAssign = 140;
-  static final int specializes = 4;
-  static final int calcMethodDeclBegin = 60;
-  static final int receiveStateBegin = 108;
-  static final int messageChannel = 37;
-  static final int transitionActionBegin = 135;
-  static final int block2Param = 19;
-  static final int standardState = 64;
-  static final int stxCallParams = 156;
-  static final int featureList = 2;
-  static final int presendState = 70;
-  static final int inSignalBinding = 31;
-  static final int blockAlias = 6;
-  static final int blockChain = 7;
-  static final int receiveAction = 131;
+  static final int receiveRequestBegin = 101;
+  static final int privateParam = 21;
+  static final int startStateBegin = 105;
+  static final int call = 155;
+  static final int receiveAssign = 141;
+  static final int specializes = 5;
+  static final int calcMethodDeclBegin = 61;
+  static final int receiveStateBegin = 109;
+  static final int messageChannel = 38;
+  static final int transitionActionBegin = 136;
+  static final int block2Param = 20;
+  static final int standardState = 65;
+  static final int stxCallParams = 157;
+  static final int featureList = 3;
+  static final int presendState = 71;
+  static final int inSignalBinding = 32;
+  static final int blockAlias = 7;
+  static final int blockChain = 8;
+  static final int receiveAction = 132;
   static final int typeIdent = 0;
-  static final int actionRandomExpr = 91;
-  static final int prereceiveStateBegin = 112;
-  static final int relParam = 17;
-  static final int calcMethodDecl = 51;
-  static final int bfChDecl = 29;
-  static final int stopStateBegin = 106;
-  static final int signalBinding = 30;
-  static final int receiveAssignSeq = 139;
-  static final int stxCallParam = 152;
-  static final int fieldDecl = 11;
-  static final int setTimerState = 72;
-  static final int stateMachineItem = 58;
-  static final int trivialRequestBegin = 98;
-  static final int weightLabel = 143;
-  static final int messageLine = 137;
-  static final int randomParam = 120;
-  static final int indexParam = 88;
-  static final int fullIdent = 134;
-  static final int blockDecl = 42;
-  static final int outSignalBinding = 32;
-  static final int nbfRelDecl = 14;
-  static final int syncRelDecl = 13;
-  static final int presendStateBegin = 111;
-  static final int countState = 69;
-  static final int outMessageDecl = 35;
-  static final int act = 126;
-  static final int sendStateBegin = 107;
-  static final int attributeDecl = 46;
-  static final int fieldDecls = 10;
-  static final int maxsizeParam = 21;
-  static final int doActions = 124;
-  static final int voidMethodDeclBegin = 59;
-  static final int randomStateBegin = 109;
-  static final int lossyParam = 22;
-  static final int target = 133;
-  static final int sendRequestBegin = 99;
-  static final int bfRelDecl = 15;
-  static final int requestParam = 76;
-  static final int payloadParam = 93;
-  static final int startState = 63;
-  static final int assign = 132;
-  static final int simpleRequest = 79;
-  static final int messageDecl = 33;
-  static final int datatypeDeclHEADER = 9;
-  static final int expr = 149;
-  static final int stopState = 65;
-  static final int randomAction = 118;
-  static final int calcMethodItem = 53;
-  static final int voidMethodDecl = 50;
-  static final int receiveState = 67;
-  static final int feature = 3;
-  static final int bfRelDeclBegin = 25;
-  static final int poolParam = 75;
-  static final int inMessageDeclBegin = 40;
-  static final int sendRequest = 83;
-  static final int nbfRelDeclBegin = 24;
-  static final int expireTimerRequestBegin = 103;
-  static final int calcMethodItems = 52;
-  static final int setTimerRequest = 85;
-  static final int redefineField = 39;
-  static final int blockDeclBegin = 43;
-  static final int constantDeclHEADER = 61;
-  static final int blockDeclBODY = 44;
-  static final int trivialRequest = 80;
-  static final int stxCall = 147;
-  static final int countAction = 121;
-  static final int expireTimerStateBegin = 115;
-  static final int relationDecl = 12;
-  static final int inMessageDecl = 34;
-  static final int blockItem = 45;
-  static final int outMessageDeclBegin = 41;
-  static final int transitionLabels = 129;
-  static final int comma = 153;
-  static final int delayParam = 89;
-  static final int relParams = 16;
-  static final int targetParam = 119;
-  static final int actionSeq = 125;
-  static final int resetTimerRequest = 86;
-  static final int syncRelDeclBegin = 23;
-  static final int expireTimerRequest = 87;
-  static final int termList = 127;
-  static final int receiveActionBegin = 136;
-  static final int randomState = 68;
-  static final int expiretimerParam = 97;
-  static final int constantDecl = 47;
-  static final int extraLabel = 144;
-  static final int state = 62;
-  static final int distributionLabel = 142;
-  static final int stateMachine = 56;
-  static final int resetTimerStateBegin = 114;
-  static final int requestArg = 82;
-  static final int syncChDecl = 27;
-  static final int signalDecl = 54;
-  static final int inMessageDeclBODY = 36;
-  static final int subsets = 5;
-  static final int standardStateBegin = 105;
-  static final int delayRandomExpr = 92;
-  static final int methodDecl = 49;
-  static final int resettimerParam = 96;
-  static final int outMessageDeclBODY = 38;
-  static final int payloadParamBegin = 117;
-  static final int receiveRequest = 84;
-  static final int channelDecl = 26;
-  static final int transition = 123;
-  static final int resetTimerRequestBegin = 102;
-  static final int channelParam = 94;
-  static final int transitionBegin = 128;
-  static final int timerDecl = 55;
-  static final int transitionAction = 130;
-  static final int stxRvalue = 145;
-  static final int sendState = 66;
-  static final int block1Param = 18;
-  static final int complexIdent = 150;
-  static final int iexpr = 148;
-  static final int datatypeDecl = 8;
-  static final int callBegin = 155;
-  static final int countParam = 122;
-  static final int expireTimerState = 74;
-  static final int prereceiveState = 71;
-  static final int requestList = 77;
-  static final int settimerParam = 95;
-  static final int setTimerRequestBegin = 101;
-  static final int requestArgs = 81;
-  static final int stateMachineItems = 57;
-  static final int request = 78;
-  static final int stxExpr = 146;
-  static final int setTimerStateBegin = 113;
-  static final int delayExpr = 90;
-  static final int attributeDeclHEADER = 48;
-  static final int resetTimerState = 73;
-  static final int model = 1;
-  static final int nbfChDecl = 28;
-  static final int receiveAssigns = 138;
-  static final int stateMachineBegin = 116;
-  static final int stxCallBegin = 151;
-  static final int transitionLabel = 141;
-  static final int countStateBegin = 110;
+  static final int actionRandomExpr = 92;
+  static final int prereceiveStateBegin = 113;
+  static final int relParam = 18;
+  static final int calcMethodDecl = 52;
+  static final int bfChDecl = 30;
+  static final int stopStateBegin = 107;
+  static final int signalBinding = 31;
+  static final int receiveAssignSeq = 140;
+  static final int stxCallParam = 153;
+  static final int fieldDecl = 12;
+  static final int setTimerState = 73;
+  static final int stateMachineItem = 59;
+  static final int trivialRequestBegin = 99;
+  static final int weightLabel = 144;
+  static final int messageLine = 138;
+  static final int randomParam = 121;
+  static final int indexParam = 89;
+  static final int fullIdent = 135;
+  static final int blockDecl = 43;
+  static final int outSignalBinding = 33;
+  static final int nbfRelDecl = 15;
+  static final int syncRelDecl = 14;
+  static final int presendStateBegin = 112;
+  static final int countState = 70;
+  static final int outMessageDecl = 36;
+  static final int act = 127;
+  static final int sendStateBegin = 108;
+  static final int attributeDecl = 47;
+  static final int fieldDecls = 11;
+  static final int maxsizeParam = 22;
+  static final int doActions = 125;
+  static final int voidMethodDeclBegin = 60;
+  static final int randomStateBegin = 110;
+  static final int lossyParam = 23;
+  static final int target = 134;
+  static final int sendRequestBegin = 100;
+  static final int bfRelDecl = 16;
+  static final int requestParam = 77;
+  static final int payloadParam = 94;
+  static final int startState = 64;
+  static final int assign = 133;
+  static final int simpleRequest = 80;
+  static final int messageDecl = 34;
+  static final int datatypeDeclHEADER = 10;
+  static final int expr = 150;
+  static final int stopState = 66;
+  static final int randomAction = 119;
+  static final int calcMethodItem = 54;
+  static final int voidMethodDecl = 51;
+  static final int receiveState = 68;
+  static final int feature = 4;
+  static final int bfRelDeclBegin = 26;
+  static final int poolParam = 76;
+  static final int inMessageDeclBegin = 41;
+  static final int sendRequest = 84;
+  static final int nbfRelDeclBegin = 25;
+  static final int expireTimerRequestBegin = 104;
+  static final int calcMethodItems = 53;
+  static final int setTimerRequest = 86;
+  static final int redefineField = 40;
+  static final int blockDeclBegin = 44;
+  static final int constantDeclHEADER = 62;
+  static final int blockDeclBODY = 45;
+  static final int trivialRequest = 81;
+  static final int stxCall = 148;
+  static final int countAction = 122;
+  static final int expireTimerStateBegin = 116;
+  static final int relationDecl = 13;
+  static final int inMessageDecl = 35;
+  static final int blockItem = 46;
+  static final int outMessageDeclBegin = 42;
+  static final int transitionLabels = 130;
+  static final int comma = 154;
+  static final int delayParam = 90;
+  static final int relParams = 17;
+  static final int targetParam = 120;
+  static final int actionSeq = 126;
+  static final int resetTimerRequest = 87;
+  static final int fulllIdent = 1;
+  static final int syncRelDeclBegin = 24;
+  static final int expireTimerRequest = 88;
+  static final int termList = 128;
+  static final int receiveActionBegin = 137;
+  static final int randomState = 69;
+  static final int expiretimerParam = 98;
+  static final int constantDecl = 48;
+  static final int extraLabel = 145;
+  static final int distributionLabel = 143;
+  static final int state = 63;
+  static final int stateMachine = 57;
+  static final int resetTimerStateBegin = 115;
+  static final int requestArg = 83;
+  static final int syncChDecl = 28;
+  static final int signalDecl = 55;
+  static final int inMessageDeclBODY = 37;
+  static final int subsets = 6;
+  static final int standardStateBegin = 106;
+  static final int delayRandomExpr = 93;
+  static final int methodDecl = 50;
+  static final int resettimerParam = 97;
+  static final int outMessageDeclBODY = 39;
+  static final int payloadParamBegin = 118;
+  static final int receiveRequest = 85;
+  static final int channelDecl = 27;
+  static final int transition = 124;
+  static final int resetTimerRequestBegin = 103;
+  static final int channelParam = 95;
+  static final int transitionBegin = 129;
+  static final int timerDecl = 56;
+  static final int transitionAction = 131;
+  static final int stxRvalue = 146;
+  static final int sendState = 67;
+  static final int block1Param = 19;
+  static final int complexIdent = 151;
+  static final int iexpr = 149;
+  static final int datatypeDecl = 9;
+  static final int callBegin = 156;
+  static final int countParam = 123;
+  static final int expireTimerState = 75;
+  static final int prereceiveState = 72;
+  static final int requestList = 78;
+  static final int settimerParam = 96;
+  static final int setTimerRequestBegin = 102;
+  static final int requestArgs = 82;
+  static final int stateMachineItems = 58;
+  static final int request = 79;
+  static final int stxExpr = 147;
+  static final int setTimerStateBegin = 114;
+  static final int delayExpr = 91;
+  static final int attributeDeclHEADER = 49;
+  static final int resetTimerState = 74;
+  static final int model = 2;
+  static final int nbfChDecl = 29;
+  static final int receiveAssigns = 139;
+  static final int stateMachineBegin = 117;
+  static final int stxCallBegin = 152;
+  static final int transitionLabel = 142;
+  static final int countStateBegin = 111;
 }
 
diff --git a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
index a6b2a82b88..f1fc7a3060 100644
--- a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
+++ b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
@@ -210,7 +210,7 @@ terminal ABOUT, ABSTRACT, ACCEPT, ACTION, ACTOR, AFTER, ALIAS, ALL, ALLOCATE, AL
 terminal PLUS, MINUS, MULT, DIV, MOD, DIF, LT, GT, LEQ, GEQ, UMINUS;
 
 /* Non terminals */
-non terminal String typeIdent;
+non terminal String typeIdent, fulllIdent;
 non terminal StxModel model;
 non terminal featureList, feature, specializes, subsets, blockAlias, blockChain, datatypeDecl, datatypeDeclHEADER,
     fieldDecls, fieldDecl, relationDecl, syncRelDecl, nbfRelDecl, bfRelDecl, relParams, relParam,
@@ -1108,13 +1108,17 @@ actionSeq ::=
     | THEN act actionSeq
 ;
 act ::=
-      assign:a fullIdent GETS stxRvalue:v SEMICOLON:q {:
-        actionList.add(new StxAction(axleft, qxright, stringAcc.toString() , v));
+      assign:a fulllIdent:id GETS stxRvalue:v SEMICOLON:q {:
+        actionList.add(new StxAction(axleft, qxright, id , v));
       :}
     | ACTION:a EQUAL stxCall:c SEMICOLON:q {:
         actionList.add(new StxAction(axleft, qxright, c));
       :}
 ;
+fulllIdent ::= fullIdent {:
+    RESULT = stringAcc.toString();
+    stringAcc.setLength(0);
+:};
 assign ::= ASSIGN {:
     stringAcc = new StringBuffer();
 :};
-- 
GitLab