From 55d70c654f500999422b3fef7be32e4118ccd541 Mon Sep 17 00:00:00 2001
From: Sophie Coudert <sophie.coudert@telecom-paris.fr>
Date: Sun, 23 Jun 2024 13:35:34 +0200
Subject: [PATCH] precise handling of default values

---
 .idea/uiDesigner.xml                          |  124 +
 .../avatartranslator/AvatarAttribute.java     |    1 +
 .../tosysmlv2/Avatar2SysML.java               |   39 +-
 .../tosysmlv2/Avatar2SysMLLexer.java          |    4 +-
 .../tosysmlv2/Avatar2SysMLNames.java          |    5 +-
 .../tosysmlv2/Avatar2SysMLParser.java         |  153 +-
 .../AvatarDataTypePrimitiveFields.java        |   28 +-
 .../tosysmlv2/AvatarFromSysML.java            |   50 +-
 .../tosysmlv2/AvatarFromSysMLLexer.java       |    4 +-
 .../tosysmlv2/AvatarFromSysMLParser.java      | 2856 +++++++++--------
 .../tosysmlv2/AvatarFromSysMLSymbols.java     |  195 +-
 .../tosysmlv2/AvatarFromSysMLSyntax.java      |   21 +-
 .../tosysmlv2/javacup/AvatarFromSysML.jcup    |   22 +-
 .../tosysmlv2/javacup/compile                 |    4 +-
 src/main/java/ui/AvatarPanelDrawer.java       |    6 +-
 15 files changed, 1893 insertions(+), 1619 deletions(-)
 create mode 100644 .idea/uiDesigner.xml

diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000000..2b63946d5b
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/avatartranslator/AvatarAttribute.java b/src/main/java/avatartranslator/AvatarAttribute.java
index 6de4559b1b..cfa4b5ad93 100644
--- a/src/main/java/avatartranslator/AvatarAttribute.java
+++ b/src/main/java/avatartranslator/AvatarAttribute.java
@@ -93,6 +93,7 @@ public class AvatarAttribute extends AvatarLeftHand implements NameChecker.NameS
         return initialValue;
     }
     public String getProvidedInitialValue() {
+        if (initialValue == null) return "";
         return initialValue;
     }
 
diff --git a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysML.java b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysML.java
index 04e37a7d0b..dbe2cf8794 100644
--- a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysML.java
@@ -209,13 +209,24 @@ public class Avatar2SysML {
                 avsysml.append(" { \n");
                 indent += indentStep;
                 for (int i = 0; i < nbFields; i++) {
-                    avsysml.append( indent + "attribute " + fieldSysMLname(dt.getAttribute(i).getName()) + " : " );
-                    if (dt.getAttribute(i).getType() == AvatarType.BOOLEAN)
+                    AvatarAttribute aa = dt.getAttribute(i);
+                    avsysml.append( indent + "attribute " + fieldSysMLname(aa.getName()) + " : " );
+                    if (aa.getType() == AvatarType.BOOLEAN) {
                         avsysml.append("Boolean;\n");
-                    else if (dt.getAttribute(i).getType() == AvatarType.INTEGER)
+                        if (aa.hasInitialValue())
+                            avsysml.append(" := " + aa.getInitialValue().trim() + ";\n");
+                        else
+                            avsysml.append(" default := " + AvatarType.BOOLEAN.getDefaultInitialValue().trim() + ";\n");
+                    }
+                    else if (aa.getType() == AvatarType.INTEGER) {
                         avsysml.append("Integer;\n");
+                         if (aa.hasInitialValue())
+                            avsysml.append(" := " + aa.getInitialValue().trim() + ";\n");
+                        else
+                            avsysml.append(" default := " + AvatarType.INTEGER.getDefaultInitialValue().trim() + ";\n");
+                    }
                     else
-                        avsysml.append(dt.getAttribute(i).getDataType().getName() + ";\n");
+                        avsysml.append(aa.getDataType().getName() + ";\n");
                 }
                 indent = indent.substring(indentStepSize);
                 avsysml.append(indent + "}\n");
@@ -492,12 +503,18 @@ public class Avatar2SysML {
                 }
                 else if (aa.isInt()) {
                     avsysml.append(indent + "attribute " + attributeSysMLname(aa.getName()) + " : Integer");
-                    if (aa.hasInitialValue()) avsysml.append(" := " + aa.getInitialValue().trim());
+                    if (aa.hasInitialValue())
+                        avsysml.append(" := " + aa.getInitialValue().trim());
+                    else
+                        avsysml.append(" default := " + AvatarType.INTEGER.getDefaultInitialValue().trim());
                     avsysml.append(";\n");
                 }
                 else if (aa.isBool()) {
                     avsysml.append(indent + "attribute " + attributeSysMLname(aa.getName()) + " : Boolean");
-                    if (aa.hasInitialValue()) avsysml.append(" := " + aa.getInitialValue().trim());
+                    if (aa.hasInitialValue())
+                        avsysml.append(" := " + aa.getInitialValue().trim());
+                    else
+                        avsysml.append(" default := " + AvatarType.BOOLEAN.getDefaultInitialValue().trim());
                     avsysml.append(";\n");
                 }
                 else if (aa.isTimer()) {
@@ -519,12 +536,18 @@ public class Avatar2SysML {
                 }
                 else if (aa.isInt()) {
                     avsysml.append(indent + "readolny attribute " + attributeSysMLname(aa.getName()) + " : Integer");
-                    if (aa.hasInitialValue()) avsysml.append(" := " + aa.getInitialValue().trim());
+                    if (aa.hasInitialValue())
+                        avsysml.append(" := " + aa.getInitialValue().trim());
+                    else
+                        avsysml.append(" default := " + AvatarType.INTEGER.getDefaultInitialValue().trim());
                     avsysml.append(";\n");
                 }
                 else if (aa.isBool()) {
                     avsysml.append(indent + "readolny attribute " + attributeSysMLname(aa.getName()) + " : Boolean");
-                    if (aa.hasInitialValue()) avsysml.append(" := " + aa.getInitialValue().trim());
+                    if (aa.hasInitialValue())
+                        avsysml.append(" := " + aa.getInitialValue().trim());
+                    else
+                        avsysml.append(" default := " + AvatarType.BOOLEAN.getDefaultInitialValue().trim());
                     avsysml.append(";\n");
                 }
                 else {} // ERROR, should not happen
diff --git a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLLexer.java b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLLexer.java
index 3faf15b59b..18625de7db 100644
--- a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLLexer.java
+++ b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 20/06/2024 14:07 */
+/* The following code was generated by JFlex 1.4.3 on 23/06/2024 11:51 */
 
 /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
  *
@@ -45,7 +45,7 @@ import java_cup.runtime.*;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 20/06/2024 14:07 from the specification file
+ * on 23/06/2024 11:51 from the specification file
  * <code>__Avatar2SysMLLexer__.jflex</code>
  */
 public class Avatar2SysMLLexer implements java_cup.runtime.Scanner {
diff --git a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLNames.java b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLNames.java
index d7335aec14..872addb802 100644
--- a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLNames.java
+++ b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLNames.java
@@ -114,8 +114,9 @@ public class Avatar2SysMLNames {
     public static String expr2SysML(String _expr) {
         Avatar2SysMLParser parser = new Avatar2SysMLParser(new Avatar2SysMLLexer(new StringReader (_expr)));
         try { return (String)parser.parse().value; }
-        catch (java.lang.Exception e) { return ""; }
+        catch (java.lang.Exception e) {
+            e.printStackTrace();
+            return ""; }
     }
-
 }
 
diff --git a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLParser.java b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLParser.java
index 71ee53c46f..c7f8be5b27 100644
--- a/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLParser.java
+++ b/src/main/java/avatartranslator/tosysmlv2/Avatar2SysMLParser.java
@@ -7,7 +7,6 @@ package avatartranslator.tosysmlv2;
 
 import java_cup.runtime.*;
 import  static avatartranslator.tosysmlv2.Avatar2SysMLNames.*;
-import java_cup.runtime.ComplexSymbolFactory.Location;
 import java_cup.runtime.XMLElement;
 
 /** CUP v0.11b 20210814 (GIT d69c832) generated parser.
@@ -233,11 +232,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 0: // expr ::= expr PLUS expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " + " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -248,8 +247,8 @@ class CUP$Avatar2SysMLParser$actions {
           case 1: // $START ::= expr EOF 
             {
               Object RESULT =null;
-		Location start_valxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).xleft;
-		Location start_valxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).xright;
+		int start_valleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).left;
+		int start_valright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).right;
 		String start_val = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1).<String>value();
 		RESULT = start_val;
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("$START",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -262,11 +261,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 2: // expr ::= expr MINUS expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " - " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -277,11 +276,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 3: // expr ::= expr MULT expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " * " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -292,11 +291,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 4: // expr ::= expr DIV expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " / " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -307,11 +306,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 5: // expr ::= expr MOD expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " % " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -322,8 +321,8 @@ class CUP$Avatar2SysMLParser$actions {
           case 6: // expr ::= MINUS expr 
             {
               String RESULT =null;
-		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int eleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int eright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String e = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = "-" + e; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -334,11 +333,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 7: // expr ::= expr OR expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " or " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -349,11 +348,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 8: // expr ::= expr AND expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " and " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -364,8 +363,8 @@ class CUP$Avatar2SysMLParser$actions {
           case 9: // expr ::= NOT expr 
             {
               String RESULT =null;
-		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int eleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int eright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String e = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = "not " + e; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -376,11 +375,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 10: // expr ::= expr LT expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " < " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -391,11 +390,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 11: // expr ::= expr GT expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " > " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -406,11 +405,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 12: // expr ::= expr LEQ expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " <= " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -421,11 +420,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 13: // expr ::= expr GEQ expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " >= " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -436,11 +435,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 14: // expr ::= expr EQ expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " == " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -451,11 +450,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 15: // expr ::= expr DIF expr 
             {
               String RESULT =null;
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location rxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int rleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int rright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String r = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = l + " != " + r; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -466,8 +465,8 @@ class CUP$Avatar2SysMLParser$actions {
           case 16: // expr ::= LPAR expr RPAR 
             {
               String RESULT =null;
-		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).xleft;
-		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).xright;
+		int eleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).left;
+		int eright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).right;
 		String e = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1).<String>value();
 		 RESULT = "(" + e + ")"; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -478,8 +477,8 @@ class CUP$Avatar2SysMLParser$actions {
           case 17: // expr ::= IDENT LPAR RPAR 
             {
               String RESULT =null;
-		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location ixright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int ileft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int iright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String i = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
 		 RESULT = i + "()"; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -490,11 +489,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 18: // expr ::= IDENT LPAR exprlist RPAR 
             {
               String RESULT =null;
-		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-3)).xleft;
-		Location ixright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-3)).xright;
+		int ileft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-3)).left;
+		int iright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-3)).right;
 		String i = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-3).<String>value();
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1)).right;
 		String l = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-1).<String>value();
 		 RESULT = methodSysMLname(i) + "(" + l + ")"; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-3), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -505,8 +504,8 @@ class CUP$Avatar2SysMLParser$actions {
           case 19: // expr ::= CONSTANT 
             {
               String RESULT =null;
-		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int eleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int eright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String e = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = e; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.peek(), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -517,8 +516,8 @@ class CUP$Avatar2SysMLParser$actions {
           case 20: // expr ::= IDENT 
             {
               String RESULT =null;
-		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int eleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int eright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String e = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = attributeSysMLname(e); 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("expr",0, CUP$Avatar2SysMLParser$stack.peek(), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -529,8 +528,8 @@ class CUP$Avatar2SysMLParser$actions {
           case 21: // exprlist ::= expr 
             {
               String RESULT =null;
-		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int eleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int eright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String e = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = e; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("exprlist",1, CUP$Avatar2SysMLParser$stack.peek(), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
@@ -541,11 +540,11 @@ class CUP$Avatar2SysMLParser$actions {
           case 22: // exprlist ::= expr COMMA exprlist 
             {
               String RESULT =null;
-		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xleft;
-		Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).xright;
+		int eleft = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).left;
+		int eright = (CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2)).right;
 		String e = CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2).<String>value();
-		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xleft;
-		Location lxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$Avatar2SysMLParser$stack.peek()).xright;
+		int lleft = (CUP$Avatar2SysMLParser$stack.peek()).left;
+		int lright = (CUP$Avatar2SysMLParser$stack.peek()).right;
 		String l = CUP$Avatar2SysMLParser$stack.peek().<String>value();
 		 RESULT = e + ", " + l; 
               CUP$Avatar2SysMLParser$result = parser.getSymbolFactory().newSymbol("exprlist",1, CUP$Avatar2SysMLParser$stack.elementAt(CUP$Avatar2SysMLParser$top-2), CUP$Avatar2SysMLParser$stack.peek(), RESULT);
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarDataTypePrimitiveFields.java b/src/main/java/avatartranslator/tosysmlv2/AvatarDataTypePrimitiveFields.java
index a6ccdbdfb2..e13170b9fc 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarDataTypePrimitiveFields.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarDataTypePrimitiveFields.java
@@ -9,22 +9,30 @@ import java.util.HashMap;
 import java.util.List;
 
 public class AvatarDataTypePrimitiveFields {
-    private List<String> names;
-    private List<AvatarType> types;
+    public static class Field {
+        private String name;
+        private AvatarType type;
+        protected Field(String _name, AvatarType _type) {
+            name = _name;
+            type = _type;
+        }
+        String getName() { return name; }
+        AvatarType getType() { return type; }
+    }
+    private List<Field> fields;
     public AvatarDataTypePrimitiveFields() {
-        names = new ArrayList<String>();
-        types = new ArrayList<AvatarType>();
+        fields = new ArrayList<Field>();
     }
-    public int getSize() { return names.size(); }
+    public int getSize() { return fields.size(); }
     public boolean addField (String name, AvatarType type) {
         if(name == null || type == null) return false;
-        for(String n : names) if (n.equals(name)) return false;
-        names.add(name);
-        types.add(type);
+        for(Field f : fields) if (f.getName().equals(name)) return false;
+        fields.add(new Field(name, type));
         return true;
     }
-    public String getName(int i) { return names.get(i); }
-    public AvatarType getType(int i) { return types.get(i); }
+    public List<Field> getFields() { return fields; }
+    public String getName(int i) { return fields.get(i).getName(); }
+    public AvatarType getType(int i) { return fields.get(i).getType(); }
     private static void buildPrimitiveFields (AvatarDataType dt, HashMap<AvatarDataType, AvatarDataTypePrimitiveFields> map,
                                        List<AvatarDataType> l, List<String> err) {
         if (map.get(dt) != null) return;
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
index 2304de4856..1588525a89 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
@@ -230,17 +230,22 @@ public class AvatarFromSysML {
             dataTypeMap.put(d.getName(), dataType);
             int nbFields = d.getSize();
             for (int i = 0; i < nbFields; i++) {
-                String type =  d.getFieldType(i);
+                StxField f = d.getField(i);
+                String type =  f.getType();
                 AvatarAttribute aa;
                 if(type.equals("Integer"))
-                    aa = new AvatarAttribute(d.getFieldName(i),AvatarType.INTEGER,null,null);
+                    aa = new AvatarAttribute(f.getName(),AvatarType.INTEGER,null,null);
                 else if(type.equals("Boolean"))
-                    aa = new AvatarAttribute(d.getFieldName(i),AvatarType.BOOLEAN,null,null);
+                    aa = new AvatarAttribute(f.getName(),AvatarType.BOOLEAN,null,null);
                 else {
-                    aa = new AvatarAttribute(d.getFieldName(i), AvatarType.UNDEFINED, null, null);
+                    aa = new AvatarAttribute(f.getName(), AvatarType.UNDEFINED, null, null);
                     attributeMap.put(aa, type);
                 }
-                aa.setInitialValue("");
+                String initVal = f.getInitialValue().trim();
+                if(f.getDefaultValue() && initVal.equals(aa.getType().getDefaultInitialValue()))
+                    aa.setInitialValue("");
+                else aa.setInitialValue(initVal);
+
                 dataType.addAttribute(aa);
             }
         }
@@ -288,27 +293,31 @@ public class AvatarFromSysML {
             int size = blk.getNbAttributes();
             for (int i = 0; i < size; i++) {
                 StxAttribute a = blk.getAttribute(i);
+                String initVal = a.getInit().trim();
                 AvatarAttribute aa;
                 AvatarAttribute ax;
                 if (a.getType().equals("Integer")) {
                     aa = new AvatarAttribute(a.getName(), AvatarType.INTEGER, theBlock, null);
-                    aa.setInitialValue(a.getInit());
                     ax = new AvatarAttribute(a.getName(), AvatarType.INTEGER, theBlock, null);
-                    ax.setInitialValue(a.getInit());
+                    if(a.getDefaultValue() && initVal.equals(AvatarType.INTEGER.getDefaultInitialValue()))
+                        initVal = "";
+                    aa.setInitialValue(initVal);
+                    ax.setInitialValue(initVal);
                     theBlock.addAttribute(ax);
                     ax.setAsConstant(false);
                 }
                 else if (a.getType().equals("Boolean")) {
                     aa = new AvatarAttribute(a.getName(), AvatarType.BOOLEAN, theBlock, null);
-                    aa.setInitialValue(a.getInit());
                     ax = new AvatarAttribute(a.getName(), AvatarType.BOOLEAN, theBlock, null);
-                    ax.setInitialValue(a.getInit());
+                    if(a.getDefaultValue() && initVal.equals(AvatarType.BOOLEAN.getDefaultInitialValue()))
+                        initVal = "";
+                    aa.setInitialValue(initVal);
+                    ax.setInitialValue(initVal);
                     theBlock.addAttribute(ax);
                     ax.setAsConstant(false);
                 }
                 else {
                     aa = new AvatarAttribute(a.getName(), AvatarType.UNDEFINED, theBlock, null);
-                    aa.setInitialValue(a.getInit());
                     AvatarDataType adt = avSpec.getDataTypeByName(a.getType());
                     aa.setDataType(adt);
                     String aaName =  a.getName() + "__";
@@ -328,27 +337,32 @@ public class AvatarFromSysML {
             size = blk.getNbConstants();
             for (int i = 0; i < size; i++) {
                 StxAttribute a = blk.getConstant(i);
-                AvatarAttribute aa;
+                String initVal = a.getInit().trim();
+                AvatarAttribute aa = null;
                 AvatarAttribute ax;
                 if (a.getType().equals("Integer")) {
                     aa = new AvatarAttribute(a.getName(), AvatarType.INTEGER, theBlock, null);
-                    aa.setInitialValue(a.getInit());
-                    theBlock.addAttribute(aa);
+                    theBlock.addOriginalAttribute(aa);
                     aa.setAsConstant(true);
                     ax = new AvatarAttribute(a.getName(), AvatarType.INTEGER, theBlock, null);
-                    ax.setInitialValue(a.getInit());
                     theBlock.addAttribute(ax);
                     ax.setAsConstant(true);
+                    if(a.getDefaultValue() && initVal.equals(AvatarType.INTEGER.getDefaultInitialValue()))
+                        initVal = "";
+                    aa.setInitialValue(initVal);
+                    ax.setInitialValue(initVal);
                 }
                 else if (a.getType().equals("Boolean")) {
                     aa = new AvatarAttribute(a.getName(), AvatarType.BOOLEAN, theBlock, null);
-                    aa.setInitialValue(a.getInit());
-                    theBlock.addAttribute(aa);
+                    theBlock.addOriginalAttribute(aa);
                     aa.setAsConstant(true);
-                    ax = new AvatarAttribute(a.getName(), AvatarType.INTEGER, theBlock, null);
-                    ax.setInitialValue(a.getInit());
+                    ax = new AvatarAttribute(a.getName(), AvatarType.BOOLEAN, theBlock, null);
                     theBlock.addAttribute(ax);
                     ax.setAsConstant(true);
+                    if(a.getDefaultValue() && initVal.equals(AvatarType.BOOLEAN.getDefaultInitialValue()))
+                        initVal = "";
+                    aa.setInitialValue(initVal);
+                    ax.setInitialValue(initVal);
                 }
                 else
                     addError(new AvatarFromSysMLError(AvatarFromSysMLError.LOWERROR,
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
index 9ef25bc3c6..37a00d324b 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 20/06/2024 14:07 */
+/* The following code was generated by JFlex 1.4.3 on 23/06/2024 10:54 */
 
 /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
  *
@@ -46,7 +46,7 @@ import avatartranslator.tosysmlv2.AvatarFromSysMLSyntax.*;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 20/06/2024 14:07 from the specification file
+ * on 23/06/2024 10:54 from the specification file
  * <code>__AvatarFromSysMLLexer__.jflex</code>
  */
 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 6ab1f65443..b63e928fc5 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
@@ -38,7 +38,7 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
   /** Production table. */
   protected static final short _production_table[][] = 
     unpackFromStrings(new String[] {
-    "\000\u013d\000\002\004\007\000\002\002\004\000\002\004" +
+    "\000\u0141\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" +
@@ -46,96 +46,97 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\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" +
+    "\016\010\000\002\101\002\000\002\101\004\000\002\101" +
+    "\005\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\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" +
+    "\060\003\000\002\060\003\000\002\060\003\000\002\060" +
+    "\003\000\002\061\004\000\002\061\006\000\002\061\007" +
+    "\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\170\007\000\002\074\003\000\002\074\004" +
+    "\000\002\075\003\000\002\075\003\000\002\102\003\000" +
+    "\002\102\003\000\002\102\003\000\002\102\003\000\002" +
+    "\102\003\000\002\102\003\000\002\102\003\000\002\102" +
+    "\003\000\002\102\003\000\002\102\003\000\002\102\003" +
+    "\000\002\102\003\000\002\103\004\000\002\103\010\000" +
+    "\002\103\011\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\156\007\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" +
+    "\002\107\004\000\002\107\010\000\002\107\011\000\002" +
+    "\160\006\000\002\110\013\000\002\110\013\000\002\110" +
+    "\011\000\002\161\006\000\002\111\011\000\002\111\013" +
+    "\000\002\111\013\000\002\162\006\000\002\112\011\000" +
+    "\002\163\006\000\002\113\011\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" +
-    "\225\002\000\002\121\014\000\002\121\004\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\224\003\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\010\000\002\176\011\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\004\000\002\204\005\000\002\220\003\000\002" +
-    "\220\003\000\002\220\003\000\002\221\010\000\002\222" +
-    "\010\000\002\222\010\000\002\223\010\000\002\223\010" +
-    "\000\002\226\003\000\002\226\003\000\002\226\003\000" +
-    "\002\227\003\000\002\231\003\000\002\231\003\000\002" +
-    "\232\005\000\002\232\005\000\002\232\005\000\002\232" +
-    "\005\000\002\232\005\000\002\232\004\000\002\232\005" +
-    "\000\002\232\005\000\002\232\004\000\002\232\005\000" +
-    "\002\232\005\000\002\232\005\000\002\232\005\000\002" +
-    "\232\005\000\002\232\005\000\002\232\005\000\002\232" +
-    "\003\000\002\232\003\000\002\233\003\000\002\233\005" +
-    "\000\002\230\004\000\002\230\005\000\002\234\004\000" +
-    "\002\241\003\000\002\241\005\000\002\236\003\000\002" +
-    "\235\003\000\002\235\003\000\002\235\003\000\002\237" +
-    "\004\000\002\237\005\000\002\240\004" });
+    "\000\002\166\006\000\002\116\011\000\002\116\010\000" +
+    "\002\116\004\000\002\167\006\000\002\117\007\000\002" +
+    "\117\005\000\002\120\005\000\002\121\003\000\002\121" +
+    "\005\000\002\226\002\000\002\122\014\000\002\122\004" +
+    "\000\002\123\003\000\002\123\003\000\002\123\003\000" +
+    "\002\123\003\000\002\123\003\000\002\123\003\000\002" +
+    "\124\003\000\002\124\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\133\005\000\002\153\004\000\002" +
+    "\125\003\000\002\125\005\000\002\126\003\000\002\126" +
+    "\003\000\002\126\003\000\002\126\003\000\002\126\003" +
+    "\000\002\126\003\000\002\126\003\000\002\134\005\000" +
+    "\002\135\005\000\002\225\003\000\002\136\003\000\002" +
+    "\136\003\000\002\140\010\000\002\141\007\000\002\141" +
+    "\006\000\002\141\004\000\002\141\007\000\002\141\006" +
+    "\000\002\171\004\000\002\142\005\000\002\143\007\000" +
+    "\002\144\007\000\002\145\007\000\002\203\003\000\002" +
+    "\203\005\000\002\172\012\000\002\172\012\000\002\173" +
+    "\005\000\002\211\003\000\002\212\003\000\002\212\005" +
+    "\000\002\174\005\000\002\137\010\000\002\175\012\000" +
+    "\002\175\012\000\002\176\011\000\002\177\006\000\002" +
+    "\177\007\000\002\177\010\000\002\177\011\000\002\204" +
+    "\007\000\002\204\013\000\002\200\005\000\002\200\006" +
+    "\000\002\200\005\000\002\200\006\000\002\213\006\000" +
+    "\002\214\006\000\002\206\010\000\002\206\006\000\002" +
+    "\201\007\000\002\201\005\000\002\202\007\000\002\202" +
+    "\006\000\002\003\003\000\002\210\003\000\002\207\004" +
+    "\000\002\207\004\000\002\215\013\000\002\216\010\000" +
+    "\002\216\006\000\002\217\006\000\002\217\004\000\002" +
+    "\220\012\000\002\205\004\000\002\205\005\000\002\221" +
+    "\003\000\002\221\003\000\002\221\003\000\002\222\010" +
+    "\000\002\223\010\000\002\223\010\000\002\224\010\000" +
+    "\002\224\010\000\002\227\003\000\002\227\003\000\002" +
+    "\227\003\000\002\230\003\000\002\232\003\000\002\232" +
+    "\003\000\002\233\005\000\002\233\005\000\002\233\005" +
+    "\000\002\233\005\000\002\233\005\000\002\233\004\000" +
+    "\002\233\005\000\002\233\005\000\002\233\004\000\002" +
+    "\233\005\000\002\233\005\000\002\233\005\000\002\233" +
+    "\005\000\002\233\005\000\002\233\005\000\002\233\005" +
+    "\000\002\233\003\000\002\233\003\000\002\234\003\000" +
+    "\002\234\005\000\002\231\004\000\002\231\005\000\002" +
+    "\235\004\000\002\242\003\000\002\242\005\000\002\237" +
+    "\003\000\002\236\003\000\002\236\003\000\002\236\003" +
+    "\000\002\240\004\000\002\240\005\000\002\241\004" });
 
   /** Access to production table. */
   @Override
@@ -144,37 +145,37 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
   /** Parse-action table. */
   protected static final short[][] _action_table = 
     unpackFromStrings(new String[] {
-    "\000\u0323\000\004\260\005\001\002\000\004\002\u0325\001" +
+    "\000\u032d\000\004\260\005\001\002\000\004\002\u032f\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" +
     "\001\002\000\014\015\ufff8\164\ufff8\166\ufff8\232\ufff8\262" +
     "\ufff8\001\002\000\014\015\ufff5\164\ufff5\166\ufff5\232\ufff5" +
-    "\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\u0308\026\u030b" +
-    "\027\u0302\031\u0309\032\u0301\001\002\000\014\015\uffc9\164" +
-    "\uffc9\166\uffc9\232\uffc9\262\uffc9\001\002\000\004\201\u031e" +
-    "\001\002\000\014\025\u0308\026\u030b\027\u0302\031\u0309\032" +
-    "\u0301\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" +
-    "\uffcf\232\uffcf\262\uffcf\001\002\000\014\015\uffc8\164\uffc8" +
-    "\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\u0308\026\u030b\027\u0302\031\u0309" +
-    "\032\u0301\001\002\000\006\014\u02f5\017\u02f4\001\002\000" +
+    "\262\ufff5\001\002\000\014\015\uffdf\164\uffdf\166\uffdf\232" +
+    "\uffdf\262\uffdf\001\002\000\014\015\uffe0\164\uffe0\166\uffe0" +
+    "\232\uffe0\262\uffe0\001\002\000\014\015\uffc6\164\uffc6\166" +
+    "\uffc6\232\uffc6\262\uffc6\001\002\000\014\015\uffc0\164\uffc0" +
+    "\166\uffc0\232\uffc0\262\uffc0\001\002\000\014\025\u0312\026" +
+    "\u0315\027\u030c\031\u0313\032\u030b\001\002\000\004\201\u0328" +
+    "\001\002\000\014\015\ufffe\164\020\166\040\232\010\262" +
+    "\046\001\002\000\014\025\u0312\026\u0315\027\u030c\031\u0313" +
+    "\032\u030b\001\002\000\014\015\uffcb\164\uffcb\166\uffcb\232" +
+    "\uffcb\262\uffcb\001\002\000\014\015\uffcc\164\uffcc\166\uffcc" +
+    "\232\uffcc\262\uffcc\001\002\000\014\015\ufffa\164\ufffa\166" +
+    "\ufffa\232\ufffa\262\ufffa\001\002\000\014\015\uffc5\164\uffc5" +
+    "\166\uffc5\232\uffc5\262\uffc5\001\002\000\014\015\uffca\164" +
+    "\uffca\166\uffca\232\uffca\262\uffca\001\002\000\004\002\uffff" +
+    "\001\002\000\014\015\uffbf\164\uffbf\166\uffbf\232\uffbf\262" +
+    "\uffbf\001\002\000\014\025\u0312\026\u0315\027\u030c\031\u0313" +
+    "\032\u030b\001\002\000\006\014\u02ff\017\u02fe\001\002\000" +
     "\014\015\ufff7\164\ufff7\166\ufff7\232\ufff7\262\ufff7\001\002" +
-    "\000\006\164\275\265\u02e4\001\002\000\014\015\ufffb\164" +
-    "\ufffb\166\ufffb\232\ufffb\262\ufffb\001\002\000\004\014\u02dd" +
-    "\001\002\000\004\020\u02c2\001\002\000\020\015\163\145" +
-    "\172\164\156\171\162\215\153\262\200\270\155\001\002" +
+    "\000\006\164\u0294\265\u02ee\001\002\000\014\015\ufffb\164" +
+    "\ufffb\166\ufffb\232\ufffb\262\ufffb\001\002\000\004\014\u02e7" +
+    "\001\002\000\004\020\u02cc\001\002\000\020\015\163\145" +
+    "\172\164\156\171\162\215\153\262\200\270\154\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" +
-    "\166\uffe4\232\uffe4\262\uffe4\001\002\000\014\015\ufff9\164" +
+    "\ufff6\232\ufff6\262\ufff6\001\002\000\014\015\uffe1\164\uffe1" +
+    "\166\uffe1\232\uffe1\262\uffe1\001\002\000\014\015\ufff9\164" +
     "\ufff9\166\ufff9\232\ufff9\262\ufff9\001\002\000\006\141\050" +
     "\201\047\001\002\000\004\141\135\001\002\000\004\020" +
     "\051\001\002\000\020\050\057\051\060\052\055\057\053" +
@@ -183,18 +184,18 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\333\105\001\002\000\004\022\077\001\002\000\004\022" +
     "\067\001\002\000\004\022\064\001\002\000\004\022\061" +
     "\001\002\000\004\051\062\001\002\000\004\012\063\001" +
-    "\002\000\014\025\uffdc\026\uffdc\027\uffdc\031\uffdc\032\uffdc" +
+    "\002\000\014\025\uffd9\026\uffd9\027\uffd9\031\uffd9\032\uffd9" +
     "\001\002\000\004\050\065\001\002\000\004\012\066\001" +
-    "\002\000\014\025\uffe0\026\uffe0\027\uffe0\031\uffe0\032\uffe0" +
+    "\002\000\014\025\uffdd\026\uffdd\027\uffdd\031\uffdd\032\uffdd" +
     "\001\002\000\004\060\070\001\002\000\004\012\071\001" +
     "\002\000\004\030\072\001\002\000\004\022\073\001\002" +
     "\000\004\141\074\001\002\000\004\013\075\001\002\000" +
-    "\004\017\076\001\002\000\014\015\uffcb\164\uffcb\166\uffcb" +
-    "\232\uffcb\262\uffcb\001\002\000\004\052\100\001\002\000" +
-    "\004\012\101\001\002\000\014\025\uffde\026\uffde\027\uffde" +
-    "\031\uffde\032\uffde\001\002\000\004\141\107\001\002\000" +
-    "\020\015\uffb0\145\uffb0\164\uffb0\171\uffb0\215\uffb0\262\uffb0" +
-    "\270\uffb0\001\002\000\004\141\ufff2\001\002\000\004\141" +
+    "\004\017\076\001\002\000\014\015\uffc8\164\uffc8\166\uffc8" +
+    "\232\uffc8\262\uffc8\001\002\000\004\052\100\001\002\000" +
+    "\004\012\101\001\002\000\014\025\uffdb\026\uffdb\027\uffdb" +
+    "\031\uffdb\032\uffdb\001\002\000\004\141\107\001\002\000" +
+    "\020\015\uffad\145\uffad\164\uffad\171\uffad\215\uffad\262\uffad" +
+    "\270\uffad\001\002\000\004\141\ufff2\001\002\000\004\141" +
     "\ufff1\001\002\000\004\022\112\001\002\000\010\017\uffef" +
     "\021\110\022\uffef\001\002\000\004\141\107\001\002\000" +
     "\006\017\uffee\022\uffee\001\002\000\004\141\107\001\002" +
@@ -203,574 +204,588 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\000\004\012\117\001\002\000\004\030\120\001\002\000" +
     "\004\022\121\001\002\000\004\141\122\001\002\000\004" +
     "\013\123\001\002\000\004\017\124\001\002\000\014\015" +
-    "\uffca\164\uffca\166\uffca\232\uffca\262\uffca\001\002\000\004" +
+    "\uffc7\164\uffc7\166\uffc7\232\uffc7\262\uffc7\001\002\000\004" +
     "\061\126\001\002\000\004\012\127\001\002\000\004\030" +
     "\130\001\002\000\004\022\131\001\002\000\004\141\132" +
     "\001\002\000\004\013\133\001\002\000\004\017\134\001" +
-    "\002\000\014\015\uffcc\164\uffcc\166\uffcc\232\uffcc\262\uffcc" +
+    "\002\000\014\015\uffc9\164\uffc9\166\uffc9\232\uffc9\262\uffc9" +
     "\001\002\000\006\305\136\333\140\001\002\000\012\053" +
     "\ufff4\054\ufff4\100\ufff4\141\ufff4\001\002\000\010\053\141" +
     "\054\143\141\142\001\002\000\012\053\ufff3\054\ufff3\100" +
     "\ufff3\141\ufff3\001\002\000\004\014\150\001\002\000\004" +
     "\016\146\001\002\000\004\016\144\001\002\000\004\141" +
-    "\145\001\002\000\006\014\uffb7\017\uffb7\001\002\000\004" +
-    "\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\u02be\001\002\000\020" +
-    "\015\uffa8\145\uffa8\164\uffa8\171\uffa8\215\uffa8\262\uffa8\270" +
-    "\uffa8\001\002\000\004\164\u02ba\001\002\000\004\141\u02b7" +
-    "\001\002\000\020\015\uffa9\145\uffa9\164\uffa9\171\uffa9\215" +
-    "\uffa9\262\uffa9\270\uffa9\001\002\000\006\017\u02b3\023\u02b4" +
-    "\001\002\000\020\015\uffac\145\uffac\164\uffac\171\uffac\215" +
-    "\uffac\262\uffac\270\uffac\001\002\000\004\141\u02b0\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\u02a5" +
-    "\001\002\000\020\015\u02a3\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\u02a0\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" +
-    "\020\015\uffa7\145\uffa7\164\uffa7\171\uffa7\215\uffa7\262\uffa7" +
-    "\270\uffa7\001\002\000\004\141\201\001\002\000\004\020" +
-    "\202\001\002\000\012\055\205\056\203\101\204\133\206" +
-    "\001\002\000\004\017\216\001\002\000\004\014\103\001" +
-    "\002\000\004\017\215\001\002\000\006\017\207\022\210" +
-    "\001\002\000\020\015\uff91\145\uff91\164\uff91\171\uff91\215" +
-    "\uff91\262\uff91\270\uff91\001\002\000\004\133\211\001\002" +
-    "\000\004\012\212\001\002\000\004\013\213\001\002\000" +
-    "\004\017\214\001\002\000\020\015\uff92\145\uff92\164\uff92" +
-    "\171\uff92\215\uff92\262\uff92\270\uff92\001\002\000\020\015" +
-    "\uff93\145\uff93\164\uff93\171\uff93\215\uff93\262\uff93\270\uff93" +
-    "\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\ufed4\013\ufed4\016\ufed4" +
-    "\017\ufed4\024\ufed4\155\ufed4\255\ufed4\334\ufed4\335\ufed4\336" +
-    "\ufed4\337\ufed4\340\ufed4\341\ufed4\342\ufed4\343\ufed4\344\ufed4" +
-    "\345\ufed4\001\002\000\046\011\ufed2\013\ufed2\016\ufed2\017" +
-    "\ufed2\021\270\024\ufed2\155\ufed2\255\ufed2\334\ufed2\335\ufed2" +
-    "\336\ufed2\337\ufed2\340\ufed2\341\ufed2\342\ufed2\343\ufed2\344" +
-    "\ufed2\345\ufed2\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\ufed3\013\ufed3\016\ufed3\017" +
-    "\ufed3\024\ufed3\155\ufed3\255\ufed3\334\ufed3\335\ufed3\336\ufed3" +
-    "\337\ufed3\340\ufed3\341\ufed3\342\ufed3\343\ufed3\344\ufed3\345" +
-    "\ufed3\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\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\016" +
-    "\004\222\005\225\012\226\141\223\251\231\335\221\001" +
-    "\002\000\044\011\241\013\ufedc\016\ufedc\017\ufedc\024\ufedc" +
-    "\155\ufedc\255\ufedc\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" +
+    "\145\001\002\000\006\014\uffb4\017\uffb4\001\002\000\004" +
+    "\054\147\001\002\000\006\014\uffb3\017\uffb3\001\002\000" +
+    "\006\164\uffbd\265\uffbd\001\002\000\004\002\001\001\002" +
+    "\000\020\015\uff9b\145\uff9b\164\uff9b\171\uff9b\215\uff9b\262" +
+    "\uff9b\270\uff9b\001\002\000\004\307\u02c8\001\002\000\004" +
+    "\164\u02c4\001\002\000\020\015\uffa5\145\uffa5\164\uffa5\171" +
+    "\uffa5\215\uffa5\262\uffa5\270\uffa5\001\002\000\004\141\u02c1" +
+    "\001\002\000\020\015\uffa6\145\uffa6\164\uffa6\171\uffa6\215" +
+    "\uffa6\262\uffa6\270\uffa6\001\002\000\010\017\u02ba\023\u02bb" +
+    "\202\u02b9\001\002\000\020\015\uffa9\145\uffa9\164\uffa9\171" +
+    "\uffa9\215\uffa9\262\uffa9\270\uffa9\001\002\000\004\141\u02b6" +
+    "\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\004" +
+    "\014\u02ab\001\002\000\020\015\uffa8\145\uffa8\164\uffa8\171" +
+    "\uffa8\215\uffa8\262\uffa8\270\uffa8\001\002\000\020\015\u02a9" +
+    "\145\172\164\156\171\162\215\153\262\200\270\154\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\020\015" +
+    "\uff9c\145\uff9c\164\uff9c\171\uff9c\215\uff9c\262\uff9c\270\uff9c" +
+    "\001\002\000\020\015\uffa7\145\uffa7\164\uffa7\171\uffa7\215" +
+    "\uffa7\262\uffa7\270\uffa7\001\002\000\004\141\u02a6\001\002" +
+    "\000\004\014\u0292\001\002\000\006\014\274\017\273\001" +
+    "\002\000\020\015\uffaa\145\uffaa\164\uffaa\171\uffaa\215\uffaa" +
+    "\262\uffaa\270\uffaa\001\002\000\006\017\220\023\217\001" +
+    "\002\000\020\015\uffa4\145\uffa4\164\uffa4\171\uffa4\215\uffa4" +
+    "\262\uffa4\270\uffa4\001\002\000\004\141\201\001\002\000" +
+    "\004\020\202\001\002\000\012\055\205\056\203\101\204" +
+    "\133\206\001\002\000\004\017\216\001\002\000\004\014" +
+    "\103\001\002\000\004\017\215\001\002\000\006\017\207" +
+    "\022\210\001\002\000\020\015\uff8d\145\uff8d\164\uff8d\171" +
+    "\uff8d\215\uff8d\262\uff8d\270\uff8d\001\002\000\004\133\211" +
+    "\001\002\000\004\012\212\001\002\000\004\013\213\001" +
+    "\002\000\004\017\214\001\002\000\020\015\uff8e\145\uff8e" +
+    "\164\uff8e\171\uff8e\215\uff8e\262\uff8e\270\uff8e\001\002\000" +
+    "\020\015\uff8f\145\uff8f\164\uff8f\171\uff8f\215\uff8f\262\uff8f" +
+    "\270\uff8f\001\002\000\020\015\uff90\145\uff90\164\uff90\171" +
+    "\uff90\215\uff90\262\uff90\270\uff90\001\002\000\016\004\222" +
+    "\005\224\012\226\141\223\251\231\335\221\001\002\000" +
+    "\020\015\uff9f\145\uff9f\164\uff9f\171\uff9f\215\uff9f\262\uff9f" +
+    "\270\uff9f\001\002\000\016\004\222\005\224\012\226\141" +
+    "\223\251\231\335\221\001\002\000\044\011\ufed0\013\ufed0" +
+    "\016\ufed0\017\ufed0\024\ufed0\155\ufed0\255\ufed0\334\ufed0\335" +
+    "\ufed0\336\ufed0\337\ufed0\340\ufed0\341\ufed0\342\ufed0\343\ufed0" +
+    "\344\ufed0\345\ufed0\001\002\000\046\011\ufece\013\ufece\016" +
+    "\ufece\017\ufece\021\270\024\ufece\155\ufece\255\ufece\334\ufece" +
+    "\335\ufece\336\ufece\337\ufece\340\ufece\341\ufece\342\ufece\343" +
+    "\ufece\344\ufece\345\ufece\001\002\000\044\011\ufecf\013\ufecf" +
+    "\016\ufecf\017\ufecf\024\ufecf\155\ufecf\255\ufecf\334\ufecf\335" +
+    "\ufecf\336\ufecf\337\ufecf\340\ufecf\341\ufecf\342\ufecf\343\ufecf" +
+    "\344\ufecf\345\ufecf\001\002\000\044\011\ufee1\013\ufee1\016" +
+    "\ufee1\017\ufee1\024\ufee1\155\ufee1\255\ufee1\334\ufee1\335\ufee1" +
+    "\336\ufee1\337\ufee1\340\ufee1\341\ufee1\342\ufee1\343\ufee1\344" +
+    "\ufee1\345\ufee1\001\002\000\016\004\222\005\224\012\226" +
+    "\141\223\251\231\335\221\001\002\000\036\011\240\017" +
+    "\265\155\233\255\246\334\241\335\234\336\235\337\243" +
+    "\340\236\341\237\342\245\343\242\344\247\345\244\001" +
+    "\002\000\044\011\ufee2\013\ufee2\016\ufee2\017\ufee2\024\ufee2" +
+    "\155\ufee2\255\ufee2\334\ufee2\335\ufee2\336\ufee2\337\ufee2\340" +
+    "\ufee2\341\ufee2\342\ufee2\343\ufee2\344\ufee2\345\ufee2\001\002" +
+    "\000\016\004\222\005\224\012\226\141\223\251\231\335" +
+    "\221\001\002\000\044\011\240\013\ufed8\016\ufed8\017\ufed8" +
+    "\024\ufed8\155\ufed8\255\ufed8\334\241\335\234\336\235\337" +
+    "\243\340\236\341\237\342\245\343\242\344\247\345\244" +
+    "\001\002\000\016\004\222\005\224\012\226\141\223\251" +
+    "\231\335\221\001\002\000\016\004\222\005\224\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" +
+    "\224\012\226\141\223\251\231\335\221\001\002\000\016" +
+    "\004\222\005\224\012\226\141\223\251\231\335\221\001" +
+    "\002\000\016\004\222\005\224\012\226\141\223\251\231" +
+    "\335\221\001\002\000\016\004\222\005\224\012\226\141" +
+    "\223\251\231\335\221\001\002\000\016\004\222\005\224" +
     "\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\ufed9\013\ufed9\016\ufed9\017\ufed9\024\ufed9\155" +
-    "\ufed9\255\ufed9\334\240\335\233\336\235\337\242\340\236" +
-    "\341\ufed9\001\002\000\044\011\241\013\ufede\016\ufede\017" +
-    "\ufede\024\ufede\155\234\255\ufede\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\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\001\002\000\034\011\ufed8\013\ufed8" +
-    "\016\ufed8\017\ufed8\024\ufed8\155\ufed8\255\ufed8\334\240\335" +
-    "\233\336\235\337\242\340\236\341\ufed8\001\002\000\034" +
-    "\011\ufeda\013\ufeda\016\ufeda\017\ufeda\024\ufeda\155\ufeda\255" +
-    "\ufeda\334\240\335\233\336\235\337\242\340\236\341\ufeda" +
-    "\001\002\000\044\011\ufee1\013\ufee1\016\ufee1\017\ufee1\024" +
-    "\ufee1\155\ufee1\255\ufee1\334\ufee1\335\ufee1\336\ufee1\337\ufee1" +
-    "\340\ufee1\341\ufee1\342\ufee1\343\ufee1\344\ufee1\345\ufee1\001" +
-    "\002\000\044\011\ufed7\013\ufed7\016\ufed7\017\ufed7\024\ufed7" +
-    "\155\ufed7\255\ufed7\334\240\335\233\336\235\337\242\340" +
-    "\236\341\ufed7\342\245\343\243\344\247\345\244\001\002" +
-    "\000\044\011\ufee4\013\ufee4\016\ufee4\017\ufee4\024\ufee4\155" +
-    "\ufee4\255\ufee4\334\ufee4\335\ufee4\336\235\337\242\340\236" +
-    "\341\ufee4\342\ufee4\343\ufee4\344\ufee4\345\ufee4\001\002\000" +
-    "\044\011\ufed6\013\ufed6\016\ufed6\017\ufed6\024\ufed6\155\ufed6" +
-    "\255\ufed6\334\240\335\233\336\235\337\242\340\236\341" +
-    "\ufed6\342\245\343\243\344\247\345\244\001\002\000\044" +
-    "\011\ufee0\013\ufee0\016\ufee0\017\ufee0\024\ufee0\155\ufee0\255" +
-    "\ufee0\334\ufee0\335\ufee0\336\ufee0\337\ufee0\340\ufee0\341\ufee0" +
-    "\342\ufee0\343\ufee0\344\ufee0\345\ufee0\001\002\000\044\011" +
-    "\ufee2\013\ufee2\016\ufee2\017\ufee2\024\ufee2\155\ufee2\255\ufee2" +
-    "\334\ufee2\335\ufee2\336\ufee2\337\ufee2\340\ufee2\341\ufee2\342" +
-    "\ufee2\343\ufee2\344\ufee2\345\ufee2\001\002\000\044\011\241" +
-    "\013\ufedd\016\ufedd\017\ufedd\024\ufedd\155\ufedd\255\ufedd\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\ufee3\013" +
-    "\ufee3\016\ufee3\017\ufee3\024\ufee3\155\ufee3\255\ufee3\334\ufee3" +
-    "\335\ufee3\336\235\337\242\340\236\341\ufee3\342\ufee3\343" +
-    "\ufee3\344\ufee3\345\ufee3\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\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\004\141\223\001\002\000\044\011" +
-    "\ufed1\013\ufed1\016\ufed1\017\ufed1\024\ufed1\155\ufed1\255\ufed1" +
-    "\334\ufed1\335\ufed1\336\ufed1\337\ufed1\340\ufed1\341\ufed1\342" +
-    "\ufed1\343\ufed1\344\ufed1\345\ufed1\001\002\000\044\011\ufedf" +
-    "\013\ufedf\016\ufedf\017\ufedf\024\ufedf\155\ufedf\255\ufedf\334" +
-    "\ufedf\335\ufedf\336\ufedf\337\ufedf\340\ufedf\341\ufedf\342\ufedf" +
-    "\343\ufedf\344\ufedf\345\ufedf\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" +
-    "\265\uffea\001\002\000\006\015\uffe9\265\uffe9\001\002\000" +
-    "\004\020\302\001\002\000\010\074\306\075\305\141\303" +
-    "\001\002\000\006\017\uffe5\023\uffe5\001\002\000\004\017" +
-    "\307\001\002\000\006\017\uffe7\023\uffe7\001\002\000\006" +
-    "\017\uffe6\023\uffe6\001\002\000\012\015\uffe8\164\uffe8\265" +
-    "\uffe8\301\uffe8\001\002\000\020\015\uff9d\145\uff9d\164\uff9d" +
-    "\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" +
-    "\354\001\002\000\004\145\u029c\001\002\000\004\022\u027a" +
-    "\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\u0271\022\u0272\001\002\000" +
-    "\014\015\uff86\212\uff86\216\uff86\307\uff86\316\uff86\001\002" +
-    "\000\004\022\u0249\001\002\000\006\017\u0240\022\u0241\001" +
-    "\002\000\014\015\uff8a\212\uff8a\216\uff8a\307\uff8a\316\uff8a" +
-    "\001\002\000\006\206\u01cd\313\u01cf\001\002\000\014\015" +
-    "\uff7f\212\uff7f\216\uff7f\307\uff7f\316\uff7f\001\002\000\014" +
-    "\015\uff87\212\uff87\216\uff87\307\uff87\316\uff87\001\002\000" +
-    "\014\015\uff88\212\uff88\216\uff88\307\uff88\316\uff88\001\002" +
-    "\000\014\015\uff80\212\uff80\216\uff80\307\uff80\316\uff80\001" +
-    "\002\000\006\017\u01bb\022\u01bc\001\002\000\004\015\u01ba" +
-    "\001\002\000\020\015\uff8f\145\uff8f\164\uff8f\171\uff8f\215" +
-    "\uff8f\262\uff8f\270\uff8f\001\002\000\006\017\u01b1\022\u01b2" +
-    "\001\002\000\014\015\uff7d\212\uff7d\216\uff7d\307\uff7d\316" +
-    "\uff7d\001\002\000\006\017\u01a8\022\u01a9\001\002\000\004" +
-    "\022\u01a2\001\002\000\006\017\u019c\022\u019d\001\002\000" +
-    "\014\015\uff8c\212\342\216\313\307\345\316\354\001\002" +
-    "\000\004\145\u0197\001\002\000\014\015\uff81\212\uff81\216" +
-    "\uff81\307\uff81\316\uff81\001\002\000\014\015\uff84\212\uff84" +
-    "\216\uff84\307\uff84\316\uff84\001\002\000\004\141\u018b\001" +
-    "\002\000\014\015\uff89\212\uff89\216\uff89\307\uff89\316\uff89" +
-    "\001\002\000\014\015\uff85\212\uff85\216\uff85\307\uff85\316" +
-    "\uff85\001\002\000\006\017\u0182\022\u0183\001\002\000\004" +
-    "\022\u017c\001\002\000\006\017\365\022\366\001\002\000" +
+    "\222\005\224\012\226\141\223\251\231\335\221\001\002" +
+    "\000\016\004\222\005\224\012\226\141\223\251\231\335" +
+    "\221\001\002\000\016\004\222\005\224\012\226\141\223" +
+    "\251\231\335\221\001\002\000\016\004\222\005\224\012" +
+    "\226\141\223\251\231\335\221\001\002\000\016\004\222" +
+    "\005\224\012\226\141\223\251\231\335\221\001\002\000" +
+    "\016\004\222\005\224\012\226\141\223\251\231\335\221" +
+    "\001\002\000\034\011\ufed5\013\ufed5\016\ufed5\017\ufed5\024" +
+    "\ufed5\155\ufed5\255\ufed5\334\241\335\234\336\235\337\243" +
+    "\340\236\341\ufed5\001\002\000\044\011\240\013\ufeda\016" +
+    "\ufeda\017\ufeda\024\ufeda\155\233\255\ufeda\334\241\335\234" +
+    "\336\235\337\243\340\236\341\237\342\245\343\242\344" +
+    "\247\345\244\001\002\000\034\011\ufed7\013\ufed7\016\ufed7" +
+    "\017\ufed7\024\ufed7\155\ufed7\255\ufed7\334\241\335\234\336" +
+    "\235\337\243\340\236\341\ufed7\001\002\000\034\011\ufed4" +
+    "\013\ufed4\016\ufed4\017\ufed4\024\ufed4\155\ufed4\255\ufed4\334" +
+    "\241\335\234\336\235\337\243\340\236\341\ufed4\001\002" +
+    "\000\044\011\ufedd\013\ufedd\016\ufedd\017\ufedd\024\ufedd\155" +
+    "\ufedd\255\ufedd\334\ufedd\335\ufedd\336\ufedd\337\ufedd\340\ufedd" +
+    "\341\ufedd\342\ufedd\343\ufedd\344\ufedd\345\ufedd\001\002\000" +
+    "\034\011\ufed6\013\ufed6\016\ufed6\017\ufed6\024\ufed6\155\ufed6" +
+    "\255\ufed6\334\241\335\234\336\235\337\243\340\236\341" +
+    "\ufed6\001\002\000\044\011\ufee0\013\ufee0\016\ufee0\017\ufee0" +
+    "\024\ufee0\155\ufee0\255\ufee0\334\ufee0\335\ufee0\336\235\337" +
+    "\243\340\236\341\ufee0\342\ufee0\343\ufee0\344\ufee0\345\ufee0" +
+    "\001\002\000\044\011\ufed3\013\ufed3\016\ufed3\017\ufed3\024" +
+    "\ufed3\155\ufed3\255\ufed3\334\241\335\234\336\235\337\243" +
+    "\340\236\341\ufed3\342\245\343\242\344\247\345\244\001" +
+    "\002\000\044\011\ufed2\013\ufed2\016\ufed2\017\ufed2\024\ufed2" +
+    "\155\ufed2\255\ufed2\334\241\335\234\336\235\337\243\340" +
+    "\236\341\ufed2\342\245\343\242\344\247\345\244\001\002" +
+    "\000\044\011\ufedc\013\ufedc\016\ufedc\017\ufedc\024\ufedc\155" +
+    "\ufedc\255\ufedc\334\ufedc\335\ufedc\336\ufedc\337\ufedc\340\ufedc" +
+    "\341\ufedc\342\ufedc\343\ufedc\344\ufedc\345\ufedc\001\002\000" +
+    "\044\011\ufede\013\ufede\016\ufede\017\ufede\024\ufede\155\ufede" +
+    "\255\ufede\334\ufede\335\ufede\336\ufede\337\ufede\340\ufede\341" +
+    "\ufede\342\ufede\343\ufede\344\ufede\345\ufede\001\002\000\044" +
+    "\011\ufedf\013\ufedf\016\ufedf\017\ufedf\024\ufedf\155\ufedf\255" +
+    "\ufedf\334\ufedf\335\ufedf\336\235\337\243\340\236\341\ufedf" +
+    "\342\ufedf\343\ufedf\344\ufedf\345\ufedf\001\002\000\044\011" +
+    "\240\013\ufed9\016\ufed9\017\ufed9\024\ufed9\155\ufed9\255\ufed9" +
+    "\334\241\335\234\336\235\337\243\340\236\341\237\342" +
+    "\245\343\242\344\247\345\244\001\002\000\020\015\uff9e" +
+    "\145\uff9e\164\uff9e\171\uff9e\215\uff9e\262\uff9e\270\uff9e\001" +
+    "\002\000\036\011\240\013\267\155\233\255\246\334\241" +
+    "\335\234\336\235\337\243\340\236\341\237\342\245\343" +
+    "\242\344\247\345\244\001\002\000\044\011\ufed1\013\ufed1" +
+    "\016\ufed1\017\ufed1\024\ufed1\155\ufed1\255\ufed1\334\ufed1\335" +
+    "\ufed1\336\ufed1\337\ufed1\340\ufed1\341\ufed1\342\ufed1\343\ufed1" +
+    "\344\ufed1\345\ufed1\001\002\000\004\141\223\001\002\000" +
+    "\044\011\ufecd\013\ufecd\016\ufecd\017\ufecd\024\ufecd\155\ufecd" +
+    "\255\ufecd\334\ufecd\335\ufecd\336\ufecd\337\ufecd\340\ufecd\341" +
+    "\ufecd\342\ufecd\343\ufecd\344\ufecd\345\ufecd\001\002\000\044" +
+    "\011\ufedb\013\ufedb\016\ufedb\017\ufedb\024\ufedb\155\ufedb\255" +
+    "\ufedb\334\ufedb\335\ufedb\336\ufedb\337\ufedb\340\ufedb\341\ufedb" +
+    "\342\ufedb\343\ufedb\344\ufedb\345\ufedb\001\002\000\020\015" +
+    "\uff8a\145\uff8a\164\uff8a\171\uff8a\215\uff8a\262\uff8a\270\uff8a" +
+    "\001\002\000\014\015\315\212\324\216\275\307\327\316" +
+    "\336\001\002\000\004\145\u028e\001\002\000\004\022\u026c" +
+    "\001\002\000\014\015\uff7f\212\uff7f\216\uff7f\307\uff7f\316" +
+    "\uff7f\001\002\000\014\015\uff7a\212\uff7a\216\uff7a\307\uff7a" +
+    "\316\uff7a\001\002\000\006\017\u0263\022\u0264\001\002\000" +
     "\014\015\uff82\212\uff82\216\uff82\307\uff82\316\uff82\001\002" +
-    "\000\004\020\355\001\002\000\004\115\356\001\002\000" +
-    "\004\221\357\001\002\000\004\141\360\001\002\000\010" +
-    "\206\uff0c\230\361\313\uff0c\001\002\000\004\036\362\001" +
-    "\002\000\004\011\363\001\002\000\004\004\364\001\002" +
-    "\000\006\206\uff0b\313\uff0b\001\002\000\014\015\uff53\212" +
-    "\uff53\216\uff53\307\uff53\316\uff53\001\002\000\004\124\367" +
-    "\001\002\000\004\012\370\001\002\000\006\013\373\034" +
-    "\371\001\002\000\004\022\377\001\002\000\004\013\375" +
-    "\001\002\000\004\017\374\001\002\000\014\015\uff54\212" +
-    "\uff54\216\uff54\307\uff54\316\uff54\001\002\000\004\017\376" +
+    "\000\004\022\u023b\001\002\000\006\017\u0232\022\u0233\001" +
+    "\002\000\006\206\u01bf\313\u01c1\001\002\000\014\015\uff86" +
+    "\212\uff86\216\uff86\307\uff86\316\uff86\001\002\000\014\015" +
+    "\uff7b\212\uff7b\216\uff7b\307\uff7b\316\uff7b\001\002\000\014" +
+    "\015\uff83\212\uff83\216\uff83\307\uff83\316\uff83\001\002\000" +
+    "\014\015\uff84\212\uff84\216\uff84\307\uff84\316\uff84\001\002" +
+    "\000\014\015\uff7c\212\uff7c\216\uff7c\307\uff7c\316\uff7c\001" +
+    "\002\000\006\017\u01ad\022\u01ae\001\002\000\004\015\u01ac" +
+    "\001\002\000\020\015\uff8b\145\uff8b\164\uff8b\171\uff8b\215" +
+    "\uff8b\262\uff8b\270\uff8b\001\002\000\006\017\u01a3\022\u01a4" +
+    "\001\002\000\014\015\uff79\212\uff79\216\uff79\307\uff79\316" +
+    "\uff79\001\002\000\006\017\u019a\022\u019b\001\002\000\004" +
+    "\022\u0194\001\002\000\006\017\u018e\022\u018f\001\002\000" +
+    "\014\015\uff88\212\324\216\275\307\327\316\336\001\002" +
+    "\000\004\145\u0189\001\002\000\014\015\uff7d\212\uff7d\216" +
+    "\uff7d\307\uff7d\316\uff7d\001\002\000\014\015\uff80\212\uff80" +
+    "\216\uff80\307\uff80\316\uff80\001\002\000\004\141\u017d\001" +
+    "\002\000\014\015\uff85\212\uff85\216\uff85\307\uff85\316\uff85" +
+    "\001\002\000\014\015\uff81\212\uff81\216\uff81\307\uff81\316" +
+    "\uff81\001\002\000\006\017\u0174\022\u0175\001\002\000\004" +
+    "\022\u016e\001\002\000\006\017\347\022\350\001\002\000" +
+    "\014\015\uff7e\212\uff7e\216\uff7e\307\uff7e\316\uff7e\001\002" +
+    "\000\004\020\337\001\002\000\004\115\340\001\002\000" +
+    "\004\221\341\001\002\000\004\141\342\001\002\000\010" +
+    "\206\uff08\230\343\313\uff08\001\002\000\004\036\344\001" +
+    "\002\000\004\011\345\001\002\000\004\004\346\001\002" +
+    "\000\006\206\uff07\313\uff07\001\002\000\014\015\uff4f\212" +
+    "\uff4f\216\uff4f\307\uff4f\316\uff4f\001\002\000\004\124\351" +
+    "\001\002\000\004\012\352\001\002\000\006\013\355\034" +
+    "\353\001\002\000\004\022\361\001\002\000\004\013\357" +
+    "\001\002\000\004\017\356\001\002\000\014\015\uff50\212" +
+    "\uff50\216\uff50\307\uff50\316\uff50\001\002\000\004\017\360" +
+    "\001\002\000\014\015\uff51\212\uff51\216\uff51\307\uff51\316" +
+    "\uff51\001\002\000\022\065\uff48\066\uff48\067\uff48\070\uff48" +
+    "\125\uff48\126\uff48\127\uff48\230\uff48\001\002\000\006\013" +
+    "\uff4b\016\uff4b\001\002\000\022\065\u0105\066\371\067\370" +
+    "\070\374\125\u0104\126\u0102\127\366\230\372\001\002\000" +
+    "\010\013\uff43\016\uff43\210\uff43\001\002\000\012\036\u0111" +
+    "\037\u0114\040\u010b\041\u0112\001\002\000\004\012\u016b\001" +
+    "\002\000\012\036\u0111\037\u0114\040\u010b\041\u0112\001\002" +
+    "\000\004\012\u0168\001\002\000\010\013\uff3f\016\uff3f\210" +
+    "\uff3f\001\002\000\016\004\222\005\224\012\226\141\223" +
+    "\251\231\335\221\001\002\000\012\036\u0111\037\u0114\040" +
+    "\u010b\041\u0112\001\002\000\004\012\u015d\001\002\000\010" +
+    "\013\uff42\016\uff42\210\uff42\001\002\000\012\036\u0111\037" +
+    "\u0114\040\u010b\041\u0112\001\002\000\012\036\u0111\037\u0114" +
+    "\040\u010b\041\u0112\001\002\000\006\013\uff46\016\uff46\001" +
+    "\002\000\010\013\uff41\016\uff41\210\uff41\001\002\000\004" +
+    "\012\u0158\001\002\000\010\013\uff45\016\uff45\210\uff45\001" +
+    "\002\000\004\012\u0157\001\002\000\004\012\u0156\001\002" +
+    "\000\010\013\uff40\016\uff40\210\uff40\001\002\000\010\013" +
+    "\uff44\016\uff44\210\uff44\001\002\000\012\036\u0111\037\u0114" +
+    "\040\u010b\041\u0112\001\002\000\006\013\uff2f\016\uff2f\001" +
+    "\002\000\006\013\uff2c\016\uff2c\001\002\000\004\022\u0155" +
+    "\001\002\000\006\013\uff30\016\uff30\001\002\000\004\013" +
+    "\u0154\001\002\000\006\013\uff32\016\u0152\001\002\000\010" +
+    "\130\u012b\131\u012a\141\u012c\001\002\000\006\013\uff2d\016" +
+    "\uff2d\001\002\000\004\022\u0128\001\002\000\004\022\u0122" +
+    "\001\002\000\006\013\uff2a\016\uff2a\001\002\000\004\022" +
+    "\uff27\001\002\000\006\013\uff2b\016\uff2b\001\002\000\004" +
+    "\022\u0118\001\002\000\006\013\uff2e\016\uff2e\001\002\000" +
+    "\020\004\222\005\224\012\226\073\u011a\141\223\251\231" +
+    "\335\221\001\002\000\006\013\uff28\016\uff28\001\002\000" +
+    "\004\012\u011d\001\002\000\006\013\uff25\016\uff25\001\002" +
+    "\000\040\011\240\013\uff26\016\uff26\155\233\255\246\334" +
+    "\241\335\234\336\235\337\243\340\236\341\237\342\245" +
+    "\343\242\344\247\345\244\001\002\000\016\004\222\005" +
+    "\224\012\226\141\223\251\231\335\221\001\002\000\036" +
+    "\011\240\016\u011f\155\233\255\246\334\241\335\234\336" +
+    "\235\337\243\340\236\341\237\342\245\343\242\344\247" +
+    "\345\244\001\002\000\016\004\222\005\224\012\226\141" +
+    "\223\251\231\335\221\001\002\000\036\011\240\013\u0121" +
+    "\155\233\255\246\334\241\335\234\336\235\337\243\340" +
+    "\236\341\237\342\245\343\242\344\247\345\244\001\002" +
+    "\000\006\013\uff24\016\uff24\001\002\000\004\141\u0123\001" +
+    "\002\000\010\013\uff1d\016\uff1d\021\u0124\001\002\000\010" +
+    "\134\u0125\135\u0127\136\u0126\001\002\000\006\013\uff1c\016" +
+    "\uff1c\001\002\000\006\013\uff1a\016\uff1a\001\002\000\006" +
+    "\013\uff1b\016\uff1b\001\002\000\004\004\u0129\001\002\000" +
+    "\006\013\uff29\016\uff29\001\002\000\004\012\u0150\001\002" +
+    "\000\004\012\u014c\001\002\000\010\012\u012d\013\uff21\016" +
+    "\uff21\001\002\000\020\004\222\005\224\012\226\013\u0134" +
+    "\141\u0130\251\231\335\221\001\002\000\006\013\uff19\016" +
+    "\uff19\001\002\000\020\004\222\005\224\012\226\013\u0141" +
+    "\141\u013d\251\231\335\221\001\002\000\046\011\ufece\012" +
+    "\u013a\013\ufece\016\ufece\017\ufece\021\270\155\ufece\255\ufece" +
+    "\334\ufece\335\ufece\336\ufece\337\ufece\340\ufece\341\ufece\342" +
+    "\ufece\343\ufece\344\ufece\345\ufece\001\002\000\042\011\ufee1" +
+    "\013\ufee4\016\ufee4\017\ufee4\155\ufee1\255\ufee1\334\ufee1\335" +
+    "\ufee1\336\ufee1\337\ufee1\340\ufee1\341\ufee1\342\ufee1\343\ufee1" +
+    "\344\ufee1\345\ufee1\001\002\000\006\013\u0138\016\u0137\001" +
+    "\002\000\034\011\240\155\233\255\246\334\241\335\234" +
+    "\336\235\337\243\340\236\341\237\342\245\343\242\344" +
+    "\247\345\244\001\002\000\006\013\uff22\016\uff22\001\002" +
+    "\000\042\011\ufee2\013\ufee5\016\ufee5\017\ufee5\155\ufee2\255" +
+    "\ufee2\334\ufee2\335\ufee2\336\ufee2\337\ufee2\340\ufee2\341\ufee2" +
+    "\342\ufee2\343\ufee2\344\ufee2\345\ufee2\001\002\000\010\013" +
+    "\ufee6\016\ufee6\017\ufee6\001\002\000\016\004\222\005\224" +
+    "\012\226\141\u0130\251\231\335\221\001\002\000\006\013" +
+    "\uff23\016\uff23\001\002\000\006\013\uff18\016\uff18\001\002" +
+    "\000\020\004\ufeca\005\ufeca\012\ufeca\013\ufeca\141\ufeca\251" +
+    "\ufeca\335\ufeca\001\002\000\016\004\222\005\224\012\226" +
+    "\141\u013d\251\231\335\221\001\002\000\004\013\u0149\001" +
+    "\002\000\044\011\ufece\012\u0148\013\ufece\016\ufece\021\270" +
+    "\155\ufece\255\ufece\334\ufece\335\ufece\336\ufece\337\ufece\340" +
+    "\ufece\341\ufece\342\ufece\343\ufece\344\ufece\345\ufece\001\002" +
+    "\000\006\013\ufec9\016\u0145\001\002\000\040\011\ufee1\013" +
+    "\ufec5\016\ufec5\155\ufee1\255\ufee1\334\ufee1\335\ufee1\336\ufee1" +
+    "\337\ufee1\340\ufee1\341\ufee1\342\ufee1\343\ufee1\344\ufee1\345" +
+    "\ufee1\001\002\000\004\013\u0144\001\002\000\010\013\ufecc" +
+    "\016\ufecc\017\ufecc\001\002\000\040\011\ufee2\013\ufec6\016" +
+    "\ufec6\155\ufee2\255\ufee2\334\ufee2\335\ufee2\336\ufee2\337\ufee2" +
+    "\340\ufee2\341\ufee2\342\ufee2\343\ufee2\344\ufee2\345\ufee2\001" +
+    "\002\000\006\013\ufec4\016\ufec4\001\002\000\010\013\ufecb" +
+    "\016\ufecb\017\ufecb\001\002\000\016\004\ufec7\005\ufec7\012" +
+    "\ufec7\141\ufec7\251\ufec7\335\ufec7\001\002\000\016\004\222" +
+    "\005\224\012\226\141\u013d\251\231\335\221\001\002\000" +
+    "\004\013\ufec8\001\002\000\020\004\ufeca\005\ufeca\012\ufeca" +
+    "\013\ufec1\141\ufeca\251\ufeca\335\ufeca\001\002\000\006\013" +
+    "\ufec3\016\ufec3\001\002\000\004\013\u014b\001\002\000\006" +
+    "\013\ufec2\016\ufec2\001\002\000\016\004\222\005\224\012" +
+    "\226\141\223\251\231\335\221\001\002\000\036\011\240" +
+    "\013\ufee3\155\233\255\246\334\241\335\234\336\235\337" +
+    "\243\340\236\341\237\342\245\343\242\344\247\345\244" +
+    "\001\002\000\004\013\u014f\001\002\000\006\013\uff20\016" +
+    "\uff20\001\002\000\004\013\u0151\001\002\000\006\013\uff1f" +
+    "\016\uff1f\001\002\000\012\036\u0111\037\u0114\040\u010b\041" +
+    "\u0112\001\002\000\004\013\uff31\001\002\000\010\013\uff36" +
+    "\016\uff36\210\uff36\001\002\000\010\130\uff1e\131\uff1e\141" +
+    "\uff1e\001\002\000\012\036\uff3d\037\uff3d\040\uff3d\041\uff3d" +
+    "\001\002\000\012\036\uff37\037\uff37\040\uff37\041\uff37\001" +
+    "\002\000\012\036\uff35\037\uff35\040\uff35\041\uff35\001\002" +
+    "\000\004\013\u015a\001\002\000\010\013\uff34\016\uff34\210" +
+    "\uff34\001\002\000\004\013\u015c\001\002\000\010\013\uff3a" +
+    "\016\uff3a\210\uff3a\001\002\000\012\036\uff39\037\uff39\040" +
+    "\uff39\041\uff39\001\002\000\004\013\u015f\001\002\000\010" +
+    "\013\uff3e\016\uff3e\210\uff3e\001\002\000\036\011\240\024" +
+    "\u0161\155\233\255\246\334\241\335\234\336\235\337\243" +
+    "\340\236\341\237\342\245\343\242\344\247\345\244\001" +
+    "\002\000\020\065\u0105\066\371\067\370\070\374\125\u0104" +
+    "\126\u0102\127\366\001\002\000\004\210\u0163\001\002\000" +
+    "\004\064\u0164\001\002\000\004\012\u0165\001\002\000\004" +
+    "\004\u0166\001\002\000\004\013\u0167\001\002\000\006\013" +
+    "\uff47\016\uff47\001\002\000\012\036\uff3b\037\uff3b\040\uff3b" +
+    "\041\uff3b\001\002\000\004\013\u016a\001\002\000\010\013" +
+    "\uff3c\016\uff3c\210\uff3c\001\002\000\012\036\uff33\037\uff33" +
+    "\040\uff33\041\uff33\001\002\000\004\013\u016d\001\002\000" +
+    "\010\013\uff38\016\uff38\210\uff38\001\002\000\004\113\u016f" +
+    "\001\002\000\004\012\u0170\001\002\000\004\034\353\001" +
+    "\002\000\004\013\u0172\001\002\000\004\017\u0173\001\002" +
+    "\000\014\015\uff5d\212\uff5d\216\uff5d\307\uff5d\316\uff5d\001" +
+    "\002\000\014\015\uff53\212\uff53\216\uff53\307\uff53\316\uff53" +
+    "\001\002\000\004\123\u0176\001\002\000\004\012\u0177\001" +
+    "\002\000\006\013\u0179\034\353\001\002\000\004\013\u017b" +
+    "\001\002\000\004\017\u017a\001\002\000\014\015\uff54\212" +
+    "\uff54\216\uff54\307\uff54\316\uff54\001\002\000\004\017\u017c" +
     "\001\002\000\014\015\uff55\212\uff55\216\uff55\307\uff55\316" +
-    "\uff55\001\002\000\022\065\uff4c\066\uff4c\067\uff4c\070\uff4c" +
-    "\125\uff4c\126\uff4c\127\uff4c\230\uff4c\001\002\000\006\013" +
-    "\uff4f\016\uff4f\001\002\000\022\065\u0113\066\u0107\067\u0106" +
-    "\070\u010a\125\u0112\126\u0110\127\u0104\230\u0108\001\002\000" +
-    "\010\013\uff47\016\uff47\210\uff47\001\002\000\012\036\u011e" +
-    "\037\u0122\040\u0119\041\u0120\001\002\000\004\012\u0179\001" +
-    "\002\000\012\036\u011e\037\u0122\040\u0119\041\u0120\001\002" +
-    "\000\004\012\u0176\001\002\000\010\013\uff43\016\uff43\210" +
-    "\uff43\001\002\000\016\004\222\005\225\012\226\141\223" +
-    "\251\231\335\221\001\002\000\012\036\u011e\037\u0122\040" +
-    "\u0119\041\u0120\001\002\000\004\012\u016b\001\002\000\010" +
-    "\013\uff46\016\uff46\210\uff46\001\002\000\012\036\u011e\037" +
-    "\u0122\040\u0119\041\u0120\001\002\000\012\036\u011e\037\u0122" +
-    "\040\u0119\041\u0120\001\002\000\010\013\uff45\016\uff45\210" +
-    "\uff45\001\002\000\006\013\uff4a\016\uff4a\001\002\000\004" +
-    "\012\u0166\001\002\000\010\013\uff49\016\uff49\210\uff49\001" +
-    "\002\000\004\012\u0165\001\002\000\004\012\u0164\001\002" +
-    "\000\010\013\uff44\016\uff44\210\uff44\001\002\000\010\013" +
-    "\uff48\016\uff48\210\uff48\001\002\000\012\036\u011e\037\u0122" +
-    "\040\u0119\041\u0120\001\002\000\006\013\uff33\016\uff33\001" +
-    "\002\000\006\013\uff30\016\uff30\001\002\000\004\022\u0163" +
-    "\001\002\000\006\013\uff34\016\uff34\001\002\000\004\013" +
-    "\u0162\001\002\000\006\013\uff36\016\u0160\001\002\000\010" +
-    "\130\u0139\131\u0138\141\u013a\001\002\000\004\022\u0136\001" +
-    "\002\000\006\013\uff31\016\uff31\001\002\000\004\022\u0130" +
-    "\001\002\000\006\013\uff2e\016\uff2e\001\002\000\004\022" +
-    "\uff2b\001\002\000\006\013\uff2f\016\uff2f\001\002\000\004" +
-    "\022\u0126\001\002\000\006\013\uff32\016\uff32\001\002\000" +
-    "\020\004\222\005\225\012\226\073\u0128\141\223\251\231" +
-    "\335\221\001\002\000\006\013\uff2c\016\uff2c\001\002\000" +
-    "\004\012\u012b\001\002\000\006\013\uff29\016\uff29\001\002" +
-    "\000\040\011\241\013\uff2a\016\uff2a\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\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\016\004\222\005\225\012\226\141" +
-    "\223\251\231\335\221\001\002\000\036\011\241\013\u012f" +
-    "\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\uff28\016\uff28\001\002\000\004\141\u0131\001" +
-    "\002\000\010\013\uff21\016\uff21\021\u0132\001\002\000\010" +
-    "\134\u0133\135\u0135\136\u0134\001\002\000\006\013\uff20\016" +
-    "\uff20\001\002\000\006\013\uff1e\016\uff1e\001\002\000\006" +
-    "\013\uff1f\016\uff1f\001\002\000\004\004\u0137\001\002\000" +
-    "\006\013\uff2d\016\uff2d\001\002\000\004\012\u015e\001\002" +
-    "\000\004\012\u015a\001\002\000\010\012\u013b\013\uff25\016" +
-    "\uff25\001\002\000\020\004\222\005\225\012\226\013\u0142" +
-    "\141\u013e\251\231\335\221\001\002\000\020\004\222\005" +
-    "\225\012\226\013\u0150\141\u014c\251\231\335\221\001\002" +
-    "\000\006\013\uff1d\016\uff1d\001\002\000\046\011\ufed2\012" +
-    "\u0148\013\ufed2\016\ufed2\017\ufed2\021\270\155\ufed2\255\ufed2" +
-    "\334\ufed2\335\ufed2\336\ufed2\337\ufed2\340\ufed2\341\ufed2\342" +
-    "\ufed2\343\ufed2\344\ufed2\345\ufed2\001\002\000\042\011\ufee5" +
-    "\013\ufee8\016\ufee8\017\ufee8\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\006\013\u0146\016\u0145\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\244\001\002\000\006\013\uff26\016\uff26\001\002" +
-    "\000\042\011\ufee6\013\ufee9\016\ufee9\017\ufee9\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\010\013" +
-    "\ufeea\016\ufeea\017\ufeea\001\002\000\016\004\222\005\225" +
-    "\012\226\141\u013e\251\231\335\221\001\002\000\006\013" +
-    "\uff27\016\uff27\001\002\000\006\013\uff1c\016\uff1c\001\002" +
-    "\000\020\004\ufece\005\ufece\012\ufece\013\ufece\141\ufece\251" +
-    "\ufece\335\ufece\001\002\000\016\004\222\005\225\012\226" +
-    "\141\u014c\251\231\335\221\001\002\000\004\013\u0157\001" +
-    "\002\000\006\013\ufecd\016\u0155\001\002\000\044\011\ufed2" +
-    "\012\u0153\013\ufed2\016\ufed2\021\270\155\ufed2\255\ufed2\334" +
-    "\ufed2\335\ufed2\336\ufed2\337\ufed2\340\ufed2\341\ufed2\342\ufed2" +
-    "\343\ufed2\344\ufed2\345\ufed2\001\002\000\040\011\ufee5\013" +
-    "\ufec9\016\ufec9\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\004\013\u0152\001\002\000\040\011\ufee6" +
-    "\013\ufeca\016\ufeca\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\010\013\ufed0\016\ufed0\017\ufed0\001" +
-    "\002\000\006\013\ufec8\016\ufec8\001\002\000\010\013\ufecf" +
-    "\016\ufecf\017\ufecf\001\002\000\020\004\ufece\005\ufece\012" +
-    "\ufece\013\ufec5\141\ufece\251\ufece\335\ufece\001\002\000\016" +
-    "\004\222\005\225\012\226\141\u014c\251\231\335\221\001" +
-    "\002\000\016\004\ufecb\005\ufecb\012\ufecb\141\ufecb\251\ufecb" +
-    "\335\ufecb\001\002\000\004\013\ufecc\001\002\000\006\013" +
-    "\ufec7\016\ufec7\001\002\000\004\013\u0159\001\002\000\006" +
-    "\013\ufec6\016\ufec6\001\002\000\016\004\222\005\225\012" +
-    "\226\141\223\251\231\335\221\001\002\000\036\011\241" +
-    "\013\ufee7\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\013\u015d\001\002\000\006\013\uff24\016" +
-    "\uff24\001\002\000\004\013\u015f\001\002\000\006\013\uff23" +
-    "\016\uff23\001\002\000\012\036\u011e\037\u0122\040\u0119\041" +
-    "\u0120\001\002\000\004\013\uff35\001\002\000\010\013\uff3a" +
-    "\016\uff3a\210\uff3a\001\002\000\010\130\uff22\131\uff22\141" +
-    "\uff22\001\002\000\012\036\uff41\037\uff41\040\uff41\041\uff41" +
-    "\001\002\000\012\036\uff3b\037\uff3b\040\uff3b\041\uff3b\001" +
-    "\002\000\012\036\uff39\037\uff39\040\uff39\041\uff39\001\002" +
-    "\000\004\013\u0168\001\002\000\010\013\uff38\016\uff38\210" +
-    "\uff38\001\002\000\004\013\u016a\001\002\000\010\013\uff3e" +
-    "\016\uff3e\210\uff3e\001\002\000\012\036\uff3d\037\uff3d\040" +
-    "\uff3d\041\uff3d\001\002\000\004\013\u016d\001\002\000\010" +
-    "\013\uff42\016\uff42\210\uff42\001\002\000\036\011\241\024" +
-    "\u016f\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\u0113\066\u0107\067\u0106\070\u010a\125\u0112" +
-    "\126\u0110\127\u0104\001\002\000\004\210\u0171\001\002\000" +
-    "\004\064\u0172\001\002\000\004\012\u0173\001\002\000\004" +
-    "\004\u0174\001\002\000\004\013\u0175\001\002\000\006\013" +
-    "\uff4b\016\uff4b\001\002\000\012\036\uff3f\037\uff3f\040\uff3f" +
-    "\041\uff3f\001\002\000\004\013\u0178\001\002\000\010\013" +
-    "\uff40\016\uff40\210\uff40\001\002\000\012\036\uff37\037\uff37" +
-    "\040\uff37\041\uff37\001\002\000\004\013\u017b\001\002\000" +
-    "\010\013\uff3c\016\uff3c\210\uff3c\001\002\000\004\113\u017d" +
-    "\001\002\000\004\012\u017e\001\002\000\004\034\371\001" +
-    "\002\000\004\013\u0180\001\002\000\004\017\u0181\001\002" +
-    "\000\014\015\uff61\212\uff61\216\uff61\307\uff61\316\uff61\001" +
+    "\uff55\001\002\000\004\020\u017e\001\002\000\026\104\u0181" +
+    "\107\u0182\110\u0180\111\u0183\112\u0186\113\u0188\114\u0184\122" +
+    "\u0185\123\u017f\124\u0187\001\002\000\006\017\uff52\022\uff52" +
+    "\001\002\000\006\017\uff66\022\uff66\001\002\000\006\017" +
+    "\uff71\022\uff71\001\002\000\006\017\uff6a\022\uff6a\001\002" +
+    "\000\004\022\uff62\001\002\000\004\022\uff5a\001\002\000" +
+    "\006\017\uff56\022\uff56\001\002\000\004\022\uff5e\001\002" +
+    "\000\006\017\uff4e\022\uff4e\001\002\000\004\022\uff5c\001" +
+    "\002\000\004\141\u018a\001\002\000\004\020\u018b\001\002" +
+    "\000\004\106\u018c\001\002\000\006\017\uff75\022\uff75\001" +
+    "\002\000\004\015\uff87\001\002\000\014\015\uff70\212\uff70" +
+    "\216\uff70\307\uff70\316\uff70\001\002\000\004\105\u0190\001" +
+    "\002\000\004\012\u0191\001\002\000\004\013\u0192\001\002" +
+    "\000\004\017\u0193\001\002\000\014\015\uff6f\212\uff6f\216" +
+    "\uff6f\307\uff6f\316\uff6f\001\002\000\004\114\u0195\001\002" +
+    "\000\004\012\u0196\001\002\000\004\034\353\001\002\000" +
+    "\004\013\u0198\001\002\000\004\017\u0199\001\002\000\014" +
+    "\015\uff5b\212\uff5b\216\uff5b\307\uff5b\316\uff5b\001\002\000" +
+    "\014\015\uff6d\212\uff6d\216\uff6d\307\uff6d\316\uff6d\001\002" +
+    "\000\004\107\u019c\001\002\000\004\012\u019d\001\002\000" +
+    "\006\013\u019f\034\353\001\002\000\004\013\u01a1\001\002" +
+    "\000\004\017\u01a0\001\002\000\014\015\uff6c\212\uff6c\216" +
+    "\uff6c\307\uff6c\316\uff6c\001\002\000\004\017\u01a2\001\002" +
+    "\000\014\015\uff6b\212\uff6b\216\uff6b\307\uff6b\316\uff6b\001" +
     "\002\000\014\015\uff57\212\uff57\216\uff57\307\uff57\316\uff57" +
-    "\001\002\000\004\123\u0184\001\002\000\004\012\u0185\001" +
-    "\002\000\006\013\u0187\034\371\001\002\000\004\013\u0189" +
-    "\001\002\000\004\017\u0188\001\002\000\014\015\uff58\212" +
-    "\uff58\216\uff58\307\uff58\316\uff58\001\002\000\004\017\u018a" +
+    "\001\002\000\004\122\u01a5\001\002\000\004\012\u01a6\001" +
+    "\002\000\006\013\u01a8\034\353\001\002\000\004\013\u01aa" +
+    "\001\002\000\004\017\u01a9\001\002\000\014\015\uff58\212" +
+    "\uff58\216\uff58\307\uff58\316\uff58\001\002\000\004\017\u01ab" +
     "\001\002\000\014\015\uff59\212\uff59\216\uff59\307\uff59\316" +
-    "\uff59\001\002\000\004\020\u018c\001\002\000\026\104\u018f" +
-    "\107\u0191\110\u018e\111\u0190\112\u0194\113\u0196\114\u0192\122" +
-    "\u0193\123\u018d\124\u0195\001\002\000\006\017\uff56\022\uff56" +
-    "\001\002\000\006\017\uff6a\022\uff6a\001\002\000\006\017" +
-    "\uff75\022\uff75\001\002\000\004\022\uff66\001\002\000\006" +
-    "\017\uff6e\022\uff6e\001\002\000\004\022\uff5e\001\002\000" +
-    "\006\017\uff5a\022\uff5a\001\002\000\004\022\uff62\001\002" +
-    "\000\006\017\uff52\022\uff52\001\002\000\004\022\uff60\001" +
-    "\002\000\004\141\u0198\001\002\000\004\020\u0199\001\002" +
-    "\000\004\106\u019a\001\002\000\006\017\uff79\022\uff79\001" +
-    "\002\000\004\015\uff8b\001\002\000\014\015\uff74\212\uff74" +
-    "\216\uff74\307\uff74\316\uff74\001\002\000\004\105\u019e\001" +
-    "\002\000\004\012\u019f\001\002\000\004\013\u01a0\001\002" +
-    "\000\004\017\u01a1\001\002\000\014\015\uff73\212\uff73\216" +
-    "\uff73\307\uff73\316\uff73\001\002\000\004\114\u01a3\001\002" +
-    "\000\004\012\u01a4\001\002\000\004\034\371\001\002\000" +
-    "\004\013\u01a6\001\002\000\004\017\u01a7\001\002\000\014" +
-    "\015\uff5f\212\uff5f\216\uff5f\307\uff5f\316\uff5f\001\002\000" +
-    "\014\015\uff71\212\uff71\216\uff71\307\uff71\316\uff71\001\002" +
-    "\000\004\107\u01aa\001\002\000\004\012\u01ab\001\002\000" +
-    "\006\013\u01ad\034\371\001\002\000\004\013\u01af\001\002" +
-    "\000\004\017\u01ae\001\002\000\014\015\uff70\212\uff70\216" +
-    "\uff70\307\uff70\316\uff70\001\002\000\004\017\u01b0\001\002" +
-    "\000\014\015\uff6f\212\uff6f\216\uff6f\307\uff6f\316\uff6f\001" +
-    "\002\000\014\015\uff5b\212\uff5b\216\uff5b\307\uff5b\316\uff5b" +
-    "\001\002\000\004\122\u01b3\001\002\000\004\012\u01b4\001" +
-    "\002\000\006\013\u01b6\034\371\001\002\000\004\013\u01b8" +
-    "\001\002\000\004\017\u01b7\001\002\000\014\015\uff5c\212" +
-    "\uff5c\216\uff5c\307\uff5c\316\uff5c\001\002\000\004\017\u01b9" +
-    "\001\002\000\014\015\uff5d\212\uff5d\216\uff5d\307\uff5d\316" +
-    "\uff5d\001\002\000\020\015\uff90\145\uff90\164\uff90\171\uff90" +
-    "\215\uff90\262\uff90\270\uff90\001\002\000\014\015\uff78\212" +
-    "\uff78\216\uff78\307\uff78\316\uff78\001\002\000\004\104\u01bd" +
-    "\001\002\000\004\012\u01be\001\002\000\006\013\u01c1\033" +
-    "\u01c0\001\002\000\004\013\u01cb\001\002\000\004\022\u01c3" +
-    "\001\002\000\004\017\u01c2\001\002\000\014\015\uff77\212" +
-    "\uff77\216\uff77\307\uff77\316\uff77\001\002\000\024\012\u01c4" +
-    "\065\uff4c\066\uff4c\067\uff4c\070\uff4c\125\uff4c\126\uff4c\127" +
-    "\uff4c\230\uff4c\001\002\000\022\065\uff4c\066\uff4c\067\uff4c" +
-    "\070\uff4c\125\uff4c\126\uff4c\127\uff4c\230\uff4c\001\002\000" +
-    "\004\013\uff50\001\002\000\004\013\u01ca\001\002\000\006" +
-    "\013\uff4e\016\u01c8\001\002\000\022\065\uff4c\066\uff4c\067" +
-    "\uff4c\070\uff4c\125\uff4c\126\uff4c\127\uff4c\230\uff4c\001\002" +
-    "\000\004\013\uff4d\001\002\000\004\013\uff51\001\002\000" +
-    "\004\017\u01cc\001\002\000\014\015\uff76\212\uff76\216\uff76" +
-    "\307\uff76\316\uff76\001\002\000\004\145\u023c\001\002\000" +
-    "\004\014\u0218\001\002\000\004\141\u0213\001\002\000\004" +
-    "\014\u01f4\001\002\000\004\313\u01d2\001\002\000\004\141" +
-    "\u01d3\001\002\000\006\014\u01d5\017\u01d4\001\002\000\014" +
-    "\015\uff0f\212\uff0f\216\uff0f\307\uff0f\316\uff0f\001\002\000" +
-    "\004\164\u01d7\001\002\000\004\017\u01f2\001\002\000\012" +
-    "\007\u01e0\137\u01dd\140\u01de\141\u01df\001\002\000\004\015" +
-    "\u01dc\001\002\000\004\017\ufef1\001\002\000\004\017\ufef0" +
-    "\001\002\000\004\017\ufef2\001\002\000\014\015\uff0d\212" +
-    "\uff0d\216\uff0d\307\uff0d\316\uff0d\001\002\000\004\020\u01ee" +
-    "\001\002\000\004\020\u01e9\001\002\000\004\020\u01e5\001" +
-    "\002\000\004\020\u01e1\001\002\000\004\076\u01e2\001\002" +
-    "\000\004\022\u01e3\001\002\000\004\006\u01e4\001\002\000" +
-    "\004\017\ufeec\001\002\000\004\076\u01e6\001\002\000\004" +
-    "\022\u01e7\001\002\000\004\006\u01e8\001\002\000\004\017" +
-    "\ufeeb\001\002\000\004\077\u01ea\001\002\000\004\022\u01eb" +
-    "\001\002\000\006\004\u01ed\010\u01ec\001\002\000\004\017" +
-    "\ufeee\001\002\000\004\017\ufeed\001\002\000\004\076\u01ef" +
-    "\001\002\000\004\022\u01f0\001\002\000\004\006\u01f1\001" +
-    "\002\000\004\017\ufeef\001\002\000\006\015\ufef4\164\u01d7" +
-    "\001\002\000\004\015\ufef3\001\002\000\006\015\u01f6\221" +
-    "\u01f7\001\002\000\004\015\u0212\001\002\000\004\313\uff0a" +
-    "\001\002\000\004\045\u01f8\001\002\000\004\017\u01f9\001" +
-    "\002\000\004\313\u01fa\001\002\000\010\046\u01fc\145\u01ff" +
-    "\160\u0200\001\002\000\004\015\uff03\001\002\000\004\017" +
-    "\u0211\001\002\000\004\313\u020d\001\002\000\004\141\u0206" +
-    "\001\002\000\004\022\u0201\001\002\000\004\141\ufefd\001" +
-    "\002\000\004\141\u0202\001\002\000\004\012\u0148\001\002" +
-    "\000\004\017\u0204\001\002\000\004\313\ufeff\001\002\000" +
-    "\006\021\u020b\023\ufefe\001\002\000\012\013\uff17\016\uff17" +
-    "\021\uff17\023\uff17\001\002\000\004\023\u0208\001\002\000" +
-    "\016\004\222\005\225\012\226\141\u013e\251\231\335\221" +
-    "\001\002\000\004\017\u020a\001\002\000\004\313\uff00\001" +
-    "\002\000\004\141\u020c\001\002\000\012\013\uff16\016\uff16" +
-    "\021\uff16\023\uff16\001\002\000\010\046\u020f\145\u01ff\160" +
-    "\u0200\001\002\000\004\015\uff01\001\002\000\004\017\u0210" +
-    "\001\002\000\004\015\uff02\001\002\000\004\015\uff04\001" +
-    "\002\000\004\313\uff09\001\002\000\006\014\u0215\017\u0214" +
-    "\001\002\000\014\015\uff10\212\uff10\216\uff10\307\uff10\316" +
-    "\uff10\001\002\000\004\164\u01d7\001\002\000\004\015\u0217" +
-    "\001\002\000\014\015\uff0e\212\uff0e\216\uff0e\307\uff0e\316" +
-    "\uff0e\001\002\000\010\015\u021c\221\u021e\241\u0219\001\002" +
-    "\000\004\071\u0234\001\002\000\004\221\u021e\001\002\000" +
-    "\004\241\u0219\001\002\000\004\313\uff08\001\002\000\004" +
-    "\015\u0231\001\002\000\004\045\u021f\001\002\000\004\017" +
-    "\u0220\001\002\000\004\313\u0221\001\002\000\006\046\u022f" +
-    "\160\u0200\001\002\000\004\313\u0224\001\002\000\006\015" +
-    "\ufef8\241\ufef8\001\002\000\006\046\u0226\160\u0200\001\002" +
-    "\000\006\015\ufef6\241\ufef6\001\002\000\004\017\u022e\001" +
-    "\002\000\004\141\u0206\001\002\000\006\021\u020b\023\u0229" +
-    "\001\002\000\004\071\u022a\001\002\000\004\021\u022b\001" +
-    "\002\000\004\141\u022c\001\002\000\004\017\u022d\001\002" +
-    "\000\004\313\ufef5\001\002\000\006\015\ufef7\241\ufef7\001" +
-    "\002\000\004\017\u0230\001\002\000\006\015\ufef9\241\ufef9" +
-    "\001\002\000\004\313\uff07\001\002\000\004\015\ufefb\001" +
-    "\002\000\004\015\ufefc\001\002\000\004\020\u0235\001\002" +
-    "\000\004\141\u0236\001\002\000\004\022\u0237\001\002\000" +
-    "\004\040\u0238\001\002\000\004\156\u0239\001\002\000\004" +
-    "\141\u023a\001\002\000\004\017\u023b\001\002\000\006\015" +
-    "\ufefa\221\ufefa\001\002\000\004\020\u023d\001\002\000\006" +
-    "\117\u023e\120\u023f\001\002\000\004\014\uff05\001\002\000" +
-    "\004\014\uff06\001\002\000\014\015\uff6d\212\uff6d\216\uff6d" +
-    "\307\uff6d\316\uff6d\001\002\000\004\110\u0242\001\002\000" +
-    "\004\012\u0243\001\002\000\006\013\u0245\034\371\001\002" +
-    "\000\004\013\u0247\001\002\000\004\017\u0246\001\002\000" +
-    "\014\015\uff6c\212\uff6c\216\uff6c\307\uff6c\316\uff6c\001\002" +
-    "\000\004\017\u0248\001\002\000\014\015\uff6b\212\uff6b\216" +
-    "\uff6b\307\uff6b\316\uff6b\001\002\000\004\111\u024a\001\002" +
-    "\000\004\012\u024b\001\002\000\006\034\371\035\u024c\001" +
-    "\002\000\004\022\u0259\001\002\000\004\016\u0255\001\002" +
-    "\000\006\013\u0250\016\u024f\001\002\000\004\034\371\001" +
-    "\002\000\004\017\u0251\001\002\000\014\015\uff67\212\uff67" +
-    "\216\uff67\307\uff67\316\uff67\001\002\000\004\013\u0253\001" +
-    "\002\000\004\017\u0254\001\002\000\014\015\uff69\212\uff69" +
-    "\216\uff69\307\uff69\316\uff69\001\002\000\004\035\u024c\001" +
-    "\002\000\004\013\u0257\001\002\000\004\017\u0258\001\002" +
-    "\000\014\015\uff68\212\uff68\216\uff68\307\uff68\316\uff68\001" +
-    "\002\000\004\072\u025a\001\002\000\004\012\u025b\001\002" +
-    "\000\006\042\u025c\043\u0260\001\002\000\004\022\u0269\001" +
-    "\002\000\004\016\u0266\001\002\000\004\016\u0263\001\002" +
-    "\000\004\022\u0261\001\002\000\004\022\uff18\001\002\000" +
-    "\004\141\u0206\001\002\000\010\013\uff19\016\uff19\021\u020b" +
-    "\001\002\000\004\042\u025c\001\002\000\004\013\u0265\001" +
-    "\002\000\006\013\uff1b\016\uff1b\001\002\000\004\043\u0260" +
-    "\001\002\000\004\013\u0268\001\002\000\006\013\uff1a\016" +
-    "\uff1a\001\002\000\004\073\u026a\001\002\000\004\012\u026c" +
-    "\001\002\000\006\013\uff15\016\uff15\001\002\000\016\004" +
-    "\222\005\225\012\226\141\223\251\231\335\221\001\002" +
-    "\000\036\011\241\016\u026e\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\u0270\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\uff14\016\uff14\001\002\000\014\015" +
-    "\uff7c\212\uff7c\216\uff7c\307\uff7c\316\uff7c\001\002\000\004" +
-    "\106\u0273\001\002\000\004\012\u0274\001\002\000\006\013" +
-    "\u0276\034\371\001\002\000\004\013\u0278\001\002\000\004" +
-    "\017\u0277\001\002\000\014\015\uff7b\212\uff7b\216\uff7b\307" +
-    "\uff7b\316\uff7b\001\002\000\004\017\u0279\001\002\000\014" +
-    "\015\uff7a\212\uff7a\216\uff7a\307\uff7a\316\uff7a\001\002\000" +
-    "\004\112\u027b\001\002\000\004\012\u027c\001\002\000\006" +
-    "\034\371\035\u027d\001\002\000\004\022\u028a\001\002\000" +
-    "\006\013\u0285\016\u0284\001\002\000\004\016\u0280\001\002" +
-    "\000\004\035\u027d\001\002\000\004\013\u0282\001\002\000" +
-    "\004\017\u0283\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\u0286\001\002\000\014\015\uff65\212\uff65\216\uff65" +
-    "\307\uff65\316\uff65\001\002\000\004\013\u0288\001\002\000" +
-    "\004\017\u0289\001\002\000\014\015\uff63\212\uff63\216\uff63" +
-    "\307\uff63\316\uff63\001\002\000\004\072\u028b\001\002\000" +
-    "\004\012\u028c\001\002\000\006\042\u028d\043\u0260\001\002" +
-    "\000\004\022\u0296\001\002\000\004\016\u0293\001\002\000" +
-    "\004\016\u0290\001\002\000\004\042\u028d\001\002\000\004" +
-    "\013\u0292\001\002\000\006\013\uff13\016\uff13\001\002\000" +
-    "\004\043\u0260\001\002\000\004\013\u0295\001\002\000\006" +
-    "\013\uff12\016\uff12\001\002\000\004\141\u0297\001\002\000" +
-    "\004\021\u0298\001\002\000\004\044\u0299\001\002\000\004" +
-    "\012\u029a\001\002\000\004\013\u029b\001\002\000\006\013" +
-    "\uff11\016\uff11\001\002\000\004\141\u029d\001\002\000\004" +
-    "\020\u029e\001\002\000\004\105\u029f\001\002\000\006\017" +
-    "\uff72\022\uff72\001\002\000\004\020\u02a1\001\002\000\004" +
-    "\102\u02a2\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\u02a8\164\275\301\u02a7\001\002\000" +
-    "\004\015\u02af\001\002\000\004\020\u02ac\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\u02a7\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\u02ae\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\u02b1\001" +
-    "\002\000\004\103\u02b2\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" +
-    "\u02b6\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\u02b8\001\002\000" +
-    "\010\074\306\075\305\141\303\001\002\000\006\017\uffa4" +
-    "\023\uffa4\001\002\000\004\141\u02bb\001\002\000\004\020" +
-    "\u02bc\001\002\000\010\074\306\075\305\141\303\001\002" +
-    "\000\006\017\uffa1\023\uffa1\001\002\000\004\121\u02bf\001" +
-    "\002\000\004\020\u02c0\001\002\000\004\116\u02c1\001\002" +
-    "\000\006\014\uff8d\017\uff8d\001\002\000\006\062\u02c4\063" +
-    "\u02c3\001\002\000\004\165\u02d1\001\002\000\004\165\u02c5" +
-    "\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\uffc6\164\uffc6" +
-    "\166\uffc6\232\uffc6\262\uffc6\001\002\000\004\022\u02ce\001" +
-    "\002\000\004\141\u02cf\001\002\000\004\017\u02d0\001\002" +
-    "\000\014\015\uffc7\164\uffc7\166\uffc7\232\uffc7\262\uffc7\001" +
-    "\002\000\004\141\u02d2\001\002\000\006\021\u02d3\022\u02d4" +
-    "\001\002\000\004\141\u02d9\001\002\000\004\141\u02d5\001" +
-    "\002\000\004\021\u02d6\001\002\000\004\141\u02d7\001\002" +
-    "\000\004\017\u02d8\001\002\000\014\015\uffc4\164\uffc4\166" +
-    "\uffc4\232\uffc4\262\uffc4\001\002\000\004\022\u02da\001\002" +
-    "\000\004\141\u02db\001\002\000\004\017\u02dc\001\002\000" +
-    "\014\015\uffc5\164\uffc5\166\uffc5\232\uffc5\262\uffc5\001\002" +
-    "\000\006\015\u02df\164\275\001\002\000\004\015\u02e0\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\u02e4\001\002\000\014\015\uffc1" +
-    "\164\uffc1\166\uffc1\232\uffc1\262\uffc1\001\002\000\006\015" +
-    "\u02f0\164\275\001\002\000\004\262\u02e5\001\002\000\004" +
-    "\041\u02e6\001\002\000\006\020\u02e8\022\u02e7\001\002\000" +
-    "\004\141\u02ed\001\002\000\004\055\u02e9\001\002\000\004" +
-    "\022\u02ea\001\002\000\004\141\u02eb\001\002\000\004\017" +
-    "\u02ec\001\002\000\006\015\uffbc\164\uffbc\001\002\000\004" +
-    "\017\u02ee\001\002\000\006\015\uffbb\164\uffbb\001\002\000" +
-    "\004\015\u02f1\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\u02f3\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\u02f8\164\u02f6\001\002\000\004\141" +
-    "\u02fc\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\u02fb\164\u02f6\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\u02fd\001\002\000\004\141\u02fe\001" +
-    "\002\000\004\017\u02ff\001\002\000\006\015\uffb3\164\uffb3" +
-    "\001\002\000\006\013\uffd7\016\uffd7\001\002\000\004\022" +
-    "\u0318\001\002\000\004\022\u0316\001\002\000\004\013\u0314" +
-    "\001\002\000\006\013\uffd8\016\uffd8\001\002\000\006\013" +
-    "\uffd5\016\uffd5\001\002\000\006\013\uffdb\016\u0312\001\002" +
-    "\000\006\013\uffd6\016\uffd6\001\002\000\004\022\u0310\001" +
-    "\002\000\004\022\u030e\001\002\000\006\013\uffd9\016\uffd9" +
-    "\001\002\000\004\022\u030c\001\002\000\004\004\u030d\001" +
-    "\002\000\006\013\uffd1\016\uffd1\001\002\000\004\141\u030f" +
-    "\001\002\000\006\013\uffd4\016\uffd4\001\002\000\004\005" +
-    "\u0311\001\002\000\006\013\uffd0\016\uffd0\001\002\000\014" +
-    "\025\u0308\026\u030b\027\u0302\031\u0309\032\u0301\001\002\000" +
-    "\004\013\uffda\001\002\000\004\017\u0315\001\002\000\014" +
-    "\015\uffe1\164\uffe1\166\uffe1\232\uffe1\262\uffe1\001\002\000" +
-    "\004\005\u0317\001\002\000\006\013\uffd2\016\uffd2\001\002" +
-    "\000\004\141\u0319\001\002\000\006\013\uffd3\016\uffd3\001" +
-    "\002\000\004\015\ufffd\001\002\000\004\013\u031c\001\002" +
-    "\000\004\017\u031d\001\002\000\014\015\uffdd\164\uffdd\166" +
-    "\uffdd\232\uffdd\262\uffdd\001\002\000\004\141\u031f\001\002" +
-    "\000\006\305\136\333\140\001\002\000\004\100\u0321\001" +
-    "\002\000\004\014\uffeb\001\002\000\004\013\u0323\001\002" +
-    "\000\004\017\u0324\001\002\000\014\015\uffdf\164\uffdf\166" +
-    "\uffdf\232\uffdf\262\uffdf\001\002\000\004\002\000\001\002" +
-    "" });
+    "\uff59\001\002\000\020\015\uff8c\145\uff8c\164\uff8c\171\uff8c" +
+    "\215\uff8c\262\uff8c\270\uff8c\001\002\000\014\015\uff74\212" +
+    "\uff74\216\uff74\307\uff74\316\uff74\001\002\000\004\104\u01af" +
+    "\001\002\000\004\012\u01b0\001\002\000\006\013\u01b3\033" +
+    "\u01b2\001\002\000\004\013\u01bd\001\002\000\004\022\u01b5" +
+    "\001\002\000\004\017\u01b4\001\002\000\014\015\uff73\212" +
+    "\uff73\216\uff73\307\uff73\316\uff73\001\002\000\024\012\u01b6" +
+    "\065\uff48\066\uff48\067\uff48\070\uff48\125\uff48\126\uff48\127" +
+    "\uff48\230\uff48\001\002\000\022\065\uff48\066\uff48\067\uff48" +
+    "\070\uff48\125\uff48\126\uff48\127\uff48\230\uff48\001\002\000" +
+    "\004\013\uff4c\001\002\000\004\013\u01bc\001\002\000\006" +
+    "\013\uff4a\016\u01ba\001\002\000\022\065\uff48\066\uff48\067" +
+    "\uff48\070\uff48\125\uff48\126\uff48\127\uff48\230\uff48\001\002" +
+    "\000\004\013\uff49\001\002\000\004\013\uff4d\001\002\000" +
+    "\004\017\u01be\001\002\000\014\015\uff72\212\uff72\216\uff72" +
+    "\307\uff72\316\uff72\001\002\000\004\145\u022e\001\002\000" +
+    "\004\014\u020a\001\002\000\004\141\u0205\001\002\000\004" +
+    "\014\u01e6\001\002\000\004\313\u01c4\001\002\000\004\141" +
+    "\u01c5\001\002\000\006\014\u01c7\017\u01c6\001\002\000\014" +
+    "\015\uff0b\212\uff0b\216\uff0b\307\uff0b\316\uff0b\001\002\000" +
+    "\004\164\u01c9\001\002\000\004\017\u01e4\001\002\000\012" +
+    "\007\u01d2\137\u01cf\140\u01d0\141\u01d1\001\002\000\004\015" +
+    "\u01ce\001\002\000\004\017\ufeed\001\002\000\004\017\ufeec" +
+    "\001\002\000\004\017\ufeee\001\002\000\014\015\uff09\212" +
+    "\uff09\216\uff09\307\uff09\316\uff09\001\002\000\004\020\u01e0" +
+    "\001\002\000\004\020\u01db\001\002\000\004\020\u01d7\001" +
+    "\002\000\004\020\u01d3\001\002\000\004\076\u01d4\001\002" +
+    "\000\004\022\u01d5\001\002\000\004\006\u01d6\001\002\000" +
+    "\004\017\ufee8\001\002\000\004\076\u01d8\001\002\000\004" +
+    "\022\u01d9\001\002\000\004\006\u01da\001\002\000\004\017" +
+    "\ufee7\001\002\000\004\077\u01dc\001\002\000\004\022\u01dd" +
+    "\001\002\000\006\004\u01df\010\u01de\001\002\000\004\017" +
+    "\ufeea\001\002\000\004\017\ufee9\001\002\000\004\076\u01e1" +
+    "\001\002\000\004\022\u01e2\001\002\000\004\006\u01e3\001" +
+    "\002\000\004\017\ufeeb\001\002\000\006\015\ufef0\164\u01c9" +
+    "\001\002\000\004\015\ufeef\001\002\000\006\015\u01e8\221" +
+    "\u01e9\001\002\000\004\015\u0204\001\002\000\004\313\uff06" +
+    "\001\002\000\004\045\u01ea\001\002\000\004\017\u01eb\001" +
+    "\002\000\004\313\u01ec\001\002\000\010\046\u01ee\145\u01f1" +
+    "\160\u01f2\001\002\000\004\015\ufeff\001\002\000\004\017" +
+    "\u0203\001\002\000\004\313\u01ff\001\002\000\004\141\u01f8" +
+    "\001\002\000\004\022\u01f3\001\002\000\004\141\ufef9\001" +
+    "\002\000\004\141\u01f4\001\002\000\004\012\u013a\001\002" +
+    "\000\004\017\u01f6\001\002\000\004\313\ufefb\001\002\000" +
+    "\006\021\u01fd\023\ufefa\001\002\000\012\013\uff13\016\uff13" +
+    "\021\uff13\023\uff13\001\002\000\004\023\u01fa\001\002\000" +
+    "\016\004\222\005\224\012\226\141\u0130\251\231\335\221" +
+    "\001\002\000\004\017\u01fc\001\002\000\004\313\ufefc\001" +
+    "\002\000\004\141\u01fe\001\002\000\012\013\uff12\016\uff12" +
+    "\021\uff12\023\uff12\001\002\000\010\046\u0201\145\u01f1\160" +
+    "\u01f2\001\002\000\004\015\ufefd\001\002\000\004\017\u0202" +
+    "\001\002\000\004\015\ufefe\001\002\000\004\015\uff00\001" +
+    "\002\000\004\313\uff05\001\002\000\006\014\u0207\017\u0206" +
+    "\001\002\000\014\015\uff0c\212\uff0c\216\uff0c\307\uff0c\316" +
+    "\uff0c\001\002\000\004\164\u01c9\001\002\000\004\015\u0209" +
+    "\001\002\000\014\015\uff0a\212\uff0a\216\uff0a\307\uff0a\316" +
+    "\uff0a\001\002\000\010\015\u020e\221\u0210\241\u020b\001\002" +
+    "\000\004\071\u0226\001\002\000\004\221\u0210\001\002\000" +
+    "\004\241\u020b\001\002\000\004\313\uff04\001\002\000\004" +
+    "\015\u0223\001\002\000\004\045\u0211\001\002\000\004\017" +
+    "\u0212\001\002\000\004\313\u0213\001\002\000\006\046\u0221" +
+    "\160\u01f2\001\002\000\004\313\u0216\001\002\000\006\015" +
+    "\ufef4\241\ufef4\001\002\000\006\046\u0218\160\u01f2\001\002" +
+    "\000\006\015\ufef2\241\ufef2\001\002\000\004\017\u0220\001" +
+    "\002\000\004\141\u01f8\001\002\000\006\021\u01fd\023\u021b" +
+    "\001\002\000\004\071\u021c\001\002\000\004\021\u021d\001" +
+    "\002\000\004\141\u021e\001\002\000\004\017\u021f\001\002" +
+    "\000\004\313\ufef1\001\002\000\006\015\ufef3\241\ufef3\001" +
+    "\002\000\004\017\u0222\001\002\000\006\015\ufef5\241\ufef5" +
+    "\001\002\000\004\313\uff03\001\002\000\004\015\ufef7\001" +
+    "\002\000\004\015\ufef8\001\002\000\004\020\u0227\001\002" +
+    "\000\004\141\u0228\001\002\000\004\022\u0229\001\002\000" +
+    "\004\040\u022a\001\002\000\004\156\u022b\001\002\000\004" +
+    "\141\u022c\001\002\000\004\017\u022d\001\002\000\006\015" +
+    "\ufef6\221\ufef6\001\002\000\004\020\u022f\001\002\000\006" +
+    "\117\u0230\120\u0231\001\002\000\004\014\uff01\001\002\000" +
+    "\004\014\uff02\001\002\000\014\015\uff69\212\uff69\216\uff69" +
+    "\307\uff69\316\uff69\001\002\000\004\110\u0234\001\002\000" +
+    "\004\012\u0235\001\002\000\006\013\u0237\034\353\001\002" +
+    "\000\004\013\u0239\001\002\000\004\017\u0238\001\002\000" +
+    "\014\015\uff68\212\uff68\216\uff68\307\uff68\316\uff68\001\002" +
+    "\000\004\017\u023a\001\002\000\014\015\uff67\212\uff67\216" +
+    "\uff67\307\uff67\316\uff67\001\002\000\004\111\u023c\001\002" +
+    "\000\004\012\u023d\001\002\000\006\034\353\035\u023e\001" +
+    "\002\000\004\022\u024b\001\002\000\004\016\u0247\001\002" +
+    "\000\006\013\u0242\016\u0241\001\002\000\004\034\353\001" +
+    "\002\000\004\017\u0243\001\002\000\014\015\uff63\212\uff63" +
+    "\216\uff63\307\uff63\316\uff63\001\002\000\004\013\u0245\001" +
+    "\002\000\004\017\u0246\001\002\000\014\015\uff65\212\uff65" +
+    "\216\uff65\307\uff65\316\uff65\001\002\000\004\035\u023e\001" +
+    "\002\000\004\013\u0249\001\002\000\004\017\u024a\001\002" +
+    "\000\014\015\uff64\212\uff64\216\uff64\307\uff64\316\uff64\001" +
+    "\002\000\004\072\u024c\001\002\000\004\012\u024d\001\002" +
+    "\000\006\042\u024e\043\u0250\001\002\000\004\022\u025b\001" +
+    "\002\000\004\016\u0258\001\002\000\004\022\uff14\001\002" +
+    "\000\004\016\u0255\001\002\000\004\022\u0253\001\002\000" +
+    "\004\141\u01f8\001\002\000\010\013\uff15\016\uff15\021\u01fd" +
+    "\001\002\000\004\042\u024e\001\002\000\004\013\u0257\001" +
+    "\002\000\006\013\uff17\016\uff17\001\002\000\004\043\u0250" +
+    "\001\002\000\004\013\u025a\001\002\000\006\013\uff16\016" +
+    "\uff16\001\002\000\004\073\u025c\001\002\000\004\012\u025e" +
+    "\001\002\000\006\013\uff11\016\uff11\001\002\000\016\004" +
+    "\222\005\224\012\226\141\223\251\231\335\221\001\002" +
+    "\000\036\011\240\016\u0260\155\233\255\246\334\241\335" +
+    "\234\336\235\337\243\340\236\341\237\342\245\343\242" +
+    "\344\247\345\244\001\002\000\016\004\222\005\224\012" +
+    "\226\141\223\251\231\335\221\001\002\000\036\011\240" +
+    "\013\u0262\155\233\255\246\334\241\335\234\336\235\337" +
+    "\243\340\236\341\237\342\245\343\242\344\247\345\244" +
+    "\001\002\000\006\013\uff10\016\uff10\001\002\000\014\015" +
+    "\uff78\212\uff78\216\uff78\307\uff78\316\uff78\001\002\000\004" +
+    "\106\u0265\001\002\000\004\012\u0266\001\002\000\006\013" +
+    "\u0268\034\353\001\002\000\004\013\u026a\001\002\000\004" +
+    "\017\u0269\001\002\000\014\015\uff77\212\uff77\216\uff77\307" +
+    "\uff77\316\uff77\001\002\000\004\017\u026b\001\002\000\014" +
+    "\015\uff76\212\uff76\216\uff76\307\uff76\316\uff76\001\002\000" +
+    "\004\112\u026d\001\002\000\004\012\u026e\001\002\000\006" +
+    "\034\353\035\u026f\001\002\000\004\022\u027c\001\002\000" +
+    "\006\013\u0277\016\u0276\001\002\000\004\016\u0272\001\002" +
+    "\000\004\035\u026f\001\002\000\004\013\u0274\001\002\000" +
+    "\004\017\u0275\001\002\000\014\015\uff60\212\uff60\216\uff60" +
+    "\307\uff60\316\uff60\001\002\000\004\034\353\001\002\000" +
+    "\004\017\u0278\001\002\000\014\015\uff61\212\uff61\216\uff61" +
+    "\307\uff61\316\uff61\001\002\000\004\013\u027a\001\002\000" +
+    "\004\017\u027b\001\002\000\014\015\uff5f\212\uff5f\216\uff5f" +
+    "\307\uff5f\316\uff5f\001\002\000\004\072\u027d\001\002\000" +
+    "\004\012\u027e\001\002\000\006\042\u027f\043\u0250\001\002" +
+    "\000\004\022\u0288\001\002\000\004\016\u0285\001\002\000" +
+    "\004\016\u0282\001\002\000\004\043\u0250\001\002\000\004" +
+    "\013\u0284\001\002\000\006\013\uff0e\016\uff0e\001\002\000" +
+    "\004\042\u027f\001\002\000\004\013\u0287\001\002\000\006" +
+    "\013\uff0f\016\uff0f\001\002\000\004\141\u0289\001\002\000" +
+    "\004\021\u028a\001\002\000\004\044\u028b\001\002\000\004" +
+    "\012\u028c\001\002\000\004\013\u028d\001\002\000\006\013" +
+    "\uff0d\016\uff0d\001\002\000\004\141\u028f\001\002\000\004" +
+    "\020\u0290\001\002\000\004\105\u0291\001\002\000\006\017" +
+    "\uff6e\022\uff6e\001\002\000\006\015\u0295\164\u0294\001\002" +
+    "\000\004\015\u02a5\001\002\000\004\141\u0298\001\002\000" +
+    "\020\015\uff9a\145\uff9a\164\uff9a\171\uff9a\215\uff9a\262\uff9a" +
+    "\270\uff9a\001\002\000\010\015\uffea\164\u0294\265\uffea\001" +
+    "\002\000\006\015\uffe9\265\uffe9\001\002\000\004\020\u0299" +
+    "\001\002\000\010\074\u029d\075\u029c\141\u029a\001\002\000" +
+    "\010\017\uffe2\023\uffe2\202\uffe2\001\002\000\010\017\uffe7" +
+    "\023\u029f\202\u029e\001\002\000\010\017\uffe4\023\uffe4\202" +
+    "\uffe4\001\002\000\010\017\uffe3\023\uffe3\202\uffe3\001\002" +
+    "\000\004\023\u02a3\001\002\000\016\004\222\005\224\012" +
+    "\226\141\223\251\231\335\221\001\002\000\004\017\u02a1" +
+    "\001\002\000\012\015\uffe8\164\uffe8\265\uffe8\301\uffe8\001" +
+    "\002\000\036\011\240\017\uffe6\155\233\255\246\334\241" +
+    "\335\234\336\235\337\243\340\236\341\237\342\245\343" +
+    "\242\344\247\345\244\001\002\000\016\004\222\005\224" +
+    "\012\226\141\223\251\231\335\221\001\002\000\036\011" +
+    "\240\017\uffe5\155\233\255\246\334\241\335\234\336\235" +
+    "\337\243\340\236\341\237\342\245\343\242\344\247\345" +
+    "\244\001\002\000\020\015\uff99\145\uff99\164\uff99\171\uff99" +
+    "\215\uff99\262\uff99\270\uff99\001\002\000\004\020\u02a7\001" +
+    "\002\000\004\102\u02a8\001\002\000\004\014\uff98\001\002" +
+    "\000\024\015\uffac\145\uffac\164\uffac\166\uffac\171\uffac\215" +
+    "\uffac\232\uffac\262\uffac\270\uffac\001\002\000\024\015\uffab" +
+    "\145\uffab\164\uffab\166\uffab\171\uffab\215\uffab\232\uffab\262" +
+    "\uffab\270\uffab\001\002\000\010\015\u02af\164\u0294\301\u02ad" +
+    "\001\002\000\004\015\u02b5\001\002\000\004\020\u02b2\001" +
+    "\002\000\010\015\uff94\164\u0294\301\u02ad\001\002\000\020" +
+    "\015\uff97\145\uff97\164\uff97\171\uff97\215\uff97\262\uff97\270" +
+    "\uff97\001\002\000\010\015\uff92\164\uff92\301\uff92\001\002" +
+    "\000\004\015\uff93\001\002\000\010\074\u029d\075\u029c\141" +
+    "\u029a\001\002\000\004\017\u02b4\001\002\000\010\015\uff91" +
+    "\164\uff91\301\uff91\001\002\000\020\015\uff96\145\uff96\164" +
+    "\uff96\171\uff96\215\uff96\262\uff96\270\uff96\001\002\000\004" +
+    "\020\u02b7\001\002\000\004\103\u02b8\001\002\000\004\014" +
+    "\uff95\001\002\000\004\023\u02be\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\224\012\226\141\223\251\231" +
+    "\335\221\001\002\000\036\011\240\017\u02bd\155\233\255" +
+    "\246\334\241\335\234\336\235\337\243\340\236\341\237" +
+    "\342\245\343\242\344\247\345\244\001\002\000\020\015" +
+    "\uffa2\145\uffa2\164\uffa2\171\uffa2\215\uffa2\262\uffa2\270\uffa2" +
+    "\001\002\000\016\004\222\005\224\012\226\141\223\251" +
+    "\231\335\221\001\002\000\036\011\240\017\u02c0\155\233" +
+    "\255\246\334\241\335\234\336\235\337\243\340\236\341" +
+    "\237\342\245\343\242\344\247\345\244\001\002\000\020" +
+    "\015\uffa1\145\uffa1\164\uffa1\171\uffa1\215\uffa1\262\uffa1\270" +
+    "\uffa1\001\002\000\004\020\u02c2\001\002\000\010\074\u029d" +
+    "\075\u029c\141\u029a\001\002\000\010\017\uffa0\023\uffa0\202" +
+    "\uffa0\001\002\000\004\141\u02c5\001\002\000\004\020\u02c6" +
+    "\001\002\000\010\074\u029d\075\u029c\141\u029a\001\002\000" +
+    "\006\017\uff9d\023\uff9d\001\002\000\004\121\u02c9\001\002" +
+    "\000\004\020\u02ca\001\002\000\004\116\u02cb\001\002\000" +
+    "\006\014\uff89\017\uff89\001\002\000\006\062\u02ce\063\u02cd" +
+    "\001\002\000\004\165\u02db\001\002\000\004\165\u02cf\001" +
+    "\002\000\004\141\u02d0\001\002\000\006\021\u02d1\022\u02d2" +
+    "\001\002\000\004\141\u02d7\001\002\000\004\141\u02d3\001" +
+    "\002\000\004\021\u02d4\001\002\000\004\141\u02d5\001\002" +
+    "\000\004\017\u02d6\001\002\000\014\015\uffc3\164\uffc3\166" +
+    "\uffc3\232\uffc3\262\uffc3\001\002\000\004\022\u02d8\001\002" +
+    "\000\004\141\u02d9\001\002\000\004\017\u02da\001\002\000" +
+    "\014\015\uffc4\164\uffc4\166\uffc4\232\uffc4\262\uffc4\001\002" +
+    "\000\004\141\u02dc\001\002\000\006\021\u02dd\022\u02de\001" +
+    "\002\000\004\141\u02e3\001\002\000\004\141\u02df\001\002" +
+    "\000\004\021\u02e0\001\002\000\004\141\u02e1\001\002\000" +
+    "\004\017\u02e2\001\002\000\014\015\uffc1\164\uffc1\166\uffc1" +
+    "\232\uffc1\262\uffc1\001\002\000\004\022\u02e4\001\002\000" +
+    "\004\141\u02e5\001\002\000\004\017\u02e6\001\002\000\014" +
+    "\015\uffc2\164\uffc2\166\uffc2\232\uffc2\262\uffc2\001\002\000" +
+    "\006\015\u02e9\164\u0294\001\002\000\004\015\u02ea\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\u02ee\001\002\000\014\015\uffbe\164" +
+    "\uffbe\166\uffbe\232\uffbe\262\uffbe\001\002\000\006\015\u02fa" +
+    "\164\u0294\001\002\000\004\262\u02ef\001\002\000\004\041" +
+    "\u02f0\001\002\000\006\020\u02f2\022\u02f1\001\002\000\004" +
+    "\141\u02f7\001\002\000\004\055\u02f3\001\002\000\004\022" +
+    "\u02f4\001\002\000\004\141\u02f5\001\002\000\004\017\u02f6" +
+    "\001\002\000\006\015\uffb9\164\uffb9\001\002\000\004\017" +
+    "\u02f8\001\002\000\006\015\uffb8\164\uffb8\001\002\000\004" +
+    "\015\u02fb\001\002\000\014\015\uffbc\164\uffbc\166\uffbc\232" +
+    "\uffbc\262\uffbc\001\002\000\014\015\uffbb\164\uffbb\166\uffbb" +
+    "\232\uffbb\262\uffbb\001\002\000\004\015\u02fd\001\002\000" +
+    "\014\015\uffba\164\uffba\166\uffba\232\uffba\262\uffba\001\002" +
+    "\000\014\015\uffb7\164\uffb7\166\uffb7\232\uffb7\262\uffb7\001" +
+    "\002\000\006\015\u0302\164\u0300\001\002\000\004\141\u0306" +
+    "\001\002\000\014\015\uffb5\164\uffb5\166\uffb5\232\uffb5\262" +
+    "\uffb5\001\002\000\014\015\uffb6\164\uffb6\166\uffb6\232\uffb6" +
+    "\262\uffb6\001\002\000\006\015\u0305\164\u0300\001\002\000" +
+    "\014\015\uffb1\164\uffb1\166\uffb1\232\uffb1\262\uffb1\001\002" +
+    "\000\014\015\uffb2\164\uffb2\166\uffb2\232\uffb2\262\uffb2\001" +
+    "\002\000\004\271\u0307\001\002\000\004\141\u0308\001\002" +
+    "\000\004\017\u0309\001\002\000\006\015\uffb0\164\uffb0\001" +
+    "\002\000\006\013\uffd4\016\uffd4\001\002\000\004\022\u0322" +
+    "\001\002\000\004\022\u0320\001\002\000\004\013\u031e\001" +
+    "\002\000\006\013\uffd5\016\uffd5\001\002\000\006\013\uffd2" +
+    "\016\uffd2\001\002\000\006\013\uffd8\016\u031c\001\002\000" +
+    "\006\013\uffd3\016\uffd3\001\002\000\004\022\u031a\001\002" +
+    "\000\004\022\u0318\001\002\000\006\013\uffd6\016\uffd6\001" +
+    "\002\000\004\022\u0316\001\002\000\004\004\u0317\001\002" +
+    "\000\006\013\uffce\016\uffce\001\002\000\004\141\u0319\001" +
+    "\002\000\006\013\uffd1\016\uffd1\001\002\000\004\005\u031b" +
+    "\001\002\000\006\013\uffcd\016\uffcd\001\002\000\014\025" +
+    "\u0312\026\u0315\027\u030c\031\u0313\032\u030b\001\002\000\004" +
+    "\013\uffd7\001\002\000\004\017\u031f\001\002\000\014\015" +
+    "\uffde\164\uffde\166\uffde\232\uffde\262\uffde\001\002\000\004" +
+    "\005\u0321\001\002\000\006\013\uffcf\016\uffcf\001\002\000" +
+    "\004\141\u0323\001\002\000\006\013\uffd0\016\uffd0\001\002" +
+    "\000\004\013\u0325\001\002\000\004\017\u0326\001\002\000" +
+    "\014\015\uffda\164\uffda\166\uffda\232\uffda\262\uffda\001\002" +
+    "\000\004\015\ufffd\001\002\000\004\141\u0329\001\002\000" +
+    "\006\305\136\333\140\001\002\000\004\100\u032b\001\002" +
+    "\000\004\014\uffeb\001\002\000\004\013\u032d\001\002\000" +
+    "\004\017\u032e\001\002\000\014\015\uffdc\164\uffdc\166\uffdc" +
+    "\232\uffdc\262\uffdc\001\002\000\004\002\000\001\002" });
 
   /** Access to parse-action table. */
   @Override
@@ -779,31 +794,31 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
   /** <code>reduce_goto</code> table. */
   protected static final short[][] _reduce_table = 
     unpackFromStrings(new String[] {
-    "\000\u0323\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" +
+    "\000\u032d\000\004\004\003\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\066\005\041\006\020" +
+    "\011\011\013\035\014\036\017\024\020\043\021\013\022" +
+    "\012\032\031\033\016\034\021\035\044\036\023\037\022" +
+    "\040\026\041\010\042\014\043\025\044\033\045\015\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\023\u0321" +
-    "\024\u0305\025\u0309\026\u0303\027\u02ff\030\u0306\031\u0304\001" +
-    "\001\000\002\001\001\000\002\001\001\000\020\023\u031a" +
-    "\024\u0305\025\u0309\026\u0303\027\u02ff\030\u0306\031\u0304\001" +
-    "\001\000\066\005\u0319\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" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\020\023\u032b\024\u030f\025\u0313\026\u030d\027\u0309\030" +
+    "\u0310\031\u030e\001\001\000\002\001\001\000\066\005\u0326" +
+    "\006\020\011\011\013\035\014\036\017\024\020\043\021" +
+    "\013\022\012\032\031\033\016\034\021\035\044\036\023" +
+    "\037\022\040\026\041\010\042\014\043\025\044\033\045" +
+    "\015\046\030\053\034\054\032\055\042\056\040\001\001" +
+    "\000\020\023\u0323\024\u030f\025\u0313\026\u030d\027\u0309\030" +
+    "\u0310\031\u030e\001\001\000\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\u0302\024\u0305" +
-    "\025\u0309\026\u0303\027\u02ff\030\u0306\031\u0304\001\001\000" +
-    "\002\001\001\000\002\001\001\000\012\015\u02e0\016\276" +
-    "\047\u02e1\050\u02e2\001\001\000\002\001\001\000\002\001" +
+    "\002\001\001\000\002\001\001\000\020\023\u030c\024\u030f" +
+    "\025\u0313\026\u030d\027\u0309\030\u0310\031\u030e\001\001\000" +
+    "\002\001\001\000\002\001\001\000\012\015\u02ea\016\u0295" +
+    "\047\u02eb\050\u02ec\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" +
+    "\060\165\061\174\062\160\063\157\064\164\065\167\066" +
+    "\151\071\170\072\156\073\154\076\172\077\163\100\175" +
+    "\170\173\001\001\000\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\010\101\001\001\000\002" +
@@ -829,10 +844,10 @@ 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\044\055\176\056" +
-    "\040\057\u02a3\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" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\044\055\176\056\040\057\u02a9\060\165\061\174\062\160" +
+    "\063\157\064\164\065\167\066\151\071\170\072\156\073" +
+    "\154\076\172\077\163\100\175\170\173\001\001\000\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" +
@@ -840,127 +855,121 @@ 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\231\226\232\227" +
-    "\233\223\001\001\000\010\231\271\232\227\233\223\001" +
+    "\002\001\001\000\010\232\226\233\227\234\224\001\001" +
+    "\000\002\001\001\000\010\232\271\233\227\234\224\001" +
     "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\010\231\265\232\227\233\223\001" +
-    "\001\000\002\001\001\000\002\001\001\000\010\231\231" +
-    "\232\227\233\223\001\001\000\002\001\001\000\010\231" +
-    "\263\232\227\233\223\001\001\000\010\231\262\232\227" +
-    "\233\223\001\001\000\010\231\261\232\227\233\223\001" +
-    "\001\000\010\231\260\232\227\233\223\001\001\000\010" +
-    "\231\257\232\227\233\223\001\001\000\010\231\256\232" +
-    "\227\233\223\001\001\000\010\231\255\232\227\233\223" +
-    "\001\001\000\010\231\254\232\227\233\223\001\001\000" +
-    "\010\231\253\232\227\233\223\001\001\000\010\231\252" +
-    "\232\227\233\223\001\001\000\010\231\251\232\227\233" +
-    "\223\001\001\000\010\231\250\232\227\233\223\001\001" +
-    "\000\010\231\247\232\227\233\223\001\001\000\002\001" +
+    "\000\002\001\001\000\010\232\265\233\227\234\224\001" +
+    "\001\000\002\001\001\000\002\001\001\000\010\232\231" +
+    "\233\227\234\224\001\001\000\002\001\001\000\010\232" +
+    "\263\233\227\234\224\001\001\000\010\232\262\233\227" +
+    "\234\224\001\001\000\010\232\261\233\227\234\224\001" +
+    "\001\000\010\232\260\233\227\234\224\001\001\000\010" +
+    "\232\257\233\227\234\224\001\001\000\010\232\256\233" +
+    "\227\234\224\001\001\000\010\232\255\233\227\234\224" +
+    "\001\001\000\010\232\254\233\227\234\224\001\001\000" +
+    "\010\232\253\233\227\234\224\001\001\000\010\232\252" +
+    "\233\227\234\224\001\001\000\010\232\251\233\227\234" +
+    "\224\001\001\000\010\232\250\233\227\234\224\001\001" +
+    "\000\010\232\247\233\227\234\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\233\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\074\331\075\340\101\322\102\317\103" +
-    "\326\104\325\105\346\106\343\107\314\110\352\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\000\002\001\001\000\002\001\001\000\004\234\270" +
     "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\010\177\u01d0" +
-    "\212\u01cf\213\u01cd\001\001\000\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\074\u019a\075\340\101\322\102\317\103" +
-    "\326\104\325\105\346\106\343\107\314\110\352\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\000\074\074\313\075\322\102\305\103\301\104\310" +
+    "\105\307\106\330\107\325\110\276\111\334\112\324\113" +
+    "\311\114\306\115\277\116\316\154\300\155\312\156\321" +
+    "\157\317\160\303\161\302\162\275\163\332\164\320\165" +
+    "\315\166\331\167\333\177\327\204\304\001\001\000\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\200\u01c2\213\u01c1\214\u01bf\001" +
+    "\001\000\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\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\006\121\377\225\u0100\001\001\000\002\001\001\000" +
-    "\034\122\u010e\123\u0110\126\u0114\127\u0101\130\u010a\131\u010d" +
-    "\132\u0113\145\u0108\146\u0104\147\u010b\150\u0102\151\u0115\152" +
-    "\u010c\001\001\000\002\001\001\000\030\124\u0179\125\u011b" +
-    "\133\u0119\134\u0116\140\u011e\141\u0124\142\u0117\143\u0122\144" +
-    "\u0120\170\u011c\224\u0123\001\001\000\002\001\001\000\030" +
-    "\124\u0176\125\u011b\133\u0119\134\u0116\140\u011e\141\u0124\142" +
-    "\u0117\143\u0122\144\u0120\170\u011c\224\u0123\001\001\000\002" +
-    "\001\001\000\002\001\001\000\010\231\u016d\232\227\233" +
-    "\223\001\001\000\030\124\u016b\125\u011b\133\u0119\134\u0116" +
-    "\140\u011e\141\u0124\142\u0117\143\u0122\144\u0120\170\u011c\224" +
-    "\u0123\001\001\000\002\001\001\000\002\001\001\000\030" +
-    "\124\u0168\125\u011b\133\u0119\134\u0116\140\u011e\141\u0124\142" +
-    "\u0117\143\u0122\144\u0120\170\u011c\224\u0123\001\001\000\030" +
-    "\124\u0166\125\u011b\133\u0119\134\u0116\140\u011e\141\u0124\142" +
-    "\u0117\143\u0122\144\u0120\170\u011c\224\u0123\001\001\000\002" +
+    "\001\000\074\074\u018c\075\322\102\305\103\301\104\310" +
+    "\105\307\106\330\107\325\110\276\111\334\112\324\113" +
+    "\311\114\306\115\277\116\316\154\300\155\312\156\321" +
+    "\157\317\160\303\161\302\162\275\163\332\164\320\165" +
+    "\315\166\331\167\333\177\327\204\304\001\001\000\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\030\124\u011a\125\u011b\133\u0119\134" +
-    "\u0116\140\u011e\141\u0124\142\u0117\143\u0122\144\u0120\170\u011c" +
-    "\224\u0123\001\001\000\002\001\001\000\002\001\001\000" +
+    "\000\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\120\353\001" +
+    "\001\000\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\135\u0126\137\u0128\231\u0129\232\227\233\223\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\010\231\u012b\232\227\233\223\001\001" +
-    "\000\002\001\001\000\010\231\u012d\232\227\233\223\001" +
+    "\006\122\361\226\362\001\001\000\002\001\001\000\034" +
+    "\123\377\124\u0102\127\u0106\130\363\131\374\132\u0100\133" +
+    "\u0105\146\372\147\366\150\375\151\364\152\u0107\153\376" +
+    "\001\001\000\002\001\001\000\030\125\u016b\126\u010d\134" +
+    "\u010b\135\u0108\141\u010f\142\u0116\143\u0109\144\u0114\145\u0112" +
+    "\171\u010e\225\u0115\001\001\000\002\001\001\000\030\125" +
+    "\u0168\126\u010d\134\u010b\135\u0108\141\u010f\142\u0116\143\u0109" +
+    "\144\u0114\145\u0112\171\u010e\225\u0115\001\001\000\002\001" +
+    "\001\000\002\001\001\000\010\232\u015f\233\227\234\224" +
+    "\001\001\000\030\125\u015d\126\u010d\134\u010b\135\u0108\141" +
+    "\u010f\142\u0116\143\u0109\144\u0114\145\u0112\171\u010e\225\u0115" +
+    "\001\001\000\002\001\001\000\002\001\001\000\030\125" +
+    "\u015a\126\u010d\134\u010b\135\u0108\141\u010f\142\u0116\143\u0109" +
+    "\144\u0114\145\u0112\171\u010e\225\u0115\001\001\000\030\125" +
+    "\u0158\126\u010d\134\u010b\135\u0108\141\u010f\142\u0116\143\u0109" +
+    "\144\u0114\145\u0112\171\u010e\225\u0115\001\001\000\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" +
+    "\002\001\001\000\030\125\u010c\126\u010d\134\u010b\135\u0108" +
+    "\141\u010f\142\u0116\143\u0109\144\u0114\145\u0112\171\u010e\225" +
+    "\u0115\001\001\000\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\202\u013f\226\u013c\230\u0143\231\u0140\232\u0142" +
-    "\233\u013e\234\u013b\001\001\000\022\231\u0140\232\u014e\233" +
-    "\u014c\234\u0148\235\u014a\237\u0150\240\u0149\241\u014d\001\001" +
+    "\001\000\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" +
+    "\136\u0118\140\u011a\232\u011b\233\227\234\224\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\016\226\u0146\230\u0143\231" +
-    "\u0140\232\u0142\233\u013e\234\u013b\001\001\000\002\001\001" +
-    "\000\002\001\001\000\002\001\001\000\022\231\u0140\232" +
-    "\u014e\233\u014c\234\u0148\235\u014a\237\u0150\240\u0149\241\u0157" +
-    "\001\001\000\002\001\001\000\004\236\u0153\001\001\000" +
-    "\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\231\u0140\232\u014e\233\u014c" +
-    "\234\u0148\235\u014a\237\u0150\240\u0149\241\u0155\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\002\001\001\000\012\227\u015b\231\u015a\232" +
-    "\227\233\223\001\001\000\002\001\001\000\002\001\001" +
+    "\001\001\000\010\232\u011d\233\227\234\224\001\001\000" +
+    "\002\001\001\000\010\232\u011f\233\227\234\224\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\030\124\u0160\125\u011b\133\u0119\134\u0116\140\u011e\141\u0124" +
-    "\142\u0117\143\u0122\144\u0120\170\u011c\224\u0123\001\001\000" +
     "\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\122\u016f\123\u0110\126\u0114\127\u0101" +
-    "\130\u010a\131\u010d\132\u0113\145\u0108\146\u0104\147\u010b\150" +
-    "\u0102\151\u0115\152\u010c\001\001\000\002\001\001\000\002" +
+    "\000\020\203\u0131\227\u012d\231\u0135\232\u0132\233\u0134\234" +
+    "\u0130\235\u012e\001\001\000\002\001\001\000\022\232\u0132" +
+    "\233\u0141\234\u013e\235\u013a\236\u013d\240\u0142\241\u013b\242" +
+    "\u013f\001\001\000\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\016\227\u0138\231\u0135\232\u0132" +
+    "\233\u0134\234\u0130\235\u012e\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\022\232\u0132\233\u0141" +
+    "\234\u013e\235\u013a\236\u013d\240\u0142\241\u013b\242\u0149\001" +
+    "\001\000\002\001\001\000\002\001\001\000\004\237\u0145" +
+    "\001\001\000\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\232\u0132\233\u0141\234\u013e\235" +
+    "\u013a\236\u013d\240\u0142\241\u013b\242\u0146\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\012\230\u014d\232\u014c\233\227" +
+    "\234\224\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\030" +
+    "\125\u0152\126\u010d\134\u010b\135\u0108\141\u010f\142\u0116\143" +
+    "\u0109\144\u0114\145\u0112\171\u010e\225\u0115\001\001\000\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\u017e\001\001\000\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\u0185\001\001\000\002\001\001\000" +
+    "\001\001\000\034\123\u0161\124\u0102\127\u0106\130\363\131" +
+    "\374\132\u0100\133\u0105\146\372\147\366\150\375\151\364" +
+    "\152\u0107\153\376\001\001\000\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\120" +
+    "\u0170\001\001\000\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\120\u0177\001\001\000\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" +
@@ -968,26 +977,26 @@ 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\002\001\001\000\004" +
-    "\117\u01a4\001\001\000\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\u01ab\001\001\000\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\120" +
+    "\u0196\001\001\000\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\u01b4\001\001\000\002\001\001\000\002" +
+    "\001\000\004\120\u019d\001\001\000\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\u01be\001\001\000\002\001" +
-    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
-    "\000\006\121\u01c4\225\u0100\001\001\000\010\120\u01c5\121" +
-    "\u01c6\225\u0100\001\001\000\002\001\001\000\002\001\001" +
-    "\000\002\001\001\000\010\120\u01c8\121\u01c6\225\u0100\001" +
+    "\000\004\120\u01a6\001\001\000\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\u01b0\001\001\000\002\001\001" +
+    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+    "\006\122\u01b6\226\362\001\001\000\010\121\u01b7\122\u01b8" +
+    "\226\362\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\010\121\u01ba\122\u01b8\226\362\001\001" +
+    "\000\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\204" +
-    "\u01d7\220\u01d5\221\u01da\222\u01d8\223\u01d9\001\001\000\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\205\u01c9" +
+    "\221\u01c7\222\u01cc\223\u01ca\224\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" +
@@ -995,30 +1004,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\002\001\001\000\014\204\u01f2\220\u01d5\221" +
-    "\u01da\222\u01d8\223\u01d9\001\001\000\002\001\001\000\004" +
-    "\205\u01f4\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\004\200\u01fa\001\001" +
-    "\000\006\201\u01fc\207\u01fd\001\001\000\002\001\001\000" +
-    "\002\001\001\000\004\200\u020d\001\001\000\006\003\u0206" +
-    "\211\u0204\001\001\000\002\001\001\000\002\001\001\000" +
-    "\006\230\u0202\234\u013b\001\001\000\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\226\u0208\230\u0143\231\u0140" +
-    "\232\u0142\233\u013e\234\u013b\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\006" +
-    "\201\u01fc\207\u01fd\001\001\000\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\204\u0215\220" +
-    "\u01d5\221\u01da\222\u01d8\223\u01d9\001\001\000\002\001\001" +
-    "\000\002\001\001\000\010\206\u021c\214\u0219\215\u021a\001" +
-    "\001\000\002\001\001\000\004\215\u0232\001\001\000\004" +
-    "\214\u0231\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\006\216\u0222\217\u0221" +
-    "\001\001\000\004\207\u0226\001\001\000\006\216\u0224\217" +
-    "\u0221\001\001\000\002\001\001\000\004\207\u0226\001\001" +
-    "\000\002\001\001\000\002\001\001\000\004\211\u0227\001" +
+    "\001\000\002\001\001\000\014\205\u01e4\221\u01c7\222\u01cc" +
+    "\223\u01ca\224\u01cb\001\001\000\002\001\001\000\004\206" +
+    "\u01e6\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\004\201\u01ec\001\001\000" +
+    "\006\202\u01ee\210\u01ef\001\001\000\002\001\001\000\002" +
+    "\001\001\000\004\201\u01ff\001\001\000\006\003\u01f8\212" +
+    "\u01f6\001\001\000\002\001\001\000\002\001\001\000\006" +
+    "\231\u01f4\235\u012e\001\001\000\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\227\u01fa\231\u0135\232\u0132\233" +
+    "\u0134\234\u0130\235\u012e\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\006\202" +
+    "\u01ee\210\u01ef\001\001\000\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\205\u0207\221\u01c7" +
+    "\222\u01cc\223\u01ca\224\u01cb\001\001\000\002\001\001\000" +
+    "\002\001\001\000\010\207\u020e\215\u020b\216\u020c\001\001" +
+    "\000\002\001\001\000\004\216\u0224\001\001\000\004\215" +
+    "\u0223\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\006\217\u0214\220\u0213\001" +
+    "\001\000\004\210\u0218\001\001\000\006\217\u0216\220\u0213" +
+    "\001\001\000\002\001\001\000\004\210\u0218\001\001\000" +
+    "\002\001\001\000\002\001\001\000\004\212\u0219\001\001" +
     "\000\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" +
@@ -1026,51 +1035,61 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
     "\000\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\u0243\001\001\000\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\u024c\171\u024d\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\004\117\u0251\001\001" +
+    "\000\002\001\001\000\004\120\u0235\001\001\000\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\171\u0255\001\001" +
+    "\006\120\u023e\172\u023f\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\004\120\u0243\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\004\172\u0247\001\001\000" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\010\173\u0250\174\u024e\211" +
+    "\u0251\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\002\001\001\000\004\212" +
+    "\u0253\001\001\000\002\001\001\000\004\174\u0255\001\001" +
+    "\000\002\001\001\000\002\001\001\000\006\173\u0258\211" +
+    "\u0251\001\001\000\002\001\001\000\002\001\001\000\004" +
+    "\137\u025c\001\001\000\002\001\001\000\002\001\001\000" +
+    "\010\232\u025e\233\227\234\224\001\001\000\002\001\001" +
+    "\000\010\232\u0260\233\227\234\224\001\001\000\002\001" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\002\001\001\000\004\120\u0266\001\001\000\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\172\u025d\173\u025c" +
-    "\210\u025e\001\001\000\002\001\001\000\002\001\001\000" +
+    "\006\120\u0270\175\u026f\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\004\175\u0272\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\004" +
-    "\211\u0261\001\001\000\002\001\001\000\004\173\u0263\001" +
-    "\001\000\002\001\001\000\002\001\001\000\006\172\u0266" +
-    "\210\u025e\001\001\000\002\001\001\000\002\001\001\000" +
-    "\004\136\u026a\001\001\000\002\001\001\000\002\001\001" +
-    "\000\010\231\u026c\232\227\233\223\001\001\000\002\001" +
-    "\001\000\010\231\u026e\232\227\233\223\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\u0274\001\001\000\002" +
+    "\120\u0278\001\001\000\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\173\u027f\176\u0280\211" +
+    "\u0251\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\006\173\u0282\211\u0251\001\001\000\002\001" +
+    "\001\000\002\001\001\000\004\176\u0285\001\001\000\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\u027e\174\u027d\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\004\174\u0280\001\001" +
     "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\004\117\u0286\001\001\000\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\172\u028e\175\u028d" +
-    "\210\u025e\001\001\000\002\001\001\000\002\001\001\000" +
-    "\002\001\001\000\004\175\u0290\001\001\000\002\001\001" +
-    "\000\002\001\001\000\006\172\u0293\210\u025e\001\001\000" +
+    "\002\001\001\000\002\001\001\000\006\015\u0292\016\u0295" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\006\015\u0296\016\u0295\001\001\000\002\001\001" +
+    "\000\002\001\001\000\004\002\u029a\001\001\000\002\001" +
+    "\001\000\004\101\u029f\001\001\000\002\001\001\000\002" +
+    "\001\001\000\002\001\001\000\010\232\u02a1\233\227\234" +
+    "\224\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\010\232\u02a3\233\227\234\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" +
+    "\001\000\010\016\u02af\067\u02ab\070\u02ad\001\001\000\002" +
+    "\001\001\000\002\001\001\000\010\016\u02af\067\u02b0\070" +
+    "\u02ad\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\004\002\u02b2\001\001\000\002\001\001\000" +
     "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
-    "\001\001\000\010\016\u02a9\067\u02a5\070\u02a8\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\010" +
-    "\016\u02a9\067\u02aa\070\u02a8\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\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\002\001\001\000\010" +
-    "\231\u02b4\232\227\233\223\001\001\000\002\001\001\000" +
-    "\002\001\001\000\002\001\001\000\004\002\u02b8\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\004\002\u02bc\001\001\000\002\001\001\000\002\001\001" +
+    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\001\000\010\232\u02bb\233\227\234\224\001\001\000\002" +
+    "\001\001\000\002\001\001\000\010\232\u02be\233\227\234" +
+    "\224\001\001\000\002\001\001\000\002\001\001\000\002" +
+    "\001\001\000\004\002\u02c2\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\004\002\u02c6\001\001" +
     "\000\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" +
@@ -1080,17 +1099,17 @@ 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\006\015\u02dd\016\276\001\001\000\002" +
-    "\001\001\000\002\001\001\000\002\001\001\000\004\050" +
-    "\u02f1\001\001\000\002\001\001\000\006\015\u02ee\016\276" +
-    "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+    "\002\001\001\000\002\001\001\000\002\001\001\000\006" +
+    "\015\u02e7\016\u0295\001\001\000\002\001\001\000\002\001" +
+    "\001\000\002\001\001\000\004\050\u02fb\001\001\000\002" +
+    "\001\001\000\006\015\u02f8\016\u0295\001\001\000\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\051\u02f6\052\u02f8\001\001" +
-    "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
-    "\006\051\u02f9\052\u02f8\001\001\000\002\001\001\000\002" +
+    "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+    "\000\006\051\u0300\052\u0302\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\006\051\u0303\052\u0302" +
     "\001\001\000\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" +
@@ -1098,14 +1117,14 @@ 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" +
-    "\020\023\u0312\024\u0305\025\u0309\026\u0303\027\u02ff\030\u0306" +
-    "\031\u0304\001\001\000\002\001\001\000\002\001\001\000" +
+    "\002\001\001\000\002\001\001\000\020\023\u031c\024\u030f" +
+    "\025\u0313\026\u030d\027\u0309\030\u0310\031\u030e\001\001\000" +
     "\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\u031f\001\001\000\002\001\001\000\002\001" +
+    "\000\002\001\001\000\002\001\001\000\004\007\u0329\001" +
     "\001\000\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" });
 
   /** Access to <code>reduce_goto</code> table. */
   @Override
@@ -1201,7 +1220,7 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
             else blk = blk.getFather();
         }
     }
-
+    private StxField theField;
     private StringBuffer stringAcc = new StringBuffer();
     private ArrayList<AvatarFromSysMLError> errors;
     private void addError(AvatarFromSysMLError _err) { errors.add(_err); }
@@ -1674,31 +1693,69 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 25: // fieldDecl ::= ATTRIBUTE IDENT COLON typeIdent SEMICOLON 
+          case 25: // fieldDecl ::= ATTRIBUTE IDENT COLON typeIdent fieldVal 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;
-		Ident id = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3).<Ident>value();
-		Location tpxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
-		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();
+		Location axleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
+		Location axright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xright;
+		Object a = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5).<Object>value();
+		Location idxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
+		Location idxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xright;
+		Ident id = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4).<Ident>value();
+		Location tpxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
+		Location tpxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xright;
+		String tp = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2).<String>value();
+		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
+		Location qxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
+		Object q = CUP$AvatarFromSysMLParser$stack.peek().<Object>value();
 		
-    StxField field = new StxField(axleft, axright, id.getAvatarName(), tp);
-    StxField clash = theStructure.addField(field);
+    theField = new StxField(axleft, axright, id.getAvatarName(), tp);
+    StxField clash = theStructure.addField(theField);
     if (clash != null)
         addError( new AvatarFromSysMLError(AvatarFromSysMLError.HIGHWARNING, axleft, "Field " + id.getAvatarName() +
         " is already declared", clash.getLeft()) );
+    theField.setLeft(axleft);
+    theField.setRight(qxright);
+
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldDecl",12, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+            }
+          return CUP$AvatarFromSysMLParser$result;
+
+          /*. . . . . . . . . . . . . . . . . . . .*/
+          case 26: // fieldVal ::= 
+            {
+              Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldDecl",12, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldVal",63, CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 26: // typeIdent ::= INTEGER_T 
+          case 27: // fieldVal ::= GETS iexpr 
+            {
+              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();
+		  theField.setInitialValue(e);  
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldVal",63, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+            }
+          return CUP$AvatarFromSysMLParser$result;
+
+          /*. . . . . . . . . . . . . . . . . . . .*/
+          case 28: // fieldVal ::= DEFAULT GETS iexpr 
+            {
+              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();
+		  theField.setInitialValue(e);  theField.setDefaultValue(true); 
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fieldVal",63, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+            }
+          return CUP$AvatarFromSysMLParser$result;
+
+          /*. . . . . . . . . . . . . . . . . . . .*/
+          case 29: // typeIdent ::= INTEGER_T 
             {
               String RESULT =null;
 		 RESULT = "Integer"; 
@@ -1707,7 +1764,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 27: // typeIdent ::= BOOLEAN_T 
+          case 30: // typeIdent ::= BOOLEAN_T 
             {
               String RESULT =null;
 		 RESULT = "Boolean"; 
@@ -1716,7 +1773,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 28: // typeIdent ::= IDENT 
+          case 31: // typeIdent ::= IDENT 
             {
               String RESULT =null;
 		Location idxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -1728,7 +1785,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 29: // relationDecl ::= syncRelDecl 
+          case 32: // relationDecl ::= syncRelDecl 
             {
               Object RESULT =null;
 
@@ -1737,7 +1794,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 30: // relationDecl ::= nbfRelDecl 
+          case 33: // relationDecl ::= nbfRelDecl 
             {
               Object RESULT =null;
 
@@ -1746,7 +1803,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 31: // relationDecl ::= bfRelDecl 
+          case 34: // relationDecl ::= bfRelDecl 
             {
               Object RESULT =null;
 
@@ -1755,7 +1812,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 32: // syncRelDecl ::= syncRelDeclBegin relParams RPAR SEMICOLON 
+          case 35: // syncRelDecl ::= syncRelDeclBegin relParams RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location xxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -1769,7 +1826,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 33: // syncRelDeclBegin ::= PART IDENT COLON SYNCREL_T EQUAL SYNCREL_T LPAR 
+          case 36: // syncRelDeclBegin ::= PART IDENT COLON SYNCREL_T EQUAL SYNCREL_T LPAR 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6)).xleft;
@@ -1795,7 +1852,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 34: // nbfRelDecl ::= nbfRelDeclBegin relParams RPAR SEMICOLON 
+          case 37: // nbfRelDecl ::= nbfRelDeclBegin relParams RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location xxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -1809,7 +1866,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 35: // nbfRelDeclBegin ::= PART IDENT COLON NBFIFOREL_T EQUAL NBFIFOREL_T LPAR 
+          case 38: // nbfRelDeclBegin ::= PART IDENT COLON NBFIFOREL_T EQUAL NBFIFOREL_T LPAR 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6)).xleft;
@@ -1835,7 +1892,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 36: // bfRelDecl ::= bfRelDeclBegin relParams RPAR SEMICOLON 
+          case 39: // bfRelDecl ::= bfRelDeclBegin relParams RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location xxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -1849,7 +1906,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 37: // bfRelDeclBegin ::= PART IDENT COLON BFIFOREL_T EQUAL BFIFOREL_T LPAR 
+          case 40: // bfRelDeclBegin ::= PART IDENT COLON BFIFOREL_T EQUAL BFIFOREL_T LPAR 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6)).xleft;
@@ -1875,7 +1932,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 38: // relParams ::= relParam 
+          case 41: // relParams ::= relParam 
             {
               Object RESULT =null;
 
@@ -1884,7 +1941,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 39: // relParams ::= relParam COMMA relParams 
+          case 42: // relParams ::= relParam COMMA relParams 
             {
               Object RESULT =null;
 
@@ -1893,7 +1950,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 40: // relParam ::= block1Param 
+          case 43: // relParam ::= block1Param 
             {
               Object RESULT =null;
 
@@ -1902,7 +1959,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 41: // relParam ::= block2Param 
+          case 44: // relParam ::= block2Param 
             {
               Object RESULT =null;
 
@@ -1911,7 +1968,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 42: // relParam ::= privateParam 
+          case 45: // relParam ::= privateParam 
             {
               Object RESULT =null;
 
@@ -1920,7 +1977,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 43: // relParam ::= maxsizeParam 
+          case 46: // relParam ::= maxsizeParam 
             {
               Object RESULT =null;
 
@@ -1929,7 +1986,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 44: // relParam ::= lossyParam 
+          case 47: // relParam ::= lossyParam 
             {
               Object RESULT =null;
 
@@ -1938,7 +1995,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 45: // block1Param ::= BLOCK1_F EQUAL IDENT 
+          case 48: // block1Param ::= BLOCK1_F EQUAL IDENT 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -1962,7 +2019,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 46: // block2Param ::= BLOCK2_F EQUAL IDENT 
+          case 49: // block2Param ::= BLOCK2_F EQUAL IDENT 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -1986,7 +2043,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 47: // privateParam ::= PRIVATE_F EQUAL BOOL 
+          case 50: // privateParam ::= PRIVATE_F EQUAL BOOL 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -2007,7 +2064,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 48: // maxsizeParam ::= MAXSIZE_F EQUAL INT 
+          case 51: // maxsizeParam ::= MAXSIZE_F EQUAL INT 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -2032,7 +2089,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 49: // lossyParam ::= LOSSY_F EQUAL BOOL 
+          case 52: // lossyParam ::= LOSSY_F EQUAL BOOL 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -2057,7 +2114,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 50: // channelDecl ::= syncChDecl 
+          case 53: // channelDecl ::= syncChDecl 
             {
               Object RESULT =null;
 
@@ -2066,7 +2123,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 51: // channelDecl ::= nbfChDecl 
+          case 54: // channelDecl ::= nbfChDecl 
             {
               Object RESULT =null;
 
@@ -2075,7 +2132,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 52: // channelDecl ::= bfChDecl 
+          case 55: // channelDecl ::= bfChDecl 
             {
               Object RESULT =null;
 
@@ -2084,7 +2141,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 53: // syncChDecl ::= PART IDENT COLON SYNC_T EQUAL SYNC_T LPAR RELATION_F EQUAL IDENT RPAR SEMICOLON 
+          case 56: // syncChDecl ::= PART IDENT COLON SYNC_T EQUAL SYNC_T LPAR RELATION_F EQUAL IDENT RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-11)).xleft;
@@ -2119,7 +2176,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 54: // nbfChDecl ::= PART IDENT COLON NBFIFO_T EQUAL NBFIFO_T LPAR RELATION_F EQUAL IDENT RPAR SEMICOLON 
+          case 57: // nbfChDecl ::= PART IDENT COLON NBFIFO_T EQUAL NBFIFO_T LPAR RELATION_F EQUAL IDENT RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-11)).xleft;
@@ -2154,7 +2211,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 55: // bfChDecl ::= PART IDENT COLON BFIFO_T EQUAL BFIFO_T LPAR RELATION_F EQUAL IDENT RPAR SEMICOLON 
+          case 58: // bfChDecl ::= PART IDENT COLON BFIFO_T EQUAL BFIFO_T LPAR RELATION_F EQUAL IDENT RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-11)).xleft;
@@ -2189,7 +2246,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 56: // signalBinding ::= inSignalBinding 
+          case 59: // signalBinding ::= inSignalBinding 
             {
               Object RESULT =null;
 
@@ -2198,7 +2255,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 57: // signalBinding ::= outSignalBinding 
+          case 60: // signalBinding ::= outSignalBinding 
             {
               Object RESULT =null;
 
@@ -2207,7 +2264,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 58: // inSignalBinding ::= BINDING COLON INSIGNALBINDING_T BIND IDENT POINT IDENT EQUAL IDENT SEMICOLON 
+          case 61: // inSignalBinding ::= BINDING COLON INSIGNALBINDING_T BIND IDENT POINT IDENT EQUAL IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -2235,7 +2292,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 59: // inSignalBinding ::= BINDING COLON INSIGNALBINDING_T BIND IDENT EQUAL IDENT POINT IDENT SEMICOLON 
+          case 62: // inSignalBinding ::= BINDING COLON INSIGNALBINDING_T BIND IDENT EQUAL IDENT POINT IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location cxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -2263,7 +2320,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 60: // outSignalBinding ::= BINDING COLON OUTSIGNALBINDING_T BIND IDENT POINT IDENT EQUAL IDENT SEMICOLON 
+          case 63: // outSignalBinding ::= BINDING COLON OUTSIGNALBINDING_T BIND IDENT POINT IDENT EQUAL IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -2291,7 +2348,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 61: // outSignalBinding ::= BINDING COLON OUTSIGNALBINDING_T BIND IDENT EQUAL IDENT POINT IDENT SEMICOLON 
+          case 64: // outSignalBinding ::= BINDING COLON OUTSIGNALBINDING_T BIND IDENT EQUAL IDENT POINT IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location cxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -2319,7 +2376,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 62: // messageDecl ::= inMessageDecl 
+          case 65: // messageDecl ::= inMessageDecl 
             {
               Object RESULT =null;
 
@@ -2328,7 +2385,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 63: // messageDecl ::= outMessageDecl 
+          case 66: // messageDecl ::= outMessageDecl 
             {
               Object RESULT =null;
 
@@ -2337,7 +2394,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 64: // inMessageDecl ::= inMessageDeclBegin inMessageDeclBODY 
+          case 67: // inMessageDecl ::= inMessageDeclBegin inMessageDeclBODY 
             {
               Object RESULT =null;
 		Location mxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -2352,7 +2409,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 65: // inMessageDeclBegin ::= PART DEF IDENT specializes INMESSAGE_T LBRAC 
+          case 68: // inMessageDeclBegin ::= PART DEF IDENT specializes INMESSAGE_T LBRAC 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -2376,7 +2433,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 66: // inMessageDeclBODY ::= messageChannel RBRAC 
+          case 69: // inMessageDeclBODY ::= messageChannel RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2390,7 +2447,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 67: // inMessageDeclBODY ::= messageChannel fieldDecls RBRAC 
+          case 70: // inMessageDeclBODY ::= messageChannel fieldDecls RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2404,7 +2461,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 68: // inMessageDeclBODY ::= fieldDecls messageChannel RBRAC 
+          case 71: // inMessageDeclBODY ::= fieldDecls messageChannel RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2418,7 +2475,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 69: // messageChannel ::= PRIVATE PART CHANNEL_F COLON CHANNEL_T EQUAL IDENT SEMICOLON 
+          case 72: // messageChannel ::= PRIVATE PART CHANNEL_F COLON CHANNEL_T EQUAL IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7)).xleft;
@@ -2443,7 +2500,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 70: // messageChannel ::= PRIVATE PART CHANNEL_F EQUAL IDENT SEMICOLON 
+          case 73: // messageChannel ::= PRIVATE PART CHANNEL_F EQUAL IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -2468,7 +2525,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 71: // outMessageDecl ::= outMessageDeclBegin SEMICOLON 
+          case 74: // outMessageDecl ::= outMessageDeclBegin SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2482,7 +2539,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 72: // outMessageDecl ::= outMessageDeclBegin LBRAC RBRAC 
+          case 75: // outMessageDecl ::= outMessageDeclBegin LBRAC RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2496,7 +2553,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 73: // outMessageDecl ::= outMessageDeclBegin LBRAC outMessageDeclBODY 
+          case 76: // outMessageDecl ::= outMessageDeclBegin LBRAC outMessageDeclBODY 
             {
               Object RESULT =null;
 
@@ -2505,7 +2562,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 74: // outMessageDeclBegin ::= PART DEF IDENT specializes OUTMESSAGE_T COMMA IDENT 
+          case 77: // outMessageDeclBegin ::= PART DEF IDENT specializes OUTMESSAGE_T COMMA IDENT 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6)).xleft;
@@ -2531,7 +2588,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 75: // outMessageDeclBegin ::= PART DEF IDENT specializes IDENT COMMA OUTMESSAGE_T 
+          case 78: // outMessageDeclBegin ::= PART DEF IDENT specializes IDENT COMMA OUTMESSAGE_T 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6)).xleft;
@@ -2553,7 +2610,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 76: // outMessageDeclBODY ::= redefineField RBRAC 
+          case 79: // outMessageDeclBODY ::= redefineField RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2567,7 +2624,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 77: // outMessageDeclBODY ::= redefineField outMessageDeclBODY 
+          case 80: // outMessageDeclBODY ::= redefineField outMessageDeclBODY 
             {
               Object RESULT =null;
 
@@ -2576,7 +2633,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 78: // redefineField ::= ATTRIBUTE IDENT REDEFINES IDENT SEMICOLON 
+          case 81: // redefineField ::= ATTRIBUTE IDENT REDEFINES IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location axleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -2597,7 +2654,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 79: // blockDecl ::= blockDeclBegin RBRAC 
+          case 82: // blockDecl ::= blockDeclBegin RBRAC 
             {
               Object RESULT =null;
 		 popBlock(); 
@@ -2606,7 +2663,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 80: // blockDecl ::= blockDeclBegin blockDeclBODY 
+          case 83: // blockDecl ::= blockDeclBegin blockDeclBODY 
             {
               Object RESULT =null;
 		 popBlock(); 
@@ -2615,7 +2672,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 81: // blockDeclBegin ::= PART IDENT COLON AVBLOCK_T LBRAC 
+          case 84: // blockDeclBegin ::= PART IDENT COLON AVBLOCK_T LBRAC 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -2641,7 +2698,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 82: // blockDeclBODY ::= blockItem RBRAC 
+          case 85: // blockDeclBODY ::= blockItem RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2655,7 +2712,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 83: // blockDeclBODY ::= blockItem blockDeclBODY 
+          case 86: // blockDeclBODY ::= blockItem blockDeclBODY 
             {
               Object RESULT =null;
 
@@ -2664,7 +2721,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 84: // blockItem ::= attributeDecl 
+          case 87: // blockItem ::= attributeDecl 
             {
               Object RESULT =null;
 
@@ -2673,7 +2730,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 85: // blockItem ::= constantDecl 
+          case 88: // blockItem ::= constantDecl 
             {
               Object RESULT =null;
 
@@ -2682,7 +2739,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 86: // blockItem ::= methodDecl 
+          case 89: // blockItem ::= methodDecl 
             {
               Object RESULT =null;
 
@@ -2691,7 +2748,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 87: // blockItem ::= signalDecl 
+          case 90: // blockItem ::= signalDecl 
             {
               Object RESULT =null;
 
@@ -2700,7 +2757,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 88: // blockItem ::= timerDecl 
+          case 91: // blockItem ::= timerDecl 
             {
               Object RESULT =null;
 
@@ -2709,7 +2766,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 89: // blockItem ::= stateMachine 
+          case 92: // blockItem ::= stateMachine 
             {
               Object RESULT =null;
 
@@ -2718,7 +2775,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 90: // blockItem ::= blockDecl 
+          case 93: // blockItem ::= blockDecl 
             {
               Object RESULT =null;
 
@@ -2727,7 +2784,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 91: // attributeDecl ::= attributeDeclHEADER SEMICOLON 
+          case 94: // attributeDecl ::= attributeDeclHEADER SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2741,7 +2798,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 92: // attributeDecl ::= attributeDeclHEADER GETS iexpr SEMICOLON 
+          case 95: // attributeDecl ::= attributeDeclHEADER GETS iexpr SEMICOLON 
             {
               Object RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -2759,7 +2816,26 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 93: // attributeDeclHEADER ::= ATTRIBUTE IDENT COLON typeIdent 
+          case 96: // attributeDecl ::= attributeDeclHEADER DEFAULT GETS iexpr SEMICOLON 
+            {
+              Object 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();
+		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
+		Location qxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
+		Object q = CUP$AvatarFromSysMLParser$stack.peek().<Object>value();
+		
+        theAttribute.setInit(e);
+        theAttribute.setRight(qxright);
+        theAttribute.setDefaultValue(true);
+    
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("attributeDecl",47, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+            }
+          return CUP$AvatarFromSysMLParser$result;
+
+          /*. . . . . . . . . . . . . . . . . . . .*/
+          case 97: // attributeDeclHEADER ::= ATTRIBUTE IDENT COLON typeIdent 
             {
               Object RESULT =null;
 		Location axleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -2797,7 +2873,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 94: // constantDecl ::= constantDeclHEADER SEMICOLON 
+          case 98: // constantDecl ::= constantDeclHEADER SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2811,7 +2887,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 95: // constantDecl ::= constantDeclHEADER GETS iexpr SEMICOLON 
+          case 99: // constantDecl ::= constantDeclHEADER GETS iexpr SEMICOLON 
             {
               Object RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -2829,7 +2905,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 96: // constantDeclHEADER ::= READONLY ATTRIBUTE IDENT COLON typeIdent 
+          case 100: // constantDeclHEADER ::= READONLY ATTRIBUTE IDENT COLON typeIdent 
             {
               Object RESULT =null;
 		Location rxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -2867,7 +2943,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 97: // methodDecl ::= voidMethodDecl 
+          case 101: // methodDecl ::= voidMethodDecl 
             {
               Object RESULT =null;
 
@@ -2876,7 +2952,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 98: // methodDecl ::= calcMethodDecl 
+          case 102: // methodDecl ::= calcMethodDecl 
             {
               Object RESULT =null;
 
@@ -2885,7 +2961,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 99: // voidMethodDecl ::= voidMethodDeclBegin LBRAC RBRAC 
+          case 103: // voidMethodDecl ::= voidMethodDeclBegin LBRAC RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2899,7 +2975,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 100: // voidMethodDecl ::= voidMethodDeclBegin LBRAC fieldDecls RBRAC 
+          case 104: // voidMethodDecl ::= voidMethodDeclBegin LBRAC fieldDecls RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2913,7 +2989,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 101: // voidMethodDeclBegin ::= ACTION IDENT COLON AVVOIDMETHOD_T 
+          case 105: // voidMethodDeclBegin ::= ACTION IDENT COLON AVVOIDMETHOD_T 
             {
               Object RESULT =null;
 		Location axleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -2948,7 +3024,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 102: // calcMethodDecl ::= calcMethodDeclBegin LBRAC RBRAC 
+          case 106: // calcMethodDecl ::= calcMethodDeclBegin LBRAC RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2962,7 +3038,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 103: // calcMethodDecl ::= calcMethodDeclBegin LBRAC calcMethodItems RBRAC 
+          case 107: // calcMethodDecl ::= calcMethodDeclBegin LBRAC calcMethodItems RBRAC 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -2976,7 +3052,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 104: // calcMethodDeclBegin ::= CALC IDENT COLON AVCALCMETHOD_T 
+          case 108: // calcMethodDeclBegin ::= CALC IDENT COLON AVCALCMETHOD_T 
             {
               Object RESULT =null;
 		Location cxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -3011,7 +3087,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 105: // calcMethodItems ::= calcMethodItem 
+          case 109: // calcMethodItems ::= calcMethodItem 
             {
               Object RESULT =null;
 
@@ -3020,7 +3096,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 106: // calcMethodItems ::= calcMethodItem calcMethodItems 
+          case 110: // calcMethodItems ::= calcMethodItem calcMethodItems 
             {
               Object RESULT =null;
 
@@ -3029,7 +3105,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 107: // calcMethodItem ::= fieldDecl 
+          case 111: // calcMethodItem ::= fieldDecl 
             {
               Object RESULT =null;
 
@@ -3038,7 +3114,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 108: // calcMethodItem ::= RETURN COLON typeIdent SEMICOLON 
+          case 112: // calcMethodItem ::= RETURN COLON typeIdent SEMICOLON 
             {
               Object RESULT =null;
 		Location tpxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -3052,7 +3128,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 109: // signalDecl ::= PART IDENT COLON FIFO_T SEMICOLON 
+          case 113: // signalDecl ::= PART IDENT COLON FIFO_T SEMICOLON 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -3091,7 +3167,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 110: // signalDecl ::= PART IDENT COLON CHANNEL_T SEMICOLON 
+          case 114: // signalDecl ::= PART IDENT COLON CHANNEL_T SEMICOLON 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -3130,7 +3206,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 111: // timerDecl ::= PART IDENT COLON AVTIMER_T EQUAL AVTIMER_T LPAR RPAR SEMICOLON 
+          case 115: // timerDecl ::= PART IDENT COLON AVTIMER_T EQUAL AVTIMER_T LPAR RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8)).xleft;
@@ -3166,7 +3242,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 112: // timerDecl ::= PART IDENT COLON AVTIMER_T SEMICOLON 
+          case 116: // timerDecl ::= PART IDENT COLON AVTIMER_T SEMICOLON 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -3202,7 +3278,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 113: // stateMachine ::= stateMachineBegin LBRAC stateMachineItems RBRAC 
+          case 117: // stateMachine ::= stateMachineBegin LBRAC stateMachineItems RBRAC 
             {
               Object RESULT =null;
 		
@@ -3214,7 +3290,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 114: // stateMachine ::= stateMachineBegin LBRAC RBRAC 
+          case 118: // stateMachine ::= stateMachineBegin LBRAC RBRAC 
             {
               Object RESULT =null;
 		
@@ -3226,7 +3302,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 115: // stateMachine ::= stateMachineBegin SEMICOLON 
+          case 119: // stateMachine ::= stateMachineBegin SEMICOLON 
             {
               Object RESULT =null;
 		
@@ -3238,18 +3314,18 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 116: // stateMachineBegin ::= EXHIBIT STATE STATEMACHINE COLON AVSTATEMACHINE_T 
+          case 120: // stateMachineBegin ::= EXHIBIT STATE STATEMACHINE COLON AVSTATEMACHINE_T 
             {
               Object RESULT =null;
 		
     stateMap = new HashMap<String, StxState>();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineBegin",117, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stateMachineBegin",118, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 117: // stateMachineItems ::= stateMachineItem 
+          case 121: // stateMachineItems ::= stateMachineItem 
             {
               Object RESULT =null;
 
@@ -3258,7 +3334,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 118: // stateMachineItems ::= stateMachineItem stateMachineItems 
+          case 122: // stateMachineItems ::= stateMachineItem stateMachineItems 
             {
               Object RESULT =null;
 
@@ -3267,7 +3343,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 119: // stateMachineItem ::= state 
+          case 123: // stateMachineItem ::= state 
             {
               Object RESULT =null;
 
@@ -3276,7 +3352,7 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 120: // stateMachineItem ::= transition 
+          case 124: // stateMachineItem ::= transition 
             {
               Object RESULT =null;
 
@@ -3285,115 +3361,115 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 121: // state ::= standardState 
+          case 125: // state ::= standardState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 122: // state ::= stopState 
+          case 126: // state ::= stopState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 123: // state ::= startState 
+          case 127: // state ::= startState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 124: // state ::= sendState 
+          case 128: // state ::= sendState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 125: // state ::= receiveState 
+          case 129: // state ::= receiveState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 126: // state ::= randomState 
+          case 130: // state ::= randomState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 127: // state ::= countState 
+          case 131: // state ::= countState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 128: // state ::= presendState 
+          case 132: // state ::= presendState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 129: // state ::= prereceiveState 
+          case 133: // state ::= prereceiveState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 130: // state ::= setTimerState 
+          case 134: // state ::= setTimerState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 131: // state ::= resetTimerState 
+          case 135: // state ::= resetTimerState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 132: // state ::= expireTimerState 
+          case 136: // state ::= expireTimerState 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",63, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("state",64, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 133: // startState ::= startStateBegin SEMICOLON 
+          case 137: // startState ::= startStateBegin SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -3406,12 +3482,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",64, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 134: // startState ::= startStateBegin EQUAL AVSTARTSTATE_T LPAR RPAR SEMICOLON 
+          case 138: // startState ::= startStateBegin EQUAL AVSTARTSTATE_T LPAR RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -3424,12 +3500,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",64, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 135: // startState ::= startStateBegin EQUAL AVSTARTSTATE_T LPAR requestParam RPAR SEMICOLON 
+          case 139: // startState ::= startStateBegin EQUAL AVSTARTSTATE_T LPAR requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3438,12 +3514,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",64, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 136: // startStateBegin ::= ENTRY ACTION IDENT COLON AVSTARTSTATE_T 
+          case 140: // startStateBegin ::= ENTRY ACTION IDENT COLON AVSTARTSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -3464,12 +3540,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startStateBegin",105, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("startStateBegin",106, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 137: // standardState ::= standardStateBegin SEMICOLON 
+          case 141: // standardState ::= standardStateBegin SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -3482,12 +3558,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 138: // standardState ::= standardStateBegin EQUAL AVSTANDARDSTATE_T LPAR RPAR SEMICOLON 
+          case 142: // standardState ::= standardStateBegin EQUAL AVSTANDARDSTATE_T LPAR RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -3500,12 +3576,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 139: // standardState ::= standardStateBegin EQUAL AVSTANDARDSTATE_T LPAR poolParam RPAR SEMICOLON 
+          case 143: // standardState ::= standardStateBegin EQUAL AVSTANDARDSTATE_T LPAR poolParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3514,12 +3590,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",65, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 140: // standardStateBegin ::= STATE IDENT COLON AVSTANDARDSTATE_T 
+          case 144: // standardStateBegin ::= STATE IDENT COLON AVSTANDARDSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -3541,12 +3617,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardStateBegin",106, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("standardStateBegin",107, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 141: // stopState ::= stopStateBegin SEMICOLON 
+          case 145: // stopState ::= stopStateBegin SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3555,12 +3631,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 142: // stopState ::= stopStateBegin EQUAL AVSTOPSTATE_T LPAR RPAR SEMICOLON 
+          case 146: // stopState ::= stopStateBegin EQUAL AVSTOPSTATE_T LPAR RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3569,12 +3645,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopState",66, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 143: // stopStateBegin ::= EXIT ACTION IDENT COLON AVSTOPSTATE_T 
+          case 147: // stopStateBegin ::= EXIT ACTION IDENT COLON AVSTOPSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -3594,12 +3670,12 @@ class CUP$AvatarFromSysMLParser$actions {
         theState.setLeft(zxright);
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopStateBegin",107, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stopStateBegin",108, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 144: // sendState ::= sendStateBegin SEMICOLON 
+          case 148: // sendState ::= sendStateBegin SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -3612,12 +3688,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 145: // sendState ::= sendStateBegin EQUAL AVSENDSTATE_T LPAR RPAR SEMICOLON 
+          case 149: // sendState ::= sendStateBegin EQUAL AVSENDSTATE_T LPAR RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3626,12 +3702,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 146: // sendState ::= sendStateBegin EQUAL AVSENDSTATE_T LPAR requestParam RPAR SEMICOLON 
+          case 150: // sendState ::= sendStateBegin EQUAL AVSENDSTATE_T LPAR requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3640,12 +3716,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",67, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 147: // sendStateBegin ::= STATE IDENT COLON AVSENDSTATE_T 
+          case 151: // sendStateBegin ::= STATE IDENT COLON AVSENDSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -3666,12 +3742,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendStateBegin",108, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendStateBegin",109, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 148: // receiveState ::= receiveStateBegin SEMICOLON 
+          case 152: // receiveState ::= receiveStateBegin SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -3684,12 +3760,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 149: // receiveState ::= receiveStateBegin EQUAL AVRECEIVESTATE_T LPAR RPAR SEMICOLON 
+          case 153: // receiveState ::= receiveStateBegin EQUAL AVRECEIVESTATE_T LPAR RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -3702,12 +3778,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 150: // receiveState ::= receiveStateBegin EQUAL AVRECEIVESTATE_T LPAR requestParam RPAR SEMICOLON 
+          case 154: // receiveState ::= receiveStateBegin EQUAL AVRECEIVESTATE_T LPAR requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3716,12 +3792,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",68, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 151: // receiveStateBegin ::= STATE IDENT COLON AVRECEIVESTATE_T 
+          case 155: // receiveStateBegin ::= STATE IDENT COLON AVRECEIVESTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -3742,12 +3818,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveStateBegin",109, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveStateBegin",110, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 152: // randomState ::= randomStateBegin EQUAL AVRANDOMSTATE_T LPAR randomAction COMMA requestParam RPAR SEMICOLON 
+          case 156: // randomState ::= randomStateBegin EQUAL AVRANDOMSTATE_T LPAR randomAction COMMA requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3756,12 +3832,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 153: // randomState ::= randomStateBegin EQUAL AVRANDOMSTATE_T LPAR requestParam COMMA randomAction RPAR SEMICOLON 
+          case 157: // randomState ::= randomStateBegin EQUAL AVRANDOMSTATE_T LPAR requestParam COMMA randomAction RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3770,12 +3846,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 154: // randomState ::= randomStateBegin EQUAL AVRANDOMSTATE_T LPAR randomAction RPAR SEMICOLON 
+          case 158: // randomState ::= randomStateBegin EQUAL AVRANDOMSTATE_T LPAR randomAction RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6)).xleft;
@@ -3788,12 +3864,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",69, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 155: // randomStateBegin ::= STATE IDENT COLON AVRANDOMSTATE_T 
+          case 159: // randomStateBegin ::= STATE IDENT COLON AVRANDOMSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -3814,12 +3890,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomStateBegin",110, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomStateBegin",111, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 156: // countState ::= countStateBegin EQUAL AVCOUNTSTATE_T LPAR countAction RPAR SEMICOLON 
+          case 160: // countState ::= countStateBegin EQUAL AVCOUNTSTATE_T LPAR countAction RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6)).xleft;
@@ -3832,12 +3908,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",71, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 157: // countState ::= countStateBegin EQUAL AVCOUNTSTATE_T LPAR requestParam COMMA countAction RPAR SEMICOLON 
+          case 161: // countState ::= countStateBegin EQUAL AVCOUNTSTATE_T LPAR requestParam COMMA countAction RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3846,12 +3922,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",71, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 158: // countState ::= countStateBegin EQUAL AVCOUNTSTATE_T LPAR countAction COMMA requestParam RPAR SEMICOLON 
+          case 162: // countState ::= countStateBegin EQUAL AVCOUNTSTATE_T LPAR countAction COMMA requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3860,12 +3936,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",70, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countState",71, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 159: // countStateBegin ::= STATE IDENT COLON AVCOUNTSTATE_T 
+          case 163: // countStateBegin ::= STATE IDENT COLON AVCOUNTSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -3886,12 +3962,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countStateBegin",111, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countStateBegin",112, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 160: // presendState ::= presendStateBegin EQUAL AVPRESENDSTATE_T LPAR requestParam RPAR SEMICOLON 
+          case 164: // presendState ::= presendStateBegin EQUAL AVPRESENDSTATE_T LPAR requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3900,12 +3976,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("presendState",71, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("presendState",72, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 161: // presendStateBegin ::= STATE IDENT COLON AVPRESENDSTATE_T 
+          case 165: // presendStateBegin ::= STATE IDENT COLON AVPRESENDSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -3926,12 +4002,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("presendStateBegin",112, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("presendStateBegin",113, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 162: // prereceiveState ::= prereceiveStateBegin EQUAL AVPRERECEIVESTATE_T LPAR requestParam RPAR SEMICOLON 
+          case 166: // prereceiveState ::= prereceiveStateBegin EQUAL AVPRERECEIVESTATE_T LPAR requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3940,12 +4016,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("prereceiveState",72, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("prereceiveState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 163: // prereceiveStateBegin ::= STATE IDENT COLON AVPRERECEIVESTATE_T 
+          case 167: // prereceiveStateBegin ::= STATE IDENT COLON AVPRERECEIVESTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -3966,12 +4042,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("prereceiveStateBegin",113, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("prereceiveStateBegin",114, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 164: // setTimerState ::= setTimerStateBegin EQUAL AVSETTIMERSTATE_T LPAR requestParam RPAR SEMICOLON 
+          case 168: // setTimerState ::= setTimerStateBegin EQUAL AVSETTIMERSTATE_T LPAR requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -3980,12 +4056,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 165: // setTimerState ::= setTimerStateBegin EQUAL AVSETTIMERSTATE_T LPAR RPAR SEMICOLON 
+          case 169: // setTimerState ::= setTimerStateBegin EQUAL AVSETTIMERSTATE_T LPAR RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -3998,12 +4074,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 166: // setTimerState ::= setTimerStateBegin SEMICOLON 
+          case 170: // setTimerState ::= setTimerStateBegin SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -4016,12 +4092,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",73, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 167: // setTimerStateBegin ::= STATE IDENT COLON AVSETTIMERSTATE_T 
+          case 171: // setTimerStateBegin ::= STATE IDENT COLON AVSETTIMERSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -4042,12 +4118,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerStateBegin",114, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerStateBegin",115, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 168: // resetTimerState ::= resetTimerStateBegin EQUAL AVRESETTIMERSTATE_T LPAR requestParam RPAR SEMICOLON 
+          case 172: // resetTimerState ::= resetTimerStateBegin EQUAL AVRESETTIMERSTATE_T LPAR requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -4056,12 +4132,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 169: // resetTimerState ::= resetTimerStateBegin EQUAL AVRESETTIMERSTATE_T LPAR RPAR SEMICOLON 
+          case 173: // resetTimerState ::= resetTimerStateBegin EQUAL AVRESETTIMERSTATE_T LPAR RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -4074,12 +4150,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 170: // resetTimerState ::= resetTimerStateBegin SEMICOLON 
+          case 174: // resetTimerState ::= resetTimerStateBegin SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -4092,12 +4168,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",74, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerState",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 171: // resetTimerStateBegin ::= STATE IDENT COLON AVRESETTIMERSTATE_T 
+          case 175: // resetTimerStateBegin ::= STATE IDENT COLON AVRESETTIMERSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -4118,12 +4194,12 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerStateBegin",115, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerStateBegin",116, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 172: // expireTimerState ::= expireTimerStateBegin EQUAL AVEXPIRETIMERSTATE_T LPAR requestParam RPAR SEMICOLON 
+          case 176: // expireTimerState ::= expireTimerStateBegin EQUAL AVEXPIRETIMERSTATE_T LPAR requestParam RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location qxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -4132,12 +4208,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",76, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 173: // expireTimerState ::= expireTimerStateBegin EQUAL AVEXPIRETIMERSTATE_T LPAR RPAR SEMICOLON 
+          case 177: // expireTimerState ::= expireTimerStateBegin EQUAL AVEXPIRETIMERSTATE_T LPAR RPAR SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -4150,12 +4226,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",76, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 174: // expireTimerState ::= expireTimerStateBegin SEMICOLON 
+          case 178: // expireTimerState ::= expireTimerStateBegin SEMICOLON 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -4168,12 +4244,12 @@ class CUP$AvatarFromSysMLParser$actions {
         tryTrivialRequest(bxleft, qxright);
         theState.setRight(qxright);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",75, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerState",76, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 175: // expireTimerStateBegin ::= STATE IDENT COLON AVEXPIRETIMERSTATE_T 
+          case 179: // expireTimerStateBegin ::= STATE IDENT COLON AVEXPIRETIMERSTATE_T 
             {
               Object RESULT =null;
 		Location zxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -4194,57 +4270,57 @@ class CUP$AvatarFromSysMLParser$actions {
         requestIndex = 0;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerStateBegin",116, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerStateBegin",117, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 176: // poolParam ::= POOL_F EQUAL LPAR requestList RPAR 
+          case 180: // poolParam ::= POOL_F EQUAL LPAR requestList RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("poolParam",76, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("poolParam",77, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 177: // poolParam ::= POOL_F EQUAL request 
+          case 181: // poolParam ::= POOL_F EQUAL request 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("poolParam",76, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("poolParam",77, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 178: // requestParam ::= REQUEST_F EQUAL request 
+          case 182: // requestParam ::= REQUEST_F EQUAL request 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestParam",77, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestParam",78, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 179: // requestList ::= request 
+          case 183: // requestList ::= request 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",78, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",79, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 180: // requestList ::= request COMMA requestList 
+          case 184: // requestList ::= request COMMA requestList 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",78, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",79, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 181: // dummy ::= 
+          case 185: // dummy ::= 
             {
               Object RESULT =null;
 		
@@ -4261,12 +4337,12 @@ class CUP$AvatarFromSysMLParser$actions {
                 okRequest = true;
             }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("dummy",147, CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("dummy",148, CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 182: // request ::= dummy IF iexpr QUEST simpleRequest ELSE NOKREQUEST_U LPAR INT RPAR 
+          case 186: // request ::= dummy IF iexpr QUEST simpleRequest ELSE NOKREQUEST_U LPAR INT RPAR 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8)).xleft;
@@ -4295,12 +4371,12 @@ class CUP$AvatarFromSysMLParser$actions {
         }
         requestIndex++;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("request",79, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("request",80, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-9), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 183: // request ::= dummy simpleRequest 
+          case 187: // request ::= dummy simpleRequest 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -4313,66 +4389,66 @@ class CUP$AvatarFromSysMLParser$actions {
         }
         requestIndex++;
        
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("request",79, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("request",80, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 184: // simpleRequest ::= trivialRequest 
+          case 188: // simpleRequest ::= trivialRequest 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",81, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 185: // simpleRequest ::= sendRequest 
+          case 189: // simpleRequest ::= sendRequest 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",81, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 186: // simpleRequest ::= receiveRequest 
+          case 190: // simpleRequest ::= receiveRequest 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",81, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 187: // simpleRequest ::= setTimerRequest 
+          case 191: // simpleRequest ::= setTimerRequest 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",81, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 188: // simpleRequest ::= resetTimerRequest 
+          case 192: // simpleRequest ::= resetTimerRequest 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",81, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 189: // simpleRequest ::= expireTimerRequest 
+          case 193: // simpleRequest ::= expireTimerRequest 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",80, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("simpleRequest",81, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 190: // trivialRequest ::= IMMEDIATEREQUEST_U 
+          case 194: // trivialRequest ::= IMMEDIATEREQUEST_U 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -4386,21 +4462,21 @@ class CUP$AvatarFromSysMLParser$actions {
         if (okRequest)
             theTransition.setType(AvatarFromSysMLSyntax.STXTRIVIALTRANSITION);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequest",81, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequest",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 191: // trivialRequest ::= trivialRequestBegin requestArgs RPAR 
+          case 195: // trivialRequest ::= trivialRequestBegin requestArgs RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequest",81, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequest",82, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 192: // trivialRequestBegin ::= TRIVIALREQUEST_T LPAR 
+          case 196: // trivialRequestBegin ::= TRIVIALREQUEST_T LPAR 
             {
               Object RESULT =null;
 		
@@ -4408,21 +4484,21 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setType(AvatarFromSysMLSyntax.STXTRIVIALTRANSITION);
     clearRequestArgs();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequestBegin",99, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("trivialRequestBegin",100, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 193: // sendRequest ::= sendRequestBegin requestArgs RPAR 
+          case 197: // sendRequest ::= sendRequestBegin requestArgs RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendRequest",84, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendRequest",85, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 194: // sendRequestBegin ::= SENDREQUEST_T LPAR 
+          case 198: // sendRequestBegin ::= SENDREQUEST_T LPAR 
             {
               Object RESULT =null;
 		
@@ -4430,21 +4506,21 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setType(AvatarFromSysMLSyntax.STXSENDTRANSITION);
     clearRequestArgs();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendRequestBegin",100, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("sendRequestBegin",101, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 195: // receiveRequest ::= receiveRequestBegin requestArgs RPAR 
+          case 199: // receiveRequest ::= receiveRequestBegin requestArgs RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveRequest",85, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveRequest",86, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 196: // receiveRequestBegin ::= RECEIVEREQUEST_T LPAR 
+          case 200: // receiveRequestBegin ::= RECEIVEREQUEST_T LPAR 
             {
               Object RESULT =null;
 		
@@ -4452,21 +4528,21 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setType(AvatarFromSysMLSyntax.STXRECEIVETRANSITION);
     clearRequestArgs();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveRequestBegin",101, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveRequestBegin",102, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 197: // setTimerRequest ::= setTimerRequestBegin requestArgs RPAR 
+          case 201: // setTimerRequest ::= setTimerRequestBegin requestArgs RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerRequest",86, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerRequest",87, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 198: // setTimerRequestBegin ::= SETTIMERREQUEST_T LPAR 
+          case 202: // setTimerRequestBegin ::= SETTIMERREQUEST_T LPAR 
             {
               Object RESULT =null;
 		
@@ -4474,21 +4550,21 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setType(AvatarFromSysMLSyntax.STXSETTIMERTRANSITION);
     clearRequestArgs();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerRequestBegin",102, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("setTimerRequestBegin",103, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 199: // resetTimerRequest ::= resetTimerRequestBegin requestArgs RPAR 
+          case 203: // resetTimerRequest ::= resetTimerRequestBegin requestArgs RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerRequest",87, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerRequest",88, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 200: // resetTimerRequestBegin ::= RESETTIMERREQUEST_T LPAR 
+          case 204: // resetTimerRequestBegin ::= RESETTIMERREQUEST_T LPAR 
             {
               Object RESULT =null;
 		
@@ -4496,21 +4572,21 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setType(AvatarFromSysMLSyntax.STXRESETTIMERTRANSITION);
     clearRequestArgs();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerRequestBegin",103, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resetTimerRequestBegin",104, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 201: // expireTimerRequest ::= expireTimerRequestBegin requestArgs RPAR 
+          case 205: // expireTimerRequest ::= expireTimerRequestBegin requestArgs RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerRequest",88, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerRequest",89, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 202: // expireTimerRequestBegin ::= EXPIRETIMERREQUEST_T LPAR 
+          case 206: // expireTimerRequestBegin ::= EXPIRETIMERREQUEST_T LPAR 
             {
               Object RESULT =null;
 		
@@ -4518,93 +4594,93 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setType(AvatarFromSysMLSyntax.STXEXPIRETIMERTRANSITION);
     clearRequestArgs();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerRequestBegin",104, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expireTimerRequestBegin",105, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 203: // requestArgs ::= requestArg 
+          case 207: // requestArgs ::= requestArg 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArgs",82, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArgs",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 204: // requestArgs ::= requestArg COMMA requestArgs 
+          case 208: // requestArgs ::= requestArg COMMA requestArgs 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArgs",82, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArgs",83, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 205: // requestArg ::= indexParam 
+          case 209: // requestArg ::= indexParam 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",84, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 206: // requestArg ::= delayParam 
+          case 210: // requestArg ::= delayParam 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",84, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 207: // requestArg ::= channelParam 
+          case 211: // requestArg ::= channelParam 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",84, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 208: // requestArg ::= payloadParam 
+          case 212: // requestArg ::= payloadParam 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",84, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 209: // requestArg ::= settimerParam 
+          case 213: // requestArg ::= settimerParam 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",84, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 210: // requestArg ::= resettimerParam 
+          case 214: // requestArg ::= resettimerParam 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",84, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 211: // requestArg ::= expiretimerParam 
+          case 215: // requestArg ::= expiretimerParam 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",83, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestArg",84, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 212: // indexParam ::= INDEX_F EQUAL INT 
+          case 216: // indexParam ::= INDEX_F EQUAL INT 
             {
               Object RESULT =null;
 		Location fxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -4621,21 +4697,21 @@ class CUP$AvatarFromSysMLParser$actions {
         null));
     if (indexArg == null) indexArg = fxleft;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("indexParam",89, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("indexParam",90, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 213: // delayParam ::= delayKeyword EQUAL delayExpr 
+          case 217: // delayParam ::= delayKeyword EQUAL delayExpr 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayParam",90, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayParam",91, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 214: // delayKeyword ::= DELAY_F 
+          case 218: // delayKeyword ::= DELAY_F 
             {
               Object RESULT =null;
 		Location dxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -4651,33 +4727,33 @@ class CUP$AvatarFromSysMLParser$actions {
         argOK = true;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayKeyword",146, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayKeyword",147, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 215: // delayExpr ::= iexpr 
+          case 219: // delayExpr ::= iexpr 
             {
               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();
 		 if (argOK && okRequest) theTransition.setMinDelay(e); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayExpr",91, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayExpr",92, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 216: // delayExpr ::= delayRandomExpr 
+          case 220: // delayExpr ::= delayRandomExpr 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayExpr",91, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayExpr",92, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 217: // delayRandomExpr ::= BOUNDRANDOM_U LPAR iexpr COMMA iexpr RPAR 
+          case 221: // delayRandomExpr ::= BOUNDRANDOM_U LPAR iexpr COMMA iexpr RPAR 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -4692,12 +4768,12 @@ class CUP$AvatarFromSysMLParser$actions {
             theTransition.setMaxDelay(a);
         }
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayRandomExpr",93, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("delayRandomExpr",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 218: // payloadParam ::= payloadParamBegin IDENT LPAR termList RPAR 
+          case 222: // payloadParam ::= payloadParamBegin IDENT LPAR termList RPAR 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -4712,12 +4788,12 @@ class CUP$AvatarFromSysMLParser$actions {
         }
         argList = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",95, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 219: // payloadParam ::= payloadParamBegin IDENT LPAR RPAR 
+          case 223: // payloadParam ::= payloadParamBegin IDENT LPAR RPAR 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -4732,12 +4808,12 @@ class CUP$AvatarFromSysMLParser$actions {
        }
        argList = null;
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",95, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 220: // payloadParam ::= payloadParamBegin IDENT 
+          case 224: // payloadParam ::= payloadParamBegin IDENT 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -4752,12 +4828,12 @@ class CUP$AvatarFromSysMLParser$actions {
        }
        argList = null;
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",95, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 221: // payloadParam ::= payloadParamBegin TIMERSETMSG_T LPAR stxExpr RPAR 
+          case 225: // payloadParam ::= payloadParamBegin TIMERSETMSG_T LPAR stxExpr RPAR 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -4776,12 +4852,12 @@ class CUP$AvatarFromSysMLParser$actions {
         }
         argList = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",95, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 222: // payloadParam ::= payloadParamBegin TIMERRESETMSG_T LPAR RPAR 
+          case 226: // payloadParam ::= payloadParamBegin TIMERRESETMSG_T LPAR RPAR 
             {
               Object RESULT =null;
 		Location bxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -4796,12 +4872,12 @@ class CUP$AvatarFromSysMLParser$actions {
         }
         argList = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",94, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParam",95, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 223: // payloadParamBegin ::= PAYLOAD_F EQUAL 
+          case 227: // payloadParamBegin ::= PAYLOAD_F EQUAL 
             {
               Object RESULT =null;
 		Location pxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -4818,12 +4894,12 @@ class CUP$AvatarFromSysMLParser$actions {
         argList= new ArrayList<StxTerm>();
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParamBegin",118, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("payloadParamBegin",119, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 224: // channelParam ::= CHANNEL_F EQUAL IDENT 
+          case 228: // channelParam ::= CHANNEL_F EQUAL IDENT 
             {
               Object RESULT =null;
 		Location cxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -4847,12 +4923,12 @@ class CUP$AvatarFromSysMLParser$actions {
        channelArg = cxleft;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelParam",95, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("channelParam",96, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 225: // settimerParam ::= CHANNEL_F EQUAL IDENT POINT SET_TM 
+          case 229: // settimerParam ::= CHANNEL_F EQUAL IDENT POINT SET_TM 
             {
               Object RESULT =null;
 		Location cxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -4872,12 +4948,12 @@ class CUP$AvatarFromSysMLParser$actions {
         settimerArg = cxleft;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("settimerParam",96, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("settimerParam",97, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 226: // resettimerParam ::= CHANNEL_F EQUAL IDENT POINT RESET_TM 
+          case 230: // resettimerParam ::= CHANNEL_F EQUAL IDENT POINT RESET_TM 
             {
               Object RESULT =null;
 		Location cxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -4897,12 +4973,12 @@ class CUP$AvatarFromSysMLParser$actions {
         resettimerArg = cxleft;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resettimerParam",97, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("resettimerParam",98, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 227: // expiretimerParam ::= CHANNEL_F EQUAL IDENT POINT EXPIRE_TM 
+          case 231: // expiretimerParam ::= CHANNEL_F EQUAL IDENT POINT EXPIRE_TM 
             {
               Object RESULT =null;
 		Location cxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -4922,76 +4998,76 @@ class CUP$AvatarFromSysMLParser$actions {
         expiretimerArg = cxleft;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expiretimerParam",98, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expiretimerParam",99, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 228: // termList ::= stxRvalue 
+          case 232: // termList ::= stxRvalue 
             {
               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;
 		StxTerm e = CUP$AvatarFromSysMLParser$stack.peek().<StxTerm>value();
 		 argList.add(e); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("termList",128, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("termList",129, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 229: // termList ::= termList COMMA stxRvalue 
+          case 233: // termList ::= termList COMMA stxRvalue 
             {
               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;
 		StxTerm e = CUP$AvatarFromSysMLParser$stack.peek().<StxTerm>value();
 		 argList.add(e); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("termList",128, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("termList",129, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 230: // randomAction ::= STATEACTION_F EQUAL ASSIGNMENT_T LPAR targetParam COMMA randomParam RPAR 
+          case 234: // randomAction ::= STATEACTION_F EQUAL ASSIGNMENT_T LPAR targetParam COMMA randomParam RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomAction",119, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomAction",120, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 231: // randomAction ::= STATEACTION_F EQUAL ASSIGNMENT_T LPAR randomParam COMMA targetParam RPAR 
+          case 235: // randomAction ::= STATEACTION_F EQUAL ASSIGNMENT_T LPAR randomParam COMMA targetParam RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomAction",119, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomAction",120, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 232: // targetParam ::= target EQUAL fullIdent 
+          case 236: // targetParam ::= target EQUAL fullIdent 
             {
               Object RESULT =null;
 		
     theState.setVariable(stringAcc.toString());
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("targetParam",120, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("targetParam",121, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 233: // target ::= TARGET_F 
+          case 237: // target ::= TARGET_F 
             {
               Object RESULT =null;
 		
     stringAcc = new StringBuffer();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("target",134, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("target",135, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 234: // fullIdent ::= IDENT 
+          case 238: // fullIdent ::= IDENT 
             {
               Object RESULT =null;
 		Location idxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -5000,12 +5076,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         stringAcc.append(id.getAvatarName());
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fullIdent",135, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fullIdent",136, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 235: // fullIdent ::= fullIdent POINT IDENT 
+          case 239: // fullIdent ::= fullIdent POINT IDENT 
             {
               Object RESULT =null;
 		Location idxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -5014,21 +5090,21 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         stringAcc.append("." + id.getAvatarName());
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fullIdent",135, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("fullIdent",136, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 236: // randomParam ::= VALUE_F EQUAL actionRandomExpr 
+          case 240: // randomParam ::= VALUE_F EQUAL actionRandomExpr 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomParam",121, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("randomParam",122, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 237: // actionRandomExpr ::= BOUNDRANDOM_U LPAR iexpr COMMA iexpr RPAR 
+          case 241: // actionRandomExpr ::= BOUNDRANDOM_U LPAR iexpr COMMA iexpr RPAR 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -5041,30 +5117,30 @@ class CUP$AvatarFromSysMLParser$actions {
         theState.setMinValue(i);
         theState.setMaxValue(a);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionRandomExpr",92, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionRandomExpr",93, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 238: // countAction ::= STATEACTION_F EQUAL ASSIGNMENT_T LPAR targetParam COMMA countParam RPAR 
+          case 242: // countAction ::= STATEACTION_F EQUAL ASSIGNMENT_T LPAR targetParam COMMA countParam RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countAction",122, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countAction",123, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 239: // countAction ::= STATEACTION_F EQUAL ASSIGNMENT_T LPAR countParam COMMA targetParam RPAR 
+          case 243: // countAction ::= STATEACTION_F EQUAL ASSIGNMENT_T LPAR countParam COMMA targetParam RPAR 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countAction",122, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countAction",123, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 240: // countParam ::= VALUE_F EQUAL IDENT POINT AMOUNT_U LPAR RPAR 
+          case 244: // countParam ::= VALUE_F EQUAL IDENT POINT AMOUNT_U LPAR RPAR 
             {
               Object RESULT =null;
 		Location idxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -5074,12 +5150,12 @@ class CUP$AvatarFromSysMLParser$actions {
     getSignal(theBlock.getName(),id.getAvatarName());
     theState.setSignal(theSignal);
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countParam",123, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("countParam",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 241: // transition ::= transitionBegin THEN IDENT SEMICOLON 
+          case 245: // transition ::= transitionBegin THEN IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location txleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -5097,12 +5173,12 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setLeft(txleft);
         theTransition.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 242: // transition ::= transitionBegin doActions THEN IDENT SEMICOLON 
+          case 246: // transition ::= transitionBegin doActions THEN IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location txleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -5120,12 +5196,12 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setLeft(txleft);
         theTransition.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 243: // transition ::= transitionBegin THEN IDENT LBRAC transitionLabels RBRAC 
+          case 247: // transition ::= transitionBegin THEN IDENT LBRAC transitionLabels RBRAC 
             {
               Object RESULT =null;
 		Location txleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -5145,12 +5221,12 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setLeft(txleft);
         theTransition.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 244: // transition ::= transitionBegin doActions THEN IDENT LBRAC transitionLabels RBRAC 
+          case 248: // transition ::= transitionBegin doActions THEN IDENT LBRAC transitionLabels RBRAC 
             {
               Object RESULT =null;
 		Location txleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6)).xleft;
@@ -5170,12 +5246,12 @@ class CUP$AvatarFromSysMLParser$actions {
         theTransition.setLeft(txleft);
         theTransition.setRight(qxright);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",124, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transition",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-6), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 245: // transitionBegin ::= TRANSITION COLON AVTRANSITION_T FIRST IDENT 
+          case 249: // transitionBegin ::= TRANSITION COLON AVTRANSITION_T FIRST IDENT 
             {
               Object RESULT =null;
 		Location txleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -5192,12 +5268,12 @@ class CUP$AvatarFromSysMLParser$actions {
                 "transition with same index has already been declared", null));
         clearTransitionLbls();
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionBegin",129, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionBegin",130, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 246: // transitionBegin ::= TRANSITION COLON AVTRANSITION_T FIRST IDENT IF INDEX_F EQ INT 
+          case 250: // transitionBegin ::= TRANSITION COLON AVTRANSITION_T FIRST IDENT IF INDEX_F EQ INT 
             {
               Object RESULT =null;
 		Location txleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8)).xleft;
@@ -5217,112 +5293,112 @@ class CUP$AvatarFromSysMLParser$actions {
                 "transition with same index has already been declared", null));
        clearTransitionLbls();
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionBegin",129, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionBegin",130, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 247: // doActions ::= transitionActionBegin LBRAC RBRAC 
+          case 251: // doActions ::= transitionActionBegin LBRAC RBRAC 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 248: // doActions ::= transitionActionBegin LBRAC transitionAction RBRAC 
+          case 252: // doActions ::= transitionActionBegin LBRAC transitionAction RBRAC 
             {
               Object RESULT =null;
 		
             theTransition.setActions(actionList);
             actionList = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 249: // doActions ::= receiveActionBegin LBRAC RBRAC 
+          case 253: // doActions ::= receiveActionBegin LBRAC RBRAC 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 250: // doActions ::= receiveActionBegin LBRAC receiveAction RBRAC 
+          case 254: // doActions ::= receiveActionBegin LBRAC receiveAction RBRAC 
             {
               Object RESULT =null;
 		
             theTransition.setReceivePayload(receiveMap);
             receiveMap = null;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",125, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("doActions",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 251: // transitionActionBegin ::= DO ACTION COLON TRANSITIONACTION_T 
+          case 255: // transitionActionBegin ::= DO ACTION COLON TRANSITIONACTION_T 
             {
               Object RESULT =null;
 		
      actionList = new ArrayList<StxAction>();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionActionBegin",136, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionActionBegin",137, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 252: // receiveActionBegin ::= DO ACTION COLON RECEIVEACTION_T 
+          case 256: // receiveActionBegin ::= DO ACTION COLON RECEIVEACTION_T 
             {
               Object RESULT =null;
 		
      receiveMap = new HashMap<String,String>();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveActionBegin",137, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveActionBegin",138, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 253: // transitionAction ::= FIRST START_U SEMICOLON THEN DONE_U SEMICOLON 
+          case 257: // transitionAction ::= FIRST START_U SEMICOLON THEN DONE_U SEMICOLON 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionAction",131, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionAction",132, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 254: // transitionAction ::= FIRST START_U SEMICOLON actionSeq 
+          case 258: // transitionAction ::= FIRST START_U SEMICOLON actionSeq 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionAction",131, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionAction",132, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 255: // actionSeq ::= THEN act THEN DONE_U SEMICOLON 
+          case 259: // actionSeq ::= THEN act THEN DONE_U SEMICOLON 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionSeq",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionSeq",127, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 256: // actionSeq ::= THEN act actionSeq 
+          case 260: // actionSeq ::= THEN act actionSeq 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionSeq",126, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("actionSeq",127, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 257: // act ::= assign fulllIdent GETS stxRvalue SEMICOLON 
+          case 261: // 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;
@@ -5340,12 +5416,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         actionList.add(new StxAction(axleft, qxright, id , v));
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("act",127, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("act",128, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 258: // act ::= ACTION EQUAL stxCall SEMICOLON 
+          case 262: // act ::= ACTION EQUAL stxCall SEMICOLON 
             {
               Object RESULT =null;
 		Location axleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3)).xleft;
@@ -5360,12 +5436,12 @@ class CUP$AvatarFromSysMLParser$actions {
 		
         actionList.add(new StxAction(axleft, qxright, c));
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("act",127, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("act",128, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 259: // fulllIdent ::= fullIdent 
+          case 263: // fulllIdent ::= fullIdent 
             {
               String RESULT =null;
 		
@@ -5377,81 +5453,81 @@ class CUP$AvatarFromSysMLParser$actions {
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 260: // assign ::= ASSIGN 
+          case 264: // assign ::= ASSIGN 
             {
               Object RESULT =null;
 		
     stringAcc = new StringBuffer();
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("assign",133, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("assign",134, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 261: // receiveAction ::= messageLine receiveAssigns 
+          case 265: // receiveAction ::= messageLine receiveAssigns 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAction",132, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAction",133, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 262: // receiveAction ::= receiveAssigns messageLine 
+          case 266: // receiveAction ::= receiveAssigns messageLine 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAction",132, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAction",133, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 263: // messageLine ::= ITEM MSG_U COLON IDENT EQUAL PAYLOAD_F AS IDENT SEMICOLON 
+          case 267: // messageLine ::= ITEM MSG_U COLON IDENT EQUAL PAYLOAD_F AS IDENT SEMICOLON 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageLine",138, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("messageLine",139, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-8), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 264: // receiveAssigns ::= FIRST START_U SEMICOLON THEN DONE_U SEMICOLON 
+          case 268: // receiveAssigns ::= FIRST START_U SEMICOLON THEN DONE_U SEMICOLON 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssigns",139, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssigns",140, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 265: // receiveAssigns ::= FIRST START_U SEMICOLON receiveAssignSeq 
+          case 269: // receiveAssigns ::= FIRST START_U SEMICOLON receiveAssignSeq 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssigns",139, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssigns",140, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 266: // receiveAssignSeq ::= receiveAssign THEN DONE_U SEMICOLON 
+          case 270: // receiveAssignSeq ::= receiveAssign THEN DONE_U SEMICOLON 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssignSeq",140, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssignSeq",141, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 267: // receiveAssignSeq ::= receiveAssign receiveAssignSeq 
+          case 271: // receiveAssignSeq ::= receiveAssign receiveAssignSeq 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssignSeq",140, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssignSeq",141, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 268: // receiveAssign ::= THEN assign fullIdent GETS MSG_U POINT IDENT SEMICOLON 
+          case 272: // receiveAssign ::= THEN assign fullIdent GETS MSG_U POINT IDENT SEMICOLON 
             {
               Object RESULT =null;
 		Location txleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7)).xleft;
@@ -5467,57 +5543,57 @@ class CUP$AvatarFromSysMLParser$actions {
         addError(new AvatarFromSysMLError(AvatarFromSysMLError.LOWERROR, txleft,
             "component " + id.getAvatarName() + " has already been assigned", null));
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssign",141, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("receiveAssign",142, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-7), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 269: // transitionLabels ::= transitionLabel SEMICOLON 
+          case 273: // transitionLabels ::= transitionLabel SEMICOLON 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabels",130, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabels",131, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 270: // transitionLabels ::= transitionLabel SEMICOLON transitionLabels 
+          case 274: // transitionLabels ::= transitionLabel SEMICOLON transitionLabels 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabels",130, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabels",131, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 271: // transitionLabel ::= distributionLabel 
+          case 275: // transitionLabel ::= distributionLabel 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",142, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",143, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 272: // transitionLabel ::= weightLabel 
+          case 276: // transitionLabel ::= weightLabel 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",142, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",143, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 273: // transitionLabel ::= extraLabel 
+          case 277: // transitionLabel ::= extraLabel 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",142, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("transitionLabel",143, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 274: // distributionLabel ::= ATTRIBUTE DISTRIBUTION_A COLON STRING_T EQUAL STRING 
+          case 278: // distributionLabel ::= ATTRIBUTE DISTRIBUTION_A COLON STRING_T EQUAL STRING 
             {
               Object RESULT =null;
 		Location axleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -5535,12 +5611,12 @@ class CUP$AvatarFromSysMLParser$actions {
         distributionLbl = axleft;
     }
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("distributionLabel",143, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("distributionLabel",144, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 275: // weightLabel ::= ATTRIBUTE WEIGHT_A COLON REAL_T EQUAL REAL 
+          case 279: // weightLabel ::= ATTRIBUTE WEIGHT_A COLON REAL_T EQUAL REAL 
             {
               Object RESULT =null;
 		Location axleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -5558,12 +5634,12 @@ class CUP$AvatarFromSysMLParser$actions {
             weightLbl = axleft;
         }
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("weightLabel",144, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("weightLabel",145, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 276: // weightLabel ::= ATTRIBUTE WEIGHT_A COLON REAL_T EQUAL INT 
+          case 280: // weightLabel ::= ATTRIBUTE WEIGHT_A COLON REAL_T EQUAL INT 
             {
               Object RESULT =null;
 		Location axleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5)).xleft;
@@ -5581,12 +5657,12 @@ class CUP$AvatarFromSysMLParser$actions {
             weightLbl = axleft;
         }
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("weightLabel",144, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("weightLabel",145, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 277: // extraLabel ::= ATTRIBUTE ANYNAME COLON STRING_T EQUAL STRING 
+          case 281: // 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;
@@ -5600,12 +5676,12 @@ class CUP$AvatarFromSysMLParser$actions {
             delayExtraMap = new HashMap<String,String>();
         delayExtraMap.put(n,s);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("extraLabel",145, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("extraLabel",146, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 278: // extraLabel ::= ATTRIBUTE IDENT COLON STRING_T EQUAL STRING 
+          case 282: // extraLabel ::= ATTRIBUTE IDENT COLON STRING_T EQUAL STRING 
             {
               Object RESULT =null;
 		Location nxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-4)).xleft;
@@ -5619,84 +5695,84 @@ class CUP$AvatarFromSysMLParser$actions {
             delayExtraMap = new HashMap<String,String>();
         delayExtraMap.put(n.getAvatarName(),s);
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("extraLabel",145, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("extraLabel",146, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-5), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 279: // stxRvalue ::= stxCall 
+          case 283: // 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",148, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxRvalue",149, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 280: // stxRvalue ::= expr 
+          case 284: // 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",148, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxRvalue",149, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 281: // stxRvalue ::= complexIdent 
+          case 285: // 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",148, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxRvalue",149, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 282: // stxExpr ::= iexpr 
+          case 286: // 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",149, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxExpr",150, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 283: // iexpr ::= expr 
+          case 287: // 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",151, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("iexpr",152, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 284: // iexpr ::= complexIdent 
+          case 288: // 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",151, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("iexpr",152, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 285: // expr ::= iexpr PLUS iexpr 
+          case 289: // expr ::= iexpr PLUS iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5706,12 +5782,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 286: // expr ::= iexpr MINUS iexpr 
+          case 290: // expr ::= iexpr MINUS iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5721,12 +5797,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 287: // expr ::= iexpr MULT iexpr 
+          case 291: // expr ::= iexpr MULT iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5736,12 +5812,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 288: // expr ::= iexpr DIV iexpr 
+          case 292: // expr ::= iexpr DIV iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5751,12 +5827,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 289: // expr ::= iexpr MOD iexpr 
+          case 293: // expr ::= iexpr MOD iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5766,24 +5842,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 290: // expr ::= MINUS iexpr 
+          case 294: // 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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 291: // expr ::= iexpr OR iexpr 
+          case 295: // expr ::= iexpr OR iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5793,12 +5869,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 292: // expr ::= iexpr AND iexpr 
+          case 296: // expr ::= iexpr AND iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5808,24 +5884,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 293: // expr ::= NOT iexpr 
+          case 297: // 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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 294: // expr ::= iexpr LT iexpr 
+          case 298: // expr ::= iexpr LT iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5835,12 +5911,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 295: // expr ::= iexpr GT iexpr 
+          case 299: // expr ::= iexpr GT iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5850,12 +5926,33 @@ 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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
+          /* . . . . . .*/
+          default:
+            throw new Exception(
+               "Invalid action number "+CUP$AvatarFromSysMLParser$act_num+"found in internal parse table");
+
+        }
+    } /* end of method */
+  /** Method 1 with the actual generated action code for actions 300 to 600. */
+  public final java_cup.runtime.Symbol CUP$AvatarFromSysMLParser$do_action_part00000001(
+    int                        CUP$AvatarFromSysMLParser$act_num,
+    java_cup.runtime.lr_parser CUP$AvatarFromSysMLParser$parser,
+    java.util.Stack<java_cup.runtime.Symbol>    CUP$AvatarFromSysMLParser$stack,
+    int                        CUP$AvatarFromSysMLParser$top)
+    throws java.lang.Exception
+    {
+      /* Symbol object for return from actions */
+      java_cup.runtime.Symbol CUP$AvatarFromSysMLParser$result;
+
+      /* select the action based on the action number */
+      switch (CUP$AvatarFromSysMLParser$act_num)
+        {
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 296: // expr ::= iexpr LEQ iexpr 
+          case 300: // expr ::= iexpr LEQ iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5865,12 +5962,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 297: // expr ::= iexpr GEQ iexpr 
+          case 301: // expr ::= iexpr GEQ iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5880,12 +5977,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 298: // expr ::= iexpr EQ iexpr 
+          case 302: // expr ::= iexpr EQ iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5895,12 +5992,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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 299: // expr ::= iexpr DIF iexpr 
+          case 303: // expr ::= iexpr DIF iexpr 
             {
               String RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5910,81 +6007,60 @@ 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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
-          /* . . . . . .*/
-          default:
-            throw new Exception(
-               "Invalid action number "+CUP$AvatarFromSysMLParser$act_num+"found in internal parse table");
-
-        }
-    } /* end of method */
-  /** Method 1 with the actual generated action code for actions 300 to 600. */
-  public final java_cup.runtime.Symbol CUP$AvatarFromSysMLParser$do_action_part00000001(
-    int                        CUP$AvatarFromSysMLParser$act_num,
-    java_cup.runtime.lr_parser CUP$AvatarFromSysMLParser$parser,
-    java.util.Stack<java_cup.runtime.Symbol>    CUP$AvatarFromSysMLParser$stack,
-    int                        CUP$AvatarFromSysMLParser$top)
-    throws java.lang.Exception
-    {
-      /* Symbol object for return from actions */
-      java_cup.runtime.Symbol CUP$AvatarFromSysMLParser$result;
-
-      /* select the action based on the action number */
-      switch (CUP$AvatarFromSysMLParser$act_num)
-        {
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 300: // expr ::= LPAR iexpr RPAR 
+          case 304: // 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",152, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 301: // expr ::= INT 
+          case 305: // 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",152, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 302: // expr ::= BOOL 
+          case 306: // 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",152, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("expr",153, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 303: // complexIdent ::= IDENT 
+          case 307: // 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",153, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("complexIdent",154, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 304: // complexIdent ::= IDENT POINT complexIdent 
+          case 308: // complexIdent ::= IDENT POINT complexIdent 
             {
               String RESULT =null;
 		Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
@@ -5994,24 +6070,24 @@ class CUP$AvatarFromSysMLParser$actions {
 		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",153, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("complexIdent",154, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 305: // stxCall ::= stxCallBegin RPAR 
+          case 309: // stxCall ::= stxCallBegin RPAR 
             {
               StxCall RESULT =null;
 		
         theCall.addSegment(stringAcc.toString() + ")");
         RESULT = theCall;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCall",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCall",151, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 306: // stxCall ::= stxCallBegin stxCallParams RPAR 
+          case 310: // stxCall ::= stxCallBegin stxCallParams RPAR 
             {
               StxCall RESULT =null;
 		Location lxleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -6021,12 +6097,12 @@ class CUP$AvatarFromSysMLParser$actions {
         theCall.addSegment(stringAcc.toString() + ")");
         RESULT = theCall;
       
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCall",150, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCall",151, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 307: // stxCallBegin ::= IDENT LPAR 
+          case 311: // stxCallBegin ::= IDENT LPAR 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -6036,51 +6112,51 @@ class CUP$AvatarFromSysMLParser$actions {
     theCall = new StxCall();
     stringAcc = new StringBuffer(i.getAvatarName() + "(");
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallBegin",154, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallBegin",155, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 308: // stxCallParams ::= stxCallParam 
+          case 312: // stxCallParams ::= stxCallParam 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParams",159, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParams",160, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 309: // stxCallParams ::= stxCallParam comma stxCallParams 
+          case 313: // stxCallParams ::= stxCallParam comma stxCallParams 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParams",159, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParams",160, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 310: // comma ::= COMMA 
+          case 314: // comma ::= COMMA 
             {
               Object RESULT =null;
 		 stringAcc.append(", "); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("comma",156, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("comma",157, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 311: // stxCallParam ::= expr 
+          case 315: // 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",155, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",156, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 312: // stxCallParam ::= complexIdent 
+          case 316: // stxCallParam ::= complexIdent 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xleft;
@@ -6091,42 +6167,42 @@ class CUP$AvatarFromSysMLParser$actions {
         theCall.addIdent(i);
         stringAcc.setLength(0);
      
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",155, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",156, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 313: // stxCallParam ::= call 
+          case 317: // stxCallParam ::= call 
             {
               Object RESULT =null;
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",155, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("stxCallParam",156, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 314: // call ::= callBegin RPAR 
+          case 318: // call ::= callBegin RPAR 
             {
               Object RESULT =null;
 		 stringAcc.append(")"); 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("call",157, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("call",158, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 315: // call ::= stxCallBegin stxCallParams RPAR 
+          case 319: // 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",157, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("call",158, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
             }
           return CUP$AvatarFromSysMLParser$result;
 
           /*. . . . . . . . . . . . . . . . . . . .*/
-          case 316: // callBegin ::= IDENT LPAR 
+          case 320: // callBegin ::= IDENT LPAR 
             {
               Object RESULT =null;
 		Location ixleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1)).xleft;
@@ -6135,7 +6211,7 @@ class CUP$AvatarFromSysMLParser$actions {
 		
     stringAcc.append(i.getAvatarName() + "(");
 
-              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("callBegin",158, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+              CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("callBegin",159, 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 702210f13f..6519821a7a 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSymbols.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSymbols.java
@@ -470,165 +470,166 @@ public class AvatarFromSysMLSymbols {
   };
 
   /* non terminals */
-  static final int receiveRequestBegin = 101;
+  static final int receiveRequestBegin = 102;
   static final int privateParam = 21;
-  static final int startStateBegin = 105;
-  static final int call = 157;
-  static final int receiveAssign = 141;
+  static final int startStateBegin = 106;
+  static final int call = 158;
+  static final int receiveAssign = 142;
   static final int specializes = 5;
   static final int calcMethodDeclBegin = 61;
-  static final int receiveStateBegin = 109;
+  static final int receiveStateBegin = 110;
   static final int messageChannel = 38;
-  static final int transitionActionBegin = 136;
+  static final int transitionActionBegin = 137;
   static final int block2Param = 20;
-  static final int standardState = 65;
-  static final int stxCallParams = 159;
+  static final int standardState = 66;
+  static final int stxCallParams = 160;
   static final int featureList = 3;
-  static final int presendState = 71;
+  static final int presendState = 72;
   static final int inSignalBinding = 32;
   static final int blockAlias = 7;
   static final int blockChain = 8;
-  static final int receiveAction = 132;
+  static final int receiveAction = 133;
   static final int typeIdent = 0;
-  static final int actionRandomExpr = 92;
-  static final int prereceiveStateBegin = 113;
+  static final int actionRandomExpr = 93;
+  static final int prereceiveStateBegin = 114;
   static final int relParam = 18;
   static final int calcMethodDecl = 52;
   static final int bfChDecl = 30;
-  static final int stopStateBegin = 107;
+  static final int stopStateBegin = 108;
   static final int signalBinding = 31;
-  static final int receiveAssignSeq = 140;
-  static final int stxCallParam = 155;
+  static final int receiveAssignSeq = 141;
+  static final int stxCallParam = 156;
   static final int fieldDecl = 12;
-  static final int setTimerState = 73;
+  static final int setTimerState = 74;
   static final int stateMachineItem = 59;
-  static final int trivialRequestBegin = 99;
-  static final int delayKeyword = 146;
-  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 trivialRequestBegin = 100;
+  static final int delayKeyword = 147;
+  static final int weightLabel = 145;
+  static final int messageLine = 139;
+  static final int randomParam = 122;
+  static final int indexParam = 90;
+  static final int fullIdent = 136;
   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 presendStateBegin = 113;
+  static final int countState = 71;
   static final int outMessageDecl = 36;
-  static final int act = 127;
-  static final int sendStateBegin = 108;
+  static final int act = 128;
+  static final int sendStateBegin = 109;
   static final int attributeDecl = 47;
   static final int fieldDecls = 11;
   static final int maxsizeParam = 22;
-  static final int doActions = 125;
+  static final int doActions = 126;
   static final int voidMethodDeclBegin = 60;
-  static final int randomStateBegin = 110;
+  static final int randomStateBegin = 111;
   static final int lossyParam = 23;
-  static final int target = 134;
-  static final int sendRequestBegin = 100;
+  static final int target = 135;
+  static final int sendRequestBegin = 101;
   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 requestParam = 78;
+  static final int payloadParam = 95;
+  static final int startState = 65;
+  static final int assign = 134;
+  static final int simpleRequest = 81;
   static final int messageDecl = 34;
   static final int datatypeDeclHEADER = 10;
-  static final int expr = 152;
-  static final int stopState = 66;
-  static final int randomAction = 119;
+  static final int expr = 153;
+  static final int stopState = 67;
+  static final int randomAction = 120;
   static final int calcMethodItem = 54;
   static final int voidMethodDecl = 51;
-  static final int receiveState = 68;
+  static final int receiveState = 69;
   static final int feature = 4;
   static final int bfRelDeclBegin = 26;
-  static final int poolParam = 76;
+  static final int poolParam = 77;
   static final int inMessageDeclBegin = 41;
-  static final int sendRequest = 84;
+  static final int sendRequest = 85;
   static final int nbfRelDeclBegin = 25;
-  static final int expireTimerRequestBegin = 104;
+  static final int expireTimerRequestBegin = 105;
   static final int calcMethodItems = 53;
-  static final int setTimerRequest = 86;
+  static final int setTimerRequest = 87;
   static final int redefineField = 40;
   static final int blockDeclBegin = 44;
-  static final int dummy = 147;
+  static final int dummy = 148;
   static final int constantDeclHEADER = 62;
   static final int blockDeclBODY = 45;
-  static final int trivialRequest = 81;
-  static final int stxCall = 150;
-  static final int countAction = 122;
-  static final int expireTimerStateBegin = 116;
+  static final int trivialRequest = 82;
+  static final int stxCall = 151;
+  static final int countAction = 123;
+  static final int expireTimerStateBegin = 117;
   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 = 156;
-  static final int delayParam = 90;
+  static final int transitionLabels = 131;
+  static final int comma = 157;
+  static final int delayParam = 91;
   static final int relParams = 17;
-  static final int targetParam = 120;
-  static final int actionSeq = 126;
-  static final int resetTimerRequest = 87;
+  static final int targetParam = 121;
+  static final int actionSeq = 127;
+  static final int resetTimerRequest = 88;
   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 expireTimerRequest = 89;
+  static final int fieldVal = 63;
+  static final int termList = 129;
+  static final int receiveActionBegin = 138;
+  static final int randomState = 70;
+  static final int expiretimerParam = 99;
   static final int constantDecl = 48;
-  static final int extraLabel = 145;
-  static final int distributionLabel = 143;
-  static final int state = 63;
+  static final int extraLabel = 146;
+  static final int distributionLabel = 144;
+  static final int state = 64;
   static final int stateMachine = 57;
-  static final int resetTimerStateBegin = 115;
-  static final int requestArg = 83;
+  static final int resetTimerStateBegin = 116;
+  static final int requestArg = 84;
   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 standardStateBegin = 107;
+  static final int delayRandomExpr = 94;
   static final int methodDecl = 50;
-  static final int resettimerParam = 97;
+  static final int resettimerParam = 98;
   static final int outMessageDeclBODY = 39;
-  static final int payloadParamBegin = 118;
-  static final int receiveRequest = 85;
+  static final int payloadParamBegin = 119;
+  static final int receiveRequest = 86;
   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 transition = 125;
+  static final int resetTimerRequestBegin = 104;
+  static final int channelParam = 96;
+  static final int transitionBegin = 130;
   static final int timerDecl = 56;
-  static final int transitionAction = 131;
-  static final int stxRvalue = 148;
-  static final int sendState = 67;
+  static final int transitionAction = 132;
+  static final int stxRvalue = 149;
+  static final int sendState = 68;
   static final int block1Param = 19;
-  static final int complexIdent = 153;
-  static final int iexpr = 151;
+  static final int complexIdent = 154;
+  static final int iexpr = 152;
   static final int datatypeDecl = 9;
-  static final int callBegin = 158;
-  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 callBegin = 159;
+  static final int countParam = 124;
+  static final int expireTimerState = 76;
+  static final int prereceiveState = 73;
+  static final int requestList = 79;
+  static final int settimerParam = 97;
+  static final int setTimerRequestBegin = 103;
+  static final int requestArgs = 83;
   static final int stateMachineItems = 58;
-  static final int request = 79;
-  static final int stxExpr = 149;
-  static final int setTimerStateBegin = 114;
-  static final int delayExpr = 91;
+  static final int request = 80;
+  static final int stxExpr = 150;
+  static final int setTimerStateBegin = 115;
+  static final int delayExpr = 92;
   static final int attributeDeclHEADER = 49;
-  static final int resetTimerState = 74;
+  static final int resetTimerState = 75;
   static final int model = 2;
   static final int nbfChDecl = 29;
-  static final int receiveAssigns = 139;
-  static final int stateMachineBegin = 117;
-  static final int stxCallBegin = 154;
-  static final int transitionLabel = 142;
-  static final int countStateBegin = 111;
+  static final int receiveAssigns = 140;
+  static final int stateMachineBegin = 118;
+  static final int stxCallBegin = 155;
+  static final int transitionLabel = 143;
+  static final int countStateBegin = 112;
 }
 
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSyntax.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSyntax.java
index 527ec993db..13869bb263 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSyntax.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSyntax.java
@@ -379,16 +379,26 @@ public class AvatarFromSysMLSyntax {
     /** Typed fields for elements that are structures */
     public static class StxField extends StxElement {
         private String type;
+        private String initialValue;
+        private boolean defaultValue;
         public StxField(String _name, String _type) {
             super(_name.trim());
             type = _type.trim();
+            initialValue = "";
+            defaultValue = false;
         }
         public StxField(Location _left, Location _right, String _name, String _type) {
             super(_name.trim(), _left, _right);
             type = _type.trim();
+            initialValue = "";
+            defaultValue = false;
         }
         public String getType() { return type; }
         public void setType(String _type) { type = _type; }
+        public void setInitialValue(String _initialValue) { initialValue = _initialValue; }
+        public String getInitialValue() { return initialValue; }
+        public void setDefaultValue(boolean b) { defaultValue = b; }
+        public boolean getDefaultValue() { return defaultValue; }
     }
 
     /** Elements that are Structures
@@ -486,22 +496,27 @@ public class AvatarFromSysMLSyntax {
 
 
     public static class StxAttribute extends StxElement {
-        String type;
-        String init;
+        private String type;
+        private String init;
+        private boolean defaultValue;
         public StxAttribute(String _name, Location _left, Location _right, String _type){
             super(_name.trim(), _left, _right);
             type = _type;
             init = "";
+            defaultValue = false;
         }
         public StxAttribute(String _name, String _type){
             super(_name.trim());
             type = _type;
             init = "";
+            defaultValue = false;
         }
         public String getType() { return type; }
         public void setInit(String _s) { init = _s; }
+        public void setDefaultValue(boolean b) { defaultValue = b; }
         public String getInit() { return init; }
-    }
+        public boolean getDefaultValue() { return defaultValue; }
+   }
 
     public static class StxTimer extends StxAttribute {
         public StxTimer( String _name, Location _left, Location _right){
diff --git a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
index 5ff29a785f..23489cad37 100644
--- a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
+++ b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
@@ -94,7 +94,7 @@ parser code {:
             else blk = blk.getFather();
         }
     }
-
+    private StxField theField;
     private StringBuffer stringAcc = new StringBuffer();
     private ArrayList<AvatarFromSysMLError> errors;
     private void addError(AvatarFromSysMLError _err) { errors.add(_err); }
@@ -344,7 +344,7 @@ non terminal channelDecl, syncChDecl , nbfChDecl, bfChDecl, signalBinding, inSig
 
 non terminal blockDecl, blockDeclBegin, blockDeclBODY, blockItem, attributeDecl, constantDecl, attributeDeclHEADER, methodDecl, voidMethodDecl,
     calcMethodDecl, calcMethodItems, calcMethodItem, signalDecl, timerDecl, stateMachine, stateMachineItems, stateMachineItem,
-    voidMethodDeclBegin, calcMethodDeclBegin, constantDeclHEADER;
+    voidMethodDeclBegin, calcMethodDeclBegin, constantDeclHEADER, fieldVal;
 
 non terminal state, startState, standardState, stopState, sendState, receiveState, randomState, countState, presendState,
     prereceiveState, setTimerState, resetTimerState, expireTimerState, poolParam, requestParam, requestList, request,
@@ -438,13 +438,20 @@ datatypeDeclHEADER ::= ATTRIBUTE:a DEF IDENT:id specializes AVDATATYPE_T {:
 :};
 fieldDecls ::= fieldDecl | fieldDecl  fieldDecls
 ;
-fieldDecl ::= ATTRIBUTE:a IDENT:id COLON typeIdent:tp SEMICOLON {:
-    StxField field = new StxField(axleft, axright, id.getAvatarName(), tp);
-    StxField clash = theStructure.addField(field);
+fieldDecl ::= ATTRIBUTE:a IDENT:id COLON typeIdent:tp fieldVal SEMICOLON:q {:
+    theField = new StxField(axleft, axright, id.getAvatarName(), tp);
+    StxField clash = theStructure.addField(theField);
     if (clash != null)
         addError( new AvatarFromSysMLError(AvatarFromSysMLError.HIGHWARNING, axleft, "Field " + id.getAvatarName() +
         " is already declared", clash.getLeft()) );
+    theField.setLeft(axleft);
+    theField.setRight(qxright);
 :};
+fieldVal ::=
+    | GETS iexpr:e {:  theField.setInitialValue(e);  :}
+    | DEFAULT GETS iexpr:e {:  theField.setInitialValue(e);  theField.setDefaultValue(true); :}
+;
+
 typeIdent ::=
       INTEGER_T {: RESULT = "Integer"; :}
     | BOOLEAN_T {: RESULT = "Boolean"; :}
@@ -791,6 +798,11 @@ attributeDecl ::=
         theAttribute.setInit(e);
         theAttribute.setRight(qxright);
     :}
+    | attributeDeclHEADER DEFAULT GETS iexpr:e SEMICOLON:q {:
+        theAttribute.setInit(e);
+        theAttribute.setRight(qxright);
+        theAttribute.setDefaultValue(true);
+    :}
 ;
 attributeDeclHEADER ::=
     ATTRIBUTE:a IDENT:id COLON typeIdent:tp {:
diff --git a/src/main/java/avatartranslator/tosysmlv2/javacup/compile b/src/main/java/avatartranslator/tosysmlv2/javacup/compile
index edba2e581a..3dbee88ea2 100755
--- a/src/main/java/avatartranslator/tosysmlv2/javacup/compile
+++ b/src/main/java/avatartranslator/tosysmlv2/javacup/compile
@@ -16,7 +16,7 @@ sed "s/<\/tt>/<\/code>/g" __${LEXER_CLASS}2__.java > ${LEXER_CLASS}.java
 rm __${LEXER_CLASS}2__.java
 sed "s/LexerClassName/$LEXER_CLASS/g" $JAVACUP_FILE > __${PARSER_CLASS}2__.jcup
 sed "s/ParserClassName/$PARSER_CLASS/g" __${PARSER_CLASS}2__.jcup > __${PARSER_CLASS}__.jcup
-java-cup  -dump -nonterms -locations -parser $PARSER_CLASS -symbols $SYMBOL_CLASS __${PARSER_CLASS}__.jcup 2> truc
+java-cup  -dump -nonterms -parser $PARSER_CLASS -symbols $SYMBOL_CLASS __${PARSER_CLASS}__.jcup 2> truc
 
-rm *~
+rm __${PARSER_CLASS}__.jcup __${PARSER_CLASS}2__.jcup *~
 mv $LEXER_CLASS.java $PARSER_CLASS.java $SYMBOL_CLASS.java ..
diff --git a/src/main/java/ui/AvatarPanelDrawer.java b/src/main/java/ui/AvatarPanelDrawer.java
index 1dd1f40775..3b1b6037c0 100644
--- a/src/main/java/ui/AvatarPanelDrawer.java
+++ b/src/main/java/ui/AvatarPanelDrawer.java
@@ -932,7 +932,7 @@ public class AvatarPanelDrawer {
 		if (useOriginalValues) {
 			for (AvatarAttribute attr : ab.getOriginalAttributes()) {
 				if (attr.isDataType()) {
-					bl.addAttribute(new TAttribute(0, attr.getName(), attr.getInitialValue(), attr.getDataType().getName()));
+					bl.addAttribute(new TAttribute(0, attr.getName(), attr.getProvidedInitialValue(), attr.getDataType().getName()));
 				} else {
 					int type = TAttribute.OTHER;
 					if (attr.getType() == AvatarType.BOOLEAN) {
@@ -947,7 +947,7 @@ public class AvatarPanelDrawer {
 					if (attr.hasInitialValue()) {
 						bl.addAttribute(new TAttribute(0, attr.getName(), attr.getInitialValue(), type));
 					} else {
-						bl.addAttribute(new TAttribute(0, attr.getName(), attr.getType().getDefaultInitialValue(), type));
+						bl.addAttribute(new TAttribute(0, attr.getName(), "", type));
 					}
 				}
 
@@ -971,7 +971,7 @@ public class AvatarPanelDrawer {
 				if (attr.hasInitialValue()) {
 					bl.addAttribute(new TAttribute(0, attr.getName(), attr.getInitialValue(), type));
 				} else {
-					bl.addAttribute(new TAttribute(0, attr.getName(), attr.getType().getDefaultInitialValue(), type));
+					bl.addAttribute(new TAttribute(0, attr.getName(), "", type));
 				}
 				if (attr.getName().contains("key_") || attr.getName().contains("privKey_")) {
 					hasCrypto = true;
-- 
GitLab