diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
index a67e3a249a904e88b784c8625455cc1aa5460f8d..85da7da5fc02b299df1bbb60c1f4355f92b45dfa 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
@@ -120,8 +120,10 @@ public class AvatarFromSysML {
}
private void addState(AvatarStateMachineElement e, AvatarBlock b) {
- ArrayList<AvatarTransition> l = new ArrayList<AvatarTransition>();
- transitionMap.put(e,new StateTransitions(b,l));
+ if (transitionMap.get(e) == null){
+ ArrayList<AvatarTransition> l = new ArrayList<AvatarTransition>();
+ transitionMap.put(e, new StateTransitions(b, l));
+ }
}
private void addTransition(AvatarTransition t, AvatarStateMachineElement e) {
transitionMap.get(e).getTransitions().add(t);
@@ -454,7 +456,7 @@ public class AvatarFromSysML {
}
if (! transition.isDeclared()) {
addError(new AvatarFromSysMLError(AvatarFromSysMLError.HIGHERROR, transition.getRleft(),
- "transition request in state " + states[i].getName() + " in block" + theBlock.getName() +
+ "transition request in state " + states[i].getName() + " of block " + theBlock.getName() +
" has no associated declaration" ));
continue;
}
@@ -561,10 +563,10 @@ public class AvatarFromSysML {
"stopstate should not have outgoing transitions"));
}
tgtState = new AvatarStopState("StopState", null, theBlock);
- asm.addElement(tgtState);
- continue;
+ addState(tgtState, theBlock);
}
else tgtState = getState(transition.getTarget(), theBlock);
+ addState(tgtState, theBlock);
byte tgtType = transition.getTarget().getType();
Location tgtLoc = transition.getTarget().getLeft();
if (transition.getType() == AvatarFromSysMLSyntax.STXSENDTRANSITION) {
@@ -727,7 +729,7 @@ public class AvatarFromSysML {
}
asm.addElement(theTransition);
theSourceState.addNext(theTransition);
- addTransition(theTransition, theSourceState);
+ addTransition(theTransition, tgtState);
theTransition.addNext(tgtState); }
}
}
@@ -745,15 +747,15 @@ public class AvatarFromSysML {
}
if (s > 0 && (e instanceof AvatarStartState)) {
addError(new AvatarFromSysMLError(AvatarFromSysMLError.LOWERROR, "start state in bloc " +
- st.getBlock().getName() + "has some input transition"));
+ st.getBlock().getName() + " has some input transition"));
for(AvatarTransition t: st.getTransitions()) {
t.getNexts().clear();
t.addNext(new AvatarStopState("errorstate",null, st.getBlock()));
}
}
- if (s > 0 && !(e instanceof AvatarStartState || e instanceof AvatarStateElement)) {
+ if (s > 1 && !(e instanceof AvatarStartState || e instanceof AvatarStateElement)) {
addError(new AvatarFromSysMLError(AvatarFromSysMLError.LOWERROR, "state " + e.getName() + " in bloc " +
- st.getBlock().getName() + "has more than one incomming transition"));
+ st.getBlock().getName() + " has more than one incomming transition"));
for(int i = 1; i < s; i++) {
st.getTransitions().get(i).getNexts().clear();
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
index c8bb37b7868f2551a9d1401d9bf1b3af53bbe173..b82001416c4d9604f3245bcafebdf177a2f1f98d 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 18/06/2024 14:19 */
+/* The following code was generated by JFlex 1.4.3 on 18/06/2024 14:42 */
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 18/06/2024 14:19 from the specification file
+ * on 18/06/2024 14:42 from the specification file
* <tt>__AvatarFromSysMLLexer__.jflex</tt>
*/
public class AvatarFromSysMLLexer implements java_cup.runtime.Scanner {
@@ -2268,7 +2268,7 @@ public class AvatarFromSysMLLexer implements java_cup.runtime.Scanner {
Location errorLocation;
public void setErrorLocation(Location _errorLocation) { errorLocation = _errorLocation; }
public Location getErrorLocation() { return errorLocation; }
- public Location getLocation() { return new Location(yyline, yycolums); }
+ public Location getLocation() { return new Location(yyline, yycolumn); }
/**
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
index 99319cddcf60c9b22731342f49ab3e82572bc081..47f9f1b5281dee88c662c387ed01fa629c7cbaaf 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
@@ -93,7 +93,7 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
"\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\004\000\002\120\006\000\002" +
+ "\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" +
@@ -144,7 +144,7 @@ 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\u0322\000\004\260\005\001\002\000\004\002\u0324\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" +
@@ -153,11 +153,11 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
"\262\ufff5\001\002\000\014\015\uffe2\164\uffe2\166\uffe2\232" +
"\uffe2\262\uffe2\001\002\000\014\015\uffe3\164\uffe3\166\uffe3" +
"\232\uffe3\262\uffe3\001\002\000\014\015\uffc3\164\uffc3\166" +
- "\uffc3\232\uffc3\262\uffc3\001\002\000\014\025\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" +
+ "\uffc3\232\uffc3\262\uffc3\001\002\000\014\025\u0307\026\u030a" +
+ "\027\u0301\031\u0308\032\u0300\001\002\000\014\015\uffc9\164" +
+ "\uffc9\166\uffc9\232\uffc9\262\uffc9\001\002\000\004\201\u031d" +
+ "\001\002\000\014\025\u0307\026\u030a\027\u0301\031\u0308\032" +
+ "\u0300\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" +
@@ -165,12 +165,12 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
"\166\uffc8\232\uffc8\262\uffc8\001\002\000\014\015\uffcd\164" +
"\uffcd\166\uffcd\232\uffcd\262\uffcd\001\002\000\004\002\uffff" +
"\001\002\000\014\015\uffc2\164\uffc2\166\uffc2\232\uffc2\262" +
- "\uffc2\001\002\000\014\025\u0308\026\u030b\027\u0302\031\u0309" +
- "\032\u0301\001\002\000\006\014\u02f5\017\u02f4\001\002\000" +
+ "\uffc2\001\002\000\014\025\u0307\026\u030a\027\u0301\031\u0308" +
+ "\032\u0300\001\002\000\006\014\u02f4\017\u02f3\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" +
+ "\000\006\164\275\265\u02e3\001\002\000\014\015\ufffb\164" +
+ "\ufffb\166\ufffb\232\ufffb\262\ufffb\001\002\000\004\014\u02dc" +
+ "\001\002\000\004\020\u02c1\001\002\000\020\015\163\145" +
"\172\164\156\171\162\215\153\262\200\270\155\001\002" +
"\000\004\015\151\001\002\000\014\015\ufff6\164\ufff6\166" +
"\ufff6\232\ufff6\262\ufff6\001\002\000\014\015\uffe4\164\uffe4" +
@@ -217,23 +217,23 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
"\054\147\001\002\000\006\014\uffb6\017\uffb6\001\002\000" +
"\006\164\uffc0\265\uffc0\001\002\000\004\002\001\001\002" +
"\000\020\015\uff9f\145\uff9f\164\uff9f\171\uff9f\215\uff9f\262" +
- "\uff9f\270\uff9f\001\002\000\004\307\u02be\001\002\000\020" +
+ "\uff9f\270\uff9f\001\002\000\004\307\u02bd\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" +
+ "\uffa8\001\002\000\004\164\u02b9\001\002\000\004\141\u02b6" +
"\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" +
+ "\uffa9\262\uffa9\270\uffa9\001\002\000\006\017\u02b2\023\u02b3" +
"\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" +
+ "\uffac\262\uffac\270\uffac\001\002\000\004\141\u02af\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" +
+ "\uffb2\232\uffb2\262\uffb2\270\uffb2\001\002\000\004\014\u02a4" +
+ "\001\002\000\020\015\u02a2\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" +
+ "\uffaa\270\uffaa\001\002\000\004\141\u029f\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" +
@@ -353,14 +353,14 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
"\171\uff9d\215\uff9d\262\uff9d\270\uff9d\001\002\000\020\015" +
"\uff8e\145\uff8e\164\uff8e\171\uff8e\215\uff8e\262\uff8e\270\uff8e" +
"\001\002\000\014\015\333\212\342\216\313\307\345\316" +
- "\354\001\002\000\004\145\u029c\001\002\000\004\022\u027a" +
+ "\354\001\002\000\004\145\u029b\001\002\000\004\022\u0279" +
"\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" +
+ "\316\uff7e\001\002\000\006\017\u0270\022\u0271\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" +
+ "\000\004\022\u0248\001\002\000\006\017\u023f\022\u0240\001" +
"\002\000\014\015\uff8a\212\uff8a\216\uff8a\307\uff8a\316\uff8a" +
- "\001\002\000\006\206\u01ce\313\u01d0\001\002\000\014\015" +
+ "\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" +
@@ -549,228 +549,227 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
"\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\u01cc\001\002\000\004\022\u01c3" +
+ "\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\u01cb\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\uff4e\016\u01c9\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\u01cd\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\u01d3\001\002\000\004\141\u01d4\001\002\000\006\014" +
- "\u01d6\017\u01d5\001\002\000\014\015\uff0f\212\uff0f\216\uff0f" +
- "\307\uff0f\316\uff0f\001\002\000\004\164\u01d8\001\002\000" +
- "\004\017\u01f2\001\002\000\012\007\u01e1\137\u01de\140\u01df" +
- "\141\u01e0\001\002\000\004\015\u01dd\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\u01ea" +
- "\001\002\000\004\020\u01e6\001\002\000\004\020\u01e2\001" +
- "\002\000\004\076\u01e3\001\002\000\004\022\u01e4\001\002" +
- "\000\004\006\u01e5\001\002\000\004\017\ufeed\001\002\000" +
- "\004\076\u01e7\001\002\000\004\022\u01e8\001\002\000\004" +
- "\006\u01e9\001\002\000\004\017\ufeec\001\002\000\004\076" +
- "\u01eb\001\002\000\004\022\u01ec\001\002\000\004\010\u01ed" +
- "\001\002\000\004\017\ufeee\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\u01d8\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\224\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\u01d8\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\224\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\236\337\243\340\235\341\237\342\245\343\242\344" +
- "\247\345\244\001\002\000\016\004\222\005\224\012\226" +
- "\141\223\251\231\335\221\001\002\000\036\011\241\013" +
- "\u0270\155\234\255\246\334\240\335\233\336\236\337\243" +
- "\340\235\341\237\342\245\343\242\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\224\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\236\337\243\340" +
- "\235\341\237\342\245\343\242\344\247\345\244\001\002" +
- "\000\020\015\uffa5\145\uffa5\164\uffa5\171\uffa5\215\uffa5\262" +
- "\uffa5\270\uffa5\001\002\000\004\020\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" });
+ "\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\u023b\001\002\000" +
+ "\004\014\u0217\001\002\000\004\141\u0212\001\002\000\004" +
+ "\014\u01f3\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\u01f1\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\u01ed" +
+ "\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\ufeed\001\002\000\004\076\u01e6\001\002\000\004" +
+ "\022\u01e7\001\002\000\004\006\u01e8\001\002\000\004\017" +
+ "\ufeec\001\002\000\004\076\u01ea\001\002\000\004\022\u01eb" +
+ "\001\002\000\004\010\u01ec\001\002\000\004\017\ufeee\001" +
+ "\002\000\004\076\u01ee\001\002\000\004\022\u01ef\001\002" +
+ "\000\004\006\u01f0\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\u01f5\221\u01f6\001\002\000\004\015\u0211\001" +
+ "\002\000\004\313\uff0a\001\002\000\004\045\u01f7\001\002" +
+ "\000\004\017\u01f8\001\002\000\004\313\u01f9\001\002\000" +
+ "\010\046\u01fb\145\u01fe\160\u01ff\001\002\000\004\015\uff03" +
+ "\001\002\000\004\017\u0210\001\002\000\004\313\u020c\001" +
+ "\002\000\004\141\u0205\001\002\000\004\022\u0200\001\002" +
+ "\000\004\141\ufefd\001\002\000\004\141\u0201\001\002\000" +
+ "\004\012\u0148\001\002\000\004\017\u0203\001\002\000\004" +
+ "\313\ufeff\001\002\000\006\021\u020a\023\ufefe\001\002\000" +
+ "\012\013\uff17\016\uff17\021\uff17\023\uff17\001\002\000\004" +
+ "\023\u0207\001\002\000\016\004\222\005\224\012\226\141" +
+ "\u013e\251\231\335\221\001\002\000\004\017\u0209\001\002" +
+ "\000\004\313\uff00\001\002\000\004\141\u020b\001\002\000" +
+ "\012\013\uff16\016\uff16\021\uff16\023\uff16\001\002\000\010" +
+ "\046\u020e\145\u01fe\160\u01ff\001\002\000\004\015\uff01\001" +
+ "\002\000\004\017\u020f\001\002\000\004\015\uff02\001\002" +
+ "\000\004\015\uff04\001\002\000\004\313\uff09\001\002\000" +
+ "\006\014\u0214\017\u0213\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\u0216\001\002\000\014\015\uff0e\212\uff0e" +
+ "\216\uff0e\307\uff0e\316\uff0e\001\002\000\010\015\u021b\221" +
+ "\u021d\241\u0218\001\002\000\004\071\u0233\001\002\000\004" +
+ "\221\u021d\001\002\000\004\241\u0218\001\002\000\004\313" +
+ "\uff08\001\002\000\004\015\u0230\001\002\000\004\045\u021e" +
+ "\001\002\000\004\017\u021f\001\002\000\004\313\u0220\001" +
+ "\002\000\006\046\u022e\160\u01ff\001\002\000\004\313\u0223" +
+ "\001\002\000\006\015\ufef8\241\ufef8\001\002\000\006\046" +
+ "\u0225\160\u01ff\001\002\000\006\015\ufef6\241\ufef6\001\002" +
+ "\000\004\017\u022d\001\002\000\004\141\u0205\001\002\000" +
+ "\006\021\u020a\023\u0228\001\002\000\004\071\u0229\001\002" +
+ "\000\004\021\u022a\001\002\000\004\141\u022b\001\002\000" +
+ "\004\017\u022c\001\002\000\004\313\ufef5\001\002\000\006" +
+ "\015\ufef7\241\ufef7\001\002\000\004\017\u022f\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\u0234\001\002\000\004\141\u0235\001\002\000\004" +
+ "\022\u0236\001\002\000\004\040\u0237\001\002\000\004\156" +
+ "\u0238\001\002\000\004\141\u0239\001\002\000\004\017\u023a" +
+ "\001\002\000\006\015\ufefa\221\ufefa\001\002\000\004\020" +
+ "\u023c\001\002\000\006\117\u023d\120\u023e\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\u0241\001\002\000\004\012\u0242\001\002\000\006\013" +
+ "\u0244\034\371\001\002\000\004\013\u0246\001\002\000\004" +
+ "\017\u0245\001\002\000\014\015\uff6c\212\uff6c\216\uff6c\307" +
+ "\uff6c\316\uff6c\001\002\000\004\017\u0247\001\002\000\014" +
+ "\015\uff6b\212\uff6b\216\uff6b\307\uff6b\316\uff6b\001\002\000" +
+ "\004\111\u0249\001\002\000\004\012\u024a\001\002\000\006" +
+ "\034\371\035\u024b\001\002\000\004\022\u0258\001\002\000" +
+ "\004\016\u0254\001\002\000\006\013\u024f\016\u024e\001\002" +
+ "\000\004\034\371\001\002\000\004\017\u0250\001\002\000" +
+ "\014\015\uff67\212\uff67\216\uff67\307\uff67\316\uff67\001\002" +
+ "\000\004\013\u0252\001\002\000\004\017\u0253\001\002\000" +
+ "\014\015\uff69\212\uff69\216\uff69\307\uff69\316\uff69\001\002" +
+ "\000\004\035\u024b\001\002\000\004\013\u0256\001\002\000" +
+ "\004\017\u0257\001\002\000\014\015\uff68\212\uff68\216\uff68" +
+ "\307\uff68\316\uff68\001\002\000\004\072\u0259\001\002\000" +
+ "\004\012\u025a\001\002\000\006\042\u025b\043\u025f\001\002" +
+ "\000\004\022\u0268\001\002\000\004\016\u0265\001\002\000" +
+ "\004\016\u0262\001\002\000\004\022\u0260\001\002\000\004" +
+ "\022\uff18\001\002\000\004\141\u0205\001\002\000\010\013" +
+ "\uff19\016\uff19\021\u020a\001\002\000\004\042\u025b\001\002" +
+ "\000\004\013\u0264\001\002\000\006\013\uff1b\016\uff1b\001" +
+ "\002\000\004\043\u025f\001\002\000\004\013\u0267\001\002" +
+ "\000\006\013\uff1a\016\uff1a\001\002\000\004\073\u0269\001" +
+ "\002\000\004\012\u026b\001\002\000\006\013\uff15\016\uff15" +
+ "\001\002\000\016\004\222\005\224\012\226\141\223\251" +
+ "\231\335\221\001\002\000\036\011\241\016\u026d\155\234" +
+ "\255\246\334\240\335\233\336\236\337\243\340\235\341" +
+ "\237\342\245\343\242\344\247\345\244\001\002\000\016" +
+ "\004\222\005\224\012\226\141\223\251\231\335\221\001" +
+ "\002\000\036\011\241\013\u026f\155\234\255\246\334\240" +
+ "\335\233\336\236\337\243\340\235\341\237\342\245\343" +
+ "\242\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\u0272\001\002\000\004\012\u0273" +
+ "\001\002\000\006\013\u0275\034\371\001\002\000\004\013" +
+ "\u0277\001\002\000\004\017\u0276\001\002\000\014\015\uff7b" +
+ "\212\uff7b\216\uff7b\307\uff7b\316\uff7b\001\002\000\004\017" +
+ "\u0278\001\002\000\014\015\uff7a\212\uff7a\216\uff7a\307\uff7a" +
+ "\316\uff7a\001\002\000\004\112\u027a\001\002\000\004\012" +
+ "\u027b\001\002\000\006\034\371\035\u027c\001\002\000\004" +
+ "\022\u0289\001\002\000\006\013\u0284\016\u0283\001\002\000" +
+ "\004\016\u027f\001\002\000\004\035\u027c\001\002\000\004" +
+ "\013\u0281\001\002\000\004\017\u0282\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\u0285\001\002\000\014\015" +
+ "\uff65\212\uff65\216\uff65\307\uff65\316\uff65\001\002\000\004" +
+ "\013\u0287\001\002\000\004\017\u0288\001\002\000\014\015" +
+ "\uff63\212\uff63\216\uff63\307\uff63\316\uff63\001\002\000\004" +
+ "\072\u028a\001\002\000\004\012\u028b\001\002\000\006\042" +
+ "\u028c\043\u025f\001\002\000\004\022\u0295\001\002\000\004" +
+ "\016\u0292\001\002\000\004\016\u028f\001\002\000\004\042" +
+ "\u028c\001\002\000\004\013\u0291\001\002\000\006\013\uff13" +
+ "\016\uff13\001\002\000\004\043\u025f\001\002\000\004\013" +
+ "\u0294\001\002\000\006\013\uff12\016\uff12\001\002\000\004" +
+ "\141\u0296\001\002\000\004\021\u0297\001\002\000\004\044" +
+ "\u0298\001\002\000\004\012\u0299\001\002\000\004\013\u029a" +
+ "\001\002\000\006\013\uff11\016\uff11\001\002\000\004\141" +
+ "\u029c\001\002\000\004\020\u029d\001\002\000\004\105\u029e" +
+ "\001\002\000\006\017\uff72\022\uff72\001\002\000\004\020" +
+ "\u02a0\001\002\000\004\102\u02a1\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\u02a7\164\275" +
+ "\301\u02a6\001\002\000\004\015\u02ae\001\002\000\004\020" +
+ "\u02ab\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\u02a6\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\u02ad\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\u02b0\001\002\000\004\103\u02b1\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\u02b5\155\234\255\246\334\240\335" +
+ "\233\336\236\337\243\340\235\341\237\342\245\343\242" +
+ "\344\247\345\244\001\002\000\020\015\uffa5\145\uffa5\164" +
+ "\uffa5\171\uffa5\215\uffa5\262\uffa5\270\uffa5\001\002\000\004" +
+ "\020\u02b7\001\002\000\010\074\306\075\305\141\303\001" +
+ "\002\000\006\017\uffa4\023\uffa4\001\002\000\004\141\u02ba" +
+ "\001\002\000\004\020\u02bb\001\002\000\010\074\306\075" +
+ "\305\141\303\001\002\000\006\017\uffa1\023\uffa1\001\002" +
+ "\000\004\121\u02be\001\002\000\004\020\u02bf\001\002\000" +
+ "\004\116\u02c0\001\002\000\006\014\uff8d\017\uff8d\001\002" +
+ "\000\006\062\u02c3\063\u02c2\001\002\000\004\165\u02d0\001" +
+ "\002\000\004\165\u02c4\001\002\000\004\141\u02c5\001\002" +
+ "\000\006\021\u02c6\022\u02c7\001\002\000\004\141\u02cc\001" +
+ "\002\000\004\141\u02c8\001\002\000\004\021\u02c9\001\002" +
+ "\000\004\141\u02ca\001\002\000\004\017\u02cb\001\002\000" +
+ "\014\015\uffc6\164\uffc6\166\uffc6\232\uffc6\262\uffc6\001\002" +
+ "\000\004\022\u02cd\001\002\000\004\141\u02ce\001\002\000" +
+ "\004\017\u02cf\001\002\000\014\015\uffc7\164\uffc7\166\uffc7" +
+ "\232\uffc7\262\uffc7\001\002\000\004\141\u02d1\001\002\000" +
+ "\006\021\u02d2\022\u02d3\001\002\000\004\141\u02d8\001\002" +
+ "\000\004\141\u02d4\001\002\000\004\021\u02d5\001\002\000" +
+ "\004\141\u02d6\001\002\000\004\017\u02d7\001\002\000\014" +
+ "\015\uffc4\164\uffc4\166\uffc4\232\uffc4\262\uffc4\001\002\000" +
+ "\004\022\u02d9\001\002\000\004\141\u02da\001\002\000\004" +
+ "\017\u02db\001\002\000\014\015\uffc5\164\uffc5\166\uffc5\232" +
+ "\uffc5\262\uffc5\001\002\000\006\015\u02de\164\275\001\002" +
+ "\000\004\015\u02df\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\u02e3\001" +
+ "\002\000\014\015\uffc1\164\uffc1\166\uffc1\232\uffc1\262\uffc1" +
+ "\001\002\000\006\015\u02ef\164\275\001\002\000\004\262" +
+ "\u02e4\001\002\000\004\041\u02e5\001\002\000\006\020\u02e7" +
+ "\022\u02e6\001\002\000\004\141\u02ec\001\002\000\004\055" +
+ "\u02e8\001\002\000\004\022\u02e9\001\002\000\004\141\u02ea" +
+ "\001\002\000\004\017\u02eb\001\002\000\006\015\uffbc\164" +
+ "\uffbc\001\002\000\004\017\u02ed\001\002\000\006\015\uffbb" +
+ "\164\uffbb\001\002\000\004\015\u02f0\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\u02f2\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\u02f7\164\u02f5" +
+ "\001\002\000\004\141\u02fb\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" +
+ "\u02fa\164\u02f5\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\u02fc\001\002" +
+ "\000\004\141\u02fd\001\002\000\004\017\u02fe\001\002\000" +
+ "\006\015\uffb3\164\uffb3\001\002\000\006\013\uffd7\016\uffd7" +
+ "\001\002\000\004\022\u0317\001\002\000\004\022\u0315\001" +
+ "\002\000\004\013\u0313\001\002\000\006\013\uffd8\016\uffd8" +
+ "\001\002\000\006\013\uffd5\016\uffd5\001\002\000\006\013" +
+ "\uffdb\016\u0311\001\002\000\006\013\uffd6\016\uffd6\001\002" +
+ "\000\004\022\u030f\001\002\000\004\022\u030d\001\002\000" +
+ "\006\013\uffd9\016\uffd9\001\002\000\004\022\u030b\001\002" +
+ "\000\004\004\u030c\001\002\000\006\013\uffd1\016\uffd1\001" +
+ "\002\000\004\141\u030e\001\002\000\006\013\uffd4\016\uffd4" +
+ "\001\002\000\004\005\u0310\001\002\000\006\013\uffd0\016" +
+ "\uffd0\001\002\000\014\025\u0307\026\u030a\027\u0301\031\u0308" +
+ "\032\u0300\001\002\000\004\013\uffda\001\002\000\004\017" +
+ "\u0314\001\002\000\014\015\uffe1\164\uffe1\166\uffe1\232\uffe1" +
+ "\262\uffe1\001\002\000\004\005\u0316\001\002\000\006\013" +
+ "\uffd2\016\uffd2\001\002\000\004\141\u0318\001\002\000\006" +
+ "\013\uffd3\016\uffd3\001\002\000\004\015\ufffd\001\002\000" +
+ "\004\013\u031b\001\002\000\004\017\u031c\001\002\000\014" +
+ "\015\uffdd\164\uffdd\166\uffdd\232\uffdd\262\uffdd\001\002\000" +
+ "\004\141\u031e\001\002\000\006\305\136\333\140\001\002" +
+ "\000\004\100\u0320\001\002\000\004\014\uffeb\001\002\000" +
+ "\004\013\u0322\001\002\000\004\017\u0323\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
@@ -779,27 +778,27 @@ 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" +
+ "\000\u0322\000\004\004\003\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\066\005\041\006\021" +
"\011\011\013\035\014\036\017\023\020\043\021\013\022" +
"\012\032\031\033\015\034\020\035\044\036\024\037\022" +
"\040\026\041\010\042\016\043\025\044\033\045\014\046" +
"\030\053\034\054\032\055\042\056\040\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\002\001\001\000\020\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" +
+ "\001\000\002\001\001\000\002\001\001\000\020\023\u0320" +
+ "\024\u0304\025\u0308\026\u0302\027\u02fe\030\u0305\031\u0303\001" +
+ "\001\000\002\001\001\000\002\001\001\000\020\023\u0319" +
+ "\024\u0304\025\u0308\026\u0302\027\u02fe\030\u0305\031\u0303\001" +
+ "\001\000\066\005\u0318\006\021\011\011\013\035\014\036" +
"\017\023\020\043\021\013\022\012\032\031\033\015\034" +
"\020\035\044\036\024\037\022\040\026\041\010\042\016" +
"\043\025\044\033\045\014\046\030\053\034\054\032\055" +
"\042\056\040\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\020\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\u0301\024\u0304" +
+ "\025\u0308\026\u0302\027\u02fe\030\u0305\031\u0303\001\001\000" +
+ "\002\001\001\000\002\001\001\000\012\015\u02df\016\276" +
+ "\047\u02e0\050\u02e1\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" +
@@ -830,7 +829,7 @@ 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\044\055\176\056" +
- "\040\057\u02a3\060\164\061\174\062\160\063\157\064\165" +
+ "\040\057\u02a2\060\164\061\174\062\160\063\157\064\165" +
"\065\167\066\151\071\170\072\156\073\153\076\173\077" +
"\163\100\175\167\172\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
@@ -874,8 +873,8 @@ public class AvatarFromSysMLParser extends java_cup.runtime.lr_parser {
"\164\333\165\347\166\351\176\345\203\323\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\002\001\001\000\010\177\u01d1" +
- "\212\u01d0\213\u01ce\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" +
@@ -979,14 +978,14 @@ 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\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\006\120\u01c5\225" +
- "\u01c6\001\001\000\002\001\001\000\002\001\001\000\006" +
- "\121\u01c7\225\u0100\001\001\000\002\001\001\000\006\120" +
- "\u01c9\225\u01c6\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" +
+ "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\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\u01d8\220\u01d6\221\u01db\222\u01d9\223\u01da" +
+ "\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\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
@@ -995,29 +994,29 @@ 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\u01d6\221" +
- "\u01db\222\u01d9\223\u01da\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\014\204\u01f1\220\u01d5\221\u01da\222\u01d8\223" +
+ "\u01d9\001\001\000\002\001\001\000\004\205\u01f3\001\001" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\004\200\u01f9\001\001\000\006\201\u01fb" +
+ "\207\u01fc\001\001\000\002\001\001\000\002\001\001\000" +
+ "\004\200\u020c\001\001\000\006\003\u0205\211\u0203\001\001" +
+ "\000\002\001\001\000\002\001\001\000\006\230\u0201\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\u0207\230\u0143\231\u0140\232\u0141\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\u01fb\207\u01fc" +
"\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\u0141\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" +
- "\u01d6\221\u01db\222\u01d9\223\u01da\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" +
+ "\000\002\001\001\000\014\204\u0214\220\u01d5\221\u01da\222" +
+ "\u01d8\223\u01d9\001\001\000\002\001\001\000\002\001\001" +
+ "\000\010\206\u021b\214\u0218\215\u0219\001\001\000\002\001" +
+ "\001\000\004\215\u0231\001\001\000\004\214\u0230\001\001" +
+ "\000\002\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\006\216\u0221\217\u0220\001\001\000\004" +
+ "\207\u0225\001\001\000\006\216\u0223\217\u0220\001\001\000" +
+ "\002\001\001\000\004\207\u0225\001\001\000\002\001\001" +
+ "\000\002\001\001\000\004\211\u0226\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
@@ -1026,51 +1025,51 @@ 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\000\004\117\u0242\001\001\000\002\001\001\000\002" +
"\001\001\000\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" +
+ "\001\000\002\001\001\000\002\001\001\000\006\117\u024b" +
+ "\171\u024c\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\004\117\u0250\001\001\000\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" +
+ "\002\001\001\000\004\171\u0254\001\001\000\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" +
- "\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\224\001\001\000\002\001" +
- "\001\000\010\231\u026e\232\227\233\224\001\001\000\002" +
+ "\002\001\001\000\010\172\u025c\173\u025b\210\u025d\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\u0260\001\001" +
+ "\000\002\001\001\000\004\173\u0262\001\001\000\002\001" +
+ "\001\000\002\001\001\000\006\172\u0265\210\u025d\001\001" +
+ "\000\002\001\001\000\002\001\001\000\004\136\u0269\001" +
+ "\001\000\002\001\001\000\002\001\001\000\010\231\u026b" +
+ "\232\227\233\224\001\001\000\002\001\001\000\010\231" +
+ "\u026d\232\227\233\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\004\117\u0274\001\001\000\002" +
+ "\001\000\004\117\u0273\001\001\000\002\001\001\000\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\u027d" +
+ "\174\u027c\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\004\174\u027f\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\004\117\u0285\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" +
+ "\002\001\001\000\010\172\u028d\175\u028c\210\u025d\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" +
+ "\004\175\u028f\001\001\000\002\001\001\000\002\001\001" +
+ "\000\006\172\u0292\210\u025d\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\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\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\224\001\001\000\002\001\001\000" +
- "\002\001\001\000\002\001\001\000\004\002\u02b8\001\001" +
+ "\016\u02a8\067\u02a4\070\u02a7\001\001\000\002\001\001\000" +
+ "\002\001\001\000\002\001\001\000\010\016\u02a8\067\u02a9" +
+ "\070\u02a7\001\001\000\002\001\001\000\002\001\001\000" +
+ "\004\002\u02ab\001\001\000\002\001\001\000\002\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" +
+ "\002\001\001\000\002\001\001\000\010\231\u02b3\232\227" +
+ "\233\224\001\001\000\002\001\001\000\002\001\001\000" +
+ "\002\001\001\000\004\002\u02b7\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\004\002\u02bb\001" +
+ "\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\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,32 +1079,32 @@ 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" +
+ "\006\015\u02dc\016\276\001\001\000\002\001\001\000\002" +
+ "\001\001\000\002\001\001\000\004\050\u02f0\001\001\000" +
+ "\002\001\001\000\006\015\u02ed\016\276\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
- "\001\000\002\001\001\000\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\006\051\u02f5\052\u02f7\001\001\000\002\001\001" +
+ "\000\002\001\001\000\002\001\001\000\006\051\u02f8\052" +
+ "\u02f7\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\002\001" +
"\001\000\002\001\001\000\002\001\001\000\002\001\001" +
"\000\002\001\001\000\002\001\001\000\002\001\001\000" +
"\002\001\001\000\002\001\001\000\002\001\001\000\002" +
"\001\001\000\002\001\001\000\002\001\001\000\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\u0311\024" +
+ "\u0304\025\u0308\026\u0302\027\u02fe\030\u0305\031\u0303\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\002\001\001\000\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\u031e" +
+ "\001\001\000\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" +
- "\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
@@ -4226,20 +4225,20 @@ class CUP$AvatarFromSysMLParser$actions {
return CUP$AvatarFromSysMLParser$result;
/*. . . . . . . . . . . . . . . . . . . .*/
- case 179: // requestList ::= dummy request
+ case 179: // requestList ::= request
{
Object RESULT =null;
- CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",78, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-1), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+ CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",78, CUP$AvatarFromSysMLParser$stack.peek(), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
}
return CUP$AvatarFromSysMLParser$result;
/*. . . . . . . . . . . . . . . . . . . .*/
- case 180: // requestList ::= dummy request COMMA requestList
+ case 180: // requestList ::= request COMMA requestList
{
Object RESULT =null;
- CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",78, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-3), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
+ CUP$AvatarFromSysMLParser$result = parser.getSymbolFactory().newSymbol("requestList",78, CUP$AvatarFromSysMLParser$stack.elementAt(CUP$AvatarFromSysMLParser$top-2), CUP$AvatarFromSysMLParser$stack.peek(), RESULT);
}
return CUP$AvatarFromSysMLParser$result;
@@ -4253,7 +4252,7 @@ class CUP$AvatarFromSysMLParser$actions {
addError( new AvatarFromSysMLError(
AvatarFromSysMLError.LOWERROR,
lexer.getLocation(),
- "Transition " + requestIndex + " is already requested",
+ "Transition " + (requestIndex + 1) + " is already requested",
theTransition.getRleft()) );
okRequest = false;
} else {
diff --git a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
index 4e88747540767107eb4e69a0ca9c8020cd4a9a69..800df7df78b713a1b8fe1f8f4511cdc327752cb1 100644
--- a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
+++ b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
@@ -1287,14 +1287,14 @@ poolParam ::=
| POOL_F EQUAL request
;
requestParam ::= REQUEST_F EQUAL request;
-requestList ::= dummy request | dummy request COMMA requestList;
+requestList ::= request | request COMMA requestList;
dummy ::= {:
getTransition(requestIndex);
if (theTransition.isRequested()) {
addError( new AvatarFromSysMLError(
AvatarFromSysMLError.LOWERROR,
lexer.getLocation(),
- "Transition " + requestIndex + " is already requested",
+ "Transition " + (requestIndex + 1) + " is already requested",
theTransition.getRleft()) );
okRequest = false;
} else {
diff --git a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jflex b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jflex
index 7dc728076731bfecf0ab202dd55e9720ca39de85..d33bb5fc7ebf944081cfea3f3f27620120c496ab 100644
--- a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jflex
+++ b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jflex
@@ -38,7 +38,7 @@ import avatartranslator.tosysmlv2.AvatarFromSysMLSyntax.*;
Location errorLocation;
public void setErrorLocation(Location _errorLocation) { errorLocation = _errorLocation; }
public Location getErrorLocation() { return errorLocation; }
- public Location getLocation() { return new Location(yyline, yycolums); }
+ public Location getLocation() { return new Location(yyline, yycolumn); }
%}
%init{
errorLocation = null;