Refactored meta models:

- extracted NamedElement from different meta models to base.ecore
- refactored StatechartScopes to be types::Type and EventDefinition, VariableDefinition and Operations to be types::Event, types::Property and types::Operation accordingly

plugins/org.yakindu.sct.generator.genmodel/src/org/yakindu/sct/generator/genmodel/SGen.xtext

@@ -24,7 +24,7 @@ FeatureConfiguration returns gen::FeatureConfiguration:
 
 FeatureParameterValue returns gen::FeatureParameterValue:
 	{gen::FeatureParameterValue} parameter=[gen::FeatureParameter] '=' expression=XLiteral;
- 
+
 QID:
 	ID (('::' | '.') ID)*; 
 	

plugins/org.yakindu.sct.model.stext.edit/plugin.properties

@@ -193,3 +193,4 @@ _UI_TimeUnit_millisecond_literal = ms
 _UI_TimeUnit_microsend_literal = \ufffds
 _UI_TimeUnit_nanosecond_literal = ns
 _UI_StatechartScope_type = Statechart Scope
+_UI_TimeUnit_microsecond_literal = mics

plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g

@@ -2812,10 +2812,10 @@ rule__TimeUnit__Alternatives
 )
 
     |(
-{ before(grammarAccess.getTimeUnitAccess().getMicrosendEnumLiteralDeclaration_2()); }
-(	'\u00D4\u00F8\u03A9s' 
+{ before(grammarAccess.getTimeUnitAccess().getMicrosecondEnumLiteralDeclaration_2()); }
+(	'mics' 
 )
-{ after(grammarAccess.getTimeUnitAccess().getMicrosendEnumLiteralDeclaration_2()); }
+{ after(grammarAccess.getTimeUnitAccess().getMicrosecondEnumLiteralDeclaration_2()); }
 )
 
     |(

plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.tokens

@@ -103,7 +103,6 @@ T__77=77
 'else'=15
 '^='=30
 '+='=25
-'\u00D4\u00F8\u03A9s'=48
 'readonly'=84
 '>>='=28
 '?'=75
@@ -124,6 +123,7 @@ T__77=77
 '!'=78
 '|'=80
 'ms'=47
+'mics'=48
 'every'=20
 '|='=31
 '@@statechart@@'=50

plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSTextLexer.java

@@ -818,10 +818,10 @@ public class InternalSTextLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g:45:7: ( '\\u00D4\\u00F8\\u03A9s' )
-            // ../org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g:45:9: '\\u00D4\\u00F8\\u03A9s'
+            // ../org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g:45:7: ( 'mics' )
+            // ../org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g:45:9: 'mics'
             {
-            match("\u00D4\u00F8\u03A9s"); 
+            match("mics"); 
 
 
             }
@@ -2926,111 +2926,111 @@ public class InternalSTextLexer extends Lexer {
 
     protected DFA16 dfa16 = new DFA16(this);
     static final String DFA16_eotS =
-        "\1\uffff\6\60\1\76\1\100\1\104\1\106\1\110\1\112\1\115\1\120\1\123"+
-        "\1\125\1\130\1\uffff\1\133\1\134\1\60\1\56\1\60\1\56\1\uffff\1\60"+
-        "\10\uffff\1\60\1\uffff\3\60\2\164\1\uffff\2\56\2\uffff\1\60\1\uffff"+
-        "\5\60\1\u0081\6\60\16\uffff\1\u0089\2\uffff\1\u008b\16\uffff\1\u008c"+
-        "\1\uffff\1\u008d\1\60\1\u008f\2\uffff\1\60\10\uffff\2\60\1\uffff"+
-        "\3\60\2\uffff\1\164\3\uffff\10\60\1\uffff\1\u00a2\5\60\6\uffff\1"+
-        "\60\3\uffff\1\u00aa\5\60\1\u008f\1\60\1\u00b1\3\60\1\u00b6\3\60"+
-        "\1\uffff\6\60\2\uffff\3\60\1\u008f\2\60\1\uffff\1\u00c6\1\u00c7"+
-        "\1\u00c9\1\60\1\uffff\1\60\1\u00cc\3\60\1\u00d1\3\60\1\uffff\1\60"+
-        "\1\u00d7\1\60\1\u008f\1\60\2\uffff\1\60\1\uffff\2\60\1\uffff\4\60"+
-        "\1\uffff\1\u00e1\1\u00e2\1\60\1\uffff\1\60\1\uffff\1\60\1\u00e7"+
-        "\6\60\1\u00ee\2\uffff\1\60\1\uffff\1\u00f2\1\60\1\uffff\2\60\1\u00f6"+
-        "\1\60\1\u00f8\1\60\1\uffff\1\60\3\uffff\1\u00fb\1\60\1\u00fd\1\uffff"+
-        "\1\u00fe\1\uffff\1\u00ff\1\u0100\1\uffff\1\u0101\5\uffff";
+        "\1\uffff\6\57\1\75\1\77\1\103\1\105\1\107\1\111\1\114\1\117\1\122"+
+        "\1\124\1\127\1\uffff\1\132\1\133\2\57\1\55\1\uffff\1\57\10\uffff"+
+        "\1\57\1\uffff\3\57\2\163\1\uffff\2\55\2\uffff\1\57\1\uffff\5\57"+
+        "\1\u0080\6\57\16\uffff\1\u0088\2\uffff\1\u008a\16\uffff\1\u008b"+
+        "\1\57\1\u008d\1\57\1\u008f\2\uffff\1\57\10\uffff\2\57\1\uffff\3"+
+        "\57\2\uffff\1\163\3\uffff\10\57\1\uffff\1\u00a2\5\57\5\uffff\1\57"+
+        "\1\uffff\1\57\3\uffff\1\u00ab\5\57\1\u008f\1\57\1\u00b2\3\57\1\u00b7"+
+        "\3\57\1\uffff\5\57\1\u00c0\1\57\2\uffff\3\57\1\u008f\2\57\1\uffff"+
+        "\1\u00c8\1\u00c9\1\u00cb\1\57\1\uffff\1\57\1\u00ce\3\57\1\u00d3"+
+        "\2\57\1\uffff\1\57\1\uffff\1\57\1\u00d9\1\57\1\u008f\1\57\2\uffff"+
+        "\1\57\1\uffff\2\57\1\uffff\4\57\1\uffff\1\u00e3\1\u00e4\1\57\1\uffff"+
+        "\1\57\1\uffff\1\57\1\u00e9\6\57\1\u00f0\2\uffff\1\57\1\uffff\1\u00f4"+
+        "\1\57\1\uffff\2\57\1\u00f8\1\57\1\u00fa\1\57\1\uffff\1\57\3\uffff"+
+        "\1\u00fd\1\57\1\u00ff\1\uffff\1\u0100\1\uffff\1\u0101\1\u0102\1"+
+        "\uffff\1\u0103\5\uffff";
     static final String DFA16_eofS =
-        "\u0102\uffff";
+        "\u0104\uffff";
     static final String DFA16_minS =
         "\1\0\1\145\1\154\1\157\2\156\1\143\2\75\1\52\3\75\1\74\1\75\1\46"+
-        "\2\75\1\uffff\1\75\1\60\1\163\1\u00f8\1\141\1\100\1\uffff\1\141"+
-        "\10\uffff\1\141\1\uffff\1\162\1\141\1\145\2\56\1\uffff\2\0\2\uffff"+
-        "\1\146\1\uffff\1\163\1\145\1\164\1\151\1\143\1\60\1\164\1\145\1"+
-        "\143\1\164\1\167\1\164\16\uffff\1\75\2\uffff\1\75\16\uffff\1\60"+
-        "\1\uffff\1\60\1\155\1\60\1\163\1\uffff\1\154\10\uffff\1\151\1\141"+
-        "\1\uffff\1\165\1\154\1\163\2\uffff\1\56\3\uffff\1\141\1\145\1\156"+
-        "\1\162\1\164\1\145\1\141\1\145\1\uffff\1\60\1\162\1\171\1\145\1"+
-        "\141\1\151\6\uffff\1\145\1\uffff\1\164\1\uffff\1\60\1\165\1\163"+
-        "\1\144\1\145\1\163\1\60\1\165\1\60\1\171\1\164\1\171\1\60\1\162"+
-        "\1\154\1\162\1\uffff\1\141\1\143\1\162\1\171\1\166\1\163\1\141\1"+
-        "\uffff\2\145\1\157\1\60\1\145\1\154\1\uffff\3\60\1\157\1\uffff\1"+
-        "\156\1\60\1\146\1\164\1\154\1\60\1\163\1\145\1\160\1\164\1\157\1"+
-        "\60\1\156\1\60\1\164\2\uffff\1\157\1\uffff\1\151\1\141\1\uffff\2"+
-        "\141\1\151\1\145\1\uffff\2\60\1\141\1\145\1\146\1\uffff\1\154\1"+
-        "\60\1\151\1\156\1\154\1\143\1\154\1\157\1\60\2\uffff\1\143\1\100"+
-        "\1\60\1\171\1\uffff\1\156\1\164\1\60\1\145\1\60\1\156\1\uffff\1"+
-        "\145\3\uffff\1\60\1\164\1\60\1\uffff\1\60\1\uffff\2\60\1\uffff\1"+
-        "\60\5\uffff";
+        "\2\75\1\uffff\1\75\1\60\1\151\1\141\1\100\1\uffff\1\141\10\uffff"+
+        "\1\141\1\uffff\1\162\1\141\1\145\2\56\1\uffff\2\0\2\uffff\1\146"+
+        "\1\uffff\1\163\1\145\1\164\1\151\1\143\1\60\1\164\1\145\1\143\1"+
+        "\164\1\167\1\164\16\uffff\1\75\2\uffff\1\75\16\uffff\1\60\1\143"+
+        "\1\60\1\155\1\60\1\163\1\uffff\1\154\10\uffff\1\151\1\141\1\uffff"+
+        "\1\165\1\154\1\163\2\uffff\1\56\3\uffff\1\141\1\145\1\156\1\162"+
+        "\1\164\1\145\1\141\1\145\1\uffff\1\60\1\162\1\171\1\145\1\141\1"+
+        "\151\5\uffff\1\163\1\uffff\1\145\1\uffff\1\164\1\uffff\1\60\1\165"+
+        "\1\163\1\144\1\145\1\163\1\60\1\165\1\60\1\171\1\164\1\171\1\60"+
+        "\1\162\1\154\1\162\1\uffff\1\141\1\143\1\162\1\171\1\166\1\60\1"+
+        "\163\1\141\1\uffff\2\145\1\157\1\60\1\145\1\154\1\uffff\3\60\1\157"+
+        "\1\uffff\1\156\1\60\1\146\1\164\1\154\1\60\1\163\1\145\1\uffff\1"+
+        "\160\1\164\1\157\1\60\1\156\1\60\1\164\2\uffff\1\157\1\uffff\1\151"+
+        "\1\141\1\uffff\2\141\1\151\1\145\1\uffff\2\60\1\141\1\145\1\146"+
+        "\1\uffff\1\154\1\60\1\151\1\156\1\154\1\143\1\154\1\157\1\60\2\uffff"+
+        "\1\143\1\100\1\60\1\171\1\uffff\1\156\1\164\1\60\1\145\1\60\1\156"+
+        "\1\uffff\1\145\3\uffff\1\60\1\164\1\60\1\uffff\1\60\1\uffff\2\60"+
+        "\1\uffff\1\60\5\uffff";
     static final String DFA16_maxS =
         "\1\uffff\1\145\1\170\1\157\1\156\1\165\1\154\7\75\1\76\1\75\1\172"+
-        "\1\174\1\uffff\1\75\1\172\1\163\1\u00f8\1\163\1\100\1\uffff\1\141"+
-        "\10\uffff\1\145\1\uffff\1\162\1\141\1\145\1\170\1\71\1\uffff\2\uffff"+
-        "\2\uffff\1\146\1\uffff\1\163\1\145\2\164\1\143\1\172\1\164\1\145"+
-        "\1\143\1\164\1\167\1\164\16\uffff\1\75\2\uffff\1\75\16\uffff\1\172"+
-        "\1\uffff\1\172\1\155\1\172\1\164\1\uffff\1\162\10\uffff\1\151\1"+
-        "\141\1\uffff\1\165\1\154\1\163\2\uffff\1\71\3\uffff\1\141\1\145"+
-        "\2\162\1\164\1\145\1\141\1\145\1\uffff\1\172\1\162\1\171\1\145\1"+
-        "\141\1\151\6\uffff\1\145\1\uffff\1\164\1\uffff\1\172\1\165\1\163"+
-        "\1\144\1\145\1\163\1\172\1\165\1\172\1\171\1\164\1\171\1\172\1\162"+
-        "\1\154\1\162\1\uffff\1\141\1\143\1\162\1\171\1\166\1\163\1\141\1"+
+        "\1\174\1\uffff\1\75\1\172\2\163\1\100\1\uffff\1\141\10\uffff\1\145"+
+        "\1\uffff\1\162\1\141\1\145\1\170\1\71\1\uffff\2\uffff\2\uffff\1"+
+        "\146\1\uffff\1\163\1\145\2\164\1\143\1\172\1\164\1\145\1\143\1\164"+
+        "\1\167\1\164\16\uffff\1\75\2\uffff\1\75\16\uffff\1\172\1\143\1\172"+
+        "\1\155\1\172\1\164\1\uffff\1\162\10\uffff\1\151\1\141\1\uffff\1"+
+        "\165\1\154\1\163\2\uffff\1\71\3\uffff\1\141\1\145\2\162\1\164\1"+
+        "\145\1\141\1\145\1\uffff\1\172\1\162\1\171\1\145\1\141\1\151\5\uffff"+
+        "\1\163\1\uffff\1\145\1\uffff\1\164\1\uffff\1\172\1\165\1\163\1\144"+
+        "\1\145\1\163\1\172\1\165\1\172\1\171\1\164\1\171\1\172\1\162\1\154"+
+        "\1\162\1\uffff\1\141\1\143\1\162\1\171\1\166\1\172\1\163\1\141\1"+
         "\uffff\2\145\1\157\1\172\1\145\1\154\1\uffff\3\172\1\157\1\uffff"+
-        "\1\156\1\172\1\156\1\164\1\154\1\172\1\163\1\145\1\160\1\164\1\157"+
-        "\1\172\1\156\1\172\1\164\2\uffff\1\157\1\uffff\1\151\1\141\1\uffff"+
-        "\2\141\1\151\1\145\1\uffff\2\172\1\141\1\145\1\146\1\uffff\1\154"+
-        "\1\172\1\151\1\156\1\154\1\143\1\154\1\157\1\172\2\uffff\2\143\1"+
-        "\172\1\171\1\uffff\1\156\1\164\1\172\1\145\1\172\1\156\1\uffff\1"+
-        "\145\3\uffff\1\172\1\164\1\172\1\uffff\1\172\1\uffff\2\172\1\uffff"+
-        "\1\172\5\uffff";
+        "\1\156\1\172\1\156\1\164\1\154\1\172\1\163\1\145\1\uffff\1\160\1"+
+        "\164\1\157\1\172\1\156\1\172\1\164\2\uffff\1\157\1\uffff\1\151\1"+
+        "\141\1\uffff\2\141\1\151\1\145\1\uffff\2\172\1\141\1\145\1\146\1"+
+        "\uffff\1\154\1\172\1\151\1\156\1\154\1\143\1\154\1\157\1\172\2\uffff"+
+        "\2\143\1\172\1\171\1\uffff\1\156\1\164\1\172\1\145\1\172\1\156\1"+
+        "\uffff\1\145\3\uffff\1\172\1\164\1\172\1\uffff\1\172\1\uffff\2\172"+
+        "\1\uffff\1\172\5\uffff";
     static final String DFA16_acceptS =
-        "\22\uffff\1\32\6\uffff\1\52\1\uffff\1\57\1\60\1\61\1\64\1\65\1\66"+
+        "\22\uffff\1\32\5\uffff\1\52\1\uffff\1\57\1\60\1\61\1\64\1\65\1\66"+
         "\1\67\1\70\1\uffff\1\76\5\uffff\1\114\2\uffff\1\121\1\122\1\uffff"+
         "\1\114\14\uffff\1\37\1\10\1\11\1\27\1\12\1\117\1\120\1\30\1\13\1"+
         "\31\1\14\1\25\1\15\1\26\1\uffff\1\34\1\33\1\uffff\1\36\1\35\1\20"+
-        "\1\100\1\104\1\21\1\102\1\22\1\77\1\103\1\32\1\40\1\101\1\41\1\uffff"+
-        "\1\43\4\uffff\1\52\1\uffff\1\57\1\60\1\61\1\64\1\65\1\66\1\67\1"+
-        "\70\2\uffff\1\76\3\uffff\1\112\1\115\1\uffff\1\113\1\116\1\121\10"+
-        "\uffff\1\4\6\uffff\1\16\1\23\1\17\1\24\1\42\1\44\1\uffff\1\111\1"+
-        "\uffff\1\47\20\uffff\1\5\7\uffff\1\55\6\uffff\1\2\4\uffff\1\72\17"+
-        "\uffff\1\7\1\54\1\uffff\1\71\2\uffff\1\3\4\uffff\1\6\5\uffff\1\75"+
-        "\11\uffff\1\74\1\106\4\uffff\1\1\6\uffff\1\73\1\uffff\1\45\1\46"+
-        "\1\105\3\uffff\1\110\1\uffff\1\53\2\uffff\1\107\1\uffff\1\63\1\51"+
-        "\1\56\1\50\1\62";
+        "\1\100\1\104\1\21\1\102\1\22\1\77\1\103\1\32\1\40\1\101\1\41\6\uffff"+
+        "\1\52\1\uffff\1\57\1\60\1\61\1\64\1\65\1\66\1\67\1\70\2\uffff\1"+
+        "\76\3\uffff\1\112\1\115\1\uffff\1\113\1\116\1\121\10\uffff\1\4\6"+
+        "\uffff\1\16\1\23\1\17\1\24\1\42\1\uffff\1\44\1\uffff\1\111\1\uffff"+
+        "\1\47\20\uffff\1\5\10\uffff\1\55\6\uffff\1\2\4\uffff\1\72\10\uffff"+
+        "\1\43\7\uffff\1\7\1\54\1\uffff\1\71\2\uffff\1\3\4\uffff\1\6\5\uffff"+
+        "\1\75\11\uffff\1\74\1\106\4\uffff\1\1\6\uffff\1\73\1\uffff\1\45"+
+        "\1\46\1\105\3\uffff\1\110\1\uffff\1\53\2\uffff\1\107\1\uffff\1\63"+
+        "\1\51\1\56\1\50\1\62";
     static final String DFA16_specialS =
-        "\1\1\52\uffff\1\2\1\0\u00d5\uffff}>";
+        "\1\1\51\uffff\1\2\1\0\u00d8\uffff}>";
     static final String[] DFA16_transitionS = {
-            "\11\56\2\55\2\56\1\55\22\56\1\55\1\23\1\53\1\37\1\56\1\12\1"+
-            "\17\1\54\1\33\1\34\1\10\1\13\1\35\1\14\1\36\1\11\1\50\11\51"+
-            "\1\31\1\42\1\15\1\7\1\16\1\44\1\30\32\52\1\40\1\56\1\41\1\20"+
-            "\1\52\1\56\1\6\2\52\1\1\1\2\1\46\2\52\1\4\2\52\1\3\1\25\1\27"+
-            "\1\5\2\52\1\43\1\24\1\45\1\52\1\32\2\52\1\47\1\52\1\56\1\21"+
-            "\1\56\1\22\125\56\1\26\uff2b\56",
-            "\1\57",
-            "\1\61\1\uffff\1\63\7\uffff\1\62\1\uffff\1\64",
+            "\11\55\2\54\2\55\1\54\22\55\1\54\1\23\1\52\1\36\1\55\1\12\1"+
+            "\17\1\53\1\32\1\33\1\10\1\13\1\34\1\14\1\35\1\11\1\47\11\50"+
+            "\1\30\1\41\1\15\1\7\1\16\1\43\1\27\32\51\1\37\1\55\1\40\1\20"+
+            "\1\51\1\55\1\6\2\51\1\1\1\2\1\45\2\51\1\4\2\51\1\3\1\25\1\26"+
+            "\1\5\2\51\1\42\1\24\1\44\1\51\1\31\2\51\1\46\1\51\1\55\1\21"+
+            "\1\55\1\22\uff81\55",
+            "\1\56",
+            "\1\60\1\uffff\1\62\7\uffff\1\61\1\uffff\1\63",
+            "\1\64",
             "\1\65",
-            "\1\66",
-            "\1\71\1\uffff\1\70\4\uffff\1\67",
-            "\1\74\2\uffff\1\72\5\uffff\1\73",
-            "\1\75",
-            "\1\77",
-            "\1\102\4\uffff\1\103\15\uffff\1\101",
-            "\1\105",
-            "\1\107",
-            "\1\111",
-            "\1\113\1\114",
-            "\1\117\1\116",
-            "\1\122\26\uffff\1\121",
-            "\1\124\3\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\1\126\76\uffff\1\127",
+            "\1\70\1\uffff\1\67\4\uffff\1\66",
+            "\1\73\2\uffff\1\71\5\uffff\1\72",
+            "\1\74",
+            "\1\76",
+            "\1\101\4\uffff\1\102\15\uffff\1\100",
+            "\1\104",
+            "\1\106",
+            "\1\110",
+            "\1\112\1\113",
+            "\1\116\1\115",
+            "\1\121\26\uffff\1\120",
+            "\1\123\3\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\125\76\uffff\1\126",
             "",
-            "\1\132",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\1\135",
-            "\1\136",
-            "\1\140\15\uffff\1\141\3\uffff\1\137",
-            "\1\142",
+            "\1\131",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\135\11\uffff\1\134",
+            "\1\137\15\uffff\1\140\3\uffff\1\136",
+            "\1\141",
             "",
-            "\1\144",
+            "\1\143",
             "",
             "",
             "",
@@ -3039,33 +3039,32 @@ public class InternalSTextLexer extends Lexer {
             "",
             "",
             "",
-            "\1\155\3\uffff\1\156",
+            "\1\154\3\uffff\1\155",
             "",
+            "\1\157",
             "\1\160",
             "\1\161",
-            "\1\162",
-            "\1\166\1\uffff\12\165\36\uffff\1\163\37\uffff\1\163",
-            "\1\166\1\uffff\12\165",
+            "\1\165\1\uffff\12\164\36\uffff\1\162\37\uffff\1\162",
+            "\1\165\1\uffff\12\164",
             "",
-            "\0\167",
-            "\0\167",
+            "\0\166",
+            "\0\166",
             "",
             "",
-            "\1\171",
+            "\1\170",
             "",
+            "\1\171",
             "\1\172",
             "\1\173",
-            "\1\174",
-            "\1\175\12\uffff\1\176",
-            "\1\177",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\23\60\1\u0080\6\60",
+            "\1\174\12\uffff\1\175",
+            "\1\176",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\23\57\1\177\6\57",
+            "\1\u0081",
             "\1\u0082",
             "\1\u0083",
             "\1\u0084",
             "\1\u0085",
             "\1\u0086",
-            "\1\u0087",
-            "",
             "",
             "",
             "",
@@ -3079,11 +3078,11 @@ public class InternalSTextLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u0088",
             "",
+            "\1\u0087",
             "",
-            "\1\u008a",
             "",
+            "\1\u0089",
             "",
             "",
             "",
@@ -3097,11 +3096,12 @@ public class InternalSTextLexer extends Lexer {
             "",
             "",
             "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
             "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u008c",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u008e",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u0090\1\u0091",
             "",
             "\1\u0093\5\uffff\1\u0092",
@@ -3121,7 +3121,7 @@ public class InternalSTextLexer extends Lexer {
             "\1\u0098",
             "",
             "",
-            "\1\166\1\uffff\12\165",
+            "\1\165\1\uffff\12\164",
             "",
             "",
             "",
@@ -3134,7 +3134,7 @@ public class InternalSTextLexer extends Lexer {
             "\1\u00a0",
             "\1\u00a1",
             "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00a3",
             "\1\u00a4",
             "\1\u00a5",
@@ -3145,120 +3145,123 @@ public class InternalSTextLexer extends Lexer {
             "",
             "",
             "",
-            "",
             "\1\u00a8",
             "",
             "\1\u00a9",
             "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\1\u00ab",
+            "\1\u00aa",
+            "",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00ac",
             "\1\u00ad",
             "\1\u00ae",
             "\1\u00af",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
             "\1\u00b0",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\1\u00b2",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u00b1",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00b3",
             "\1\u00b4",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u00b5\12"+
-            "\60",
-            "\1\u00b7",
+            "\1\u00b5",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\17\57\1\u00b6\12"+
+            "\57",
             "\1\u00b8",
             "\1\u00b9",
-            "",
             "\1\u00ba",
+            "",
             "\1\u00bb",
             "\1\u00bc",
             "\1\u00bd",
             "\1\u00be",
             "\1\u00bf",
-            "\1\u00c0",
-            "",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00c1",
             "\1\u00c2",
+            "",
             "\1\u00c3",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
             "\1\u00c4",
             "\1\u00c5",
-            "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\17\60\1\u00c8\12"+
-            "\60",
-            "\1\u00ca",
-            "",
-            "\1\u00cb",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\1\u00cd\7\uffff\1\u00ce",
-            "\1\u00cf",
-            "\1\u00d0",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u00c6",
+            "\1\u00c7",
+            "",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\17\57\1\u00ca\12"+
+            "\57",
+            "\1\u00cc",
+            "",
+            "\1\u00cd",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u00cf\7\uffff\1\u00d0",
+            "\1\u00d1",
             "\1\u00d2",
-            "\1\u00d3",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00d4",
             "\1\u00d5",
+            "",
             "\1\u00d6",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\1\u00d7",
             "\1\u00d8",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\1\u00d9",
-            "",
-            "",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00da",
-            "",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00db",
+            "",
+            "",
             "\1\u00dc",
             "",
             "\1\u00dd",
             "\1\u00de",
+            "",
             "\1\u00df",
             "\1\u00e0",
+            "\1\u00e1",
+            "\1\u00e2",
             "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\1\u00e3",
-            "\1\u00e4",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00e5",
-            "",
             "\1\u00e6",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\1\u00e7",
+            "",
             "\1\u00e8",
-            "\1\u00e9",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00ea",
             "\1\u00eb",
             "\1\u00ec",
             "\1\u00ed",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "",
-            "",
+            "\1\u00ee",
             "\1\u00ef",
-            "\1\u00f1\42\uffff\1\u00f0",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\1\u00f3",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
-            "\1\u00f4",
+            "",
+            "\1\u00f1",
+            "\1\u00f3\42\uffff\1\u00f2",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00f5",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "",
+            "\1\u00f6",
             "\1\u00f7",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "\1\u00f9",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u00fb",
             "",
-            "\1\u00fa",
+            "\1\u00fc",
             "",
             "",
             "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\1\u00fc",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\1\u00fe",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
-            "\12\60\7\uffff\32\60\4\uffff\1\60\1\uffff\32\60",
+            "\12\57\7\uffff\32\57\4\uffff\1\57\1\uffff\32\57",
             "",
             "",
             "",
@@ -3303,12 +3306,12 @@ public class InternalSTextLexer extends Lexer {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA16_44 = input.LA(1);
+                        int LA16_43 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA16_44>='\u0000' && LA16_44<='\uFFFF')) ) {s = 119;}
+                        if ( ((LA16_43>='\u0000' && LA16_43<='\uFFFF')) ) {s = 118;}
 
-                        else s = 46;
+                        else s = 45;
 
                         if ( s>=0 ) return s;
                         break;
@@ -3358,65 +3361,63 @@ public class InternalSTextLexer extends Lexer {
 
                         else if ( (LA16_0=='m') ) {s = 21;}
 
-                        else if ( (LA16_0=='\u00D4') ) {s = 22;}
-
-                        else if ( (LA16_0=='n') ) {s = 23;}
+                        else if ( (LA16_0=='n') ) {s = 22;}
 
-                        else if ( (LA16_0=='@') ) {s = 24;}
+                        else if ( (LA16_0=='@') ) {s = 23;}
 
-                        else if ( (LA16_0==':') ) {s = 25;}
+                        else if ( (LA16_0==':') ) {s = 24;}
 
-                        else if ( (LA16_0=='v') ) {s = 26;}
+                        else if ( (LA16_0=='v') ) {s = 25;}
 
-                        else if ( (LA16_0=='(') ) {s = 27;}
+                        else if ( (LA16_0=='(') ) {s = 26;}
 
-                        else if ( (LA16_0==')') ) {s = 28;}
+                        else if ( (LA16_0==')') ) {s = 27;}
 
-                        else if ( (LA16_0==',') ) {s = 29;}
+                        else if ( (LA16_0==',') ) {s = 28;}
 
-                        else if ( (LA16_0=='.') ) {s = 30;}
+                        else if ( (LA16_0=='.') ) {s = 29;}
 
-                        else if ( (LA16_0=='#') ) {s = 31;}
+                        else if ( (LA16_0=='#') ) {s = 30;}
 
-                        else if ( (LA16_0=='[') ) {s = 32;}
+                        else if ( (LA16_0=='[') ) {s = 31;}
 
-                        else if ( (LA16_0==']') ) {s = 33;}
+                        else if ( (LA16_0==']') ) {s = 32;}
 
-                        else if ( (LA16_0==';') ) {s = 34;}
+                        else if ( (LA16_0==';') ) {s = 33;}
 
-                        else if ( (LA16_0=='r') ) {s = 35;}
+                        else if ( (LA16_0=='r') ) {s = 34;}
 
-                        else if ( (LA16_0=='?') ) {s = 36;}
+                        else if ( (LA16_0=='?') ) {s = 35;}
 
-                        else if ( (LA16_0=='t') ) {s = 37;}
+                        else if ( (LA16_0=='t') ) {s = 36;}
 
-                        else if ( (LA16_0=='f') ) {s = 38;}
+                        else if ( (LA16_0=='f') ) {s = 37;}
 
-                        else if ( (LA16_0=='y') ) {s = 39;}
+                        else if ( (LA16_0=='y') ) {s = 38;}
 
-                        else if ( (LA16_0=='0') ) {s = 40;}
+                        else if ( (LA16_0=='0') ) {s = 39;}
 
-                        else if ( ((LA16_0>='1' && LA16_0<='9')) ) {s = 41;}
+                        else if ( ((LA16_0>='1' && LA16_0<='9')) ) {s = 40;}
 
-                        else if ( ((LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='b' && LA16_0<='c')||(LA16_0>='g' && LA16_0<='h')||(LA16_0>='j' && LA16_0<='k')||(LA16_0>='p' && LA16_0<='q')||LA16_0=='u'||(LA16_0>='w' && LA16_0<='x')||LA16_0=='z') ) {s = 42;}
+                        else if ( ((LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='b' && LA16_0<='c')||(LA16_0>='g' && LA16_0<='h')||(LA16_0>='j' && LA16_0<='k')||(LA16_0>='p' && LA16_0<='q')||LA16_0=='u'||(LA16_0>='w' && LA16_0<='x')||LA16_0=='z') ) {s = 41;}
 
-                        else if ( (LA16_0=='\"') ) {s = 43;}
+                        else if ( (LA16_0=='\"') ) {s = 42;}
 
-                        else if ( (LA16_0=='\'') ) {s = 44;}
+                        else if ( (LA16_0=='\'') ) {s = 43;}
 
-                        else if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {s = 45;}
+                        else if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {s = 44;}
 
-                        else if ( ((LA16_0>='\u0000' && LA16_0<='\b')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\u001F')||LA16_0=='$'||LA16_0=='\\'||LA16_0=='`'||LA16_0=='{'||LA16_0=='}'||(LA16_0>='\u007F' && LA16_0<='\u00D3')||(LA16_0>='\u00D5' && LA16_0<='\uFFFF')) ) {s = 46;}
+                        else if ( ((LA16_0>='\u0000' && LA16_0<='\b')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\u001F')||LA16_0=='$'||LA16_0=='\\'||LA16_0=='`'||LA16_0=='{'||LA16_0=='}'||(LA16_0>='\u007F' && LA16_0<='\uFFFF')) ) {s = 45;}
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA16_43 = input.LA(1);
+                        int LA16_42 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA16_43>='\u0000' && LA16_43<='\uFFFF')) ) {s = 119;}
+                        if ( ((LA16_42>='\u0000' && LA16_42<='\uFFFF')) ) {s = 118;}
 
-                        else s = 46;
+                        else s = 45;
 
                         if ( s>=0 ) return s;
                         break;

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore

@@ -147,7 +147,7 @@
   <eClassifiers xsi:type="ecore:EEnum" name="TimeUnit">
     <eLiterals name="second" literal="s"/>
     <eLiterals name="millisecond" value="1" literal="ms"/>
-    <eLiterals name="microsend" value="2" literal="ÔøΩs"/>
+    <eLiterals name="microsecond" value="2" literal="mics"/>
     <eLiterals name="nanosecond" value="3" literal="ns"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ElementReferenceExpression" eSuperTypes="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Expression">

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.genmodel

@@ -60,7 +60,7 @@
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//TimeUnit">
       <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//TimeUnit/second"/>
       <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//TimeUnit/millisecond"/>
-      <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//TimeUnit/microsend"/>
+      <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//TimeUnit/microsecond"/>
       <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//TimeUnit/nanosecond"/>
     </genEnums>
     <genClasses ecoreClass="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Root">

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.xmi

@@ -1204,8 +1204,8 @@
           <literal value="ms"/>
         </elements>
         <elements xsi:type="xtext:EnumLiteralDeclaration">
-          <enumLiteral href="http://www.yakindu.org/sct/statechart/SText#//TimeUnit/microsend"/>
-          <literal value="&#xd4;&#xf8;&#x3a9;s"/>
+          <enumLiteral href="http://www.yakindu.org/sct/statechart/SText#//TimeUnit/microsecond"/>
+          <literal value="mics"/>
         </elements>
         <elements xsi:type="xtext:EnumLiteralDeclaration">
           <enumLiteral href="http://www.yakindu.org/sct/statechart/SText#//TimeUnit/nanosecond"/>

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.g

@@ -4180,10 +4180,10 @@ ruleTimeUnit returns [Enumerator current=null]
         newLeafNode(enumLiteral_1, grammarAccess.getTimeUnitAccess().getMillisecondEnumLiteralDeclaration_1()); 
     }
 )
-    |(	enumLiteral_2='\u00D4\u00F8\u03A9s' 
+    |(	enumLiteral_2='mics' 
 	{
-        $current = grammarAccess.getTimeUnitAccess().getMicrosendEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getTimeUnitAccess().getMicrosendEnumLiteralDeclaration_2()); 
+        $current = grammarAccess.getTimeUnitAccess().getMicrosecondEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
+        newLeafNode(enumLiteral_2, grammarAccess.getTimeUnitAccess().getMicrosecondEnumLiteralDeclaration_2()); 
     }
 )
     |(	enumLiteral_3='ns' 

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.tokens

@@ -103,7 +103,6 @@ T__77=77
 'else'=44
 '^='=68
 '+='=63
-'\u00D4\u00F8\u03A9s'=84
 'readonly'=24
 '>>='=66
 '?'=46
@@ -123,6 +122,7 @@ T__77=77
 'ns'=85
 '!'=49
 '|'=51
+'mics'=84
 'ms'=83
 'every'=59
 '|='=69

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSTextLexer.java

@@ -1560,10 +1560,10 @@ public class InternalSTextLexer extends Lexer {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.g:81:7: ( '\\u00D4\\u00F8\\u03A9s' )
-            // ../org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.g:81:9: '\\u00D4\\u00F8\\u03A9s'
+            // ../org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.g:81:7: ( 'mics' )
+            // ../org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.g:81:9: 'mics'
             {
-            match("\u00D4\u00F8\u03A9s"); 
+            match("mics"); 
 
 
             }
@@ -2926,149 +2926,148 @@ public class InternalSTextLexer extends Lexer {
 
     protected DFA16 dfa16 = new DFA16(this);
     static final String DFA16_eotS =
-        "\1\uffff\1\56\2\63\1\uffff\1\63\1\73\3\63\4\uffff\1\111\4\uffff"+
-        "\1\120\2\63\1\uffff\1\130\1\133\1\135\1\137\1\63\1\142\1\144\1\146"+
-        "\1\150\1\153\1\uffff\1\155\1\63\1\56\3\63\2\164\1\uffff\2\56\3\uffff"+
-        "\1\63\1\174\1\175\1\uffff\1\177\1\uffff\4\63\2\uffff\6\63\14\uffff"+
-        "\1\u008d\2\uffff\4\63\13\uffff\1\63\10\uffff\1\u0094\4\uffff\1\u0095"+
-        "\1\uffff\3\63\2\uffff\1\164\5\uffff\1\63\2\uffff\1\63\1\uffff\5"+
-        "\63\1\u00a2\5\63\1\u00a8\2\uffff\5\63\3\uffff\2\63\1\175\1\uffff"+
-        "\5\63\1\u00b7\1\63\1\u00b9\1\uffff\5\63\1\uffff\5\63\1\175\1\63"+
-        "\1\uffff\2\63\1\u00c9\1\u00ca\2\63\1\uffff\1\u00ce\1\uffff\2\63"+
-        "\1\u00d1\4\63\1\u00d6\1\63\1\u00d8\1\175\1\uffff\3\63\2\uffff\3"+
-        "\63\1\uffff\2\63\1\uffff\2\63\1\u00e4\1\u00e5\1\uffff\1\63\2\uffff"+
-        "\6\63\1\u00ef\2\63\1\u00f2\2\uffff\1\u00f3\2\uffff\2\63\1\u00f6"+
-        "\1\u00f7\2\63\1\uffff\1\u00fa\1\63\2\uffff\1\u00fc\1\u00fd\2\uffff"+
-        "\1\u00fe\1\63\1\uffff\1\u0100\3\uffff\1\u0101\2\uffff";
+        "\1\uffff\1\55\2\62\1\uffff\1\62\1\72\3\62\4\uffff\1\110\4\uffff"+
+        "\1\117\2\62\1\uffff\1\127\1\132\1\134\1\136\1\62\1\141\1\143\1\145"+
+        "\1\147\1\152\1\uffff\1\154\4\62\2\163\1\uffff\2\55\3\uffff\1\62"+
+        "\1\173\1\174\1\uffff\1\176\1\uffff\4\62\2\uffff\6\62\14\uffff\1"+
+        "\u008c\2\uffff\4\62\13\uffff\1\62\10\uffff\1\u0093\4\uffff\1\u0094"+
+        "\4\62\2\uffff\1\163\5\uffff\1\62\2\uffff\1\62\1\uffff\5\62\1\u00a2"+
+        "\5\62\1\u00a8\2\uffff\5\62\3\uffff\3\62\1\174\1\uffff\5\62\1\u00b8"+
+        "\1\62\1\u00ba\1\uffff\5\62\1\uffff\5\62\1\u00c5\1\174\1\62\1\uffff"+
+        "\2\62\1\u00cb\1\u00cc\2\62\1\uffff\1\u00d0\1\uffff\2\62\1\u00d3"+
+        "\4\62\1\u00d8\1\62\1\u00da\1\uffff\1\174\1\uffff\3\62\2\uffff\3"+
+        "\62\1\uffff\2\62\1\uffff\2\62\1\u00e6\1\u00e7\1\uffff\1\62\2\uffff"+
+        "\6\62\1\u00f1\2\62\1\u00f4\2\uffff\1\u00f5\2\uffff\2\62\1\u00f8"+
+        "\1\u00f9\2\62\1\uffff\1\u00fc\1\62\2\uffff\1\u00fe\1\u00ff\2\uffff"+
+        "\1\u0100\1\62\1\uffff\1\u0102\3\uffff\1\u0103\2\uffff";
     static final String DFA16_eofS =
-        "\u0102\uffff";
+        "\u0104\uffff";
     static final String DFA16_minS =
         "\1\0\1\100\1\141\1\156\1\uffff\1\154\1\75\2\141\1\156\4\uffff\1"+
         "\52\4\uffff\1\75\1\143\1\145\1\uffff\1\75\1\46\2\75\1\157\4\75\1"+
-        "\74\1\uffff\1\60\1\163\1\u00f8\1\162\1\141\1\145\2\56\1\uffff\2"+
-        "\0\2\uffff\1\163\1\155\2\60\1\uffff\1\60\1\uffff\1\145\1\151\1\164"+
-        "\1\163\2\uffff\1\154\1\141\1\151\1\145\1\143\1\164\14\uffff\1\75"+
-        "\2\uffff\1\167\2\164\1\146\13\uffff\1\143\10\uffff\1\75\4\uffff"+
-        "\1\60\1\uffff\1\165\1\154\1\163\2\uffff\1\56\3\uffff\1\164\1\uffff"+
-        "\1\145\2\uffff\1\145\1\uffff\1\156\1\145\1\164\1\162\1\145\1\60"+
-        "\1\165\1\144\1\163\1\162\1\171\1\60\2\uffff\1\141\1\151\1\145\2"+
-        "\141\3\uffff\1\145\1\163\1\60\1\141\1\163\1\162\1\164\1\171\1\162"+
-        "\1\60\1\171\1\60\1\uffff\1\145\1\157\1\145\1\141\1\143\1\uffff\1"+
-        "\171\1\166\1\162\1\165\1\154\1\60\1\145\1\164\1\160\1\146\2\60\1"+
-        "\156\1\157\1\uffff\1\60\1\uffff\1\157\1\156\1\60\1\164\1\154\1\163"+
-        "\1\145\1\60\1\154\2\60\1\145\3\141\2\uffff\1\141\1\151\1\157\1\uffff"+
-        "\1\146\1\154\1\uffff\1\151\1\145\2\60\1\uffff\1\164\1\uffff\1\100"+
-        "\2\143\2\154\1\156\1\151\1\60\1\171\1\157\1\60\2\uffff\1\60\2\uffff"+
-        "\2\145\2\60\1\164\1\156\1\uffff\1\60\1\156\2\uffff\2\60\2\uffff"+
-        "\1\60\1\164\1\uffff\1\60\3\uffff\1\60\2\uffff";
+        "\74\1\uffff\1\60\1\151\1\162\1\141\1\145\2\56\1\uffff\2\0\2\uffff"+
+        "\1\163\1\155\2\60\1\uffff\1\60\1\uffff\1\145\1\151\1\164\1\163\2"+
+        "\uffff\1\154\1\141\1\151\1\145\1\143\1\164\14\uffff\1\75\2\uffff"+
+        "\1\167\2\164\1\146\13\uffff\1\143\10\uffff\1\75\4\uffff\1\60\1\143"+
+        "\1\165\1\154\1\163\2\uffff\1\56\3\uffff\1\164\1\uffff\1\145\2\uffff"+
+        "\1\145\1\uffff\1\156\1\145\1\164\1\162\1\145\1\60\1\165\1\144\1"+
+        "\163\1\162\1\171\1\60\2\uffff\1\141\1\151\1\145\2\141\3\uffff\1"+
+        "\163\1\145\1\163\1\60\1\141\1\163\1\162\1\164\1\171\1\162\1\60\1"+
+        "\171\1\60\1\uffff\1\145\1\157\1\145\1\141\1\143\1\uffff\1\171\1"+
+        "\166\1\162\1\165\1\154\2\60\1\145\1\164\1\160\1\146\2\60\1\156\1"+
+        "\157\1\uffff\1\60\1\uffff\1\157\1\156\1\60\1\164\1\154\1\163\1\145"+
+        "\1\60\1\154\1\60\1\uffff\1\60\1\145\3\141\2\uffff\1\141\1\151\1"+
+        "\157\1\uffff\1\146\1\154\1\uffff\1\151\1\145\2\60\1\uffff\1\164"+
+        "\1\uffff\1\100\2\143\2\154\1\156\1\151\1\60\1\171\1\157\1\60\2\uffff"+
+        "\1\60\2\uffff\2\145\2\60\1\164\1\156\1\uffff\1\60\1\156\2\uffff"+
+        "\2\60\2\uffff\1\60\1\164\1\uffff\1\60\3\uffff\1\60\2\uffff";
     static final String DFA16_maxS =
         "\1\uffff\1\100\1\163\1\156\1\uffff\1\170\1\75\1\141\1\145\1\165"+
         "\4\uffff\1\75\4\uffff\1\76\1\154\1\145\1\uffff\1\174\2\75\1\172"+
-        "\1\157\5\75\1\uffff\1\172\1\163\1\u00f8\1\162\1\141\1\145\1\170"+
-        "\1\71\1\uffff\2\uffff\2\uffff\1\164\1\155\2\172\1\uffff\1\172\1"+
-        "\uffff\1\145\2\164\1\163\2\uffff\1\162\1\141\1\151\1\145\1\143\1"+
-        "\164\14\uffff\1\75\2\uffff\1\167\2\164\1\146\13\uffff\1\143\10\uffff"+
-        "\1\75\4\uffff\1\172\1\uffff\1\165\1\154\1\163\2\uffff\1\71\3\uffff"+
-        "\1\164\1\uffff\1\145\2\uffff\1\145\1\uffff\1\162\1\145\1\164\1\162"+
-        "\1\145\1\172\1\165\1\144\1\163\1\162\1\171\1\172\2\uffff\1\141\1"+
-        "\151\1\145\2\141\3\uffff\1\145\1\163\1\172\1\141\1\163\1\162\1\164"+
-        "\1\171\1\162\1\172\1\171\1\172\1\uffff\1\145\1\157\1\145\1\141\1"+
-        "\143\1\uffff\1\171\1\166\1\162\1\165\1\154\1\172\1\145\1\164\1\160"+
-        "\1\156\2\172\1\156\1\157\1\uffff\1\172\1\uffff\1\157\1\156\1\172"+
-        "\1\164\1\154\1\163\1\145\1\172\1\154\2\172\1\145\3\141\2\uffff\1"+
-        "\141\1\151\1\157\1\uffff\1\146\1\154\1\uffff\1\151\1\145\2\172\1"+
-        "\uffff\1\164\1\uffff\3\143\2\154\1\156\1\151\1\172\1\171\1\157\1"+
-        "\172\2\uffff\1\172\2\uffff\2\145\2\172\1\164\1\156\1\uffff\1\172"+
-        "\1\156\2\uffff\2\172\2\uffff\1\172\1\164\1\uffff\1\172\3\uffff\1"+
-        "\172\2\uffff";
+        "\1\157\5\75\1\uffff\1\172\1\163\1\162\1\141\1\145\1\170\1\71\1\uffff"+
+        "\2\uffff\2\uffff\1\164\1\155\2\172\1\uffff\1\172\1\uffff\1\145\2"+
+        "\164\1\163\2\uffff\1\162\1\141\1\151\1\145\1\143\1\164\14\uffff"+
+        "\1\75\2\uffff\1\167\2\164\1\146\13\uffff\1\143\10\uffff\1\75\4\uffff"+
+        "\1\172\1\143\1\165\1\154\1\163\2\uffff\1\71\3\uffff\1\164\1\uffff"+
+        "\1\145\2\uffff\1\145\1\uffff\1\162\1\145\1\164\1\162\1\145\1\172"+
+        "\1\165\1\144\1\163\1\162\1\171\1\172\2\uffff\1\141\1\151\1\145\2"+
+        "\141\3\uffff\1\163\1\145\1\163\1\172\1\141\1\163\1\162\1\164\1\171"+
+        "\1\162\1\172\1\171\1\172\1\uffff\1\145\1\157\1\145\1\141\1\143\1"+
+        "\uffff\1\171\1\166\1\162\1\165\1\154\2\172\1\145\1\164\1\160\1\156"+
+        "\2\172\1\156\1\157\1\uffff\1\172\1\uffff\1\157\1\156\1\172\1\164"+
+        "\1\154\1\163\1\145\1\172\1\154\1\172\1\uffff\1\172\1\145\3\141\2"+
+        "\uffff\1\141\1\151\1\157\1\uffff\1\146\1\154\1\uffff\1\151\1\145"+
+        "\2\172\1\uffff\1\164\1\uffff\3\143\2\154\1\156\1\151\1\172\1\171"+
+        "\1\157\1\172\2\uffff\1\172\2\uffff\2\145\2\172\1\164\1\156\1\uffff"+
+        "\1\172\1\156\2\uffff\2\172\2\uffff\1\172\1\164\1\uffff\1\172\3\uffff"+
+        "\1\172\2\uffff";
     static final String DFA16_acceptS =
         "\4\uffff\1\6\5\uffff\1\16\1\17\1\20\1\23\1\uffff\1\25\1\26\1\27"+
-        "\1\30\3\uffff\1\41\12\uffff\1\77\10\uffff\1\114\2\uffff\1\121\1"+
-        "\122\4\uffff\1\114\1\uffff\1\6\4\uffff\1\103\1\11\6\uffff\1\16\1"+
-        "\17\1\20\1\23\1\60\1\117\1\120\1\24\1\25\1\26\1\27\1\30\1\uffff"+
-        "\1\102\1\31\4\uffff\1\41\1\42\1\70\1\46\1\43\1\66\1\47\1\104\1\44"+
-        "\1\67\1\45\1\uffff\1\57\1\75\1\61\1\76\1\62\1\73\1\63\1\74\1\uffff"+
-        "\1\101\1\100\1\77\1\105\1\uffff\1\107\3\uffff\1\112\1\115\1\uffff"+
-        "\1\113\1\116\1\121\1\uffff\1\3\1\uffff\1\110\1\111\1\uffff\1\53"+
-        "\14\uffff\1\65\1\72\5\uffff\1\64\1\71\1\106\14\uffff\1\12\5\uffff"+
-        "\1\54\16\uffff\1\33\1\uffff\1\37\17\uffff\1\10\1\56\3\uffff\1\32"+
+        "\1\30\3\uffff\1\41\12\uffff\1\77\7\uffff\1\114\2\uffff\1\121\1\122"+
+        "\4\uffff\1\114\1\uffff\1\6\4\uffff\1\103\1\11\6\uffff\1\16\1\17"+
+        "\1\20\1\23\1\60\1\117\1\120\1\24\1\25\1\26\1\27\1\30\1\uffff\1\102"+
+        "\1\31\4\uffff\1\41\1\42\1\70\1\46\1\43\1\66\1\47\1\104\1\44\1\67"+
+        "\1\45\1\uffff\1\57\1\75\1\61\1\76\1\62\1\73\1\63\1\74\1\uffff\1"+
+        "\101\1\100\1\77\1\105\5\uffff\1\112\1\115\1\uffff\1\113\1\116\1"+
+        "\121\1\uffff\1\3\1\uffff\1\110\1\111\1\uffff\1\53\14\uffff\1\65"+
+        "\1\72\5\uffff\1\64\1\71\1\106\15\uffff\1\12\5\uffff\1\54\17\uffff"+
+        "\1\33\1\uffff\1\37\12\uffff\1\107\5\uffff\1\10\1\56\3\uffff\1\32"+
         "\2\uffff\1\40\4\uffff\1\55\1\uffff\1\52\13\uffff\1\35\1\51\1\uffff"+
         "\1\1\1\2\6\uffff\1\50\2\uffff\1\34\1\36\2\uffff\1\7\1\14\2\uffff"+
         "\1\13\1\uffff\1\4\1\5\1\22\1\uffff\1\15\1\21";
     static final String DFA16_specialS =
-        "\1\1\52\uffff\1\2\1\0\u00d5\uffff}>";
+        "\1\1\51\uffff\1\2\1\0\u00d8\uffff}>";
     static final String[] DFA16_transitionS = {
-            "\11\56\2\55\2\56\1\55\22\56\1\55\1\31\1\53\1\17\1\56\1\35\1"+
-            "\30\1\54\1\12\1\14\1\34\1\36\1\13\1\37\1\15\1\16\1\50\11\51"+
-            "\1\4\1\22\1\40\1\6\1\23\1\26\1\1\32\52\1\20\1\56\1\21\1\32\1"+
-            "\52\1\56\1\24\2\52\1\25\1\5\1\46\2\52\1\3\2\52\1\33\1\43\1\2"+
-            "\1\11\2\52\1\10\1\42\1\45\1\52\1\7\2\52\1\47\1\52\1\56\1\27"+
-            "\1\56\1\41\125\56\1\44\uff2b\56",
-            "\1\57",
-            "\1\60\15\uffff\1\62\3\uffff\1\61",
-            "\1\64",
+            "\11\55\2\54\2\55\1\54\22\55\1\54\1\31\1\52\1\17\1\55\1\35\1"+
+            "\30\1\53\1\12\1\14\1\34\1\36\1\13\1\37\1\15\1\16\1\47\11\50"+
+            "\1\4\1\22\1\40\1\6\1\23\1\26\1\1\32\51\1\20\1\55\1\21\1\32\1"+
+            "\51\1\55\1\24\2\51\1\25\1\5\1\45\2\51\1\3\2\51\1\33\1\43\1\2"+
+            "\1\11\2\51\1\10\1\42\1\44\1\51\1\7\2\51\1\46\1\51\1\55\1\27"+
+            "\1\55\1\41\uff81\55",
+            "\1\56",
+            "\1\57\15\uffff\1\61\3\uffff\1\60",
+            "\1\63",
             "",
-            "\1\71\1\uffff\1\70\7\uffff\1\66\1\uffff\1\67",
-            "\1\72",
-            "\1\74",
-            "\1\76\3\uffff\1\75",
-            "\1\100\1\uffff\1\77\4\uffff\1\101",
+            "\1\70\1\uffff\1\67\7\uffff\1\65\1\uffff\1\66",
+            "\1\71",
+            "\1\73",
+            "\1\75\3\uffff\1\74",
+            "\1\77\1\uffff\1\76\4\uffff\1\100",
             "",
             "",
             "",
             "",
-            "\1\107\4\uffff\1\110\15\uffff\1\106",
+            "\1\106\4\uffff\1\107\15\uffff\1\105",
             "",
             "",
             "",
             "",
-            "\1\117\1\116",
-            "\1\122\2\uffff\1\123\5\uffff\1\121",
-            "\1\124",
+            "\1\116\1\115",
+            "\1\121\2\uffff\1\122\5\uffff\1\120",
+            "\1\123",
             "",
-            "\1\127\76\uffff\1\126",
-            "\1\131\26\uffff\1\132",
-            "\1\134",
-            "\1\136\3\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\1\126\76\uffff\1\125",
+            "\1\130\26\uffff\1\131",
+            "\1\133",
+            "\1\135\3\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\1\137",
             "\1\140",
-            "\1\141",
-            "\1\143",
-            "\1\145",
-            "\1\147",
-            "\1\151\1\152",
-            "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\1\156",
+            "\1\142",
+            "\1\144",
+            "\1\146",
+            "\1\150\1\151",
+            "",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\1\156\11\uffff\1\155",
             "\1\157",
             "\1\160",
             "\1\161",
-            "\1\162",
-            "\1\166\1\uffff\12\165\36\uffff\1\163\37\uffff\1\163",
-            "\1\166\1\uffff\12\165",
+            "\1\165\1\uffff\12\164\36\uffff\1\162\37\uffff\1\162",
+            "\1\165\1\uffff\12\164",
             "",
-            "\0\167",
-            "\0\167",
+            "\0\166",
+            "\0\166",
             "",
             "",
-            "\1\171\1\172",
-            "\1\173",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\1\170\1\171",
+            "\1\172",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\23\63\1\176\6\63",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\23\62\1\175\6\62",
             "",
-            "\1\u0080",
-            "\1\u0082\12\uffff\1\u0081",
+            "\1\177",
+            "\1\u0081\12\uffff\1\u0080",
+            "\1\u0082",
             "\1\u0083",
-            "\1\u0084",
             "",
             "",
-            "\1\u0086\5\uffff\1\u0085",
+            "\1\u0085\5\uffff\1\u0084",
+            "\1\u0086",
             "\1\u0087",
             "\1\u0088",
             "\1\u0089",
             "\1\u008a",
-            "\1\u008b",
             "",
             "",
             "",
@@ -3081,14 +3080,13 @@ public class InternalSTextLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u008c",
+            "\1\u008b",
             "",
             "",
+            "\1\u008d",
             "\1\u008e",
             "\1\u008f",
             "\1\u0090",
-            "\1\u0091",
-            "",
             "",
             "",
             "",
@@ -3099,8 +3097,8 @@ public class InternalSTextLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u0092",
             "",
+            "\1\u0091",
             "",
             "",
             "",
@@ -3108,19 +3106,20 @@ public class InternalSTextLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u0093",
             "",
+            "\1\u0092",
             "",
             "",
             "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
             "",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\1\u0095",
             "\1\u0096",
             "\1\u0097",
             "\1\u0098",
             "",
             "",
-            "\1\166\1\uffff\12\165",
+            "\1\165\1\uffff\12\164",
             "",
             "",
             "",
@@ -3136,13 +3135,13 @@ public class InternalSTextLexer extends Lexer {
             "\1\u009f",
             "\1\u00a0",
             "\1\u00a1",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "\1\u00a3",
             "\1\u00a4",
             "\1\u00a5",
             "\1\u00a6",
             "\1\u00a7",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "",
             "",
             "\1\u00a9",
@@ -3155,112 +3154,115 @@ public class InternalSTextLexer extends Lexer {
             "",
             "\1\u00ae",
             "\1\u00af",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
             "\1\u00b0",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "\1\u00b1",
             "\1\u00b2",
             "\1\u00b3",
             "\1\u00b4",
             "\1\u00b5",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\17\63\1\u00b6\12"+
-            "\63",
-            "\1\u00b8",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\1\u00b6",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\17\62\1\u00b7\12"+
+            "\62",
+            "\1\u00b9",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "",
-            "\1\u00ba",
             "\1\u00bb",
             "\1\u00bc",
             "\1\u00bd",
             "\1\u00be",
-            "",
             "\1\u00bf",
+            "",
             "\1\u00c0",
             "\1\u00c1",
             "\1\u00c2",
             "\1\u00c3",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
             "\1\u00c4",
-            "\1\u00c5",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "\1\u00c6",
-            "\1\u00c7\7\uffff\1\u00c8",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\1\u00cb",
-            "\1\u00cc",
-            "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\17\63\1\u00cd\12"+
-            "\63",
-            "",
-            "\1\u00cf",
-            "\1\u00d0",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\1\u00c7",
+            "\1\u00c8",
+            "\1\u00c9\7\uffff\1\u00ca",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\1\u00cd",
+            "\1\u00ce",
+            "",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\17\62\1\u00cf\12"+
+            "\62",
+            "",
+            "\1\u00d1",
             "\1\u00d2",
-            "\1\u00d3",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "\1\u00d4",
             "\1\u00d5",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\1\u00d6",
             "\1\u00d7",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "\1\u00d9",
-            "\1\u00da",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "\1\u00db",
             "\1\u00dc",
-            "",
-            "",
             "\1\u00dd",
             "\1\u00de",
-            "\1\u00df",
             "",
+            "",
+            "\1\u00df",
             "\1\u00e0",
             "\1\u00e1",
             "",
             "\1\u00e2",
             "\1\u00e3",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
             "",
-            "\1\u00e6",
+            "\1\u00e4",
+            "\1\u00e5",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "",
+            "\1\u00e8",
             "",
-            "\1\u00e8\42\uffff\1\u00e7",
-            "\1\u00e9",
-            "\1\u00ea",
+            "\1\u00ea\42\uffff\1\u00e9",
             "\1\u00eb",
             "\1\u00ec",
             "\1\u00ed",
             "\1\u00ee",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\1\u00ef",
             "\1\u00f0",
-            "\1\u00f1",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\1\u00f2",
+            "\1\u00f3",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "",
             "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "",
             "",
-            "\1\u00f4",
-            "\1\u00f5",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\1\u00f8",
-            "\1\u00f9",
-            "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\1\u00f6",
+            "\1\u00f7",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\1\u00fa",
             "\1\u00fb",
             "",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\1\u00fd",
+            "",
             "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "",
             "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
-            "\1\u00ff",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
+            "\1\u0101",
             "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "",
             "",
             "",
-            "\12\63\7\uffff\32\63\4\uffff\1\63\1\uffff\32\63",
+            "\12\62\7\uffff\32\62\4\uffff\1\62\1\uffff\32\62",
             "",
             ""
     };
@@ -3302,12 +3304,12 @@ public class InternalSTextLexer extends Lexer {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA16_44 = input.LA(1);
+                        int LA16_43 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA16_44>='\u0000' && LA16_44<='\uFFFF')) ) {s = 119;}
+                        if ( ((LA16_43>='\u0000' && LA16_43<='\uFFFF')) ) {s = 118;}
 
-                        else s = 46;
+                        else s = 45;
 
                         if ( s>=0 ) return s;
                         break;
@@ -3385,37 +3387,35 @@ public class InternalSTextLexer extends Lexer {
 
                         else if ( (LA16_0=='m') ) {s = 35;}
 
-                        else if ( (LA16_0=='\u00D4') ) {s = 36;}
+                        else if ( (LA16_0=='t') ) {s = 36;}
 
-                        else if ( (LA16_0=='t') ) {s = 37;}
+                        else if ( (LA16_0=='f') ) {s = 37;}
 
-                        else if ( (LA16_0=='f') ) {s = 38;}
+                        else if ( (LA16_0=='y') ) {s = 38;}
 
-                        else if ( (LA16_0=='y') ) {s = 39;}
+                        else if ( (LA16_0=='0') ) {s = 39;}
 
-                        else if ( (LA16_0=='0') ) {s = 40;}
+                        else if ( ((LA16_0>='1' && LA16_0<='9')) ) {s = 40;}
 
-                        else if ( ((LA16_0>='1' && LA16_0<='9')) ) {s = 41;}
+                        else if ( ((LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='b' && LA16_0<='c')||(LA16_0>='g' && LA16_0<='h')||(LA16_0>='j' && LA16_0<='k')||(LA16_0>='p' && LA16_0<='q')||LA16_0=='u'||(LA16_0>='w' && LA16_0<='x')||LA16_0=='z') ) {s = 41;}
 
-                        else if ( ((LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='b' && LA16_0<='c')||(LA16_0>='g' && LA16_0<='h')||(LA16_0>='j' && LA16_0<='k')||(LA16_0>='p' && LA16_0<='q')||LA16_0=='u'||(LA16_0>='w' && LA16_0<='x')||LA16_0=='z') ) {s = 42;}
+                        else if ( (LA16_0=='\"') ) {s = 42;}
 
-                        else if ( (LA16_0=='\"') ) {s = 43;}
+                        else if ( (LA16_0=='\'') ) {s = 43;}
 
-                        else if ( (LA16_0=='\'') ) {s = 44;}
+                        else if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {s = 44;}
 
-                        else if ( ((LA16_0>='\t' && LA16_0<='\n')||LA16_0=='\r'||LA16_0==' ') ) {s = 45;}
-
-                        else if ( ((LA16_0>='\u0000' && LA16_0<='\b')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\u001F')||LA16_0=='$'||LA16_0=='\\'||LA16_0=='`'||LA16_0=='{'||LA16_0=='}'||(LA16_0>='\u007F' && LA16_0<='\u00D3')||(LA16_0>='\u00D5' && LA16_0<='\uFFFF')) ) {s = 46;}
+                        else if ( ((LA16_0>='\u0000' && LA16_0<='\b')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\u001F')||LA16_0=='$'||LA16_0=='\\'||LA16_0=='`'||LA16_0=='{'||LA16_0=='}'||(LA16_0>='\u007F' && LA16_0<='\uFFFF')) ) {s = 45;}
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA16_43 = input.LA(1);
+                        int LA16_42 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA16_43>='\u0000' && LA16_43<='\uFFFF')) ) {s = 119;}
+                        if ( ((LA16_42>='\u0000' && LA16_42<='\uFFFF')) ) {s = 118;}
 
-                        else s = 46;
+                        else s = 45;
 
                         if ( s>=0 ) return s;
                         break;

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/services/STextGrammarAccess.java

@@ -2762,16 +2762,16 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 		private final Keyword cSecondSKeyword_0_0 = (Keyword)cSecondEnumLiteralDeclaration_0.eContents().get(0);
 		private final EnumLiteralDeclaration cMillisecondEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
 		private final Keyword cMillisecondMsKeyword_1_0 = (Keyword)cMillisecondEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cMicrosendEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cMicrosendSKeyword_2_0 = (Keyword)cMicrosendEnumLiteralDeclaration_2.eContents().get(0);
+		private final EnumLiteralDeclaration cMicrosecondEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
+		private final Keyword cMicrosecondMicsKeyword_2_0 = (Keyword)cMicrosecondEnumLiteralDeclaration_2.eContents().get(0);
 		private final EnumLiteralDeclaration cNanosecondEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
 		private final Keyword cNanosecondNsKeyword_3_0 = (Keyword)cNanosecondEnumLiteralDeclaration_3.eContents().get(0);
 		
 		//enum TimeUnit:
-		//	second="s" | millisecond="ms" | microsend="�s" | nanosecond="ns";
+		//	second="s" | millisecond="ms" | microsecond="mics" | nanosecond="ns";
 		public EnumRule getRule() { return rule; }
 
-		//second="s" | millisecond="ms" | microsend="�s" | nanosecond="ns"
+		//second="s" | millisecond="ms" | microsecond="mics" | nanosecond="ns"
 		public Alternatives getAlternatives() { return cAlternatives; }
 
 		//second="s"
@@ -2786,11 +2786,11 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 		//"ms"
 		public Keyword getMillisecondMsKeyword_1_0() { return cMillisecondMsKeyword_1_0; }
 
-		//microsend="�s"
-		public EnumLiteralDeclaration getMicrosendEnumLiteralDeclaration_2() { return cMicrosendEnumLiteralDeclaration_2; }
+		//microsecond="mics"
+		public EnumLiteralDeclaration getMicrosecondEnumLiteralDeclaration_2() { return cMicrosecondEnumLiteralDeclaration_2; }
 
-		//"�s"
-		public Keyword getMicrosendSKeyword_2_0() { return cMicrosendSKeyword_2_0; }
+		//"mics"
+		public Keyword getMicrosecondMicsKeyword_2_0() { return cMicrosecondMicsKeyword_2_0; }
 
 		//nanosecond="ns"
 		public EnumLiteralDeclaration getNanosecondEnumLiteralDeclaration_3() { return cNanosecondEnumLiteralDeclaration_3; }
@@ -3606,7 +3606,7 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//enum TimeUnit:
-	//	second="s" | millisecond="ms" | microsend="�s" | nanosecond="ns";
+	//	second="s" | millisecond="ms" | microsecond="mics" | nanosecond="ns";
 	public TimeUnitElements getTimeUnitAccess() {
 		return (unknownRuleTimeUnit != null) ? unknownRuleTimeUnit : (unknownRuleTimeUnit = new TimeUnitElements());
 	}

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/TimeUnit.java

@@ -43,14 +43,14 @@ public enum TimeUnit implements Enumerator
   MILLISECOND(1, "millisecond", "ms"),
 
   /**
-   * The '<em><b>Microsend</b></em>' literal object.
+   * The '<em><b>Microsecond</b></em>' literal object.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #MICROSEND_VALUE
+   * @see #MICROSECOND_VALUE
    * @generated
    * @ordered
    */
-  MICROSEND(2, "microsend", "\u00d4\u00f8\u03a9s"),
+  MICROSECOND(2, "microsecond", "mics"),
 
   /**
    * The '<em><b>Nanosecond</b></em>' literal object.
@@ -93,19 +93,19 @@ public enum TimeUnit implements Enumerator
   public static final int MILLISECOND_VALUE = 1;
 
   /**
-   * The '<em><b>Microsend</b></em>' literal value.
+   * The '<em><b>Microsecond</b></em>' literal value.
    * <!-- begin-user-doc -->
    * <p>
-   * If the meaning of '<em><b>Microsend</b></em>' literal object isn't clear,
+   * If the meaning of '<em><b>Microsecond</b></em>' literal object isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * @see #MICROSEND
-   * @model name="microsend" literal="\324\370\u03a9s"
+   * @see #MICROSECOND
+   * @model name="microsecond" literal="mics"
    * @generated
    * @ordered
    */
-  public static final int MICROSEND_VALUE = 2;
+  public static final int MICROSECOND_VALUE = 2;
 
   /**
    * The '<em><b>Nanosecond</b></em>' literal value.
@@ -133,7 +133,7 @@ public enum TimeUnit implements Enumerator
     {
       SECOND,
       MILLISECOND,
-      MICROSEND,
+      MICROSECOND,
       NANOSECOND,
     };
 
@@ -195,7 +195,7 @@ public enum TimeUnit implements Enumerator
     {
       case SECOND_VALUE: return SECOND;
       case MILLISECOND_VALUE: return MILLISECOND;
-      case MICROSEND_VALUE: return MICROSEND;
+      case MICROSECOND_VALUE: return MICROSECOND;
       case NANOSECOND_VALUE: return NANOSECOND;
     }
     return null;

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/impl/StextPackageImpl.java

@@ -2636,7 +2636,7 @@ public class StextPackageImpl extends EPackageImpl implements StextPackage
     initEEnum(timeUnitEEnum, TimeUnit.class, "TimeUnit");
     addEEnumLiteral(timeUnitEEnum, TimeUnit.SECOND);
     addEEnumLiteral(timeUnitEEnum, TimeUnit.MILLISECOND);
-    addEEnumLiteral(timeUnitEEnum, TimeUnit.MICROSEND);
+    addEEnumLiteral(timeUnitEEnum, TimeUnit.MICROSECOND);
     addEEnumLiteral(timeUnitEEnum, TimeUnit.NANOSECOND);
 
     // Create resource

plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/SText.xtext

@@ -277,7 +277,7 @@ enum RelationalOperator:
 enum TimeUnit:
 	second='s'
 	| millisecond='ms'
-	| microsend = '�s'
+	| microsecond = 'mics'
 	| nanosecond='ns';
 
 ValueExpression returns Expression: