From e2b128ec68279ae653316c6a7e904dda8195b1b4 Mon Sep 17 00:00:00 2001
From: Sophie Coudert <sophie.coudert@telecom-paris.fr>
Date: Thu, 30 May 2024 14:05:38 +0200
Subject: [PATCH] first tests 0K, except datatypes
---
.../tosysmlv2/AvatarFromSysML.java | 30 +-
.../tosysmlv2/AvatarFromSysMLLexer.java | 4 +-
.../tosysmlv2/AvatarFromSysMLParser.java | 856 +++++++++---------
.../tosysmlv2/AvatarFromSysMLSyntax.java | 6 +-
.../tosysmlv2/javacup/AvatarFromSysML.jcup | 2 +-
5 files changed, 452 insertions(+), 446 deletions(-)
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
index e9afbbe130..0652ad416b 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
@@ -135,9 +135,6 @@ public class AvatarFromSysML {
case AvatarFromSysMLSyntax.STXSTARTSTATE :
s = new AvatarStartState("StartState", null, _b);
break;
- case AvatarFromSysMLSyntax.STXSTOPSTATE :
- s = new AvatarStopState("StopState", null, _b);
- break;
case AvatarFromSysMLSyntax.STXSTANDARDSTATE :
s = new AvatarState(_s.getName(), null, _b);
break;
@@ -148,6 +145,7 @@ public class AvatarFromSysML {
s = new AvatarQueryOnSignal(_s.getName(), getSignal(_s.getSignal()),
getAttributeByName(_s.getVariable(),_b), null, _b);
break;
+ case AvatarFromSysMLSyntax.STXSTOPSTATE :
case AvatarFromSysMLSyntax.STXSENDSTATE :
case AvatarFromSysMLSyntax.STXRECEIVESTATE :
s = new AvatarActionOnSignal(_s.getName(), null, _b);
@@ -201,12 +199,10 @@ public class AvatarFromSysML {
public BuildBlock(){}
public void accept(String n, StxBlock blk) {
AvatarBlock theBlock = getBlock(blk);
- blockMap.put(blk, theBlock);
avSpec.addBlock(theBlock);
// set father
StxBlock fth = blk.getFather();
- if (fth != null) theBlock.setFather(blockMap.get(fth));
-
+ if (fth != null) theBlock.setFather(getBlock(fth));
// add Attributes
int size = blk.getNbAttributes();
for (int i = 0; i < size; i++) {
@@ -313,7 +309,9 @@ public class AvatarFromSysML {
size = states.length;
for (int i = 0; i < size; i++) {
byte stateType = states[i].getType();
- if (stateType != AvatarFromSysMLSyntax.STXPRESENDSTATE && stateType != AvatarFromSysMLSyntax.STXPRERECEIVESTATE) {
+ if (stateType != AvatarFromSysMLSyntax.STXPRESENDSTATE &&
+ stateType != AvatarFromSysMLSyntax.STXPRERECEIVESTATE &&
+ stateType != AvatarFromSysMLSyntax.STXSTOPSTATE ) {
theSourceState = getState(states[i], theBlock);
asm.addElement(theSourceState);
if (stateType == AvatarFromSysMLSyntax.STXRANDOMSTATE) {
@@ -331,7 +329,10 @@ public class AvatarFromSysML {
asm.addElement(theTransition);
theSourceState.addNext(theTransition);
theTransition.setGuard(transition.getGuard());
- theTransition.setDelays(transition.getMinDelay(), transition.getMaxDelay());
+ String minDelay = transition.getMinDelay().trim();
+ String maxDelay = transition.getMaxDelay().trim();
+ if (minDelay.equals(maxDelay)) maxDelay = "";
+ theTransition.setDelays(minDelay, maxDelay);
setDistributionLaw(theTransition, transition.getDelayDistributionLaw(),transition.getDelayExtra());
// add actions
List<StxAction> actions = transition.getActions(); // should exist only in some cases...
@@ -358,7 +359,12 @@ public class AvatarFromSysML {
transition.getTarget().getType() == AvatarFromSysMLSyntax.STXPRERECEIVESTATE)
transition = transition.getTarget().getTransition(0);
- AvatarStateMachineElement tgtState = getState(transition.getTarget(), theBlock);
+ AvatarStateMachineElement tgtState;
+ if (transition.getTarget().getType() == AvatarFromSysMLSyntax.STXSTOPSTATE) {
+ tgtState = new AvatarStopState("StopState", null, theBlock);
+ asm.addElement(tgtState);
+ }
+ else tgtState =getState(transition.getTarget(), theBlock);
theTransition.addNext(tgtState);
if (transition.getType() == AvatarFromSysMLSyntax.STXSENDTRANSITION) {
@@ -366,7 +372,9 @@ public class AvatarFromSysML {
AvatarActionOnSignal state = (AvatarActionOnSignal)tgtState;
state.setSignal( getSignal(transition.getSignal()));
ArrayList<StxTerm> sendPayload = transition.getSendPayload();
- for(StxTerm p: sendPayload) {
+ int nbParam = sendPayload.size();
+ for(int u = 0; u < nbParam; u++) {
+ StxTerm p = sendPayload.get(u);
if (p instanceof StxId){
String[] ids = extendPath(((StxId)p).getString(),blk).split(",");
for (String id : ids) { state.addValue(id.trim()); }
@@ -548,8 +556,6 @@ public class AvatarFromSysML {
for (int i = 0; i < size; i++) {
StxChannel c = r.getChannel(i);
c.commuteSignals(r.getBlock1().getName());
- System.out.println("$$$$$$$$$ : " +blk1.getName() + "." + c.getSignalA().getName() + ", "
- + blk2.getName() + "." + c.getSignalB().getName());
theRelation.addSignals(getSignal(c.getSignalA()),getSignal(c.getSignalB()));
}
}
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
index 2c8d939fca..c6f338e792 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 29/05/2024 14:40 */
+/* The following code was generated by JFlex 1.4.3 on 30/05/2024 10:29 */
package avatartranslator.tosysmlv2;
import java_cup.runtime.*;
@@ -9,7 +9,7 @@ import avatartranslator.tosysmlv2.AvatarFromSysMLSyntax.*;
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 29/05/2024 14:40 from the specification file
+ * on 30/05/2024 10:29 from the specification file
* <tt>__AvatarFromSysMLLexer__.jflex</tt>
*/
public class AvatarFromSysMLLexer implements java_cup.runtime.Scanner {
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
index 6a9ba4937f..73829c83e1 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
@@ -438,335 +438,335 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
"\000\004\012\u0158\001\002\000\010\012\u0139\013\uff27\016" +
"\uff27\001\002\000\020\004\222\005\224\012\226\013\u0140" +
"\141\u013c\251\231\335\221\001\002\000\006\013\uff1f\016" +
- "\u0156\001\002\000\020\004\222\005\224\012\226\013\u014b" +
- "\141\u0148\251\231\335\221\001\002\000\046\011\ufed5\012" +
- "\u0144\013\ufed5\016\ufed5\017\ufed5\021\270\155\ufed5\255\ufed5" +
+ "\uff1f\001\002\000\020\004\222\005\224\012\226\013\u014d" +
+ "\141\u014a\251\231\335\221\001\002\000\046\011\ufed5\012" +
+ "\u0146\013\ufed5\016\ufed5\017\ufed5\021\270\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\042\011\ufee8" +
"\013\ufeeb\016\ufeeb\017\ufeeb\155\ufee8\255\ufee8\334\ufee8\335" +
"\ufee8\336\ufee8\337\ufee8\340\ufee8\341\ufee8\342\ufee8\343\ufee8" +
- "\344\ufee8\345\ufee8\001\002\000\004\013\u0143\001\002\000" +
- "\034\011\241\155\234\255\246\334\240\335\233\336\235" +
- "\337\242\340\236\341\237\342\244\343\243\344\247\345" +
- "\245\001\002\000\006\013\uff28\016\uff28\001\002\000\042" +
- "\011\ufee9\013\ufeec\016\ufeec\017\ufeec\155\ufee9\255\ufee9\334" +
- "\ufee9\335\ufee9\336\ufee9\337\ufee9\340\ufee9\341\ufee9\342\ufee9" +
- "\343\ufee9\344\ufee9\345\ufee9\001\002\000\010\013\ufeed\016" +
- "\ufeed\017\ufeed\001\002\000\006\013\uff29\016\uff29\001\002" +
+ "\344\ufee8\345\ufee8\001\002\000\006\013\u0144\016\u0143\001" +
+ "\002\000\034\011\241\155\234\255\246\334\240\335\233" +
+ "\336\235\337\242\340\236\341\237\342\244\343\243\344" +
+ "\247\345\245\001\002\000\006\013\uff28\016\uff28\001\002" +
+ "\000\042\011\ufee9\013\ufeec\016\ufeec\017\ufeec\155\ufee9\255" +
+ "\ufee9\334\ufee9\335\ufee9\336\ufee9\337\ufee9\340\ufee9\341\ufee9" +
+ "\342\ufee9\343\ufee9\344\ufee9\345\ufee9\001\002\000\010\013" +
+ "\ufeed\016\ufeed\017\ufeed\001\002\000\016\004\222\005\224" +
+ "\012\226\141\u013c\251\231\335\221\001\002\000\006\013" +
+ "\uff29\016\uff29\001\002\000\006\013\uff1e\016\uff1e\001\002" +
"\000\020\004\ufed1\005\ufed1\012\ufed1\013\ufed1\141\ufed1\251" +
"\ufed1\335\ufed1\001\002\000\016\004\222\005\224\012\226" +
- "\141\u0148\251\231\335\221\001\002\000\004\013\u0153\001" +
- "\002\000\006\013\ufed0\016\u0151\001\002\000\044\011\ufed5" +
- "\012\u014f\013\ufed5\016\ufed5\021\270\155\ufed5\255\ufed5\334" +
+ "\141\u014a\251\231\335\221\001\002\000\004\013\u0155\001" +
+ "\002\000\006\013\ufed0\016\u0153\001\002\000\044\011\ufed5" +
+ "\012\u0151\013\ufed5\016\ufed5\021\270\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\040\011\ufee8\013" +
"\ufecc\016\ufecc\155\ufee8\255\ufee8\334\ufee8\335\ufee8\336\ufee8" +
"\337\ufee8\340\ufee8\341\ufee8\342\ufee8\343\ufee8\344\ufee8\345" +
- "\ufee8\001\002\000\004\013\u014e\001\002\000\010\013\ufed3" +
+ "\ufee8\001\002\000\004\013\u0150\001\002\000\010\013\ufed3" +
"\016\ufed3\017\ufed3\001\002\000\040\011\ufee9\013\ufecd\016" +
"\ufecd\155\ufee9\255\ufee9\334\ufee9\335\ufee9\336\ufee9\337\ufee9" +
"\340\ufee9\341\ufee9\342\ufee9\343\ufee9\344\ufee9\345\ufee9\001" +
"\002\000\006\013\ufecb\016\ufecb\001\002\000\010\013\ufed2" +
"\016\ufed2\017\ufed2\001\002\000\020\004\ufed1\005\ufed1\012" +
"\ufed1\013\ufec8\141\ufed1\251\ufed1\335\ufed1\001\002\000\016" +
- "\004\222\005\224\012\226\141\u0148\251\231\335\221\001" +
+ "\004\222\005\224\012\226\141\u014a\251\231\335\221\001" +
"\002\000\016\004\ufece\005\ufece\012\ufece\141\ufece\251\ufece" +
"\335\ufece\001\002\000\004\013\ufecf\001\002\000\006\013" +
- "\ufeca\016\ufeca\001\002\000\004\013\u0155\001\002\000\006" +
+ "\ufeca\016\ufeca\001\002\000\004\013\u0157\001\002\000\006" +
"\013\ufec9\016\ufec9\001\002\000\016\004\222\005\224\012" +
- "\226\141\u013c\251\231\335\221\001\002\000\004\013\uff1e" +
+ "\226\141\223\251\231\335\221\001\002\000\036\011\241" +
+ "\013\ufeea\155\234\255\246\334\240\335\233\336\235\337" +
+ "\242\340\236\341\237\342\244\343\243\344\247\345\245" +
+ "\001\002\000\004\013\u015b\001\002\000\006\013\uff26\016" +
+ "\uff26\001\002\000\004\013\u015d\001\002\000\006\013\uff25" +
+ "\016\uff25\001\002\000\012\036\u011e\037\u0121\040\u0118\041" +
+ "\u011f\001\002\000\004\013\uff36\001\002\000\010\013\uff3b" +
+ "\016\uff3b\210\uff3b\001\002\000\010\130\uff24\131\uff24\141" +
+ "\uff24\001\002\000\012\036\uff42\037\uff42\040\uff42\041\uff42" +
+ "\001\002\000\012\036\uff3c\037\uff3c\040\uff3c\041\uff3c\001" +
+ "\002\000\012\036\uff3a\037\uff3a\040\uff3a\041\uff3a\001\002" +
+ "\000\004\013\u0166\001\002\000\010\013\uff39\016\uff39\210" +
+ "\uff39\001\002\000\004\013\u0168\001\002\000\010\013\uff3f" +
+ "\016\uff3f\210\uff3f\001\002\000\012\036\uff3e\037\uff3e\040" +
+ "\uff3e\041\uff3e\001\002\000\004\013\u016b\001\002\000\010" +
+ "\013\uff43\016\uff43\210\uff43\001\002\000\036\011\241\024" +
+ "\u016d\155\234\255\246\334\240\335\233\336\235\337\242" +
+ "\340\236\341\237\342\244\343\243\344\247\345\245\001" +
+ "\002\000\020\065\u0112\066\u0106\067\u0105\070\u0109\125\u0111" +
+ "\126\u010f\127\u0102\001\002\000\004\210\u016f\001\002\000" +
+ "\004\064\u0170\001\002\000\004\012\u0171\001\002\000\004" +
+ "\004\u0172\001\002\000\004\013\u0173\001\002\000\006\013" +
+ "\uff4c\016\uff4c\001\002\000\012\036\uff40\037\uff40\040\uff40" +
+ "\041\uff40\001\002\000\004\013\u0176\001\002\000\010\013" +
+ "\uff41\016\uff41\210\uff41\001\002\000\012\036\uff38\037\uff38" +
+ "\040\uff38\041\uff38\001\002\000\004\013\u0179\001\002\000" +
+ "\010\013\uff3d\016\uff3d\210\uff3d\001\002\000\004\113\u017b" +
+ "\001\002\000\004\012\u017c\001\002\000\004\034\371\001" +
+ "\002\000\004\013\u017e\001\002\000\004\017\u017f\001\002" +
+ "\000\014\015\uff61\212\uff61\216\uff61\307\uff61\316\uff61\001" +
+ "\002\000\014\015\uff57\212\uff57\216\uff57\307\uff57\316\uff57" +
+ "\001\002\000\004\123\u0182\001\002\000\004\012\u0183\001" +
+ "\002\000\006\013\u0185\034\371\001\002\000\004\013\u0187" +
+ "\001\002\000\004\017\u0186\001\002\000\014\015\uff58\212" +
+ "\uff58\216\uff58\307\uff58\316\uff58\001\002\000\004\017\u0188" +
+ "\001\002\000\014\015\uff59\212\uff59\216\uff59\307\uff59\316" +
+ "\uff59\001\002\000\004\020\u018a\001\002\000\026\104\u018d" +
+ "\107\u018f\110\u018c\111\u018e\112\u0192\113\u0194\114\u0190\122" +
+ "\u0191\123\u018b\124\u0193\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\u0196\001\002\000\004\020\u0197\001\002" +
+ "\000\004\106\u0198\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\u019c\001" +
+ "\002\000\004\012\u019d\001\002\000\004\013\u019e\001\002" +
+ "\000\004\017\u019f\001\002\000\014\015\uff73\212\uff73\216" +
+ "\uff73\307\uff73\316\uff73\001\002\000\004\114\u01a1\001\002" +
+ "\000\004\012\u01a2\001\002\000\004\034\371\001\002\000" +
+ "\004\013\u01a4\001\002\000\004\017\u01a5\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\u01a8\001\002\000\004\012\u01a9\001\002\000" +
+ "\006\013\u01ab\034\371\001\002\000\004\013\u01ad\001\002" +
+ "\000\004\017\u01ac\001\002\000\014\015\uff70\212\uff70\216" +
+ "\uff70\307\uff70\316\uff70\001\002\000\004\017\u01ae\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\u01b1\001\002\000\004\012\u01b2\001" +
+ "\002\000\006\013\u01b4\034\371\001\002\000\004\013\u01b6" +
+ "\001\002\000\004\017\u01b5\001\002\000\014\015\uff5c\212" +
+ "\uff5c\216\uff5c\307\uff5c\316\uff5c\001\002\000\004\017\u01b7" +
+ "\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\u01bb" +
+ "\001\002\000\004\012\u01bc\001\002\000\006\013\u01bf\033" +
+ "\u01be\001\002\000\004\013\u01c9\001\002\000\004\022\u01c1" +
+ "\001\002\000\004\017\u01c0\001\002\000\014\015\uff77\212" +
+ "\uff77\216\uff77\307\uff77\316\uff77\001\002\000\024\012\u01c3" +
+ "\065\u0112\066\u0106\067\u0105\070\u0109\125\u0111\126\u010f\127" +
+ "\u0102\230\u0107\001\002\000\004\013\uff50\001\002\000\022" +
+ "\065\u0112\066\u0106\067\u0105\070\u0109\125\u0111\126\u010f\127" +
+ "\u0102\230\u0107\001\002\000\006\013\uff4e\016\u01c7\001\002" +
+ "\000\004\013\u01c6\001\002\000\004\013\uff51\001\002\000" +
+ "\022\065\u0112\066\u0106\067\u0105\070\u0109\125\u0111\126\u010f" +
+ "\127\u0102\230\u0107\001\002\000\004\013\uff4d\001\002\000" +
+ "\004\017\u01ca\001\002\000\014\015\uff76\212\uff76\216\uff76" +
+ "\307\uff76\316\uff76\001\002\000\004\145\u0239\001\002\000" +
+ "\004\014\u0215\001\002\000\004\141\u0210\001\002\000\004" +
+ "\014\u01f1\001\002\000\004\313\u01d0\001\002\000\004\141" +
+ "\u01d1\001\002\000\006\014\u01d3\017\u01d2\001\002\000\014" +
+ "\015\uff11\212\uff11\216\uff11\307\uff11\316\uff11\001\002\000" +
+ "\004\164\u01d5\001\002\000\004\017\u01ef\001\002\000\012" +
+ "\007\u01de\137\u01db\140\u01dc\141\u01dd\001\002\000\004\015" +
+ "\u01da\001\002\000\004\017\ufef2\001\002\000\004\017\ufef3" +
+ "\001\002\000\004\017\ufef4\001\002\000\014\015\uff0f\212" +
+ "\uff0f\216\uff0f\307\uff0f\316\uff0f\001\002\000\004\020\u01eb" +
+ "\001\002\000\004\020\u01e7\001\002\000\004\020\u01e3\001" +
+ "\002\000\004\020\u01df\001\002\000\004\076\u01e0\001\002" +
+ "\000\004\022\u01e1\001\002\000\004\006\u01e2\001\002\000" +
+ "\004\017\ufeef\001\002\000\004\076\u01e4\001\002\000\004" +
+ "\022\u01e5\001\002\000\004\006\u01e6\001\002\000\004\017" +
+ "\ufeee\001\002\000\004\076\u01e8\001\002\000\004\022\u01e9" +
+ "\001\002\000\004\010\u01ea\001\002\000\004\017\ufef0\001" +
+ "\002\000\004\076\u01ec\001\002\000\004\022\u01ed\001\002" +
+ "\000\004\006\u01ee\001\002\000\004\017\ufef1\001\002\000" +
+ "\010\014\ufef6\015\ufef6\164\u01d5\001\002\000\006\014\ufef5" +
+ "\015\ufef5\001\002\000\006\015\u01f3\221\u01f4\001\002\000" +
+ "\004\015\u020f\001\002\000\004\313\uff0c\001\002\000\004" +
+ "\045\u01f5\001\002\000\004\017\u01f6\001\002\000\004\313" +
+ "\u01f7\001\002\000\010\046\u01f9\145\u01fc\160\u01fd\001\002" +
+ "\000\004\015\uff05\001\002\000\004\017\u020e\001\002\000" +
+ "\004\313\u020a\001\002\000\004\141\u0203\001\002\000\004" +
+ "\022\u01fe\001\002\000\004\141\ufeff\001\002\000\004\141" +
+ "\u01ff\001\002\000\004\012\u0146\001\002\000\004\017\u0201" +
+ "\001\002\000\004\313\uff01\001\002\000\006\021\u0208\023" +
+ "\uff00\001\002\000\012\013\uff19\016\uff19\021\uff19\023\uff19" +
+ "\001\002\000\004\023\u0205\001\002\000\016\004\222\005" +
+ "\224\012\226\141\u013c\251\231\335\221\001\002\000\004" +
+ "\017\u0207\001\002\000\004\313\uff02\001\002\000\004\141" +
+ "\u0209\001\002\000\012\013\uff18\016\uff18\021\uff18\023\uff18" +
+ "\001\002\000\010\046\u020c\145\u01fc\160\u01fd\001\002\000" +
+ "\004\015\uff03\001\002\000\004\017\u020d\001\002\000\004" +
+ "\015\uff04\001\002\000\004\015\uff06\001\002\000\004\313" +
+ "\uff0b\001\002\000\006\017\u0211\164\u01d5\001\002\000\014" +
+ "\015\uff12\212\uff12\216\uff12\307\uff12\316\uff12\001\002\000" +
+ "\004\014\u0213\001\002\000\004\015\u0214\001\002\000\014" +
+ "\015\uff10\212\uff10\216\uff10\307\uff10\316\uff10\001\002\000" +
+ "\010\015\u0219\221\u021b\241\u0217\001\002\000\004\221\u021b" +
+ "\001\002\000\004\071\u0230\001\002\000\004\241\u0217\001" +
+ "\002\000\004\313\uff0a\001\002\000\004\015\u022e\001\002" +
+ "\000\004\045\u021c\001\002\000\004\017\u021d\001\002\000" +
+ "\004\313\u021e\001\002\000\006\046\u022c\160\u01fd\001\002" +
+ "\000\004\313\u0221\001\002\000\006\015\ufefa\241\ufefa\001" +
+ "\002\000\006\046\u0223\160\u01fd\001\002\000\006\015\ufef8" +
+ "\241\ufef8\001\002\000\004\017\u022b\001\002\000\004\141" +
+ "\u0203\001\002\000\006\021\u0208\023\u0226\001\002\000\004" +
+ "\071\u0227\001\002\000\004\021\u0228\001\002\000\004\141" +
+ "\u0229\001\002\000\004\017\u022a\001\002\000\004\313\ufef7" +
+ "\001\002\000\006\015\ufef9\241\ufef9\001\002\000\004\017" +
+ "\u022d\001\002\000\006\015\ufefb\241\ufefb\001\002\000\004" +
+ "\313\uff09\001\002\000\004\015\ufefd\001\002\000\004\020" +
+ "\u0231\001\002\000\004\141\u0232\001\002\000\004\022\u0233" +
+ "\001\002\000\004\040\u0234\001\002\000\004\156\u0235\001" +
+ "\002\000\004\141\u0236\001\002\000\004\017\u0237\001\002" +
+ "\000\006\015\ufefc\221\ufefc\001\002\000\004\015\ufefe\001" +
+ "\002\000\004\020\u023a\001\002\000\006\117\u023b\120\u023c" +
+ "\001\002\000\004\014\uff07\001\002\000\004\014\uff08\001" +
+ "\002\000\014\015\uff6d\212\uff6d\216\uff6d\307\uff6d\316\uff6d" +
+ "\001\002\000\004\110\u023f\001\002\000\004\012\u0240\001" +
+ "\002\000\006\013\u0242\034\371\001\002\000\004\013\u0244" +
+ "\001\002\000\004\017\u0243\001\002\000\014\015\uff6c\212" +
+ "\uff6c\216\uff6c\307\uff6c\316\uff6c\001\002\000\004\017\u0245" +
+ "\001\002\000\014\015\uff6b\212\uff6b\216\uff6b\307\uff6b\316" +
+ "\uff6b\001\002\000\004\111\u0247\001\002\000\004\012\u0248" +
+ "\001\002\000\006\034\371\035\u0249\001\002\000\004\022" +
+ "\u0256\001\002\000\004\016\u0252\001\002\000\006\013\u024d" +
+ "\016\u024c\001\002\000\004\034\371\001\002\000\004\017" +
+ "\u024e\001\002\000\014\015\uff67\212\uff67\216\uff67\307\uff67" +
+ "\316\uff67\001\002\000\004\013\u0250\001\002\000\004\017" +
+ "\u0251\001\002\000\014\015\uff69\212\uff69\216\uff69\307\uff69" +
+ "\316\uff69\001\002\000\004\035\u0249\001\002\000\004\013" +
+ "\u0254\001\002\000\004\017\u0255\001\002\000\014\015\uff68" +
+ "\212\uff68\216\uff68\307\uff68\316\uff68\001\002\000\004\072" +
+ "\u0257\001\002\000\004\012\u0258\001\002\000\006\042\u0259" +
+ "\043\u025b\001\002\000\004\022\u0266\001\002\000\004\016" +
+ "\u0263\001\002\000\004\022\uff1a\001\002\000\004\016\u0260" +
+ "\001\002\000\004\022\u025e\001\002\000\004\141\u0203\001" +
+ "\002\000\010\013\uff1b\016\uff1b\021\u0208\001\002\000\004" +
+ "\042\u0259\001\002\000\004\013\u0262\001\002\000\006\013" +
+ "\uff1d\016\uff1d\001\002\000\004\043\u025b\001\002\000\004" +
+ "\013\u0265\001\002\000\006\013\uff1c\016\uff1c\001\002\000" +
+ "\004\073\u0267\001\002\000\004\012\u0269\001\002\000\006" +
+ "\013\uff17\016\uff17\001\002\000\016\004\222\005\224\012" +
+ "\226\141\223\251\231\335\221\001\002\000\036\011\241" +
+ "\016\u026b\155\234\255\246\334\240\335\233\336\235\337" +
+ "\242\340\236\341\237\342\244\343\243\344\247\345\245" +
"\001\002\000\016\004\222\005\224\012\226\141\223\251" +
- "\231\335\221\001\002\000\036\011\241\013\ufeea\155\234" +
+ "\231\335\221\001\002\000\036\011\241\013\u026d\155\234" +
"\255\246\334\240\335\233\336\235\337\242\340\236\341" +
- "\237\342\244\343\243\344\247\345\245\001\002\000\004" +
- "\013\u015b\001\002\000\006\013\uff26\016\uff26\001\002\000" +
- "\004\013\u015d\001\002\000\006\013\uff25\016\uff25\001\002" +
- "\000\012\036\u011e\037\u0121\040\u0118\041\u011f\001\002\000" +
- "\004\013\uff36\001\002\000\010\013\uff3b\016\uff3b\210\uff3b" +
- "\001\002\000\010\130\uff24\131\uff24\141\uff24\001\002\000" +
- "\012\036\uff42\037\uff42\040\uff42\041\uff42\001\002\000\012" +
- "\036\uff3c\037\uff3c\040\uff3c\041\uff3c\001\002\000\012\036" +
- "\uff3a\037\uff3a\040\uff3a\041\uff3a\001\002\000\004\013\u0166" +
- "\001\002\000\010\013\uff39\016\uff39\210\uff39\001\002\000" +
- "\004\013\u0168\001\002\000\010\013\uff3f\016\uff3f\210\uff3f" +
- "\001\002\000\012\036\uff3e\037\uff3e\040\uff3e\041\uff3e\001" +
- "\002\000\004\013\u016b\001\002\000\010\013\uff43\016\uff43" +
- "\210\uff43\001\002\000\036\011\241\024\u016d\155\234\255" +
+ "\237\342\244\343\243\344\247\345\245\001\002\000\006" +
+ "\013\uff16\016\uff16\001\002\000\014\015\uff7c\212\uff7c\216" +
+ "\uff7c\307\uff7c\316\uff7c\001\002\000\004\106\u0270\001\002" +
+ "\000\004\012\u0271\001\002\000\006\013\u0273\034\371\001" +
+ "\002\000\004\013\u0275\001\002\000\004\017\u0274\001\002" +
+ "\000\014\015\uff7b\212\uff7b\216\uff7b\307\uff7b\316\uff7b\001" +
+ "\002\000\004\017\u0276\001\002\000\014\015\uff7a\212\uff7a" +
+ "\216\uff7a\307\uff7a\316\uff7a\001\002\000\004\112\u0278\001" +
+ "\002\000\004\012\u0279\001\002\000\006\034\371\035\u027a" +
+ "\001\002\000\004\022\u0287\001\002\000\006\013\u0282\016" +
+ "\u0281\001\002\000\004\016\u027d\001\002\000\004\035\u027a" +
+ "\001\002\000\004\013\u027f\001\002\000\004\017\u0280\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\u0283\001" +
+ "\002\000\014\015\uff65\212\uff65\216\uff65\307\uff65\316\uff65" +
+ "\001\002\000\004\013\u0285\001\002\000\004\017\u0286\001" +
+ "\002\000\014\015\uff63\212\uff63\216\uff63\307\uff63\316\uff63" +
+ "\001\002\000\004\072\u0288\001\002\000\004\012\u0289\001" +
+ "\002\000\006\042\u028a\043\u025b\001\002\000\004\022\u0293" +
+ "\001\002\000\004\016\u0290\001\002\000\004\016\u028d\001" +
+ "\002\000\004\043\u025b\001\002\000\004\013\u028f\001\002" +
+ "\000\006\013\uff14\016\uff14\001\002\000\004\042\u028a\001" +
+ "\002\000\004\013\u0292\001\002\000\006\013\uff15\016\uff15" +
+ "\001\002\000\004\141\u0294\001\002\000\004\021\u0295\001" +
+ "\002\000\004\044\u0296\001\002\000\004\012\u0297\001\002" +
+ "\000\004\013\u0298\001\002\000\006\013\uff13\016\uff13\001" +
+ "\002\000\004\141\u029a\001\002\000\004\020\u029b\001\002" +
+ "\000\004\105\u029c\001\002\000\006\017\uff72\022\uff72\001" +
+ "\002\000\004\020\u029e\001\002\000\004\102\u029f\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\u02a5\164\275\301\u02a4\001\002\000\004\015\u02ac\001" +
+ "\002\000\004\020\u02a9\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\u02a4\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\u02ab" +
+ "\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\u02ae\001\002\000\004\103" +
+ "\u02af\001\002\000\004\014\uff99\001\002\000\020\015\uffa6" +
+ "\145\uffa6\164\uffa6\171\uffa6\215\uffa6\262\uffa6\270\uffa6\001" +
+ "\002\000\016\004\222\005\224\012\226\141\223\251\231" +
+ "\335\221\001\002\000\036\011\241\017\u02b3\155\234\255" +
"\246\334\240\335\233\336\235\337\242\340\236\341\237" +
- "\342\244\343\243\344\247\345\245\001\002\000\020\065" +
- "\u0112\066\u0106\067\u0105\070\u0109\125\u0111\126\u010f\127\u0102" +
- "\001\002\000\004\210\u016f\001\002\000\004\064\u0170\001" +
- "\002\000\004\012\u0171\001\002\000\004\004\u0172\001\002" +
- "\000\004\013\u0173\001\002\000\006\013\uff4c\016\uff4c\001" +
- "\002\000\012\036\uff40\037\uff40\040\uff40\041\uff40\001\002" +
- "\000\004\013\u0176\001\002\000\010\013\uff41\016\uff41\210" +
- "\uff41\001\002\000\012\036\uff38\037\uff38\040\uff38\041\uff38" +
- "\001\002\000\004\013\u0179\001\002\000\010\013\uff3d\016" +
- "\uff3d\210\uff3d\001\002\000\004\113\u017b\001\002\000\004" +
- "\012\u017c\001\002\000\004\034\371\001\002\000\004\013" +
- "\u017e\001\002\000\004\017\u017f\001\002\000\014\015\uff61" +
- "\212\uff61\216\uff61\307\uff61\316\uff61\001\002\000\014\015" +
- "\uff57\212\uff57\216\uff57\307\uff57\316\uff57\001\002\000\004" +
- "\123\u0182\001\002\000\004\012\u0183\001\002\000\006\013" +
- "\u0185\034\371\001\002\000\004\013\u0187\001\002\000\004" +
- "\017\u0186\001\002\000\014\015\uff58\212\uff58\216\uff58\307" +
- "\uff58\316\uff58\001\002\000\004\017\u0188\001\002\000\014" +
- "\015\uff59\212\uff59\216\uff59\307\uff59\316\uff59\001\002\000" +
- "\004\020\u018a\001\002\000\026\104\u018d\107\u018f\110\u018c" +
- "\111\u018e\112\u0192\113\u0194\114\u0190\122\u0191\123\u018b\124" +
- "\u0193\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" +
- "\u0196\001\002\000\004\020\u0197\001\002\000\004\106\u0198" +
- "\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\u019c\001\002\000\004\012" +
- "\u019d\001\002\000\004\013\u019e\001\002\000\004\017\u019f" +
- "\001\002\000\014\015\uff73\212\uff73\216\uff73\307\uff73\316" +
- "\uff73\001\002\000\004\114\u01a1\001\002\000\004\012\u01a2" +
- "\001\002\000\004\034\371\001\002\000\004\013\u01a4\001" +
- "\002\000\004\017\u01a5\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\u01a8" +
- "\001\002\000\004\012\u01a9\001\002\000\006\013\u01ab\034" +
- "\371\001\002\000\004\013\u01ad\001\002\000\004\017\u01ac" +
- "\001\002\000\014\015\uff70\212\uff70\216\uff70\307\uff70\316" +
- "\uff70\001\002\000\004\017\u01ae\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\u01b1\001\002\000\004\012\u01b2\001\002\000\006\013" +
- "\u01b4\034\371\001\002\000\004\013\u01b6\001\002\000\004" +
- "\017\u01b5\001\002\000\014\015\uff5c\212\uff5c\216\uff5c\307" +
- "\uff5c\316\uff5c\001\002\000\004\017\u01b7\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\u01bb\001\002\000\004" +
- "\012\u01bc\001\002\000\006\013\u01bf\033\u01be\001\002\000" +
- "\004\013\u01c9\001\002\000\004\022\u01c1\001\002\000\004" +
- "\017\u01c0\001\002\000\014\015\uff77\212\uff77\216\uff77\307" +
- "\uff77\316\uff77\001\002\000\024\012\u01c3\065\u0112\066\u0106" +
- "\067\u0105\070\u0109\125\u0111\126\u010f\127\u0102\230\u0107\001" +
- "\002\000\004\013\uff50\001\002\000\022\065\u0112\066\u0106" +
- "\067\u0105\070\u0109\125\u0111\126\u010f\127\u0102\230\u0107\001" +
- "\002\000\006\013\uff4e\016\u01c7\001\002\000\004\013\u01c6" +
- "\001\002\000\004\013\uff51\001\002\000\022\065\u0112\066" +
- "\u0106\067\u0105\070\u0109\125\u0111\126\u010f\127\u0102\230\u0107" +
- "\001\002\000\004\013\uff4d\001\002\000\004\017\u01ca\001" +
- "\002\000\014\015\uff76\212\uff76\216\uff76\307\uff76\316\uff76" +
- "\001\002\000\004\145\u0239\001\002\000\004\014\u0215\001" +
- "\002\000\004\141\u0210\001\002\000\004\014\u01f1\001\002" +
- "\000\004\313\u01d0\001\002\000\004\141\u01d1\001\002\000" +
- "\006\014\u01d3\017\u01d2\001\002\000\014\015\uff11\212\uff11" +
- "\216\uff11\307\uff11\316\uff11\001\002\000\004\164\u01d5\001" +
- "\002\000\004\017\u01ef\001\002\000\012\007\u01de\137\u01db" +
- "\140\u01dc\141\u01dd\001\002\000\004\015\u01da\001\002\000" +
- "\004\017\ufef2\001\002\000\004\017\ufef3\001\002\000\004" +
- "\017\ufef4\001\002\000\014\015\uff0f\212\uff0f\216\uff0f\307" +
- "\uff0f\316\uff0f\001\002\000\004\020\u01eb\001\002\000\004" +
- "\020\u01e7\001\002\000\004\020\u01e3\001\002\000\004\020" +
- "\u01df\001\002\000\004\076\u01e0\001\002\000\004\022\u01e1" +
- "\001\002\000\004\006\u01e2\001\002\000\004\017\ufeef\001" +
- "\002\000\004\076\u01e4\001\002\000\004\022\u01e5\001\002" +
- "\000\004\006\u01e6\001\002\000\004\017\ufeee\001\002\000" +
- "\004\076\u01e8\001\002\000\004\022\u01e9\001\002\000\004" +
- "\010\u01ea\001\002\000\004\017\ufef0\001\002\000\004\076" +
- "\u01ec\001\002\000\004\022\u01ed\001\002\000\004\006\u01ee" +
- "\001\002\000\004\017\ufef1\001\002\000\010\014\ufef6\015" +
- "\ufef6\164\u01d5\001\002\000\006\014\ufef5\015\ufef5\001\002" +
- "\000\006\015\u01f3\221\u01f4\001\002\000\004\015\u020f\001" +
- "\002\000\004\313\uff0c\001\002\000\004\045\u01f5\001\002" +
- "\000\004\017\u01f6\001\002\000\004\313\u01f7\001\002\000" +
- "\010\046\u01f9\145\u01fc\160\u01fd\001\002\000\004\015\uff05" +
- "\001\002\000\004\017\u020e\001\002\000\004\313\u020a\001" +
- "\002\000\004\141\u0203\001\002\000\004\022\u01fe\001\002" +
- "\000\004\141\ufeff\001\002\000\004\141\u01ff\001\002\000" +
- "\004\012\u0144\001\002\000\004\017\u0201\001\002\000\004" +
- "\313\uff01\001\002\000\006\021\u0208\023\uff00\001\002\000" +
- "\012\013\uff19\016\uff19\021\uff19\023\uff19\001\002\000\004" +
- "\023\u0205\001\002\000\016\004\222\005\224\012\226\141" +
- "\u013c\251\231\335\221\001\002\000\004\017\u0207\001\002" +
- "\000\004\313\uff02\001\002\000\004\141\u0209\001\002\000" +
- "\012\013\uff18\016\uff18\021\uff18\023\uff18\001\002\000\010" +
- "\046\u020c\145\u01fc\160\u01fd\001\002\000\004\015\uff03\001" +
- "\002\000\004\017\u020d\001\002\000\004\015\uff04\001\002" +
- "\000\004\015\uff06\001\002\000\004\313\uff0b\001\002\000" +
- "\006\017\u0211\164\u01d5\001\002\000\014\015\uff12\212\uff12" +
- "\216\uff12\307\uff12\316\uff12\001\002\000\004\014\u0213\001" +
- "\002\000\004\015\u0214\001\002\000\014\015\uff10\212\uff10" +
- "\216\uff10\307\uff10\316\uff10\001\002\000\010\015\u0219\221" +
- "\u021b\241\u0217\001\002\000\004\221\u021b\001\002\000\004" +
- "\071\u0230\001\002\000\004\241\u0217\001\002\000\004\313" +
- "\uff0a\001\002\000\004\015\u022e\001\002\000\004\045\u021c" +
- "\001\002\000\004\017\u021d\001\002\000\004\313\u021e\001" +
- "\002\000\006\046\u022c\160\u01fd\001\002\000\004\313\u0221" +
- "\001\002\000\006\015\ufefa\241\ufefa\001\002\000\006\046" +
- "\u0223\160\u01fd\001\002\000\006\015\ufef8\241\ufef8\001\002" +
- "\000\004\017\u022b\001\002\000\004\141\u0203\001\002\000" +
- "\006\021\u0208\023\u0226\001\002\000\004\071\u0227\001\002" +
- "\000\004\021\u0228\001\002\000\004\141\u0229\001\002\000" +
- "\004\017\u022a\001\002\000\004\313\ufef7\001\002\000\006" +
- "\015\ufef9\241\ufef9\001\002\000\004\017\u022d\001\002\000" +
- "\006\015\ufefb\241\ufefb\001\002\000\004\313\uff09\001\002" +
- "\000\004\015\ufefd\001\002\000\004\020\u0231\001\002\000" +
- "\004\141\u0232\001\002\000\004\022\u0233\001\002\000\004" +
- "\040\u0234\001\002\000\004\156\u0235\001\002\000\004\141" +
- "\u0236\001\002\000\004\017\u0237\001\002\000\006\015\ufefc" +
- "\221\ufefc\001\002\000\004\015\ufefe\001\002\000\004\020" +
- "\u023a\001\002\000\006\117\u023b\120\u023c\001\002\000\004" +
- "\014\uff07\001\002\000\004\014\uff08\001\002\000\014\015" +
- "\uff6d\212\uff6d\216\uff6d\307\uff6d\316\uff6d\001\002\000\004" +
- "\110\u023f\001\002\000\004\012\u0240\001\002\000\006\013" +
- "\u0242\034\371\001\002\000\004\013\u0244\001\002\000\004" +
- "\017\u0243\001\002\000\014\015\uff6c\212\uff6c\216\uff6c\307" +
- "\uff6c\316\uff6c\001\002\000\004\017\u0245\001\002\000\014" +
- "\015\uff6b\212\uff6b\216\uff6b\307\uff6b\316\uff6b\001\002\000" +
- "\004\111\u0247\001\002\000\004\012\u0248\001\002\000\006" +
- "\034\371\035\u0249\001\002\000\004\022\u0256\001\002\000" +
- "\004\016\u0252\001\002\000\006\013\u024d\016\u024c\001\002" +
- "\000\004\034\371\001\002\000\004\017\u024e\001\002\000" +
- "\014\015\uff67\212\uff67\216\uff67\307\uff67\316\uff67\001\002" +
- "\000\004\013\u0250\001\002\000\004\017\u0251\001\002\000" +
- "\014\015\uff69\212\uff69\216\uff69\307\uff69\316\uff69\001\002" +
- "\000\004\035\u0249\001\002\000\004\013\u0254\001\002\000" +
- "\004\017\u0255\001\002\000\014\015\uff68\212\uff68\216\uff68" +
- "\307\uff68\316\uff68\001\002\000\004\072\u0257\001\002\000" +
- "\004\012\u0258\001\002\000\006\042\u0259\043\u025b\001\002" +
- "\000\004\022\u0266\001\002\000\004\016\u0263\001\002\000" +
- "\004\022\uff1a\001\002\000\004\016\u0260\001\002\000\004" +
- "\022\u025e\001\002\000\004\141\u0203\001\002\000\010\013" +
- "\uff1b\016\uff1b\021\u0208\001\002\000\004\042\u0259\001\002" +
- "\000\004\013\u0262\001\002\000\006\013\uff1d\016\uff1d\001" +
- "\002\000\004\043\u025b\001\002\000\004\013\u0265\001\002" +
- "\000\006\013\uff1c\016\uff1c\001\002\000\004\073\u0267\001" +
- "\002\000\004\012\u0269\001\002\000\006\013\uff17\016\uff17" +
- "\001\002\000\016\004\222\005\224\012\226\141\223\251" +
- "\231\335\221\001\002\000\036\011\241\016\u026b\155\234" +
- "\255\246\334\240\335\233\336\235\337\242\340\236\341" +
- "\237\342\244\343\243\344\247\345\245\001\002\000\016" +
- "\004\222\005\224\012\226\141\223\251\231\335\221\001" +
- "\002\000\036\011\241\013\u026d\155\234\255\246\334\240" +
- "\335\233\336\235\337\242\340\236\341\237\342\244\343" +
- "\243\344\247\345\245\001\002\000\006\013\uff16\016\uff16" +
- "\001\002\000\014\015\uff7c\212\uff7c\216\uff7c\307\uff7c\316" +
- "\uff7c\001\002\000\004\106\u0270\001\002\000\004\012\u0271" +
- "\001\002\000\006\013\u0273\034\371\001\002\000\004\013" +
- "\u0275\001\002\000\004\017\u0274\001\002\000\014\015\uff7b" +
- "\212\uff7b\216\uff7b\307\uff7b\316\uff7b\001\002\000\004\017" +
- "\u0276\001\002\000\014\015\uff7a\212\uff7a\216\uff7a\307\uff7a" +
- "\316\uff7a\001\002\000\004\112\u0278\001\002\000\004\012" +
- "\u0279\001\002\000\006\034\371\035\u027a\001\002\000\004" +
- "\022\u0287\001\002\000\006\013\u0282\016\u0281\001\002\000" +
- "\004\016\u027d\001\002\000\004\035\u027a\001\002\000\004" +
- "\013\u027f\001\002\000\004\017\u0280\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\u0283\001\002\000\014\015" +
- "\uff65\212\uff65\216\uff65\307\uff65\316\uff65\001\002\000\004" +
- "\013\u0285\001\002\000\004\017\u0286\001\002\000\014\015" +
- "\uff63\212\uff63\216\uff63\307\uff63\316\uff63\001\002\000\004" +
- "\072\u0288\001\002\000\004\012\u0289\001\002\000\006\042" +
- "\u028a\043\u025b\001\002\000\004\022\u0293\001\002\000\004" +
- "\016\u0290\001\002\000\004\016\u028d\001\002\000\004\043" +
- "\u025b\001\002\000\004\013\u028f\001\002\000\006\013\uff14" +
- "\016\uff14\001\002\000\004\042\u028a\001\002\000\004\013" +
- "\u0292\001\002\000\006\013\uff15\016\uff15\001\002\000\004" +
- "\141\u0294\001\002\000\004\021\u0295\001\002\000\004\044" +
- "\u0296\001\002\000\004\012\u0297\001\002\000\004\013\u0298" +
- "\001\002\000\006\013\uff13\016\uff13\001\002\000\004\141" +
- "\u029a\001\002\000\004\020\u029b\001\002\000\004\105\u029c" +
- "\001\002\000\006\017\uff72\022\uff72\001\002\000\004\020" +
- "\u029e\001\002\000\004\102\u029f\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\u02a5\164\275" +
- "\301\u02a4\001\002\000\004\015\u02ac\001\002\000\004\020" +
- "\u02a9\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\u02a4\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\u02ab\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\u02ae\001\002\000\004\103\u02af\001\002\000" +
- "\004\014\uff99\001\002\000\020\015\uffa6\145\uffa6\164\uffa6" +
- "\171\uffa6\215\uffa6\262\uffa6\270\uffa6\001\002\000\016\004" +
- "\222\005\224\012\226\141\223\251\231\335\221\001\002" +
- "\000\036\011\241\017\u02b3\155\234\255\246\334\240\335" +
- "\233\336\235\337\242\340\236\341\237\342\244\343\243" +
- "\344\247\345\245\001\002\000\020\015\uffa5\145\uffa5\164" +
- "\uffa5\171\uffa5\215\uffa5\262\uffa5\270\uffa5\001\002\000\004" +
- "\020\u02b5\001\002\000\010\074\306\075\305\141\303\001" +
- "\002\000\006\017\uffa4\023\uffa4\001\002\000\004\141\u02b8" +
- "\001\002\000\004\020\u02b9\001\002\000\010\074\306\075" +
- "\305\141\303\001\002\000\006\017\uffa1\023\uffa1\001\002" +
- "\000\004\121\u02bc\001\002\000\004\020\u02bd\001\002\000" +
- "\004\116\u02be\001\002\000\006\014\uff8d\017\uff8d\001\002" +
- "\000\006\062\u02c1\063\u02c0\001\002\000\004\165\u02ce\001" +
- "\002\000\004\165\u02c2\001\002\000\004\141\u02c3\001\002" +
- "\000\006\021\u02c4\022\u02c5\001\002\000\004\141\u02ca\001" +
- "\002\000\004\141\u02c6\001\002\000\004\021\u02c7\001\002" +
- "\000\004\141\u02c8\001\002\000\004\017\u02c9\001\002\000" +
- "\014\015\uffc6\164\uffc6\166\uffc6\232\uffc6\262\uffc6\001\002" +
- "\000\004\022\u02cb\001\002\000\004\141\u02cc\001\002\000" +
- "\004\017\u02cd\001\002\000\014\015\uffc7\164\uffc7\166\uffc7" +
- "\232\uffc7\262\uffc7\001\002\000\004\141\u02cf\001\002\000" +
- "\006\021\u02d0\022\u02d1\001\002\000\004\141\u02d6\001\002" +
- "\000\004\141\u02d2\001\002\000\004\021\u02d3\001\002\000" +
- "\004\141\u02d4\001\002\000\004\017\u02d5\001\002\000\014" +
- "\015\uffc4\164\uffc4\166\uffc4\232\uffc4\262\uffc4\001\002\000" +
- "\004\022\u02d7\001\002\000\004\141\u02d8\001\002\000\004" +
- "\017\u02d9\001\002\000\014\015\uffc5\164\uffc5\166\uffc5\232" +
- "\uffc5\262\uffc5\001\002\000\006\015\u02dc\164\275\001\002" +
- "\000\004\015\u02dd\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\u02e1\001" +
- "\002\000\014\015\uffc1\164\uffc1\166\uffc1\232\uffc1\262\uffc1" +
- "\001\002\000\006\015\u02ed\164\275\001\002\000\004\262" +
- "\u02e2\001\002\000\004\041\u02e3\001\002\000\006\020\u02e5" +
- "\022\u02e4\001\002\000\004\141\u02ea\001\002\000\004\055" +
- "\u02e6\001\002\000\004\022\u02e7\001\002\000\004\141\u02e8" +
- "\001\002\000\004\017\u02e9\001\002\000\006\015\uffbc\164" +
- "\uffbc\001\002\000\004\017\u02eb\001\002\000\006\015\uffbb" +
- "\164\uffbb\001\002\000\004\015\u02ee\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\u02f0\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\u02f5\164\u02f3" +
- "\001\002\000\004\141\u02f9\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" +
- "\u02f8\164\u02f3\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\u02fa\001\002" +
- "\000\004\141\u02fb\001\002\000\004\017\u02fc\001\002\000" +
- "\006\015\uffb3\164\uffb3\001\002\000\006\013\uffd7\016\uffd7" +
- "\001\002\000\004\022\u0315\001\002\000\004\022\u0313\001" +
- "\002\000\004\013\u0311\001\002\000\006\013\uffd8\016\uffd8" +
- "\001\002\000\006\013\uffd5\016\uffd5\001\002\000\006\013" +
- "\uffdb\016\u030f\001\002\000\006\013\uffd6\016\uffd6\001\002" +
- "\000\004\022\u030d\001\002\000\004\022\u030b\001\002\000" +
- "\006\013\uffd9\016\uffd9\001\002\000\004\022\u0309\001\002" +
- "\000\004\004\u030a\001\002\000\006\013\uffd1\016\uffd1\001" +
- "\002\000\004\141\u030c\001\002\000\006\013\uffd4\016\uffd4" +
- "\001\002\000\004\005\u030e\001\002\000\006\013\uffd0\016" +
- "\uffd0\001\002\000\014\025\u0305\026\u0308\027\u02ff\031\u0306" +
- "\032\u02fe\001\002\000\004\013\uffda\001\002\000\004\017" +
- "\u0312\001\002\000\014\015\uffe1\164\uffe1\166\uffe1\232\uffe1" +
- "\262\uffe1\001\002\000\004\005\u0314\001\002\000\006\013" +
- "\uffd2\016\uffd2\001\002\000\004\141\u0316\001\002\000\006" +
- "\013\uffd3\016\uffd3\001\002\000\004\015\ufffd\001\002\000" +
- "\004\013\u0319\001\002\000\004\017\u031a\001\002\000\014" +
- "\015\uffdd\164\uffdd\166\uffdd\232\uffdd\262\uffdd\001\002\000" +
- "\004\141\u031c\001\002\000\006\305\136\333\140\001\002" +
- "\000\004\100\u031e\001\002\000\004\014\uffeb\001\002\000" +
- "\004\013\u0320\001\002\000\004\017\u0321\001\002\000\014" +
- "\015\uffdf\164\uffdf\166\uffdf\232\uffdf\262\uffdf\001\002\000" +
- "\004\002\000\001\002" });
+ "\342\244\343\243\344\247\345\245\001\002\000\020\015" +
+ "\uffa5\145\uffa5\164\uffa5\171\uffa5\215\uffa5\262\uffa5\270\uffa5" +
+ "\001\002\000\004\020\u02b5\001\002\000\010\074\306\075" +
+ "\305\141\303\001\002\000\006\017\uffa4\023\uffa4\001\002" +
+ "\000\004\141\u02b8\001\002\000\004\020\u02b9\001\002\000" +
+ "\010\074\306\075\305\141\303\001\002\000\006\017\uffa1" +
+ "\023\uffa1\001\002\000\004\121\u02bc\001\002\000\004\020" +
+ "\u02bd\001\002\000\004\116\u02be\001\002\000\006\014\uff8d" +
+ "\017\uff8d\001\002\000\006\062\u02c1\063\u02c0\001\002\000" +
+ "\004\165\u02ce\001\002\000\004\165\u02c2\001\002\000\004" +
+ "\141\u02c3\001\002\000\006\021\u02c4\022\u02c5\001\002\000" +
+ "\004\141\u02ca\001\002\000\004\141\u02c6\001\002\000\004" +
+ "\021\u02c7\001\002\000\004\141\u02c8\001\002\000\004\017" +
+ "\u02c9\001\002\000\014\015\uffc6\164\uffc6\166\uffc6\232\uffc6" +
+ "\262\uffc6\001\002\000\004\022\u02cb\001\002\000\004\141" +
+ "\u02cc\001\002\000\004\017\u02cd\001\002\000\014\015\uffc7" +
+ "\164\uffc7\166\uffc7\232\uffc7\262\uffc7\001\002\000\004\141" +
+ "\u02cf\001\002\000\006\021\u02d0\022\u02d1\001\002\000\004" +
+ "\141\u02d6\001\002\000\004\141\u02d2\001\002\000\004\021" +
+ "\u02d3\001\002\000\004\141\u02d4\001\002\000\004\017\u02d5" +
+ "\001\002\000\014\015\uffc4\164\uffc4\166\uffc4\232\uffc4\262" +
+ "\uffc4\001\002\000\004\022\u02d7\001\002\000\004\141\u02d8" +
+ "\001\002\000\004\017\u02d9\001\002\000\014\015\uffc5\164" +
+ "\uffc5\166\uffc5\232\uffc5\262\uffc5\001\002\000\006\015\u02dc" +
+ "\164\275\001\002\000\004\015\u02dd\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\u02e1\001\002\000\014\015\uffc1\164\uffc1\166\uffc1" +
+ "\232\uffc1\262\uffc1\001\002\000\006\015\u02ed\164\275\001" +
+ "\002\000\004\262\u02e2\001\002\000\004\041\u02e3\001\002" +
+ "\000\006\020\u02e5\022\u02e4\001\002\000\004\141\u02ea\001" +
+ "\002\000\004\055\u02e6\001\002\000\004\022\u02e7\001\002" +
+ "\000\004\141\u02e8\001\002\000\004\017\u02e9\001\002\000" +
+ "\006\015\uffbc\164\uffbc\001\002\000\004\017\u02eb\001\002" +
+ "\000\006\015\uffbb\164\uffbb\001\002\000\004\015\u02ee\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\u02f0\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\u02f5\164\u02f3\001\002\000\004\141\u02f9\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\u02f8\164\u02f3\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\u02fa\001\002\000\004\141\u02fb\001\002\000\004\017" +
+ "\u02fc\001\002\000\006\015\uffb3\164\uffb3\001\002\000\006" +
+ "\013\uffd7\016\uffd7\001\002\000\004\022\u0315\001\002\000" +
+ "\004\022\u0313\001\002\000\004\013\u0311\001\002\000\006" +
+ "\013\uffd8\016\uffd8\001\002\000\006\013\uffd5\016\uffd5\001" +
+ "\002\000\006\013\uffdb\016\u030f\001\002\000\006\013\uffd6" +
+ "\016\uffd6\001\002\000\004\022\u030d\001\002\000\004\022" +
+ "\u030b\001\002\000\006\013\uffd9\016\uffd9\001\002\000\004" +
+ "\022\u0309\001\002\000\004\004\u030a\001\002\000\006\013" +
+ "\uffd1\016\uffd1\001\002\000\004\141\u030c\001\002\000\006" +
+ "\013\uffd4\016\uffd4\001\002\000\004\005\u030e\001\002\000" +
+ "\006\013\uffd0\016\uffd0\001\002\000\014\025\u0305\026\u0308" +
+ "\027\u02ff\031\u0306\032\u02fe\001\002\000\004\013\uffda\001" +
+ "\002\000\004\017\u0312\001\002\000\014\015\uffe1\164\uffe1" +
+ "\166\uffe1\232\uffe1\262\uffe1\001\002\000\004\005\u0314\001" +
+ "\002\000\006\013\uffd2\016\uffd2\001\002\000\004\141\u0316" +
+ "\001\002\000\006\013\uffd3\016\uffd3\001\002\000\004\015" +
+ "\ufffd\001\002\000\004\013\u0319\001\002\000\004\017\u031a" +
+ "\001\002\000\014\015\uffdd\164\uffdd\166\uffdd\232\uffdd\262" +
+ "\uffdd\001\002\000\004\141\u031c\001\002\000\006\305\136" +
+ "\333\140\001\002\000\004\100\u031e\001\002\000\004\014" +
+ "\uffeb\001\002\000\004\013\u0320\001\002\000\004\017\u0321" +
+ "\001\002\000\014\015\uffdf\164\uffdf\166\uffdf\232\uffdf\262" +
+ "\uffdf\001\002\000\004\002\000\001\002" });
/** Access to parse-action table. */
@Override
@@ -922,189 +922,189 @@ 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\020\202\u013d\224\u0139\226\u0141" +
"\227\u013e\230\u0140\231\u013c\232\u013a\001\001\000\002\001" +
- "\001\000\022\227\u013e\230\u014b\231\u0148\232\u0144\233\u0146" +
- "\235\u014c\236\u0145\237\u0149\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\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\227\u013e\230\u014b\231\u0148" +
- "\232\u0144\233\u0146\235\u014c\236\u0145\237\u0153\001\001\000" +
- "\002\001\001\000\004\234\u014f\001\001\000\002\001\001" +
- "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\001\000\022\227\u013e\230\u014d\231\u014a\232\u0146\233\u0148" +
+ "\235\u014e\236\u0147\237\u014b\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\022\227\u013e\230\u014b\231\u0148\232\u0144\233" +
- "\u0146\235\u014c\236\u0145\237\u0151\001\001\000\002\001\001" +
+ "\001\001\000\002\001\001\000\002\001\001\000\016\224" +
+ "\u0144\226\u0141\227\u013e\230\u0140\231\u013c\232\u013a\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\020\202\u0156\224\u0139\226\u0141\227\u013e" +
- "\230\u0140\231\u013c\232\u013a\001\001\000\002\001\001\000" +
- "\012\225\u0159\227\u0158\230\227\231\224\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\026\124\u015e\125\u011a\133\u0118" +
- "\134\u0115\140\u011c\141\u0122\142\u0116\143\u0121\144\u011f\170" +
- "\u011b\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\022\227\u013e\230\u014d\231\u014a\232\u0146\233\u0148\235\u014e" +
+ "\236\u0147\237\u0155\001\001\000\002\001\001\000\004\234" +
+ "\u0151\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+ "\001\000\002\001\001\000\002\001\001\000\022\227\u013e" +
+ "\230\u014d\231\u014a\232\u0146\233\u0148\235\u014e\236\u0147\237" +
+ "\u0153\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\012\225" +
+ "\u0159\227\u0158\230\227\231\224\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\034\122\u016d\123\u010f" +
- "\126\u0113\127\377\130\u0109\131\u010d\132\u0112\145\u0107\146" +
- "\u0102\147\u010a\150\u0100\151\u0114\152\u010b\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\002\001\001\000\026\124\u015e\125\u011a\133\u0118\134\u0115" +
+ "\140\u011c\141\u0122\142\u0116\143\u0121\144\u011f\170\u011b\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\004\117\u017c\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\004\117\u0183\001\001\000" +
+ "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\034\122\u016d\123\u010f\126\u0113" +
+ "\127\377\130\u0109\131\u010d\132\u0112\145\u0107\146\u0102\147" +
+ "\u010a\150\u0100\151\u0114\152\u010b\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+ "\000\004\117\u017c\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
+ "\000\002\001\001\000\004\117\u0183\001\001\000\002\001" +
+ "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\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\u01a2\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\004\117\u01a9\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\004\117\u01b2\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
- "\000\002\001\001\000\002\001\001\000\004\116\u01bc\001" +
+ "\000\004\117\u01a2\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
- "\000\002\001\001\000\036\121\u01c1\122\u010c\123\u010f\126" +
- "\u0113\127\377\130\u0109\131\u010d\132\u0112\145\u0107\146\u0102" +
- "\147\u010a\150\u0100\151\u0114\152\u010b\001\001\000\002\001" +
- "\001\000\040\120\u01c4\121\u01c3\122\u010c\123\u010f\126\u0113" +
- "\127\377\130\u0109\131\u010d\132\u0112\145\u0107\146\u0102\147" +
- "\u010a\150\u0100\151\u0114\152\u010b\001\001\000\002\001\001" +
- "\000\002\001\001\000\002\001\001\000\040\120\u01c7\121" +
- "\u01c3\122\u010c\123\u010f\126\u0113\127\377\130\u0109\131\u010d" +
- "\132\u0112\145\u0107\146\u0102\147\u010a\150\u0100\151\u0114\152" +
- "\u010b\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\000\002\001\001\000\004\117\u01a9\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
- "\000\002\001\001\000\002\001\001\000\014\204\u01d5\220" +
- "\u01d3\221\u01d8\222\u01d7\223\u01d6\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\u01b2\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\001\001\000\002\001\001\000\004\116\u01bc\001\001\000" +
+ "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\036\121\u01c1\122\u010c\123\u010f\126\u0113\127" +
+ "\377\130\u0109\131\u010d\132\u0112\145\u0107\146\u0102\147\u010a" +
+ "\150\u0100\151\u0114\152\u010b\001\001\000\002\001\001\000" +
+ "\040\120\u01c4\121\u01c3\122\u010c\123\u010f\126\u0113\127\377" +
+ "\130\u0109\131\u010d\132\u0112\145\u0107\146\u0102\147\u010a\150" +
+ "\u0100\151\u0114\152\u010b\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\040\120\u01c7\121\u01c3\122" +
+ "\u010c\123\u010f\126\u0113\127\377\130\u0109\131\u010d\132\u0112" +
+ "\145\u0107\146\u0102\147\u010a\150\u0100\151\u0114\152\u010b\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\014\204\u01d5\220\u01d3\221" +
+ "\u01d8\222\u01d7\223\u01d6\001\001\000\002\001\001\000\002" +
"\001\001\000\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\u01ef\220\u01d3\221\u01d8\222\u01d7\223\u01d6\001" +
- "\001\000\002\001\001\000\004\205\u01f1\001\001\000\002" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\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\200\u01f7\001\001\000\006\201\u01f9\207\u01fa" +
- "\001\001\000\002\001\001\000\002\001\001\000\004\200" +
- "\u020a\001\001\000\006\003\u0203\211\u0201\001\001\000\002" +
- "\001\001\000\002\001\001\000\006\226\u01ff\232\u013a\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\016\224\u0205\226\u0141\227\u013e\230\u0140\231\u013c\232\u013a" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\006\201\u01f9\207\u01fa\001\001" +
+ "\002\001\001\000\002\001\001\000\002\001\001\000\014" +
+ "\204\u01ef\220\u01d3\221\u01d8\222\u01d7\223\u01d6\001\001\000" +
+ "\002\001\001\000\004\205\u01f1\001\001\000\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\u0211\220\u01d3" +
- "\221\u01d8\222\u01d7\223\u01d6\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001\000\010" +
- "\206\u0219\214\u0215\215\u0217\001\001\000\004\215\u0237\001" +
- "\001\000\002\001\001\000\004\214\u022e\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\006\216\u021f\217\u021e\001\001\000\004\207\u0223" +
- "\001\001\000\006\216\u0221\217\u021e\001\001\000\002\001" +
- "\001\000\004\207\u0223\001\001\000\002\001\001\000\002" +
- "\001\001\000\004\211\u0224\001\001\000\002\001\001\000" +
+ "\004\200\u01f7\001\001\000\006\201\u01f9\207\u01fa\001\001" +
+ "\000\002\001\001\000\002\001\001\000\004\200\u020a\001" +
+ "\001\000\006\003\u0203\211\u0201\001\001\000\002\001\001" +
+ "\000\002\001\001\000\006\226\u01ff\232\u013a\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\016\224" +
+ "\u0205\226\u0141\227\u013e\230\u0140\231\u013c\232\u013a\001\001" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\006\201\u01f9\207\u01fa\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\u0211\220\u01d3\221\u01d8" +
+ "\222\u01d7\223\u01d6\001\001\000\002\001\001\000\002\001" +
+ "\001\000\002\001\001\000\002\001\001\000\010\206\u0219" +
+ "\214\u0215\215\u0217\001\001\000\004\215\u0237\001\001\000" +
+ "\002\001\001\000\004\214\u022e\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\006\216\u021f\217\u021e\001\001\000\004\207\u0223\001\001" +
+ "\000\006\216\u0221\217\u021e\001\001\000\002\001\001\000" +
+ "\004\207\u0223\001\001\000\002\001\001\000\002\001\001" +
+ "\000\004\211\u0224\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\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\u0240\001\001\000\002\001\001\000\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\u0249\171\u024a" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\004\117\u024e\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\u0252\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\u025b\173\u0259\210\u025c\001\001\000\002" +
+ "\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" +
+ "\u0240\001\001\000\002\001\001\000\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\211\u025e\001\001\000\002" +
- "\001\001\000\004\173\u0260\001\001\000\002\001\001\000" +
- "\002\001\001\000\006\172\u0263\210\u025c\001\001\000\002" +
- "\001\001\000\002\001\001\000\004\136\u0267\001\001\000" +
- "\002\001\001\000\002\001\001\000\010\227\u0269\230\227" +
- "\231\224\001\001\000\002\001\001\000\010\227\u026b\230" +
- "\227\231\224\001\001\000\002\001\001\000\002\001\001" +
+ "\001\000\002\001\001\000\006\117\u0249\171\u024a\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\004\117\u0271\001\001\000\002\001\001\000\002\001\001" +
+ "\004\117\u024e\001\001\000\002\001\001\000\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\u027b\174\u027a" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\004\174\u027d\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\004\117\u0283\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\004\171\u0252\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\u025b\173\u0259\210\u025c\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\004\211\u025e\001\001\000\002\001\001" +
+ "\000\004\173\u0260\001\001\000\002\001\001\000\002\001" +
+ "\001\000\006\172\u0263\210\u025c\001\001\000\002\001\001" +
+ "\000\002\001\001\000\004\136\u0267\001\001\000\002\001" +
+ "\001\000\002\001\001\000\010\227\u0269\230\227\231\224" +
+ "\001\001\000\002\001\001\000\010\227\u026b\230\227\231" +
+ "\224\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\004\117" +
+ "\u0271\001\001\000\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\u028a\175\u028b\210\u025c\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\006\172" +
- "\u028d\210\u025c\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\002\001\001\000\006\117\u027b\174\u027a\001\001" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\004\174\u027d\001\001\000\002\001\001\000\002\001\001" +
+ "\000\002\001\001\000\004\117\u0283\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001\000\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\016\u02a6" +
- "\067\u02a2\070\u02a5\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\010\016\u02a6\067\u02a7\070\u02a5" +
- "\001\001\000\002\001\001\000\002\001\001\000\004\002" +
- "\u02a9\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\010\227\u02b1\230\227\231\224" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\004\002\u02b5\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\004\002\u02b9\001\001\000" +
+ "\010\172\u028a\175\u028b\210\u025c\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\006\172\u028d\210" +
+ "\u025c\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" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
+ "\002\001\001\000\002\001\001\000\010\016\u02a6\067\u02a2" +
+ "\070\u02a5\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\010\016\u02a6\067\u02a7\070\u02a5\001\001" +
+ "\000\002\001\001\000\002\001\001\000\004\002\u02a9\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\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" +
- "\u02da\016\276\001\001\000\002\001\001\000\002\001\001" +
- "\000\002\001\001\000\004\050\u02ee\001\001\000\002\001" +
- "\001\000\006\015\u02eb\016\276\001\001\000\002\001\001" +
+ "\002\001\001\000\010\227\u02b1\230\227\231\224\001\001" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\004\002\u02b5\001\001\000\002\001\001\000\002\001\001" +
+ "\000\002\001\001\000\004\002\u02b9\001\001\000\002\001" +
+ "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\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\u02f3\052\u02f5\001\001\000\002\001\001\000\002" +
- "\001\001\000\002\001\001\000\006\051\u02f6\052\u02f5\001" +
+ "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\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\u02da\016" +
+ "\276\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\004\050\u02ee\001\001\000\002\001\001\000" +
+ "\006\015\u02eb\016\276\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\002\001\001\000\006\051" +
+ "\u02f3\052\u02f5\001\001\000\002\001\001\000\002\001\001" +
+ "\000\002\001\001\000\006\051\u02f6\052\u02f5\001\001\000" +
+ "\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\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\u030f\024\u0302\025" +
- "\u0306\026\u0300\027\u02fc\030\u0303\031\u0301\001\001\000\002" +
"\001\001\000\002\001\001\000\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\u030f\024\u0302\025\u0306\026" +
+ "\u0300\027\u02fc\030\u0303\031\u0301\001\001\000\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\u031c\001\001" +
- "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\002\001\001" });
+ "\002\001\001\000\002\001\001\000\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\u031c\001\001\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
@@ -4312,12 +4312,12 @@ class CUP$AvatarFromSysMLParser$actions {
return CUP$AvatarFromSysMLParser$result;
/*. . . . . . . . . . . . . . . . . . . .*/
- case 227: // termList ::= stxRvalue COMMA termList
+ case 227: // termList ::= termList COMMA stxRvalue
{
Object RESULT =null;
- Location exleft = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xleft;
- Location exright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2)).xright;
- StxTerm e = CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2).<StxTerm>value();
+ 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);
}
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSyntax.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSyntax.java
index eb881f5a42..404aba5d30 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSyntax.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLSyntax.java
@@ -101,6 +101,8 @@ public class AvatarFromSysMLSyntax {
avatarName = _smlName.substring(14, _smlName.length() - 1);
} else if (type == BLOCKNAME) {
avatarName = _smlName.substring(6, _smlName.length() - 1);
+ } else if (type == TIMERBLOCKNAME) {
+ avatarName = _smlName.substring(6, _smlName.length() - 1);
} else {
avatarName = sysMLName;
if (type == QUOTEDNAME) type = AVATARNAME;
@@ -395,9 +397,8 @@ public class AvatarFromSysMLSyntax {
else if (signalB == null) { blockB = _block; signalB = s; }
}
public void commuteSignals(String _block1) {
- System.out.println("%%%%%%%%%% " + blockA + "." + signalA.getName() + " " + blockB + "." + signalB.getName());
boolean permut =
- (blockB != null && blockB.equals(_block1)) ||(blockA != null && ! blockB.equals(_block1));
+ (blockB != null && blockB.equals(_block1)) || (blockA != null && ! blockA.equals(_block1));
if (permut) {
String auxStr = blockA;
StxSignal auxSig = signalA;
@@ -406,7 +407,6 @@ public class AvatarFromSysMLSyntax {
blockB = auxStr;
signalB = auxSig;
}
- System.out.println("????????????? " + blockA + "." + signalA.getName() + " " + blockB + "." + signalB.getName());
}
public void setSignalA(StxSignal s) { signalA = s; }
public void setSignalB(StxSignal s) { signalB = s; }
diff --git a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
index b591998b8a..10119188dd 100644
--- a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
+++ b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
@@ -1033,7 +1033,7 @@ expiretimerParam ::= CHANNEL_F EQUAL IDENT:id POINT EXPIRE_TM {:
termList ::=
stxRvalue:e {: argList.add(e); :}
- | stxRvalue:e COMMA termList {: argList.add(e); :}
+ | termList COMMA stxRvalue:e {: argList.add(e); :}
;
// STATE ACTIONS ++++++++++++++++++++++++++++++++++++
randomAction ::=
--
GitLab