diff options
| author | Ralf Mollik | 2019-09-09 07:27:57 +0000 |
|---|---|---|
| committer | Ralf Mollik | 2019-09-09 07:27:57 +0000 |
| commit | 40beb5db4d0a42953655c3bcfa0f35f3250b28d4 (patch) | |
| tree | 8e37b2e20c6b72d3f02d13afb009fdb7344ba6f4 | |
| parent | d8aae969e8a24f0b18506bdd11fffb0c6cc7faf1 (diff) | |
| download | org.eclipse.osbp.xtext.perspective-master.tar.gz org.eclipse.osbp.xtext.perspective-master.tar.xz org.eclipse.osbp.xtext.perspective-master.zip | |
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
15 files changed, 2146 insertions, 2194 deletions
diff --git a/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDsl.g b/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDsl.g index 30e7f09..959c5e7 100644 --- a/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDsl.g +++ b/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDsl.g @@ -6104,9 +6104,9 @@ rule__PerspectivePart__Group_3_2__0__Impl } : ( - { before(grammarAccess.getPerspectivePartAccess().getIconURIKeyword_3_2_0()); } - 'iconURI' - { after(grammarAccess.getPerspectivePartAccess().getIconURIKeyword_3_2_0()); } + { before(grammarAccess.getPerspectivePartAccess().getIconKeyword_3_2_0()); } + 'icon' + { after(grammarAccess.getPerspectivePartAccess().getIconKeyword_3_2_0()); } ) ; finally { diff --git a/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDsl.tokens b/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDsl.tokens index e04e811..996bc8e 100644 --- a/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDsl.tokens +++ b/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDsl.tokens @@ -1,20 +1,20 @@ '!'=40 '!='=22 '!=='=24 -'#'=102 +'#'=101 '%'=39 '%='=20 '&&'=15 -'&'=125 -'('=98 -')'=99 +'&'=124 +'('=97 +')'=98 '*'=36 '**'=37 '*='=18 '+'=34 '++'=41 '+='=16 -','=100 +','=99 '-'=35 '--'=42 '-='=17 @@ -24,9 +24,9 @@ '..<'=29 '/'=38 '/='=19 -':'=109 -'::'=130 -';'=96 +':'=108 +'::'=129 +';'=95 '<'=27 '<>'=32 '='=13 @@ -35,89 +35,88 @@ '=>'=31 '>'=26 '>='=25 -'?'=124 -'?.'=131 +'?'=123 +'?.'=130 '?:'=33 -'@'=97 -'['=103 -']'=101 +'@'=96 +'['=102 +']'=100 'accessibility'=60 -'allowedSources'=73 -'as'=105 -'bpmn'=82 -'browser'=94 -'card'=85 -'case'=111 -'catch'=123 -'chart'=77 -'cubeView'=128 -'dataInterchange'=91 -'default'=110 -'depth'=89 -'describedBy'=126 -'dialog'=81 -'do'=114 -'editableTable'=76 -'else'=107 +'allowedSources'=72 +'as'=104 +'bpmn'=81 +'browser'=93 +'card'=84 +'case'=110 +'catch'=122 +'chart'=76 +'cubeView'=127 +'dataInterchange'=90 +'default'=109 +'depth'=88 +'describedBy'=125 +'dialog'=80 +'do'=113 +'editableTable'=75 +'else'=106 'eventManager'=62 'extends'=45 'extension'=48 'false'=50 -'filterColumns'=90 -'finally'=121 -'for'=112 +'filterColumns'=89 +'finally'=120 +'for'=111 'horizontal'=51 'icon'=59 -'iconURI'=70 -'if'=106 +'if'=105 'import'=47 -'in'=88 -'instanceof'=104 -'isClosable'=127 -'kanban'=83 -'name'=93 -'new'=115 -'ns'=129 -'null'=116 -'of'=84 -'organigram'=79 +'in'=87 +'instanceof'=103 +'isClosable'=126 +'kanban'=82 +'name'=92 +'new'=114 +'ns'=128 +'null'=115 +'of'=83 +'organigram'=78 'orientation'=64 'package'=53 'part'=69 'partStack'=67 'perspective'=56 'process'=57 -'readOnlyTable'=75 -'report'=78 -'return'=119 +'readOnlyTable'=74 +'report'=77 +'return'=118 'sashContainer'=63 -'search'=87 -'select'=74 +'search'=86 +'select'=73 'selectedElement'=65 'spaceVolume'=66 'static'=46 'super'=49 -'switch'=108 +'switch'=107 'synchronize'=68 -'synchronized'=122 -'targetPart'=72 -'throw'=118 -'title'=92 +'synchronized'=121 +'targetPart'=71 +'throw'=117 +'title'=91 'toolbar'=61 -'topology'=80 -'true'=134 -'try'=120 -'typeof'=117 -'url'=95 +'topology'=79 +'true'=133 +'try'=119 +'typeof'=116 +'url'=94 'usertask'=58 'val'=44 -'var'=133 +'var'=132 'vertical'=52 -'view'=71 -'welcome'=86 -'while'=113 +'view'=70 +'welcome'=85 +'while'=112 '{'=54 -'|'=132 +'|'=131 '||'=14 '}'=55 RULE_ANY_OTHER=12 @@ -163,7 +162,6 @@ T__130=130 T__131=131 T__132=132 T__133=133 -T__134=134 T__13=13 T__14=14 T__15=15 diff --git a/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDslLexer.java b/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDslLexer.java index cfd757e..dd737df 100644 --- a/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDslLexer.java +++ b/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDslLexer.java @@ -27,7 +27,6 @@ public class InternalPerspectiveDslLexer extends Lexer { public static final int T__132=132; public static final int T__60=60; public static final int T__61=61; - public static final int T__134=134; public static final int RULE_ID=4; public static final int T__131=131; public static final int T__130=130; @@ -1348,10 +1347,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__70; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:68:7: ( 'iconURI' ) - // InternalPerspectiveDsl.g:68:9: 'iconURI' + // InternalPerspectiveDsl.g:68:7: ( 'view' ) + // InternalPerspectiveDsl.g:68:9: 'view' { - match("iconURI"); + match("view"); } @@ -1369,10 +1368,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__71; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:69:7: ( 'view' ) - // InternalPerspectiveDsl.g:69:9: 'view' + // InternalPerspectiveDsl.g:69:7: ( 'targetPart' ) + // InternalPerspectiveDsl.g:69:9: 'targetPart' { - match("view"); + match("targetPart"); } @@ -1390,10 +1389,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__72; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:70:7: ( 'targetPart' ) - // InternalPerspectiveDsl.g:70:9: 'targetPart' + // InternalPerspectiveDsl.g:70:7: ( 'allowedSources' ) + // InternalPerspectiveDsl.g:70:9: 'allowedSources' { - match("targetPart"); + match("allowedSources"); } @@ -1411,10 +1410,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__73; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:71:7: ( 'allowedSources' ) - // InternalPerspectiveDsl.g:71:9: 'allowedSources' + // InternalPerspectiveDsl.g:71:7: ( 'select' ) + // InternalPerspectiveDsl.g:71:9: 'select' { - match("allowedSources"); + match("select"); } @@ -1432,10 +1431,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__74; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:72:7: ( 'select' ) - // InternalPerspectiveDsl.g:72:9: 'select' + // InternalPerspectiveDsl.g:72:7: ( 'readOnlyTable' ) + // InternalPerspectiveDsl.g:72:9: 'readOnlyTable' { - match("select"); + match("readOnlyTable"); } @@ -1453,10 +1452,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__75; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:73:7: ( 'readOnlyTable' ) - // InternalPerspectiveDsl.g:73:9: 'readOnlyTable' + // InternalPerspectiveDsl.g:73:7: ( 'editableTable' ) + // InternalPerspectiveDsl.g:73:9: 'editableTable' { - match("readOnlyTable"); + match("editableTable"); } @@ -1474,10 +1473,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__76; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:74:7: ( 'editableTable' ) - // InternalPerspectiveDsl.g:74:9: 'editableTable' + // InternalPerspectiveDsl.g:74:7: ( 'chart' ) + // InternalPerspectiveDsl.g:74:9: 'chart' { - match("editableTable"); + match("chart"); } @@ -1495,10 +1494,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__77; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:75:7: ( 'chart' ) - // InternalPerspectiveDsl.g:75:9: 'chart' + // InternalPerspectiveDsl.g:75:7: ( 'report' ) + // InternalPerspectiveDsl.g:75:9: 'report' { - match("chart"); + match("report"); } @@ -1516,10 +1515,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__78; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:76:7: ( 'report' ) - // InternalPerspectiveDsl.g:76:9: 'report' + // InternalPerspectiveDsl.g:76:7: ( 'organigram' ) + // InternalPerspectiveDsl.g:76:9: 'organigram' { - match("report"); + match("organigram"); } @@ -1537,10 +1536,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__79; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:77:7: ( 'organigram' ) - // InternalPerspectiveDsl.g:77:9: 'organigram' + // InternalPerspectiveDsl.g:77:7: ( 'topology' ) + // InternalPerspectiveDsl.g:77:9: 'topology' { - match("organigram"); + match("topology"); } @@ -1558,10 +1557,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__80; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:78:7: ( 'topology' ) - // InternalPerspectiveDsl.g:78:9: 'topology' + // InternalPerspectiveDsl.g:78:7: ( 'dialog' ) + // InternalPerspectiveDsl.g:78:9: 'dialog' { - match("topology"); + match("dialog"); } @@ -1579,10 +1578,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__81; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:79:7: ( 'dialog' ) - // InternalPerspectiveDsl.g:79:9: 'dialog' + // InternalPerspectiveDsl.g:79:7: ( 'bpmn' ) + // InternalPerspectiveDsl.g:79:9: 'bpmn' { - match("dialog"); + match("bpmn"); } @@ -1600,10 +1599,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__82; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:80:7: ( 'bpmn' ) - // InternalPerspectiveDsl.g:80:9: 'bpmn' + // InternalPerspectiveDsl.g:80:7: ( 'kanban' ) + // InternalPerspectiveDsl.g:80:9: 'kanban' { - match("bpmn"); + match("kanban"); } @@ -1621,10 +1620,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__83; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:81:7: ( 'kanban' ) - // InternalPerspectiveDsl.g:81:9: 'kanban' + // InternalPerspectiveDsl.g:81:7: ( 'of' ) + // InternalPerspectiveDsl.g:81:9: 'of' { - match("kanban"); + match("of"); } @@ -1642,10 +1641,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__84; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:82:7: ( 'of' ) - // InternalPerspectiveDsl.g:82:9: 'of' + // InternalPerspectiveDsl.g:82:7: ( 'card' ) + // InternalPerspectiveDsl.g:82:9: 'card' { - match("of"); + match("card"); } @@ -1663,10 +1662,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__85; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:83:7: ( 'card' ) - // InternalPerspectiveDsl.g:83:9: 'card' + // InternalPerspectiveDsl.g:83:7: ( 'welcome' ) + // InternalPerspectiveDsl.g:83:9: 'welcome' { - match("card"); + match("welcome"); } @@ -1684,10 +1683,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__86; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:84:7: ( 'welcome' ) - // InternalPerspectiveDsl.g:84:9: 'welcome' + // InternalPerspectiveDsl.g:84:7: ( 'search' ) + // InternalPerspectiveDsl.g:84:9: 'search' { - match("welcome"); + match("search"); } @@ -1705,10 +1704,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__87; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:85:7: ( 'search' ) - // InternalPerspectiveDsl.g:85:9: 'search' + // InternalPerspectiveDsl.g:85:7: ( 'in' ) + // InternalPerspectiveDsl.g:85:9: 'in' { - match("search"); + match("in"); } @@ -1726,10 +1725,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__88; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:86:7: ( 'in' ) - // InternalPerspectiveDsl.g:86:9: 'in' + // InternalPerspectiveDsl.g:86:7: ( 'depth' ) + // InternalPerspectiveDsl.g:86:9: 'depth' { - match("in"); + match("depth"); } @@ -1747,10 +1746,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__89; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:87:7: ( 'depth' ) - // InternalPerspectiveDsl.g:87:9: 'depth' + // InternalPerspectiveDsl.g:87:7: ( 'filterColumns' ) + // InternalPerspectiveDsl.g:87:9: 'filterColumns' { - match("depth"); + match("filterColumns"); } @@ -1768,10 +1767,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__90; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:88:7: ( 'filterColumns' ) - // InternalPerspectiveDsl.g:88:9: 'filterColumns' + // InternalPerspectiveDsl.g:88:7: ( 'dataInterchange' ) + // InternalPerspectiveDsl.g:88:9: 'dataInterchange' { - match("filterColumns"); + match("dataInterchange"); } @@ -1789,10 +1788,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__91; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:89:7: ( 'dataInterchange' ) - // InternalPerspectiveDsl.g:89:9: 'dataInterchange' + // InternalPerspectiveDsl.g:89:7: ( 'title' ) + // InternalPerspectiveDsl.g:89:9: 'title' { - match("dataInterchange"); + match("title"); } @@ -1810,10 +1809,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__92; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:90:7: ( 'title' ) - // InternalPerspectiveDsl.g:90:9: 'title' + // InternalPerspectiveDsl.g:90:7: ( 'name' ) + // InternalPerspectiveDsl.g:90:9: 'name' { - match("title"); + match("name"); } @@ -1831,10 +1830,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__93; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:91:7: ( 'name' ) - // InternalPerspectiveDsl.g:91:9: 'name' + // InternalPerspectiveDsl.g:91:7: ( 'browser' ) + // InternalPerspectiveDsl.g:91:9: 'browser' { - match("name"); + match("browser"); } @@ -1852,10 +1851,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__94; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:92:7: ( 'browser' ) - // InternalPerspectiveDsl.g:92:9: 'browser' + // InternalPerspectiveDsl.g:92:7: ( 'url' ) + // InternalPerspectiveDsl.g:92:9: 'url' { - match("browser"); + match("url"); } @@ -1873,11 +1872,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__95; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:93:7: ( 'url' ) - // InternalPerspectiveDsl.g:93:9: 'url' + // InternalPerspectiveDsl.g:93:7: ( ';' ) + // InternalPerspectiveDsl.g:93:9: ';' { - match("url"); - + match(';'); } @@ -1894,10 +1892,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__96; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:94:7: ( ';' ) - // InternalPerspectiveDsl.g:94:9: ';' + // InternalPerspectiveDsl.g:94:7: ( '@' ) + // InternalPerspectiveDsl.g:94:9: '@' { - match(';'); + match('@'); } @@ -1914,10 +1912,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__97; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:95:7: ( '@' ) - // InternalPerspectiveDsl.g:95:9: '@' + // InternalPerspectiveDsl.g:95:7: ( '(' ) + // InternalPerspectiveDsl.g:95:9: '(' { - match('@'); + match('('); } @@ -1934,10 +1932,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__98; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:96:7: ( '(' ) - // InternalPerspectiveDsl.g:96:9: '(' + // InternalPerspectiveDsl.g:96:7: ( ')' ) + // InternalPerspectiveDsl.g:96:9: ')' { - match('('); + match(')'); } @@ -1954,10 +1952,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__99; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:97:7: ( ')' ) - // InternalPerspectiveDsl.g:97:9: ')' + // InternalPerspectiveDsl.g:97:7: ( ',' ) + // InternalPerspectiveDsl.g:97:9: ',' { - match(')'); + match(','); } @@ -1974,10 +1972,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__100; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:98:8: ( ',' ) - // InternalPerspectiveDsl.g:98:10: ',' + // InternalPerspectiveDsl.g:98:8: ( ']' ) + // InternalPerspectiveDsl.g:98:10: ']' { - match(','); + match(']'); } @@ -1994,10 +1992,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__101; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:99:8: ( ']' ) - // InternalPerspectiveDsl.g:99:10: ']' + // InternalPerspectiveDsl.g:99:8: ( '#' ) + // InternalPerspectiveDsl.g:99:10: '#' { - match(']'); + match('#'); } @@ -2014,10 +2012,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__102; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:100:8: ( '#' ) - // InternalPerspectiveDsl.g:100:10: '#' + // InternalPerspectiveDsl.g:100:8: ( '[' ) + // InternalPerspectiveDsl.g:100:10: '[' { - match('#'); + match('['); } @@ -2034,10 +2032,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__103; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:101:8: ( '[' ) - // InternalPerspectiveDsl.g:101:10: '[' + // InternalPerspectiveDsl.g:101:8: ( 'instanceof' ) + // InternalPerspectiveDsl.g:101:10: 'instanceof' { - match('['); + match("instanceof"); + } @@ -2054,10 +2053,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__104; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:102:8: ( 'instanceof' ) - // InternalPerspectiveDsl.g:102:10: 'instanceof' + // InternalPerspectiveDsl.g:102:8: ( 'as' ) + // InternalPerspectiveDsl.g:102:10: 'as' { - match("instanceof"); + match("as"); } @@ -2075,10 +2074,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__105; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:103:8: ( 'as' ) - // InternalPerspectiveDsl.g:103:10: 'as' + // InternalPerspectiveDsl.g:103:8: ( 'if' ) + // InternalPerspectiveDsl.g:103:10: 'if' { - match("as"); + match("if"); } @@ -2096,10 +2095,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__106; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:104:8: ( 'if' ) - // InternalPerspectiveDsl.g:104:10: 'if' + // InternalPerspectiveDsl.g:104:8: ( 'else' ) + // InternalPerspectiveDsl.g:104:10: 'else' { - match("if"); + match("else"); } @@ -2117,10 +2116,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__107; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:105:8: ( 'else' ) - // InternalPerspectiveDsl.g:105:10: 'else' + // InternalPerspectiveDsl.g:105:8: ( 'switch' ) + // InternalPerspectiveDsl.g:105:10: 'switch' { - match("else"); + match("switch"); } @@ -2138,11 +2137,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__108; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:106:8: ( 'switch' ) - // InternalPerspectiveDsl.g:106:10: 'switch' + // InternalPerspectiveDsl.g:106:8: ( ':' ) + // InternalPerspectiveDsl.g:106:10: ':' { - match("switch"); - + match(':'); } @@ -2159,10 +2157,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__109; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:107:8: ( ':' ) - // InternalPerspectiveDsl.g:107:10: ':' + // InternalPerspectiveDsl.g:107:8: ( 'default' ) + // InternalPerspectiveDsl.g:107:10: 'default' { - match(':'); + match("default"); + } @@ -2179,10 +2178,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__110; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:108:8: ( 'default' ) - // InternalPerspectiveDsl.g:108:10: 'default' + // InternalPerspectiveDsl.g:108:8: ( 'case' ) + // InternalPerspectiveDsl.g:108:10: 'case' { - match("default"); + match("case"); } @@ -2200,10 +2199,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__111; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:109:8: ( 'case' ) - // InternalPerspectiveDsl.g:109:10: 'case' + // InternalPerspectiveDsl.g:109:8: ( 'for' ) + // InternalPerspectiveDsl.g:109:10: 'for' { - match("case"); + match("for"); } @@ -2221,10 +2220,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__112; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:110:8: ( 'for' ) - // InternalPerspectiveDsl.g:110:10: 'for' + // InternalPerspectiveDsl.g:110:8: ( 'while' ) + // InternalPerspectiveDsl.g:110:10: 'while' { - match("for"); + match("while"); } @@ -2242,10 +2241,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__113; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:111:8: ( 'while' ) - // InternalPerspectiveDsl.g:111:10: 'while' + // InternalPerspectiveDsl.g:111:8: ( 'do' ) + // InternalPerspectiveDsl.g:111:10: 'do' { - match("while"); + match("do"); } @@ -2263,10 +2262,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__114; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:112:8: ( 'do' ) - // InternalPerspectiveDsl.g:112:10: 'do' + // InternalPerspectiveDsl.g:112:8: ( 'new' ) + // InternalPerspectiveDsl.g:112:10: 'new' { - match("do"); + match("new"); } @@ -2284,10 +2283,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__115; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:113:8: ( 'new' ) - // InternalPerspectiveDsl.g:113:10: 'new' + // InternalPerspectiveDsl.g:113:8: ( 'null' ) + // InternalPerspectiveDsl.g:113:10: 'null' { - match("new"); + match("null"); } @@ -2305,10 +2304,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__116; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:114:8: ( 'null' ) - // InternalPerspectiveDsl.g:114:10: 'null' + // InternalPerspectiveDsl.g:114:8: ( 'typeof' ) + // InternalPerspectiveDsl.g:114:10: 'typeof' { - match("null"); + match("typeof"); } @@ -2326,10 +2325,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__117; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:115:8: ( 'typeof' ) - // InternalPerspectiveDsl.g:115:10: 'typeof' + // InternalPerspectiveDsl.g:115:8: ( 'throw' ) + // InternalPerspectiveDsl.g:115:10: 'throw' { - match("typeof"); + match("throw"); } @@ -2347,10 +2346,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__118; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:116:8: ( 'throw' ) - // InternalPerspectiveDsl.g:116:10: 'throw' + // InternalPerspectiveDsl.g:116:8: ( 'return' ) + // InternalPerspectiveDsl.g:116:10: 'return' { - match("throw"); + match("return"); } @@ -2368,10 +2367,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__119; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:117:8: ( 'return' ) - // InternalPerspectiveDsl.g:117:10: 'return' + // InternalPerspectiveDsl.g:117:8: ( 'try' ) + // InternalPerspectiveDsl.g:117:10: 'try' { - match("return"); + match("try"); } @@ -2389,10 +2388,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__120; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:118:8: ( 'try' ) - // InternalPerspectiveDsl.g:118:10: 'try' + // InternalPerspectiveDsl.g:118:8: ( 'finally' ) + // InternalPerspectiveDsl.g:118:10: 'finally' { - match("try"); + match("finally"); } @@ -2410,10 +2409,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__121; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:119:8: ( 'finally' ) - // InternalPerspectiveDsl.g:119:10: 'finally' + // InternalPerspectiveDsl.g:119:8: ( 'synchronized' ) + // InternalPerspectiveDsl.g:119:10: 'synchronized' { - match("finally"); + match("synchronized"); } @@ -2431,10 +2430,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__122; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:120:8: ( 'synchronized' ) - // InternalPerspectiveDsl.g:120:10: 'synchronized' + // InternalPerspectiveDsl.g:120:8: ( 'catch' ) + // InternalPerspectiveDsl.g:120:10: 'catch' { - match("synchronized"); + match("catch"); } @@ -2452,11 +2451,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__123; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:121:8: ( 'catch' ) - // InternalPerspectiveDsl.g:121:10: 'catch' + // InternalPerspectiveDsl.g:121:8: ( '?' ) + // InternalPerspectiveDsl.g:121:10: '?' { - match("catch"); - + match('?'); } @@ -2473,10 +2471,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__124; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:122:8: ( '?' ) - // InternalPerspectiveDsl.g:122:10: '?' + // InternalPerspectiveDsl.g:122:8: ( '&' ) + // InternalPerspectiveDsl.g:122:10: '&' { - match('?'); + match('&'); } @@ -2493,10 +2491,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__125; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:123:8: ( '&' ) - // InternalPerspectiveDsl.g:123:10: '&' + // InternalPerspectiveDsl.g:123:8: ( 'describedBy' ) + // InternalPerspectiveDsl.g:123:10: 'describedBy' { - match('&'); + match("describedBy"); + } @@ -2513,10 +2512,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__126; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:124:8: ( 'describedBy' ) - // InternalPerspectiveDsl.g:124:10: 'describedBy' + // InternalPerspectiveDsl.g:124:8: ( 'isClosable' ) + // InternalPerspectiveDsl.g:124:10: 'isClosable' { - match("describedBy"); + match("isClosable"); } @@ -2534,10 +2533,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__127; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:125:8: ( 'isClosable' ) - // InternalPerspectiveDsl.g:125:10: 'isClosable' + // InternalPerspectiveDsl.g:125:8: ( 'cubeView' ) + // InternalPerspectiveDsl.g:125:10: 'cubeView' { - match("isClosable"); + match("cubeView"); } @@ -2555,10 +2554,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__128; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:126:8: ( 'cubeView' ) - // InternalPerspectiveDsl.g:126:10: 'cubeView' + // InternalPerspectiveDsl.g:126:8: ( 'ns' ) + // InternalPerspectiveDsl.g:126:10: 'ns' { - match("cubeView"); + match("ns"); } @@ -2576,10 +2575,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__129; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:127:8: ( 'ns' ) - // InternalPerspectiveDsl.g:127:10: 'ns' + // InternalPerspectiveDsl.g:127:8: ( '::' ) + // InternalPerspectiveDsl.g:127:10: '::' { - match("ns"); + match("::"); } @@ -2597,10 +2596,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__130; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:128:8: ( '::' ) - // InternalPerspectiveDsl.g:128:10: '::' + // InternalPerspectiveDsl.g:128:8: ( '?.' ) + // InternalPerspectiveDsl.g:128:10: '?.' { - match("::"); + match("?."); } @@ -2618,11 +2617,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__131; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:129:8: ( '?.' ) - // InternalPerspectiveDsl.g:129:10: '?.' + // InternalPerspectiveDsl.g:129:8: ( '|' ) + // InternalPerspectiveDsl.g:129:10: '|' { - match("?."); - + match('|'); } @@ -2639,10 +2637,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__132; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:130:8: ( '|' ) - // InternalPerspectiveDsl.g:130:10: '|' + // InternalPerspectiveDsl.g:130:8: ( 'var' ) + // InternalPerspectiveDsl.g:130:10: 'var' { - match('|'); + match("var"); + } @@ -2659,29 +2658,8 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__133; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:131:8: ( 'var' ) - // InternalPerspectiveDsl.g:131:10: 'var' - { - match("var"); - - - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "T__133" - - // $ANTLR start "T__134" - public final void mT__134() throws RecognitionException { - try { - int _type = T__134; - int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:132:8: ( 'true' ) - // InternalPerspectiveDsl.g:132:10: 'true' + // InternalPerspectiveDsl.g:131:8: ( 'true' ) + // InternalPerspectiveDsl.g:131:10: 'true' { match("true"); @@ -2694,7 +2672,7 @@ public class InternalPerspectiveDslLexer extends Lexer { finally { } } - // $ANTLR end "T__134" + // $ANTLR end "T__133" // $ANTLR start "RULE_HEX" public final void mRULE_HEX() throws RecognitionException { @@ -3539,8 +3517,8 @@ public class InternalPerspectiveDslLexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // InternalPerspectiveDsl.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt21=131; + // InternalPerspectiveDsl.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt21=130; alt21 = dfa21.predict(input); switch (alt21) { case 1 : @@ -4391,70 +4369,63 @@ public class InternalPerspectiveDslLexer extends Lexer { } break; case 122 : - // InternalPerspectiveDsl.g:1:770: T__134 - { - mT__134(); - - } - break; - case 123 : - // InternalPerspectiveDsl.g:1:777: RULE_HEX + // InternalPerspectiveDsl.g:1:770: RULE_HEX { mRULE_HEX(); } break; - case 124 : - // InternalPerspectiveDsl.g:1:786: RULE_INT + case 123 : + // InternalPerspectiveDsl.g:1:779: RULE_INT { mRULE_INT(); } break; - case 125 : - // InternalPerspectiveDsl.g:1:795: RULE_DECIMAL + case 124 : + // InternalPerspectiveDsl.g:1:788: RULE_DECIMAL { mRULE_DECIMAL(); } break; - case 126 : - // InternalPerspectiveDsl.g:1:808: RULE_ID + case 125 : + // InternalPerspectiveDsl.g:1:801: RULE_ID { mRULE_ID(); } break; - case 127 : - // InternalPerspectiveDsl.g:1:816: RULE_STRING + case 126 : + // InternalPerspectiveDsl.g:1:809: RULE_STRING { mRULE_STRING(); } break; - case 128 : - // InternalPerspectiveDsl.g:1:828: RULE_ML_COMMENT + case 127 : + // InternalPerspectiveDsl.g:1:821: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; - case 129 : - // InternalPerspectiveDsl.g:1:844: RULE_SL_COMMENT + case 128 : + // InternalPerspectiveDsl.g:1:837: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; - case 130 : - // InternalPerspectiveDsl.g:1:860: RULE_WS + case 129 : + // InternalPerspectiveDsl.g:1:853: RULE_WS { mRULE_WS(); } break; - case 131 : - // InternalPerspectiveDsl.g:1:868: RULE_ANY_OTHER + case 130 : + // InternalPerspectiveDsl.g:1:861: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -4468,17 +4439,17 @@ public class InternalPerspectiveDslLexer extends Lexer { protected DFA21 dfa21 = new DFA21(this); static final String DFA21_eotS = - "\1\uffff\1\65\1\67\1\71\1\74\1\100\1\103\1\107\1\111\1\113\1\115\1\117\1\121\1\124\7\130\2\uffff\13\130\10\uffff\1\u0099\2\u009c\1\62\5\uffff\1\u00a1\26\uffff\1\u00a3\5\uffff\1\u00a5\4\uffff\3\130\1\uffff\15\130\1\u00b9\1\u00ba\10\130\2\uffff\4\130\1\u00c9\7\130\1\u00d4\7\130\1\u00e2\10\130\1\u00eb\13\uffff\1\u009c\12\uffff\1\u00ec\1\u00ed\21\130\2\uffff\4\130\1\u0103\6\130\1\u010a\2\130\1\uffff\6\130\1\u0113\3\130\1\uffff\15\130\1\uffff\6\130\1\u012a\1\130\3\uffff\1\130\1\u012d\3\130\1\u0131\11\130\1\u013c\5\130\1\uffff\2\130\1\u0145\3\130\1\uffff\10\130\1\uffff\1\u0151\6\130\1\u0158\1\u0159\7\130\1\u0161\4\130\1\u0166\1\uffff\1\u0167\1\130\1\uffff\3\130\1\uffff\1\130\1\u016e\10\130\1\uffff\2\130\1\u0179\5\130\1\uffff\10\130\1\u0187\1\130\1\u0189\1\uffff\5\130\1\u018f\2\uffff\1\u0190\2\130\1\u0193\3\130\1\uffff\3\130\1\u019a\2\uffff\5\130\1\u01a0\1\uffff\1\130\1\u01a3\1\u01a4\2\130\1\u01a7\1\u01a8\3\130\1\uffff\15\130\1\uffff\1\u01b9\1\uffff\3\130\1\u01bd\1\u01be\2\uffff\1\130\1\u01c0\1\uffff\4\130\1\u01c5\1\130\1\uffff\1\130\1\u01c8\3\130\1\uffff\2\130\2\uffff\2\130\2\uffff\1\u01d0\3\130\1\u01d4\1\130\1\u01d6\2\130\1\u01d9\3\130\1\u01dd\2\130\1\uffff\3\130\2\uffff\1\130\1\uffff\1\u01e4\2\130\1\u01e7\1\uffff\1\u01e8\1\u01e9\1\uffff\7\130\1\uffff\3\130\1\uffff\1\130\1\uffff\2\130\1\uffff\1\u01f7\2\130\1\uffff\1\u01fa\4\130\1\u01ff\1\uffff\2\130\3\uffff\1\u0202\12\130\1\u020d\1\130\1\uffff\2\130\1\uffff\4\130\1\uffff\2\130\1\uffff\6\130\1\u021d\1\u021e\1\130\1\u0220\1\uffff\3\130\1\u0224\1\130\1\u0226\7\130\1\u022e\1\u0230\2\uffff\1\130\1\uffff\1\u0232\2\130\1\uffff\1\u0235\1\uffff\1\130\1\u0237\1\130\1\u0239\3\130\1\uffff\1\u023d\1\uffff\1\130\1\uffff\2\130\1\uffff\1\130\1\uffff\1\130\1\uffff\1\u0243\1\u0244\1\130\1\uffff\1\u0246\1\u0247\1\130\1\u0249\1\130\2\uffff\1\130\2\uffff\1\u024c\1\uffff\1\130\1\u024e\1\uffff\1\u024f\2\uffff"; + "\1\uffff\1\65\1\67\1\71\1\74\1\100\1\103\1\107\1\111\1\113\1\115\1\117\1\121\1\124\7\130\2\uffff\13\130\10\uffff\1\u0099\2\u009c\1\62\5\uffff\1\u00a1\26\uffff\1\u00a3\5\uffff\1\u00a5\4\uffff\3\130\1\uffff\15\130\1\u00b9\1\u00ba\10\130\2\uffff\4\130\1\u00c9\7\130\1\u00d4\7\130\1\u00e2\10\130\1\u00eb\13\uffff\1\u009c\12\uffff\1\u00ec\1\u00ed\21\130\2\uffff\4\130\1\u0103\6\130\1\u010a\2\130\1\uffff\6\130\1\u0113\3\130\1\uffff\15\130\1\uffff\6\130\1\u012a\1\130\3\uffff\1\130\1\u012d\3\130\1\u0131\11\130\1\u013b\5\130\1\uffff\2\130\1\u0144\3\130\1\uffff\10\130\1\uffff\1\u0150\6\130\1\u0157\1\u0158\7\130\1\u0160\4\130\1\u0165\1\uffff\1\u0166\1\130\1\uffff\3\130\1\uffff\1\130\1\u016d\7\130\1\uffff\2\130\1\u0177\5\130\1\uffff\10\130\1\u0185\1\130\1\u0187\1\uffff\5\130\1\u018d\2\uffff\1\u018e\2\130\1\u0191\3\130\1\uffff\3\130\1\u0198\2\uffff\5\130\1\u019e\1\uffff\1\130\1\u01a1\1\u01a2\2\130\1\u01a5\1\u01a6\2\130\1\uffff\15\130\1\uffff\1\u01b6\1\uffff\3\130\1\u01ba\1\u01bb\2\uffff\1\130\1\u01bd\1\uffff\4\130\1\u01c2\1\130\1\uffff\1\130\1\u01c5\3\130\1\uffff\2\130\2\uffff\2\130\2\uffff\3\130\1\u01d0\1\130\1\u01d2\2\130\1\u01d5\3\130\1\u01d9\2\130\1\uffff\3\130\2\uffff\1\130\1\uffff\1\u01e0\2\130\1\u01e3\1\uffff\1\u01e4\1\u01e5\1\uffff\12\130\1\uffff\1\130\1\uffff\2\130\1\uffff\1\u01f3\2\130\1\uffff\1\u01f6\4\130\1\u01fb\1\uffff\2\130\3\uffff\1\u01fe\12\130\1\u0209\1\130\1\uffff\2\130\1\uffff\4\130\1\uffff\2\130\1\uffff\6\130\1\u0219\1\u021a\1\130\1\u021c\1\uffff\3\130\1\u0220\1\130\1\u0222\7\130\1\u022a\1\u022c\2\uffff\1\130\1\uffff\1\u022e\2\130\1\uffff\1\u0231\1\uffff\1\130\1\u0233\1\130\1\u0235\3\130\1\uffff\1\u0239\1\uffff\1\130\1\uffff\2\130\1\uffff\1\130\1\uffff\1\130\1\uffff\1\u023f\1\u0240\1\130\1\uffff\1\u0242\1\u0243\1\130\1\u0245\1\130\2\uffff\1\130\2\uffff\1\u0248\1\uffff\1\130\1\u024a\1\uffff\1\u024b\2\uffff"; static final String DFA21_eofS = - "\u0250\uffff"; + "\u024c\uffff"; static final String DFA21_minS = - "\1\0\1\75\1\174\1\46\1\53\1\55\2\52\3\75\1\76\2\56\1\141\1\144\1\141\1\143\1\141\1\157\1\141\2\uffff\1\162\1\143\1\141\1\146\1\145\2\141\1\160\1\141\1\145\1\141\10\uffff\1\72\2\60\1\44\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\1\154\1\162\1\145\1\uffff\1\164\1\145\1\151\1\163\1\141\1\160\1\163\2\141\1\156\1\151\1\160\1\157\2\44\1\103\2\154\2\162\1\143\1\162\1\157\2\uffff\1\145\1\154\1\143\1\154\1\44\1\157\1\162\1\164\1\160\1\162\1\165\1\147\1\44\2\141\1\162\1\142\1\141\1\146\1\164\1\44\1\155\1\157\1\156\1\154\1\151\1\155\1\167\1\154\1\44\13\uffff\1\60\12\uffff\2\44\1\164\1\167\1\145\1\156\1\164\1\145\1\164\1\145\1\150\1\145\1\162\2\143\1\164\1\157\1\156\1\164\2\uffff\1\154\1\163\1\164\1\141\1\44\1\151\1\153\1\164\1\163\1\143\1\162\1\44\1\145\1\157\1\uffff\1\154\1\157\1\147\1\154\1\145\1\157\1\44\2\145\1\141\1\uffff\1\144\1\157\1\165\1\162\1\144\1\145\1\143\1\145\1\154\1\164\1\141\1\143\1\141\1\uffff\1\156\1\167\1\142\1\143\1\154\1\145\1\44\1\154\3\uffff\1\151\1\44\1\156\1\164\1\141\1\44\1\151\1\162\1\103\2\143\1\145\1\150\1\143\1\162\1\44\1\141\1\157\2\145\1\154\1\uffff\1\172\1\141\1\44\1\160\1\145\1\164\1\uffff\1\163\1\167\1\142\1\154\2\145\1\157\1\167\1\uffff\1\44\2\156\1\117\2\162\1\164\2\44\1\150\1\126\1\157\1\150\1\165\1\162\1\111\1\44\1\163\1\141\1\157\1\145\1\44\1\uffff\1\44\1\143\1\uffff\1\144\1\115\1\142\1\uffff\1\143\1\44\1\157\1\164\1\150\1\126\1\162\1\150\1\164\1\122\1\uffff\1\156\1\163\1\44\1\162\1\154\1\157\1\147\1\164\1\uffff\1\145\1\163\1\141\1\163\1\145\1\141\1\157\1\164\1\44\1\146\1\44\1\uffff\1\164\1\151\1\156\1\164\1\156\1\44\2\uffff\1\44\1\151\1\147\1\44\1\154\1\151\1\156\1\uffff\1\145\1\156\1\155\1\44\2\uffff\1\141\1\163\1\151\1\141\1\154\1\44\1\uffff\1\156\2\44\2\157\2\44\1\111\1\143\1\141\1\uffff\1\103\1\171\1\156\1\145\1\141\1\143\2\163\1\151\1\144\1\162\1\147\1\120\1\uffff\1\44\1\uffff\1\141\1\147\1\154\2\44\2\uffff\1\145\1\44\1\uffff\1\164\1\142\1\164\1\162\1\44\1\145\1\uffff\1\154\1\44\1\157\1\156\1\145\1\uffff\1\164\1\144\2\uffff\1\154\1\156\2\uffff\1\44\1\145\1\142\1\157\1\44\1\164\1\44\1\143\1\164\1\44\1\153\1\142\1\123\1\44\1\171\1\141\1\uffff\1\164\1\162\1\171\2\uffff\1\167\1\uffff\1\44\2\145\1\44\1\uffff\2\44\1\uffff\1\156\1\141\1\124\1\141\1\105\1\165\1\151\1\uffff\1\157\2\154\1\uffff\1\141\1\uffff\1\153\1\151\1\uffff\1\44\1\151\1\157\1\uffff\1\44\1\162\1\151\1\141\1\124\1\44\1\uffff\1\144\1\162\3\uffff\1\44\1\147\1\141\1\151\1\154\1\155\1\172\1\146\1\145\1\165\1\154\1\44\1\166\1\uffff\1\154\1\165\1\uffff\1\164\1\157\1\155\1\141\1\uffff\1\102\1\143\1\uffff\1\145\1\142\1\156\3\145\2\44\1\155\1\44\1\uffff\1\145\1\151\1\162\1\44\1\156\1\44\1\142\1\171\1\150\1\162\1\154\1\145\1\155\2\44\2\uffff\1\156\1\uffff\1\44\1\164\1\143\1\uffff\1\44\1\uffff\1\154\1\44\1\141\1\44\1\145\1\162\1\145\1\uffff\1\44\1\uffff\1\163\1\uffff\1\171\1\145\1\uffff\1\145\1\uffff\1\156\1\uffff\2\44\1\156\1\uffff\2\44\1\163\1\44\1\147\2\uffff\1\164\2\uffff\1\44\1\uffff\1\145\1\44\1\uffff\1\44\2\uffff"; + "\1\0\1\75\1\174\1\46\1\53\1\55\2\52\3\75\1\76\2\56\1\141\1\144\1\141\1\143\1\141\1\157\1\141\2\uffff\1\162\1\143\1\141\1\146\1\145\2\141\1\160\1\141\1\145\1\141\10\uffff\1\72\2\60\1\44\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\1\154\1\162\1\145\1\uffff\1\164\1\145\1\151\1\163\1\141\1\160\1\163\2\141\1\156\1\151\1\160\1\157\2\44\1\103\2\154\2\162\1\143\1\162\1\157\2\uffff\1\145\1\154\1\143\1\154\1\44\1\157\1\162\1\164\1\160\1\162\1\165\1\147\1\44\2\141\1\162\1\142\1\141\1\146\1\164\1\44\1\155\1\157\1\156\1\154\1\151\1\155\1\167\1\154\1\44\13\uffff\1\60\12\uffff\2\44\1\164\1\167\1\145\1\156\1\164\1\145\1\164\1\145\1\150\1\145\1\162\2\143\1\164\1\157\1\156\1\164\2\uffff\1\154\1\163\1\164\1\141\1\44\1\151\1\153\1\164\1\163\1\143\1\162\1\44\1\145\1\157\1\uffff\1\154\1\157\1\147\1\154\1\145\1\157\1\44\2\145\1\141\1\uffff\1\144\1\157\1\165\1\162\1\144\1\145\1\143\1\145\1\154\1\164\1\141\1\143\1\141\1\uffff\1\156\1\167\1\142\1\143\1\154\1\145\1\44\1\154\3\uffff\1\151\1\44\1\156\1\164\1\141\1\44\1\151\1\162\1\103\2\143\1\145\1\150\1\143\1\162\1\44\1\141\1\157\2\145\1\154\1\uffff\1\172\1\141\1\44\1\160\1\145\1\164\1\uffff\1\163\1\167\1\142\1\154\2\145\1\157\1\167\1\uffff\1\44\2\156\1\117\2\162\1\164\2\44\1\150\1\126\1\157\1\150\1\165\1\162\1\111\1\44\1\163\1\141\1\157\1\145\1\44\1\uffff\1\44\1\143\1\uffff\1\144\1\115\1\142\1\uffff\1\143\1\44\1\157\1\164\1\150\1\126\1\162\1\150\1\164\1\uffff\1\156\1\163\1\44\1\162\1\154\1\157\1\147\1\164\1\uffff\1\145\1\163\1\141\1\163\1\145\1\141\1\157\1\164\1\44\1\146\1\44\1\uffff\1\164\1\151\1\156\1\164\1\156\1\44\2\uffff\1\44\1\151\1\147\1\44\1\154\1\151\1\156\1\uffff\1\145\1\156\1\155\1\44\2\uffff\1\141\1\163\1\151\1\141\1\154\1\44\1\uffff\1\156\2\44\2\157\2\44\1\143\1\141\1\uffff\1\103\1\171\1\156\1\145\1\141\1\143\2\163\1\151\1\144\1\162\1\147\1\120\1\uffff\1\44\1\uffff\1\141\1\147\1\154\2\44\2\uffff\1\145\1\44\1\uffff\1\164\1\142\1\164\1\162\1\44\1\145\1\uffff\1\154\1\44\1\157\1\156\1\145\1\uffff\1\164\1\144\2\uffff\1\154\1\156\2\uffff\1\145\1\142\1\157\1\44\1\164\1\44\1\143\1\164\1\44\1\153\1\142\1\123\1\44\1\171\1\141\1\uffff\1\164\1\162\1\171\2\uffff\1\167\1\uffff\1\44\2\145\1\44\1\uffff\2\44\1\uffff\1\156\1\141\1\124\1\141\1\105\1\165\1\151\1\157\2\154\1\uffff\1\141\1\uffff\1\153\1\151\1\uffff\1\44\1\151\1\157\1\uffff\1\44\1\162\1\151\1\141\1\124\1\44\1\uffff\1\144\1\162\3\uffff\1\44\1\147\1\141\1\151\1\154\1\155\1\172\1\146\1\145\1\165\1\154\1\44\1\166\1\uffff\1\154\1\165\1\uffff\1\164\1\157\1\155\1\141\1\uffff\1\102\1\143\1\uffff\1\145\1\142\1\156\3\145\2\44\1\155\1\44\1\uffff\1\145\1\151\1\162\1\44\1\156\1\44\1\142\1\171\1\150\1\162\1\154\1\145\1\155\2\44\2\uffff\1\156\1\uffff\1\44\1\164\1\143\1\uffff\1\44\1\uffff\1\154\1\44\1\141\1\44\1\145\1\162\1\145\1\uffff\1\44\1\uffff\1\163\1\uffff\1\171\1\145\1\uffff\1\145\1\uffff\1\156\1\uffff\2\44\1\156\1\uffff\2\44\1\163\1\44\1\147\2\uffff\1\164\2\uffff\1\44\1\uffff\1\145\1\44\1\uffff\1\44\2\uffff"; static final String DFA21_maxS = - "\1\uffff\1\76\1\174\1\46\1\75\1\76\5\75\1\76\1\56\1\72\1\151\1\170\1\171\1\163\2\157\1\162\2\uffff\2\163\1\171\1\162\1\145\1\165\1\157\1\162\1\141\1\150\1\165\10\uffff\1\72\1\170\1\154\1\172\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\2\162\1\145\1\uffff\1\164\1\145\1\151\1\163\1\141\1\160\1\163\1\154\1\141\1\156\1\151\1\160\1\157\2\172\1\103\1\154\1\156\4\162\1\157\2\uffff\1\145\1\154\1\143\1\154\1\172\1\160\1\162\1\164\1\160\1\162\1\171\1\151\1\172\1\164\1\141\1\164\1\142\1\141\1\163\1\164\1\172\1\155\1\157\1\156\1\154\1\151\1\155\1\167\1\154\1\172\13\uffff\1\154\12\uffff\2\172\1\164\1\167\1\145\1\156\1\164\1\145\1\164\1\145\1\150\1\145\1\162\2\143\1\164\1\157\1\156\1\164\2\uffff\1\154\1\163\1\164\1\141\1\172\1\151\1\153\1\164\1\163\1\143\1\162\1\172\1\145\1\157\1\uffff\1\154\1\157\1\147\1\154\1\145\1\157\1\172\2\145\1\141\1\uffff\1\144\1\157\1\165\1\162\1\144\1\145\1\143\1\145\1\154\1\164\1\141\1\143\1\141\1\uffff\1\156\1\167\1\142\1\143\1\154\1\145\1\172\1\154\3\uffff\1\151\1\172\1\156\1\164\1\141\1\172\1\151\1\162\1\103\2\143\1\145\1\150\1\143\1\162\1\172\1\141\1\157\2\145\1\154\1\uffff\1\172\1\141\1\172\1\160\1\145\1\164\1\uffff\1\163\1\167\1\142\1\154\2\145\1\157\1\167\1\uffff\1\172\2\156\1\117\2\162\1\164\2\172\1\150\1\126\1\157\1\150\1\165\1\162\1\111\1\172\1\163\1\141\1\157\1\145\1\172\1\uffff\1\172\1\143\1\uffff\1\163\1\115\1\142\1\uffff\1\143\1\172\1\157\1\164\1\150\1\126\1\162\1\150\1\164\1\122\1\uffff\1\156\1\163\1\172\1\162\1\154\1\157\1\147\1\164\1\uffff\1\145\1\163\1\141\1\163\1\145\1\141\1\157\1\164\1\172\1\146\1\172\1\uffff\1\164\1\151\1\156\1\164\1\156\1\172\2\uffff\1\172\1\151\1\147\1\172\1\154\1\151\1\156\1\uffff\1\145\1\156\1\155\1\172\2\uffff\1\141\1\163\1\151\1\141\1\154\1\172\1\uffff\1\156\2\172\2\157\2\172\1\111\1\143\1\141\1\uffff\1\103\1\171\1\156\1\145\1\141\1\143\2\163\1\151\1\144\1\162\1\147\1\120\1\uffff\1\172\1\uffff\1\141\1\147\1\154\2\172\2\uffff\1\145\1\172\1\uffff\1\164\1\142\1\164\1\162\1\172\1\145\1\uffff\1\154\1\172\1\157\1\156\1\145\1\uffff\1\164\1\144\2\uffff\1\154\1\156\2\uffff\1\172\1\145\1\142\1\157\1\172\1\164\1\172\1\143\1\164\1\172\1\153\1\142\1\123\1\172\1\171\1\141\1\uffff\1\164\1\162\1\171\2\uffff\1\167\1\uffff\1\172\2\145\1\172\1\uffff\2\172\1\uffff\1\156\1\141\1\124\1\141\1\105\1\165\1\151\1\uffff\1\157\2\154\1\uffff\1\141\1\uffff\1\153\1\151\1\uffff\1\172\1\151\1\157\1\uffff\1\172\1\162\1\151\1\141\1\124\1\172\1\uffff\1\144\1\162\3\uffff\1\172\1\147\1\141\1\151\1\154\1\155\1\172\1\146\1\145\1\165\1\154\1\172\1\166\1\uffff\1\154\1\165\1\uffff\1\164\1\157\1\155\1\141\1\uffff\1\102\1\143\1\uffff\1\145\1\142\1\156\3\145\2\172\1\155\1\172\1\uffff\1\145\1\151\1\162\1\172\1\156\1\172\1\142\1\171\1\150\1\162\1\154\1\145\1\155\2\172\2\uffff\1\156\1\uffff\1\172\1\164\1\143\1\uffff\1\172\1\uffff\1\154\1\172\1\141\1\172\1\145\1\162\1\145\1\uffff\1\172\1\uffff\1\163\1\uffff\1\171\1\145\1\uffff\1\145\1\uffff\1\156\1\uffff\2\172\1\156\1\uffff\2\172\1\163\1\172\1\147\2\uffff\1\164\2\uffff\1\172\1\uffff\1\145\1\172\1\uffff\1\172\2\uffff"; + "\1\uffff\1\76\1\174\1\46\1\75\1\76\5\75\1\76\1\56\1\72\1\151\1\170\1\171\1\163\2\157\1\162\2\uffff\2\163\1\171\1\162\1\145\1\165\1\157\1\162\1\141\1\150\1\165\10\uffff\1\72\1\170\1\154\1\172\5\uffff\1\75\26\uffff\1\75\5\uffff\1\74\4\uffff\2\162\1\145\1\uffff\1\164\1\145\1\151\1\163\1\141\1\160\1\163\1\154\1\141\1\156\1\151\1\160\1\157\2\172\1\103\1\154\1\156\4\162\1\157\2\uffff\1\145\1\154\1\143\1\154\1\172\1\160\1\162\1\164\1\160\1\162\1\171\1\151\1\172\1\164\1\141\1\164\1\142\1\141\1\163\1\164\1\172\1\155\1\157\1\156\1\154\1\151\1\155\1\167\1\154\1\172\13\uffff\1\154\12\uffff\2\172\1\164\1\167\1\145\1\156\1\164\1\145\1\164\1\145\1\150\1\145\1\162\2\143\1\164\1\157\1\156\1\164\2\uffff\1\154\1\163\1\164\1\141\1\172\1\151\1\153\1\164\1\163\1\143\1\162\1\172\1\145\1\157\1\uffff\1\154\1\157\1\147\1\154\1\145\1\157\1\172\2\145\1\141\1\uffff\1\144\1\157\1\165\1\162\1\144\1\145\1\143\1\145\1\154\1\164\1\141\1\143\1\141\1\uffff\1\156\1\167\1\142\1\143\1\154\1\145\1\172\1\154\3\uffff\1\151\1\172\1\156\1\164\1\141\1\172\1\151\1\162\1\103\2\143\1\145\1\150\1\143\1\162\1\172\1\141\1\157\2\145\1\154\1\uffff\1\172\1\141\1\172\1\160\1\145\1\164\1\uffff\1\163\1\167\1\142\1\154\2\145\1\157\1\167\1\uffff\1\172\2\156\1\117\2\162\1\164\2\172\1\150\1\126\1\157\1\150\1\165\1\162\1\111\1\172\1\163\1\141\1\157\1\145\1\172\1\uffff\1\172\1\143\1\uffff\1\163\1\115\1\142\1\uffff\1\143\1\172\1\157\1\164\1\150\1\126\1\162\1\150\1\164\1\uffff\1\156\1\163\1\172\1\162\1\154\1\157\1\147\1\164\1\uffff\1\145\1\163\1\141\1\163\1\145\1\141\1\157\1\164\1\172\1\146\1\172\1\uffff\1\164\1\151\1\156\1\164\1\156\1\172\2\uffff\1\172\1\151\1\147\1\172\1\154\1\151\1\156\1\uffff\1\145\1\156\1\155\1\172\2\uffff\1\141\1\163\1\151\1\141\1\154\1\172\1\uffff\1\156\2\172\2\157\2\172\1\143\1\141\1\uffff\1\103\1\171\1\156\1\145\1\141\1\143\2\163\1\151\1\144\1\162\1\147\1\120\1\uffff\1\172\1\uffff\1\141\1\147\1\154\2\172\2\uffff\1\145\1\172\1\uffff\1\164\1\142\1\164\1\162\1\172\1\145\1\uffff\1\154\1\172\1\157\1\156\1\145\1\uffff\1\164\1\144\2\uffff\1\154\1\156\2\uffff\1\145\1\142\1\157\1\172\1\164\1\172\1\143\1\164\1\172\1\153\1\142\1\123\1\172\1\171\1\141\1\uffff\1\164\1\162\1\171\2\uffff\1\167\1\uffff\1\172\2\145\1\172\1\uffff\2\172\1\uffff\1\156\1\141\1\124\1\141\1\105\1\165\1\151\1\157\2\154\1\uffff\1\141\1\uffff\1\153\1\151\1\uffff\1\172\1\151\1\157\1\uffff\1\172\1\162\1\151\1\141\1\124\1\172\1\uffff\1\144\1\162\3\uffff\1\172\1\147\1\141\1\151\1\154\1\155\1\172\1\146\1\145\1\165\1\154\1\172\1\166\1\uffff\1\154\1\165\1\uffff\1\164\1\157\1\155\1\141\1\uffff\1\102\1\143\1\uffff\1\145\1\142\1\156\3\145\2\172\1\155\1\172\1\uffff\1\145\1\151\1\162\1\172\1\156\1\172\1\142\1\171\1\150\1\162\1\154\1\145\1\155\2\172\2\uffff\1\156\1\uffff\1\172\1\164\1\143\1\uffff\1\172\1\uffff\1\154\1\172\1\141\1\172\1\145\1\162\1\145\1\uffff\1\172\1\uffff\1\163\1\uffff\1\171\1\145\1\uffff\1\145\1\uffff\1\156\1\uffff\2\172\1\156\1\uffff\2\172\1\163\1\172\1\147\2\uffff\1\164\2\uffff\1\172\1\uffff\1\145\1\172\1\uffff\1\172\2\uffff"; static final String DFA21_acceptS = - "\25\uffff\1\52\1\53\13\uffff\1\124\1\125\1\126\1\127\1\130\1\131\1\132\1\133\4\uffff\1\176\2\177\1\u0082\1\u0083\1\uffff\1\23\1\1\1\2\1\170\1\3\1\161\1\4\1\35\1\26\1\5\1\20\1\36\1\27\1\6\1\31\1\30\1\7\1\u0080\1\u0081\1\32\1\10\1\33\1\uffff\1\34\1\15\1\16\1\24\1\17\1\uffff\1\37\1\25\1\167\1\160\3\uffff\1\176\27\uffff\1\52\1\53\36\uffff\1\124\1\125\1\126\1\127\1\130\1\131\1\132\1\133\1\166\1\141\1\173\1\uffff\1\174\1\175\1\177\1\u0082\1\13\1\11\1\14\1\12\1\21\1\22\23\uffff\1\114\1\136\16\uffff\1\135\12\uffff\1\110\15\uffff\1\146\10\uffff\1\165\1\40\1\171\25\uffff\1\144\6\uffff\1\123\10\uffff\1\154\26\uffff\1\147\2\uffff\1\73\3\uffff\1\137\12\uffff\1\57\10\uffff\1\71\13\uffff\1\172\6\uffff\1\111\1\143\7\uffff\1\106\4\uffff\1\121\1\150\6\uffff\1\45\12\uffff\1\46\15\uffff\1\120\1\uffff\1\152\5\uffff\1\101\1\157\2\uffff\1\115\6\uffff\1\145\5\uffff\1\42\2\uffff\1\76\1\113\2\uffff\1\140\1\43\20\uffff\1\151\3\uffff\1\102\1\153\1\uffff\1\105\4\uffff\1\107\2\uffff\1\41\7\uffff\1\72\3\uffff\1\155\1\uffff\1\51\2\uffff\1\55\3\uffff\1\61\6\uffff\1\142\2\uffff\1\122\1\112\1\50\15\uffff\1\56\2\uffff\1\104\4\uffff\1\164\2\uffff\1\44\12\uffff\1\67\17\uffff\1\134\1\163\1\uffff\1\47\3\uffff\1\74\1\uffff\1\103\7\uffff\1\66\1\uffff\1\70\1\uffff\1\54\2\uffff\1\64\1\uffff\1\162\1\uffff\1\62\3\uffff\1\156\5\uffff\1\100\1\63\1\uffff\1\116\1\60\1\uffff\1\77\2\uffff\1\75\1\uffff\1\65\1\117"; + "\25\uffff\1\52\1\53\13\uffff\1\123\1\124\1\125\1\126\1\127\1\130\1\131\1\132\4\uffff\1\175\2\176\1\u0081\1\u0082\1\uffff\1\23\1\1\1\2\1\167\1\3\1\160\1\4\1\35\1\26\1\5\1\20\1\36\1\27\1\6\1\31\1\30\1\7\1\177\1\u0080\1\32\1\10\1\33\1\uffff\1\34\1\15\1\16\1\24\1\17\1\uffff\1\37\1\25\1\166\1\157\3\uffff\1\175\27\uffff\1\52\1\53\36\uffff\1\123\1\124\1\125\1\126\1\127\1\130\1\131\1\132\1\165\1\140\1\172\1\uffff\1\173\1\174\1\176\1\u0081\1\13\1\11\1\14\1\12\1\21\1\22\23\uffff\1\113\1\135\16\uffff\1\134\12\uffff\1\107\15\uffff\1\145\10\uffff\1\164\1\40\1\170\25\uffff\1\143\6\uffff\1\122\10\uffff\1\153\26\uffff\1\146\2\uffff\1\72\3\uffff\1\136\11\uffff\1\57\10\uffff\1\71\13\uffff\1\171\6\uffff\1\110\1\142\7\uffff\1\105\4\uffff\1\120\1\147\6\uffff\1\45\11\uffff\1\46\15\uffff\1\117\1\uffff\1\151\5\uffff\1\100\1\156\2\uffff\1\114\6\uffff\1\144\5\uffff\1\42\2\uffff\1\75\1\112\2\uffff\1\137\1\43\17\uffff\1\150\3\uffff\1\101\1\152\1\uffff\1\104\4\uffff\1\106\2\uffff\1\41\12\uffff\1\154\1\uffff\1\51\2\uffff\1\55\3\uffff\1\61\6\uffff\1\141\2\uffff\1\121\1\111\1\50\15\uffff\1\56\2\uffff\1\103\4\uffff\1\163\2\uffff\1\44\12\uffff\1\67\17\uffff\1\133\1\162\1\uffff\1\47\3\uffff\1\73\1\uffff\1\102\7\uffff\1\66\1\uffff\1\70\1\uffff\1\54\2\uffff\1\64\1\uffff\1\161\1\uffff\1\62\3\uffff\1\155\5\uffff\1\77\1\63\1\uffff\1\115\1\60\1\uffff\1\76\2\uffff\1\74\1\uffff\1\65\1\116"; static final String DFA21_specialS = - "\1\0\u024f\uffff}>"; + "\1\0\u024b\uffff}>"; static final String[] DFA21_transitionS = { "\11\62\2\61\2\62\1\61\22\62\1\61\1\11\1\57\1\50\1\56\1\10\1\3\1\60\1\44\1\45\1\6\1\4\1\46\1\5\1\14\1\7\1\53\11\54\1\52\1\42\1\13\1\1\1\12\1\15\1\43\32\56\1\51\1\62\1\47\1\55\1\56\1\62\1\30\1\36\1\34\1\35\1\17\1\22\1\56\1\23\1\21\1\56\1\37\2\56\1\41\1\32\1\24\1\56\1\33\1\20\1\31\1\27\1\16\1\40\3\56\1\25\1\2\1\26\uff82\62", "\1\63\1\64", @@ -4733,20 +4704,21 @@ public class InternalPerspectiveDslLexer extends Lexer { "\1\u0138", "\1\u0139", "\1\u013a", - "\1\130\13\uffff\12\130\7\uffff\24\130\1\u013b\5\130\4\uffff\1\130\1\uffff\32\130", + "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u013c", "\1\u013d", "\1\u013e", "\1\u013f", "\1\u0140", - "\1\u0141", "", + "\1\u0141", "\1\u0142", - "\1\u0143", - "\1\130\13\uffff\12\130\7\uffff\22\130\1\u0144\7\130\4\uffff\1\130\1\uffff\32\130", + "\1\130\13\uffff\12\130\7\uffff\22\130\1\u0143\7\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0145", "\1\u0146", "\1\u0147", - "\1\u0148", "", + "\1\u0148", "\1\u0149", "\1\u014a", "\1\u014b", @@ -4754,110 +4726,110 @@ public class InternalPerspectiveDslLexer extends Lexer { "\1\u014d", "\1\u014e", "\1\u014f", - "\1\u0150", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0151", "\1\u0152", "\1\u0153", "\1\u0154", "\1\u0155", "\1\u0156", - "\1\u0157", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0159", "\1\u015a", "\1\u015b", "\1\u015c", "\1\u015d", "\1\u015e", "\1\u015f", - "\1\u0160", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0161", "\1\u0162", "\1\u0163", "\1\u0164", - "\1\u0165", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u0168", + "\1\u0167", "", - "\1\u0169\16\uffff\1\u016a", + "\1\u0168\16\uffff\1\u0169", + "\1\u016a", "\1\u016b", - "\1\u016c", "", - "\1\u016d", + "\1\u016c", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u016e", "\1\u016f", "\1\u0170", "\1\u0171", "\1\u0172", "\1\u0173", "\1\u0174", + "", "\1\u0175", "\1\u0176", - "", - "\1\u0177", - "\1\u0178", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0178", + "\1\u0179", "\1\u017a", "\1\u017b", "\1\u017c", + "", "\1\u017d", "\1\u017e", - "", "\1\u017f", "\1\u0180", "\1\u0181", "\1\u0182", "\1\u0183", "\1\u0184", - "\1\u0185", - "\1\u0186", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u0188", + "\1\u0186", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", + "\1\u0188", + "\1\u0189", "\1\u018a", "\1\u018b", "\1\u018c", - "\1\u018d", - "\1\u018e", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u0191", - "\1\u0192", + "\1\u018f", + "\1\u0190", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0192", + "\1\u0193", "\1\u0194", + "", "\1\u0195", "\1\u0196", - "", "\1\u0197", - "\1\u0198", - "\1\u0199", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", "", + "\1\u0199", + "\1\u019a", "\1\u019b", "\1\u019c", "\1\u019d", - "\1\u019e", - "\1\u019f", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", - "\1\u01a1", - "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\4\130\1\u01a2\25\130", + "\1\u019f", + "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\4\130\1\u01a0\25\130", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u01a5", - "\1\u01a6", + "\1\u01a3", + "\1\u01a4", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u01a7", + "\1\u01a8", + "", "\1\u01a9", "\1\u01aa", "\1\u01ab", - "", "\1\u01ac", "\1\u01ad", "\1\u01ae", @@ -4868,205 +4840,200 @@ public class InternalPerspectiveDslLexer extends Lexer { "\1\u01b3", "\1\u01b4", "\1\u01b5", - "\1\u01b6", - "\1\u01b7", - "\1\u01b8", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", - "\1\u01ba", - "\1\u01bb", - "\1\u01bc", + "\1\u01b7", + "\1\u01b8", + "\1\u01b9", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", "", - "\1\u01bf", + "\1\u01bc", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", + "\1\u01be", + "\1\u01bf", + "\1\u01c0", "\1\u01c1", - "\1\u01c2", + "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\u01c3", + "", "\1\u01c4", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\u01c6", - "", "\1\u01c7", - "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u01c8", + "", "\1\u01c9", "\1\u01ca", - "\1\u01cb", "", + "", + "\1\u01cb", "\1\u01cc", - "\1\u01cd", "", "", + "\1\u01cd", "\1\u01ce", "\1\u01cf", - "", - "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\u01d1", - "\1\u01d2", - "\1\u01d3", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u01d5", + "\1\u01d3", + "\1\u01d4", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u01d6", "\1\u01d7", "\1\u01d8", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\u01da", "\1\u01db", + "", "\1\u01dc", - "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u01dd", "\1\u01de", - "\1\u01df", - "", - "\1\u01e0", - "\1\u01e1", - "\1\u01e2", "", "", - "\1\u01e3", + "\1\u01df", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u01e5", - "\1\u01e6", + "\1\u01e1", + "\1\u01e2", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", + "\1\u01e6", + "\1\u01e7", + "\1\u01e8", + "\1\u01e9", "\1\u01ea", "\1\u01eb", "\1\u01ec", "\1\u01ed", "\1\u01ee", "\1\u01ef", + "", "\1\u01f0", "", "\1\u01f1", "\1\u01f2", - "\1\u01f3", "", + "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\u01f4", - "", "\1\u01f5", - "\1\u01f6", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u01f7", "\1\u01f8", "\1\u01f9", - "", + "\1\u01fa", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u01fb", + "", "\1\u01fc", "\1\u01fd", - "\1\u01fe", - "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "", - "\1\u0200", - "\1\u0201", "", "", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u01ff", + "\1\u0200", + "\1\u0201", + "\1\u0202", "\1\u0203", "\1\u0204", "\1\u0205", "\1\u0206", "\1\u0207", "\1\u0208", - "\1\u0209", + "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\u020a", + "", "\1\u020b", "\1\u020c", - "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u020e", "", + "\1\u020d", + "\1\u020e", "\1\u020f", "\1\u0210", "", "\1\u0211", "\1\u0212", + "", "\1\u0213", "\1\u0214", - "", "\1\u0215", "\1\u0216", - "", "\1\u0217", "\1\u0218", - "\1\u0219", - "\1\u021a", - "\1\u021b", - "\1\u021c", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u021f", + "\1\u021b", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", + "\1\u021d", + "\1\u021e", + "\1\u021f", + "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\u0221", - "\1\u0222", - "\1\u0223", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0223", + "\1\u0224", "\1\u0225", - "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0226", "\1\u0227", "\1\u0228", "\1\u0229", - "\1\u022a", - "\1\u022b", - "\1\u022c", - "\1\u022d", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\3\130\1\u022f\26\130", + "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\3\130\1\u022b\26\130", "", "", - "\1\u0231", + "\1\u022d", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u0233", - "\1\u0234", + "\1\u022f", + "\1\u0230", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", - "\1\u0236", + "\1\u0232", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0234", + "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u0236", + "\1\u0237", "\1\u0238", + "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "", "\1\u023a", + "", "\1\u023b", "\1\u023c", "", - "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", + "\1\u023d", "", "\1\u023e", "", - "\1\u023f", - "\1\u0240", - "", - "\1\u0241", - "", - "\1\u0242", - "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u0245", + "\1\u0241", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u0248", + "\1\u0244", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", - "\1\u024a", + "\1\u0246", "", "", - "\1\u024b", + "\1\u0247", "", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", - "\1\u024d", + "\1\u0249", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", "", "\1\130\13\uffff\12\130\7\uffff\32\130\4\uffff\1\130\1\uffff\32\130", @@ -5104,7 +5071,7 @@ public class InternalPerspectiveDslLexer extends Lexer { this.transition = DFA21_transition; } public String getDescription() { - return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; diff --git a/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDslParser.java b/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDslParser.java index f76a3bc..2dc43f1 100644 --- a/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDslParser.java +++ b/org.eclipse.osbp.xtext.perspective.ide/src-gen/org/eclipse/osbp/xtext/perspective/ide/contentassist/antlr/internal/InternalPerspectiveDslParser.java @@ -40,7 +40,7 @@ import java.util.HashMap; @SuppressWarnings("all") public class InternalPerspectiveDslParser extends AbstractInternalContentAssistParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'='", "'||'", "'&&'", "'+='", "'-='", "'*='", "'/='", "'%='", "'=='", "'!='", "'==='", "'!=='", "'>='", "'>'", "'<'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'*'", "'**'", "'/'", "'%'", "'!'", "'++'", "'--'", "'.'", "'val'", "'extends'", "'static'", "'import'", "'extension'", "'super'", "'false'", "'horizontal'", "'vertical'", "'package'", "'{'", "'}'", "'perspective'", "'process'", "'usertask'", "'icon'", "'accessibility'", "'toolbar'", "'eventManager'", "'sashContainer'", "'orientation'", "'selectedElement'", "'spaceVolume'", "'partStack'", "'synchronize'", "'part'", "'iconURI'", "'view'", "'targetPart'", "'allowedSources'", "'select'", "'readOnlyTable'", "'editableTable'", "'chart'", "'report'", "'organigram'", "'topology'", "'dialog'", "'bpmn'", "'kanban'", "'of'", "'card'", "'welcome'", "'search'", "'in'", "'depth'", "'filterColumns'", "'dataInterchange'", "'title'", "'name'", "'browser'", "'url'", "';'", "'@'", "'('", "')'", "','", "']'", "'#'", "'['", "'instanceof'", "'as'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'new'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'describedBy'", "'isClosable'", "'cubeView'", "'ns'", "'::'", "'?.'", "'|'", "'var'", "'true'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_HEX", "RULE_INT", "RULE_DECIMAL", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'='", "'||'", "'&&'", "'+='", "'-='", "'*='", "'/='", "'%='", "'=='", "'!='", "'==='", "'!=='", "'>='", "'>'", "'<'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'*'", "'**'", "'/'", "'%'", "'!'", "'++'", "'--'", "'.'", "'val'", "'extends'", "'static'", "'import'", "'extension'", "'super'", "'false'", "'horizontal'", "'vertical'", "'package'", "'{'", "'}'", "'perspective'", "'process'", "'usertask'", "'icon'", "'accessibility'", "'toolbar'", "'eventManager'", "'sashContainer'", "'orientation'", "'selectedElement'", "'spaceVolume'", "'partStack'", "'synchronize'", "'part'", "'view'", "'targetPart'", "'allowedSources'", "'select'", "'readOnlyTable'", "'editableTable'", "'chart'", "'report'", "'organigram'", "'topology'", "'dialog'", "'bpmn'", "'kanban'", "'of'", "'card'", "'welcome'", "'search'", "'in'", "'depth'", "'filterColumns'", "'dataInterchange'", "'title'", "'name'", "'browser'", "'url'", "';'", "'@'", "'('", "')'", "','", "']'", "'#'", "'['", "'instanceof'", "'as'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'new'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'describedBy'", "'isClosable'", "'cubeView'", "'ns'", "'::'", "'?.'", "'|'", "'var'", "'true'" }; public static final int RULE_HEX=6; public static final int T__50=50; @@ -57,7 +57,6 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP public static final int T__132=132; public static final int T__60=60; public static final int T__61=61; - public static final int T__134=134; public static final int RULE_ID=4; public static final int T__131=131; public static final int T__130=130; @@ -9698,82 +9697,82 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP // InternalPerspectiveDsl.g:2862:1: ( ( rulePerspectiveSelection ) | ( rulePerspectiveTable ) | ( rulePerspectiveChart ) | ( rulePerspectiveReport ) | ( rulePerspectiveOrganization ) | ( rulePerspectiveTopology ) | ( rulePerspectiveDialog ) | ( rulePerspectiveGrid ) | ( rulePerspectiveWelcome ) | ( rulePerspectiveSearch ) | ( rulePerspectiveDataInterchange ) | ( rulePerspectiveBPMN ) | ( rulePerspectiveKanban ) | ( rulePerspectiveTitle ) | ( rulePerspectiveDashboard ) | ( rulePerspectiveBrowser ) ) int alt4=16; switch ( input.LA(1) ) { - case 74: + case 73: { alt4=1; } break; - case 75: + case 74: { alt4=2; } break; - case 77: + case 76: { alt4=3; } break; - case 78: + case 77: { alt4=4; } break; - case 79: + case 78: { alt4=5; } break; - case 80: + case 79: { alt4=6; } break; - case 81: + case 80: { alt4=7; } break; - case 76: + case 75: { alt4=8; } break; - case 86: + case 85: { alt4=9; } break; - case 87: + case 86: { alt4=10; } break; - case 91: + case 90: { alt4=11; } break; - case 82: + case 81: { alt4=12; } break; - case 83: + case 82: { alt4=13; } break; - case 92: + case 91: { alt4=14; } break; - case 93: + case 92: { alt4=15; } break; - case 94: + case 93: { alt4=16; } @@ -10183,10 +10182,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt5=2; int LA5_0 = input.LA(1); - if ( (LA5_0==95) ) { + if ( (LA5_0==94) ) { alt5=1; } - else if ( (LA5_0==128) ) { + else if ( (LA5_0==127) ) { alt5=2; } else { @@ -10779,10 +10778,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt11=2; int LA11_0 = input.LA(1); - if ( (LA11_0==97) ) { + if ( (LA11_0==96) ) { alt11=1; } - else if ( ((LA11_0>=RULE_ID && LA11_0<=RULE_DECIMAL)||LA11_0==27||(LA11_0>=34 && LA11_0<=35)||LA11_0==40||(LA11_0>=45 && LA11_0<=50)||LA11_0==54||LA11_0==98||(LA11_0>=102 && LA11_0<=103)||LA11_0==106||LA11_0==108||(LA11_0>=112 && LA11_0<=120)||LA11_0==122||LA11_0==134) ) { + else if ( ((LA11_0>=RULE_ID && LA11_0<=RULE_DECIMAL)||LA11_0==27||(LA11_0>=34 && LA11_0<=35)||LA11_0==40||(LA11_0>=45 && LA11_0<=50)||LA11_0==54||LA11_0==97||(LA11_0>=101 && LA11_0<=102)||LA11_0==105||LA11_0==107||(LA11_0>=111 && LA11_0<=119)||LA11_0==121||LA11_0==133) ) { alt11=2; } else { @@ -10870,7 +10869,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP { int LA12_1 = input.LA(2); - if ( (LA12_1==EOF||(LA12_1>=RULE_ID && LA12_1<=RULE_DECIMAL)||(LA12_1>=14 && LA12_1<=50)||(LA12_1>=54 && LA12_1<=55)||LA12_1==96||(LA12_1>=98 && LA12_1<=123)||(LA12_1>=130 && LA12_1<=131)||(LA12_1>=133 && LA12_1<=134)) ) { + if ( (LA12_1==EOF||(LA12_1>=RULE_ID && LA12_1<=RULE_DECIMAL)||(LA12_1>=14 && LA12_1<=50)||(LA12_1>=54 && LA12_1<=55)||LA12_1==95||(LA12_1>=97 && LA12_1<=122)||(LA12_1>=129 && LA12_1<=130)||(LA12_1>=132 && LA12_1<=133)) ) { alt12=2; } else if ( (LA12_1==13) ) { @@ -10892,7 +10891,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( (LA12_2==13) ) { alt12=1; } - else if ( (LA12_2==EOF||(LA12_2>=RULE_ID && LA12_2<=RULE_DECIMAL)||(LA12_2>=14 && LA12_2<=50)||(LA12_2>=54 && LA12_2<=55)||LA12_2==96||(LA12_2>=98 && LA12_2<=123)||(LA12_2>=130 && LA12_2<=131)||(LA12_2>=133 && LA12_2<=134)) ) { + else if ( (LA12_2==EOF||(LA12_2>=RULE_ID && LA12_2<=RULE_DECIMAL)||(LA12_2>=14 && LA12_2<=50)||(LA12_2>=54 && LA12_2<=55)||LA12_2==95||(LA12_2>=97 && LA12_2<=122)||(LA12_2>=129 && LA12_2<=130)||(LA12_2>=132 && LA12_2<=133)) ) { alt12=2; } else { @@ -10911,7 +10910,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( (LA12_3==13) ) { alt12=1; } - else if ( (LA12_3==EOF||(LA12_3>=RULE_ID && LA12_3<=RULE_DECIMAL)||(LA12_3>=14 && LA12_3<=50)||(LA12_3>=54 && LA12_3<=55)||LA12_3==96||(LA12_3>=98 && LA12_3<=123)||(LA12_3>=130 && LA12_3<=131)||(LA12_3>=133 && LA12_3<=134)) ) { + else if ( (LA12_3==EOF||(LA12_3>=RULE_ID && LA12_3<=RULE_DECIMAL)||(LA12_3>=14 && LA12_3<=50)||(LA12_3>=54 && LA12_3<=55)||LA12_3==95||(LA12_3>=97 && LA12_3<=122)||(LA12_3>=129 && LA12_3<=130)||(LA12_3>=132 && LA12_3<=133)) ) { alt12=2; } else { @@ -10927,7 +10926,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP { int LA12_4 = input.LA(2); - if ( (LA12_4==EOF||(LA12_4>=RULE_ID && LA12_4<=RULE_DECIMAL)||(LA12_4>=14 && LA12_4<=50)||(LA12_4>=54 && LA12_4<=55)||LA12_4==96||(LA12_4>=98 && LA12_4<=123)||(LA12_4>=130 && LA12_4<=131)||(LA12_4>=133 && LA12_4<=134)) ) { + if ( (LA12_4==EOF||(LA12_4>=RULE_ID && LA12_4<=RULE_DECIMAL)||(LA12_4>=14 && LA12_4<=50)||(LA12_4>=54 && LA12_4<=55)||LA12_4==95||(LA12_4>=97 && LA12_4<=122)||(LA12_4>=129 && LA12_4<=130)||(LA12_4>=132 && LA12_4<=133)) ) { alt12=2; } else if ( (LA12_4==13) ) { @@ -10949,7 +10948,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( (LA12_5==13) ) { alt12=1; } - else if ( (LA12_5==EOF||(LA12_5>=RULE_ID && LA12_5<=RULE_DECIMAL)||(LA12_5>=14 && LA12_5<=50)||(LA12_5>=54 && LA12_5<=55)||LA12_5==96||(LA12_5>=98 && LA12_5<=123)||(LA12_5>=130 && LA12_5<=131)||(LA12_5>=133 && LA12_5<=134)) ) { + else if ( (LA12_5==EOF||(LA12_5>=RULE_ID && LA12_5<=RULE_DECIMAL)||(LA12_5>=14 && LA12_5<=50)||(LA12_5>=54 && LA12_5<=55)||LA12_5==95||(LA12_5>=97 && LA12_5<=122)||(LA12_5>=129 && LA12_5<=130)||(LA12_5>=132 && LA12_5<=133)) ) { alt12=2; } else { @@ -10972,11 +10971,12 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP case 49: case 50: case 54: - case 98: + case 97: + case 101: case 102: - case 103: - case 106: - case 108: + case 105: + case 107: + case 111: case 112: case 113: case 114: @@ -10985,9 +10985,8 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP case 117: case 118: case 119: - case 120: - case 122: - case 134: + case 121: + case 133: { alt12=2; } @@ -11443,7 +11442,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt15=2; int LA15_0 = input.LA(1); - if ( (LA15_0==104) ) { + if ( (LA15_0==103) ) { alt15=1; } else if ( ((LA15_0>=25 && LA15_0<=27)) ) { @@ -11554,7 +11553,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( (LA16_2==13) ) { alt16=2; } - else if ( (LA16_2==EOF||(LA16_2>=RULE_ID && LA16_2<=RULE_DECIMAL)||LA16_2==27||(LA16_2>=34 && LA16_2<=35)||LA16_2==40||(LA16_2>=45 && LA16_2<=50)||LA16_2==54||LA16_2==98||(LA16_2>=102 && LA16_2<=103)||LA16_2==106||LA16_2==108||(LA16_2>=112 && LA16_2<=120)||LA16_2==122||LA16_2==134) ) { + else if ( (LA16_2==EOF||(LA16_2>=RULE_ID && LA16_2<=RULE_DECIMAL)||LA16_2==27||(LA16_2>=34 && LA16_2<=35)||LA16_2==40||(LA16_2>=45 && LA16_2<=50)||LA16_2==54||LA16_2==97||(LA16_2>=101 && LA16_2<=102)||LA16_2==105||LA16_2==107||(LA16_2>=111 && LA16_2<=119)||LA16_2==121||LA16_2==133) ) { alt16=4; } else { @@ -11929,7 +11928,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( (LA18_1==26) ) { alt18=1; } - else if ( (LA18_1==EOF||(LA18_1>=RULE_ID && LA18_1<=RULE_DECIMAL)||LA18_1==27||(LA18_1>=34 && LA18_1<=35)||LA18_1==40||(LA18_1>=45 && LA18_1<=50)||LA18_1==54||LA18_1==98||(LA18_1>=102 && LA18_1<=103)||LA18_1==106||LA18_1==108||(LA18_1>=112 && LA18_1<=120)||LA18_1==122||LA18_1==134) ) { + else if ( (LA18_1==EOF||(LA18_1>=RULE_ID && LA18_1<=RULE_DECIMAL)||LA18_1==27||(LA18_1>=34 && LA18_1<=35)||LA18_1==40||(LA18_1>=45 && LA18_1<=50)||LA18_1==54||LA18_1==97||(LA18_1>=101 && LA18_1<=102)||LA18_1==105||LA18_1==107||(LA18_1>=111 && LA18_1<=119)||LA18_1==121||LA18_1==133) ) { alt18=2; } else { @@ -12362,7 +12361,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( ((LA22_0>=34 && LA22_0<=35)||LA22_0==40) ) { alt22=1; } - else if ( ((LA22_0>=RULE_ID && LA22_0<=RULE_DECIMAL)||LA22_0==27||(LA22_0>=45 && LA22_0<=50)||LA22_0==54||LA22_0==98||(LA22_0>=102 && LA22_0<=103)||LA22_0==106||LA22_0==108||(LA22_0>=112 && LA22_0<=120)||LA22_0==122||LA22_0==134) ) { + else if ( ((LA22_0>=RULE_ID && LA22_0<=RULE_DECIMAL)||LA22_0==27||(LA22_0>=45 && LA22_0<=50)||LA22_0==54||LA22_0==97||(LA22_0>=101 && LA22_0<=102)||LA22_0==105||LA22_0==107||(LA22_0>=111 && LA22_0<=119)||LA22_0==121||LA22_0==133) ) { alt22=2; } else { @@ -12730,7 +12729,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( (LA26_0==43) ) { alt26=1; } - else if ( (LA26_0==130) ) { + else if ( (LA26_0==129) ) { alt26=2; } else { @@ -12821,12 +12820,12 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP alt27=1; } break; - case 131: + case 130: { alt27=2; } break; - case 130: + case 129: { alt27=3; } @@ -13415,18 +13414,18 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP // InternalPerspectiveDsl.g:3708:1: ( ( ruleXCollectionLiteral ) | ( ( ruleXClosure ) ) | ( ruleXBooleanLiteral ) | ( ruleXNumberLiteral ) | ( ruleXNullLiteral ) | ( ruleXStringLiteral ) | ( ruleXTypeLiteral ) ) int alt30=7; switch ( input.LA(1) ) { - case 102: + case 101: { alt30=1; } break; - case 103: + case 102: { alt30=2; } break; case 50: - case 134: + case 133: { alt30=3; } @@ -13438,7 +13437,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP alt30=4; } break; - case 116: + case 115: { alt30=5; } @@ -13448,7 +13447,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP alt30=6; } break; - case 117: + case 116: { alt30=7; } @@ -13657,13 +13656,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt31=2; int LA31_0 = input.LA(1); - if ( (LA31_0==102) ) { + if ( (LA31_0==101) ) { int LA31_1 = input.LA(2); if ( (LA31_1==54) ) { alt31=1; } - else if ( (LA31_1==103) ) { + else if ( (LA31_1==102) ) { alt31=2; } else { @@ -13842,10 +13841,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt33=2; int LA33_0 = input.LA(1); - if ( (LA33_0==109) ) { + if ( (LA33_0==108) ) { alt33=1; } - else if ( (LA33_0==100) ) { + else if ( (LA33_0==99) ) { alt33=2; } else { @@ -13942,10 +13941,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt34=2; int LA34_0 = input.LA(1); - if ( (LA34_0==44||LA34_0==133) ) { + if ( (LA34_0==44||LA34_0==132) ) { alt34=1; } - else if ( ((LA34_0>=RULE_ID && LA34_0<=RULE_DECIMAL)||LA34_0==27||(LA34_0>=34 && LA34_0<=35)||LA34_0==40||(LA34_0>=45 && LA34_0<=50)||LA34_0==54||LA34_0==98||(LA34_0>=102 && LA34_0<=103)||LA34_0==106||LA34_0==108||(LA34_0>=112 && LA34_0<=120)||LA34_0==122||LA34_0==134) ) { + else if ( ((LA34_0>=RULE_ID && LA34_0<=RULE_DECIMAL)||LA34_0==27||(LA34_0>=34 && LA34_0<=35)||LA34_0==40||(LA34_0>=45 && LA34_0<=50)||LA34_0==54||LA34_0==97||(LA34_0>=101 && LA34_0<=102)||LA34_0==105||LA34_0==107||(LA34_0>=111 && LA34_0<=119)||LA34_0==121||LA34_0==133) ) { alt34=2; } else { @@ -14030,7 +14029,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt35=2; int LA35_0 = input.LA(1); - if ( (LA35_0==133) ) { + if ( (LA35_0==132) ) { alt35=1; } else if ( (LA35_0==44) ) { @@ -14137,7 +14136,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP throw nvae; } } - else if ( (LA36_0==31||LA36_0==98) ) { + else if ( (LA36_0==31||LA36_0==97) ) { alt36=1; } else { @@ -14653,7 +14652,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( (LA41_0==50) ) { alt41=1; } - else if ( (LA41_0==134) ) { + else if ( (LA41_0==133) ) { alt41=2; } else { @@ -14740,10 +14739,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt42=2; int LA42_0 = input.LA(1); - if ( (LA42_0==123) ) { + if ( (LA42_0==122) ) { alt42=1; } - else if ( (LA42_0==121) ) { + else if ( (LA42_0==120) ) { alt42=2; } else { @@ -15093,7 +15092,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( (LA46_0==RULE_ID) ) { alt46=1; } - else if ( (LA46_0==31||LA46_0==98) ) { + else if ( (LA46_0==31||LA46_0==97) ) { alt46=2; } else { @@ -15184,10 +15183,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt47=2; int LA47_0 = input.LA(1); - if ( (LA47_0==RULE_ID||LA47_0==31||LA47_0==98) ) { + if ( (LA47_0==RULE_ID||LA47_0==31||LA47_0==97) ) { alt47=1; } - else if ( (LA47_0==124) ) { + else if ( (LA47_0==123) ) { alt47=2; } else { @@ -16562,7 +16561,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt54=2; int LA54_0 = input.LA(1); - if ( (LA54_0==126) ) { + if ( (LA54_0==125) ) { alt54=1; } switch (alt54) { @@ -21501,24 +21500,24 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP // $ANTLR start "rule__PerspectivePart__Group_3_2__0__Impl" - // InternalPerspectiveDsl.g:6101:1: rule__PerspectivePart__Group_3_2__0__Impl : ( 'iconURI' ) ; + // InternalPerspectiveDsl.g:6101:1: rule__PerspectivePart__Group_3_2__0__Impl : ( 'icon' ) ; public final void rule__PerspectivePart__Group_3_2__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalPerspectiveDsl.g:6105:1: ( ( 'iconURI' ) ) - // InternalPerspectiveDsl.g:6106:1: ( 'iconURI' ) + // InternalPerspectiveDsl.g:6105:1: ( ( 'icon' ) ) + // InternalPerspectiveDsl.g:6106:1: ( 'icon' ) { - // InternalPerspectiveDsl.g:6106:1: ( 'iconURI' ) - // InternalPerspectiveDsl.g:6107:2: 'iconURI' + // InternalPerspectiveDsl.g:6106:1: ( 'icon' ) + // InternalPerspectiveDsl.g:6107:2: 'icon' { if ( state.backtracking==0 ) { - before(grammarAccess.getPerspectivePartAccess().getIconURIKeyword_3_2_0()); + before(grammarAccess.getPerspectivePartAccess().getIconKeyword_3_2_0()); } - match(input,70,FOLLOW_2); if (state.failed) return ; + match(input,59,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getPerspectivePartAccess().getIconURIKeyword_3_2_0()); + after(grammarAccess.getPerspectivePartAccess().getIconKeyword_3_2_0()); } } @@ -21679,7 +21678,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectivePartAccess().getViewKeyword_3_3_0()); } - match(input,71,FOLLOW_2); if (state.failed) return ; + match(input,70,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectivePartAccess().getViewKeyword_3_3_0()); } @@ -22095,7 +22094,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt60=2; int LA60_0 = input.LA(1); - if ( (LA60_0==72) ) { + if ( (LA60_0==71) ) { alt60=1; } @@ -22349,7 +22348,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveEventAccess().getTargetPartKeyword_1()); } - match(input,72,FOLLOW_2); if (state.failed) return ; + match(input,71,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveEventAccess().getTargetPartKeyword_1()); } @@ -22517,7 +22516,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveEventAccess().getAllowedSourcesKeyword_3()); } - match(input,73,FOLLOW_2); if (state.failed) return ; + match(input,72,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveEventAccess().getAllowedSourcesKeyword_3()); } @@ -22935,7 +22934,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveSelectionAccess().getSelectKeyword_1()); } - match(input,74,FOLLOW_2); if (state.failed) return ; + match(input,73,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveSelectionAccess().getSelectKeyword_1()); } @@ -23177,7 +23176,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveTableAccess().getReadOnlyTableKeyword_1()); } - match(input,75,FOLLOW_2); if (state.failed) return ; + match(input,74,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveTableAccess().getReadOnlyTableKeyword_1()); } @@ -23419,7 +23418,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveGridAccess().getEditableTableKeyword_1()); } - match(input,76,FOLLOW_2); if (state.failed) return ; + match(input,75,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveGridAccess().getEditableTableKeyword_1()); } @@ -23661,7 +23660,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveChartAccess().getChartKeyword_1()); } - match(input,77,FOLLOW_2); if (state.failed) return ; + match(input,76,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveChartAccess().getChartKeyword_1()); } @@ -23903,7 +23902,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveReportAccess().getReportKeyword_1()); } - match(input,78,FOLLOW_2); if (state.failed) return ; + match(input,77,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveReportAccess().getReportKeyword_1()); } @@ -24145,7 +24144,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveOrganizationAccess().getOrganigramKeyword_1()); } - match(input,79,FOLLOW_2); if (state.failed) return ; + match(input,78,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveOrganizationAccess().getOrganigramKeyword_1()); } @@ -24387,7 +24386,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveTopologyAccess().getTopologyKeyword_1()); } - match(input,80,FOLLOW_2); if (state.failed) return ; + match(input,79,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveTopologyAccess().getTopologyKeyword_1()); } @@ -24629,7 +24628,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveDialogAccess().getDialogKeyword_1()); } - match(input,81,FOLLOW_2); if (state.failed) return ; + match(input,80,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveDialogAccess().getDialogKeyword_1()); } @@ -24866,7 +24865,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveBPMNAccess().getBpmnKeyword_1()); } - match(input,82,FOLLOW_2); if (state.failed) return ; + match(input,81,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveBPMNAccess().getBpmnKeyword_1()); } @@ -25024,7 +25023,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveKanbanAccess().getKanbanKeyword_1()); } - match(input,83,FOLLOW_2); if (state.failed) return ; + match(input,82,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveKanbanAccess().getKanbanKeyword_1()); } @@ -25103,7 +25102,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveKanbanAccess().getOfKeyword_2()); } - match(input,84,FOLLOW_2); if (state.failed) return ; + match(input,83,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveKanbanAccess().getOfKeyword_2()); } @@ -25271,7 +25270,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveKanbanAccess().getCardKeyword_4()); } - match(input,85,FOLLOW_2); if (state.failed) return ; + match(input,84,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveKanbanAccess().getCardKeyword_4()); } @@ -25439,7 +25438,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveKanbanAccess().getDialogKeyword_6()); } - match(input,81,FOLLOW_2); if (state.failed) return ; + match(input,80,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveKanbanAccess().getDialogKeyword_6()); } @@ -25676,7 +25675,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveWelcomeAccess().getWelcomeKeyword_1()); } - match(input,86,FOLLOW_2); if (state.failed) return ; + match(input,85,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveWelcomeAccess().getWelcomeKeyword_1()); } @@ -25834,7 +25833,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveSearchAccess().getSearchKeyword_1()); } - match(input,87,FOLLOW_2); if (state.failed) return ; + match(input,86,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveSearchAccess().getSearchKeyword_1()); } @@ -25913,7 +25912,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveSearchAccess().getInKeyword_2()); } - match(input,88,FOLLOW_2); if (state.failed) return ; + match(input,87,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveSearchAccess().getInKeyword_2()); } @@ -26165,7 +26164,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveSearchAccess().getDepthKeyword_4_0_0()); } - match(input,89,FOLLOW_2); if (state.failed) return ; + match(input,88,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveSearchAccess().getDepthKeyword_4_0_0()); } @@ -26328,7 +26327,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveSearchAccess().getFilterColumnsKeyword_4_1_0()); } - match(input,90,FOLLOW_2); if (state.failed) return ; + match(input,89,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveSearchAccess().getFilterColumnsKeyword_4_1_0()); } @@ -26570,7 +26569,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveDataInterchangeAccess().getDataInterchangeKeyword_1()); } - match(input,91,FOLLOW_2); if (state.failed) return ; + match(input,90,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveDataInterchangeAccess().getDataInterchangeKeyword_1()); } @@ -26812,7 +26811,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveTitleAccess().getTitleKeyword_1()); } - match(input,92,FOLLOW_2); if (state.failed) return ; + match(input,91,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveTitleAccess().getTitleKeyword_1()); } @@ -27054,7 +27053,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveDashboardAccess().getNameKeyword_1()); } - match(input,93,FOLLOW_2); if (state.failed) return ; + match(input,92,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveDashboardAccess().getNameKeyword_1()); } @@ -27296,7 +27295,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveBrowserAccess().getBrowserKeyword_1()); } - match(input,94,FOLLOW_2); if (state.failed) return ; + match(input,93,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveBrowserAccess().getBrowserKeyword_1()); } @@ -27459,7 +27458,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveBrowserAccess().getUrlKeyword_2_0_0()); } - match(input,95,FOLLOW_2); if (state.failed) return ; + match(input,94,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveBrowserAccess().getUrlKeyword_2_0_0()); } @@ -27868,14 +27867,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt62=2; int LA62_0 = input.LA(1); - if ( (LA62_0==96) ) { + if ( (LA62_0==95) ) { alt62=1; } switch (alt62) { case 1 : // InternalPerspectiveDsl.g:8213:3: ';' { - match(input,96,FOLLOW_2); if (state.failed) return ; + match(input,95,FOLLOW_2); if (state.failed) return ; } break; @@ -28574,7 +28573,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); } - match(input,97,FOLLOW_2); if (state.failed) return ; + match(input,96,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); } @@ -28741,7 +28740,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt64=2; int LA64_0 = input.LA(1); - if ( (LA64_0==98) ) { + if ( (LA64_0==97) ) { alt64=1; } switch (alt64) { @@ -28840,7 +28839,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP // InternalPerspectiveDsl.g:8511:2: ( '(' ) // InternalPerspectiveDsl.g:8511:3: '(' { - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; } @@ -28926,7 +28925,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt65=2; int LA65_0 = input.LA(1); - if ( ((LA65_0>=RULE_ID && LA65_0<=RULE_DECIMAL)||LA65_0==27||(LA65_0>=34 && LA65_0<=35)||LA65_0==40||(LA65_0>=45 && LA65_0<=50)||LA65_0==54||(LA65_0>=97 && LA65_0<=98)||(LA65_0>=102 && LA65_0<=103)||LA65_0==106||LA65_0==108||(LA65_0>=112 && LA65_0<=120)||LA65_0==122||LA65_0==134) ) { + if ( ((LA65_0>=RULE_ID && LA65_0<=RULE_DECIMAL)||LA65_0==27||(LA65_0>=34 && LA65_0<=35)||LA65_0==40||(LA65_0>=45 && LA65_0<=50)||LA65_0==54||(LA65_0>=96 && LA65_0<=97)||(LA65_0>=101 && LA65_0<=102)||LA65_0==105||LA65_0==107||(LA65_0>=111 && LA65_0<=119)||LA65_0==121||LA65_0==133) ) { alt65=1; } switch (alt65) { @@ -29017,7 +29016,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); } @@ -29186,7 +29185,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt66=2; int LA66_0 = input.LA(1); - if ( (LA66_0==100) ) { + if ( (LA66_0==99) ) { alt66=1; } @@ -29287,7 +29286,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); } @@ -29963,7 +29962,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt67=2; int LA67_0 = input.LA(1); - if ( ((LA67_0>=RULE_ID && LA67_0<=RULE_DECIMAL)||LA67_0==27||(LA67_0>=34 && LA67_0<=35)||LA67_0==40||(LA67_0>=45 && LA67_0<=50)||LA67_0==54||(LA67_0>=97 && LA67_0<=98)||(LA67_0>=102 && LA67_0<=103)||LA67_0==106||LA67_0==108||(LA67_0>=112 && LA67_0<=120)||LA67_0==122||LA67_0==134) ) { + if ( ((LA67_0>=RULE_ID && LA67_0<=RULE_DECIMAL)||LA67_0==27||(LA67_0>=34 && LA67_0<=35)||LA67_0==40||(LA67_0>=45 && LA67_0<=50)||LA67_0==54||(LA67_0>=96 && LA67_0<=97)||(LA67_0>=101 && LA67_0<=102)||LA67_0==105||LA67_0==107||(LA67_0>=111 && LA67_0<=119)||LA67_0==121||LA67_0==133) ) { alt67=1; } switch (alt67) { @@ -30054,7 +30053,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); } - match(input,101,FOLLOW_2); if (state.failed) return ; + match(input,100,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); } @@ -30296,7 +30295,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); } - match(input,102,FOLLOW_2); if (state.failed) return ; + match(input,101,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); } @@ -30370,7 +30369,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); } - match(input,103,FOLLOW_2); if (state.failed) return ; + match(input,102,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); } @@ -30539,7 +30538,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt68=2; int LA68_0 = input.LA(1); - if ( (LA68_0==100) ) { + if ( (LA68_0==99) ) { alt68=1; } @@ -30640,7 +30639,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); } @@ -30885,7 +30884,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt69=2; int LA69_0 = input.LA(1); - if ( (LA69_0==100) ) { + if ( (LA69_0==99) ) { alt69=1; } switch (alt69) { @@ -31087,7 +31086,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt70=2; int LA70_0 = input.LA(1); - if ( (LA70_0==100) ) { + if ( (LA70_0==99) ) { alt70=1; } @@ -31191,7 +31190,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); } @@ -31447,7 +31446,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt71=2; int LA71_0 = input.LA(1); - if ( ((LA71_0>=RULE_ID && LA71_0<=RULE_DECIMAL)||LA71_0==27||(LA71_0>=34 && LA71_0<=35)||LA71_0==40||(LA71_0>=45 && LA71_0<=50)||LA71_0==54||(LA71_0>=97 && LA71_0<=98)||(LA71_0>=102 && LA71_0<=103)||LA71_0==106||LA71_0==108||(LA71_0>=112 && LA71_0<=120)||LA71_0==122||LA71_0==134) ) { + if ( ((LA71_0>=RULE_ID && LA71_0<=RULE_DECIMAL)||LA71_0==27||(LA71_0>=34 && LA71_0<=35)||LA71_0==40||(LA71_0>=45 && LA71_0<=50)||LA71_0==54||(LA71_0>=96 && LA71_0<=97)||(LA71_0>=101 && LA71_0<=102)||LA71_0==105||LA71_0==107||(LA71_0>=111 && LA71_0<=119)||LA71_0==121||LA71_0==133) ) { alt71=1; } switch (alt71) { @@ -31538,7 +31537,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); } - match(input,101,FOLLOW_2); if (state.failed) return ; + match(input,100,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); } @@ -31780,7 +31779,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); } - match(input,102,FOLLOW_2); if (state.failed) return ; + match(input,101,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); } @@ -31854,7 +31853,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); } - match(input,103,FOLLOW_2); if (state.failed) return ; + match(input,102,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); } @@ -32023,7 +32022,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt72=2; int LA72_0 = input.LA(1); - if ( (LA72_0==100) ) { + if ( (LA72_0==99) ) { alt72=1; } @@ -32124,7 +32123,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); } @@ -35670,7 +35669,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } break; - case 104: + case 103: { int LA78_4 = input.LA(2); @@ -36122,7 +36121,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); } - match(input,104,FOLLOW_2); if (state.failed) return ; + match(input,103,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); } @@ -39928,7 +39927,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt82=2; int LA82_0 = input.LA(1); - if ( (LA82_0==105) ) { + if ( (LA82_0==104) ) { int LA82_2 = input.LA(2); if ( (synpred141_InternalPerspectiveDsl()) ) { @@ -40366,7 +40365,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); } - match(input,105,FOLLOW_2); if (state.failed) return ; + match(input,104,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); } @@ -40975,7 +40974,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } break; - case 130: + case 129: { int LA84_3 = input.LA(2); @@ -40986,7 +40985,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } break; - case 131: + case 130: { int LA84_4 = input.LA(2); @@ -42574,7 +42573,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt88=2; int LA88_0 = input.LA(1); - if ( (LA88_0==100) ) { + if ( (LA88_0==99) ) { alt88=1; } @@ -42749,7 +42748,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); } @@ -43005,7 +43004,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt89=2; int LA89_0 = input.LA(1); - if ( ((LA89_0>=RULE_ID && LA89_0<=RULE_DECIMAL)||LA89_0==27||LA89_0==31||(LA89_0>=34 && LA89_0<=35)||LA89_0==40||(LA89_0>=45 && LA89_0<=50)||LA89_0==54||LA89_0==98||(LA89_0>=102 && LA89_0<=103)||LA89_0==106||LA89_0==108||(LA89_0>=112 && LA89_0<=120)||LA89_0==122||LA89_0==132||LA89_0==134) ) { + if ( ((LA89_0>=RULE_ID && LA89_0<=RULE_DECIMAL)||LA89_0==27||LA89_0==31||(LA89_0>=34 && LA89_0<=35)||LA89_0==40||(LA89_0>=45 && LA89_0<=50)||LA89_0==54||LA89_0==97||(LA89_0>=101 && LA89_0<=102)||LA89_0==105||LA89_0==107||(LA89_0>=111 && LA89_0<=119)||LA89_0==121||LA89_0==131||LA89_0==133) ) { alt89=1; } switch (alt89) { @@ -43096,7 +43095,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); } @@ -43265,7 +43264,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt90=2; int LA90_0 = input.LA(1); - if ( (LA90_0==100) ) { + if ( (LA90_0==99) ) { alt90=1; } @@ -43366,7 +43365,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); } @@ -43608,7 +43607,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); } - match(input,102,FOLLOW_2); if (state.failed) return ; + match(input,101,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); } @@ -43770,7 +43769,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt91=2; int LA91_0 = input.LA(1); - if ( ((LA91_0>=RULE_ID && LA91_0<=RULE_DECIMAL)||LA91_0==27||(LA91_0>=34 && LA91_0<=35)||LA91_0==40||(LA91_0>=45 && LA91_0<=50)||LA91_0==54||LA91_0==98||(LA91_0>=102 && LA91_0<=103)||LA91_0==106||LA91_0==108||(LA91_0>=112 && LA91_0<=120)||LA91_0==122||LA91_0==134) ) { + if ( ((LA91_0>=RULE_ID && LA91_0<=RULE_DECIMAL)||LA91_0==27||(LA91_0>=34 && LA91_0<=35)||LA91_0==40||(LA91_0>=45 && LA91_0<=50)||LA91_0==54||LA91_0==97||(LA91_0>=101 && LA91_0<=102)||LA91_0==105||LA91_0==107||(LA91_0>=111 && LA91_0<=119)||LA91_0==121||LA91_0==133) ) { alt91=1; } switch (alt91) { @@ -44030,7 +44029,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt92=2; int LA92_0 = input.LA(1); - if ( (LA92_0==100) ) { + if ( (LA92_0==99) ) { alt92=1; } @@ -44131,7 +44130,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); } @@ -44373,7 +44372,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); } - match(input,102,FOLLOW_2); if (state.failed) return ; + match(input,101,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); } @@ -44452,7 +44451,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); } - match(input,103,FOLLOW_2); if (state.failed) return ; + match(input,102,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); } @@ -44535,7 +44534,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt93=2; int LA93_0 = input.LA(1); - if ( ((LA93_0>=RULE_ID && LA93_0<=RULE_DECIMAL)||LA93_0==27||(LA93_0>=34 && LA93_0<=35)||LA93_0==40||(LA93_0>=45 && LA93_0<=50)||LA93_0==54||LA93_0==98||(LA93_0>=102 && LA93_0<=103)||LA93_0==106||LA93_0==108||(LA93_0>=112 && LA93_0<=120)||LA93_0==122||LA93_0==134) ) { + if ( ((LA93_0>=RULE_ID && LA93_0<=RULE_DECIMAL)||LA93_0==27||(LA93_0>=34 && LA93_0<=35)||LA93_0==40||(LA93_0>=45 && LA93_0<=50)||LA93_0==54||LA93_0==97||(LA93_0>=101 && LA93_0<=102)||LA93_0==105||LA93_0==107||(LA93_0>=111 && LA93_0<=119)||LA93_0==121||LA93_0==133) ) { alt93=1; } switch (alt93) { @@ -44626,7 +44625,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); } - match(input,101,FOLLOW_2); if (state.failed) return ; + match(input,100,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); } @@ -44795,7 +44794,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt94=2; int LA94_0 = input.LA(1); - if ( (LA94_0==100) ) { + if ( (LA94_0==99) ) { alt94=1; } @@ -44896,7 +44895,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); } @@ -45328,7 +45327,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); } - match(input,101,FOLLOW_2); if (state.failed) return ; + match(input,100,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); } @@ -45565,7 +45564,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); } - match(input,103,FOLLOW_2); if (state.failed) return ; + match(input,102,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); } @@ -45732,7 +45731,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt96=2; int LA96_0 = input.LA(1); - if ( (LA96_0==RULE_ID||LA96_0==31||LA96_0==98) ) { + if ( (LA96_0==RULE_ID||LA96_0==31||LA96_0==97) ) { alt96=1; } switch (alt96) { @@ -46002,7 +46001,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt97=2; int LA97_0 = input.LA(1); - if ( (LA97_0==100) ) { + if ( (LA97_0==99) ) { alt97=1; } @@ -46103,7 +46102,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); } @@ -46346,7 +46345,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt98=2; int LA98_0 = input.LA(1); - if ( ((LA98_0>=RULE_ID && LA98_0<=RULE_DECIMAL)||LA98_0==27||(LA98_0>=34 && LA98_0<=35)||LA98_0==40||(LA98_0>=44 && LA98_0<=50)||LA98_0==54||LA98_0==98||(LA98_0>=102 && LA98_0<=103)||LA98_0==106||LA98_0==108||(LA98_0>=112 && LA98_0<=120)||LA98_0==122||(LA98_0>=133 && LA98_0<=134)) ) { + if ( ((LA98_0>=RULE_ID && LA98_0<=RULE_DECIMAL)||LA98_0==27||(LA98_0>=34 && LA98_0<=35)||LA98_0==40||(LA98_0>=44 && LA98_0<=50)||LA98_0==54||LA98_0==97||(LA98_0>=101 && LA98_0<=102)||LA98_0==105||LA98_0==107||(LA98_0>=111 && LA98_0<=119)||LA98_0==121||(LA98_0>=132 && LA98_0<=133)) ) { alt98=1; } @@ -46535,14 +46534,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt99=2; int LA99_0 = input.LA(1); - if ( (LA99_0==96) ) { + if ( (LA99_0==95) ) { alt99=1; } switch (alt99) { case 1 : // InternalPerspectiveDsl.g:14052:3: ';' { - match(input,96,FOLLOW_2); if (state.failed) return ; + match(input,95,FOLLOW_2); if (state.failed) return ; } break; @@ -46967,7 +46966,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt100=2; int LA100_0 = input.LA(1); - if ( (LA100_0==RULE_ID||LA100_0==31||LA100_0==98) ) { + if ( (LA100_0==RULE_ID||LA100_0==31||LA100_0==97) ) { alt100=1; } switch (alt100) { @@ -47237,7 +47236,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt101=2; int LA101_0 = input.LA(1); - if ( (LA101_0==100) ) { + if ( (LA101_0==99) ) { alt101=1; } @@ -47338,7 +47337,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); } @@ -47501,7 +47500,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); } @@ -47658,7 +47657,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); } @@ -47816,7 +47815,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); } - match(input,106,FOLLOW_2); if (state.failed) return ; + match(input,105,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); } @@ -47895,7 +47894,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); } @@ -48063,7 +48062,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); } @@ -48230,7 +48229,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt102=2; int LA102_0 = input.LA(1); - if ( (LA102_0==107) ) { + if ( (LA102_0==106) ) { int LA102_1 = input.LA(2); if ( (synpred161_InternalPerspectiveDsl()) ) { @@ -48333,7 +48332,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP // InternalPerspectiveDsl.g:14620:2: ( 'else' ) // InternalPerspectiveDsl.g:14620:3: 'else' { - match(input,107,FOLLOW_2); if (state.failed) return ; + match(input,106,FOLLOW_2); if (state.failed) return ; } @@ -48578,7 +48577,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); } - match(input,108,FOLLOW_2); if (state.failed) return ; + match(input,107,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); } @@ -48831,7 +48830,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt103=2; int LA103_0 = input.LA(1); - if ( (LA103_0==RULE_ID||LA103_0==31||LA103_0==98||LA103_0==100||LA103_0==109||LA103_0==111) ) { + if ( (LA103_0==RULE_ID||LA103_0==31||LA103_0==97||LA103_0==99||LA103_0==108||LA103_0==110) ) { alt103=1; } @@ -48936,7 +48935,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt104=2; int LA104_0 = input.LA(1); - if ( (LA104_0==110) ) { + if ( (LA104_0==109) ) { alt104=1; } switch (alt104) { @@ -49279,7 +49278,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); } @@ -49442,7 +49441,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); } @@ -49605,7 +49604,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); } - match(input,109,FOLLOW_2); if (state.failed) return ; + match(input,108,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); } @@ -50032,7 +50031,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); } - match(input,109,FOLLOW_2); if (state.failed) return ; + match(input,108,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); } @@ -50111,7 +50110,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); } - match(input,110,FOLLOW_2); if (state.failed) return ; + match(input,109,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); } @@ -50190,7 +50189,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); } - match(input,109,FOLLOW_2); if (state.failed) return ; + match(input,108,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); } @@ -50436,7 +50435,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt106=2; int LA106_0 = input.LA(1); - if ( (LA106_0==RULE_ID||LA106_0==31||LA106_0==98) ) { + if ( (LA106_0==RULE_ID||LA106_0==31||LA106_0==97) ) { alt106=1; } switch (alt106) { @@ -50536,7 +50535,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt107=2; int LA107_0 = input.LA(1); - if ( (LA107_0==111) ) { + if ( (LA107_0==110) ) { alt107=1; } switch (alt107) { @@ -50716,7 +50715,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); } - match(input,111,FOLLOW_2); if (state.failed) return ; + match(input,110,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); } @@ -50879,7 +50878,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); } - match(input,109,FOLLOW_2); if (state.failed) return ; + match(input,108,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); } @@ -51220,7 +51219,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); } @@ -51546,7 +51545,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); } - match(input,112,FOLLOW_2); if (state.failed) return ; + match(input,111,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); } @@ -51625,7 +51624,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); } @@ -51788,7 +51787,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); } - match(input,109,FOLLOW_2); if (state.failed) return ; + match(input,108,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); } @@ -51946,7 +51945,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); } - match(input,112,FOLLOW_2); if (state.failed) return ; + match(input,111,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); } @@ -52025,7 +52024,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); } @@ -52108,7 +52107,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt108=2; int LA108_0 = input.LA(1); - if ( ((LA108_0>=RULE_ID && LA108_0<=RULE_DECIMAL)||LA108_0==27||(LA108_0>=34 && LA108_0<=35)||LA108_0==40||(LA108_0>=44 && LA108_0<=50)||LA108_0==54||LA108_0==98||(LA108_0>=102 && LA108_0<=103)||LA108_0==106||LA108_0==108||(LA108_0>=112 && LA108_0<=120)||LA108_0==122||(LA108_0>=133 && LA108_0<=134)) ) { + if ( ((LA108_0>=RULE_ID && LA108_0<=RULE_DECIMAL)||LA108_0==27||(LA108_0>=34 && LA108_0<=35)||LA108_0==40||(LA108_0>=44 && LA108_0<=50)||LA108_0==54||LA108_0==97||(LA108_0>=101 && LA108_0<=102)||LA108_0==105||LA108_0==107||(LA108_0>=111 && LA108_0<=119)||LA108_0==121||(LA108_0>=132 && LA108_0<=133)) ) { alt108=1; } switch (alt108) { @@ -52204,7 +52203,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); } - match(input,96,FOLLOW_2); if (state.failed) return ; + match(input,95,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); } @@ -52287,7 +52286,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt109=2; int LA109_0 = input.LA(1); - if ( ((LA109_0>=RULE_ID && LA109_0<=RULE_DECIMAL)||LA109_0==27||(LA109_0>=34 && LA109_0<=35)||LA109_0==40||(LA109_0>=45 && LA109_0<=50)||LA109_0==54||LA109_0==98||(LA109_0>=102 && LA109_0<=103)||LA109_0==106||LA109_0==108||(LA109_0>=112 && LA109_0<=120)||LA109_0==122||LA109_0==134) ) { + if ( ((LA109_0>=RULE_ID && LA109_0<=RULE_DECIMAL)||LA109_0==27||(LA109_0>=34 && LA109_0<=35)||LA109_0==40||(LA109_0>=45 && LA109_0<=50)||LA109_0==54||LA109_0==97||(LA109_0>=101 && LA109_0<=102)||LA109_0==105||LA109_0==107||(LA109_0>=111 && LA109_0<=119)||LA109_0==121||LA109_0==133) ) { alt109=1; } switch (alt109) { @@ -52383,7 +52382,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); } - match(input,96,FOLLOW_2); if (state.failed) return ; + match(input,95,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); } @@ -52466,7 +52465,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt110=2; int LA110_0 = input.LA(1); - if ( ((LA110_0>=RULE_ID && LA110_0<=RULE_DECIMAL)||LA110_0==27||(LA110_0>=34 && LA110_0<=35)||LA110_0==40||(LA110_0>=45 && LA110_0<=50)||LA110_0==54||LA110_0==98||(LA110_0>=102 && LA110_0<=103)||LA110_0==106||LA110_0==108||(LA110_0>=112 && LA110_0<=120)||LA110_0==122||LA110_0==134) ) { + if ( ((LA110_0>=RULE_ID && LA110_0<=RULE_DECIMAL)||LA110_0==27||(LA110_0>=34 && LA110_0<=35)||LA110_0==40||(LA110_0>=45 && LA110_0<=50)||LA110_0==54||LA110_0==97||(LA110_0>=101 && LA110_0<=102)||LA110_0==105||LA110_0==107||(LA110_0>=111 && LA110_0<=119)||LA110_0==121||LA110_0==133) ) { alt110=1; } switch (alt110) { @@ -52562,7 +52561,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); } @@ -52815,7 +52814,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt111=2; int LA111_0 = input.LA(1); - if ( (LA111_0==100) ) { + if ( (LA111_0==99) ) { alt111=1; } @@ -52916,7 +52915,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); } @@ -53169,7 +53168,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt112=2; int LA112_0 = input.LA(1); - if ( (LA112_0==100) ) { + if ( (LA112_0==99) ) { alt112=1; } @@ -53270,7 +53269,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); } @@ -53512,7 +53511,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); } - match(input,113,FOLLOW_2); if (state.failed) return ; + match(input,112,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); } @@ -53591,7 +53590,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); } @@ -53759,7 +53758,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); } @@ -54001,7 +54000,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); } - match(input,114,FOLLOW_2); if (state.failed) return ; + match(input,113,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); } @@ -54169,7 +54168,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); } - match(input,113,FOLLOW_2); if (state.failed) return ; + match(input,112,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); } @@ -54248,7 +54247,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); } @@ -54411,7 +54410,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); } @@ -54654,7 +54653,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt113=2; int LA113_0 = input.LA(1); - if ( ((LA113_0>=RULE_ID && LA113_0<=RULE_DECIMAL)||LA113_0==27||(LA113_0>=34 && LA113_0<=35)||LA113_0==40||(LA113_0>=44 && LA113_0<=50)||LA113_0==54||LA113_0==98||(LA113_0>=102 && LA113_0<=103)||LA113_0==106||LA113_0==108||(LA113_0>=112 && LA113_0<=120)||LA113_0==122||(LA113_0>=133 && LA113_0<=134)) ) { + if ( ((LA113_0>=RULE_ID && LA113_0<=RULE_DECIMAL)||LA113_0==27||(LA113_0>=34 && LA113_0<=35)||LA113_0==40||(LA113_0>=44 && LA113_0<=50)||LA113_0==54||LA113_0==97||(LA113_0>=101 && LA113_0<=102)||LA113_0==105||LA113_0==107||(LA113_0>=111 && LA113_0<=119)||LA113_0==121||(LA113_0>=132 && LA113_0<=133)) ) { alt113=1; } @@ -54917,14 +54916,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt114=2; int LA114_0 = input.LA(1); - if ( (LA114_0==96) ) { + if ( (LA114_0==95) ) { alt114=1; } switch (alt114) { case 1 : // InternalPerspectiveDsl.g:16725:3: ';' { - match(input,96,FOLLOW_2); if (state.failed) return ; + match(input,95,FOLLOW_2); if (state.failed) return ; } break; @@ -55788,11 +55787,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( (LA116_0==RULE_ID) ) { int LA116_1 = input.LA(2); - if ( (LA116_1==RULE_ID||LA116_1==27||LA116_1==43||LA116_1==103) ) { + if ( (LA116_1==RULE_ID||LA116_1==27||LA116_1==43||LA116_1==102) ) { alt116=1; } } - else if ( (LA116_0==31||LA116_0==98) ) { + else if ( (LA116_0==31||LA116_0==97) ) { alt116=1; } switch (alt116) { @@ -56774,7 +56773,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt120=2; int LA120_0 = input.LA(1); - if ( (LA120_0==100) ) { + if ( (LA120_0==99) ) { alt120=1; } @@ -56949,7 +56948,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); } @@ -57205,7 +57204,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt121=2; int LA121_0 = input.LA(1); - if ( ((LA121_0>=RULE_ID && LA121_0<=RULE_DECIMAL)||LA121_0==27||LA121_0==31||(LA121_0>=34 && LA121_0<=35)||LA121_0==40||(LA121_0>=45 && LA121_0<=50)||LA121_0==54||LA121_0==98||(LA121_0>=102 && LA121_0<=103)||LA121_0==106||LA121_0==108||(LA121_0>=112 && LA121_0<=120)||LA121_0==122||LA121_0==132||LA121_0==134) ) { + if ( ((LA121_0>=RULE_ID && LA121_0<=RULE_DECIMAL)||LA121_0==27||LA121_0==31||(LA121_0>=34 && LA121_0<=35)||LA121_0==40||(LA121_0>=45 && LA121_0<=50)||LA121_0==54||LA121_0==97||(LA121_0>=101 && LA121_0<=102)||LA121_0==105||LA121_0==107||(LA121_0>=111 && LA121_0<=119)||LA121_0==121||LA121_0==131||LA121_0==133) ) { alt121=1; } switch (alt121) { @@ -57296,7 +57295,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); } @@ -57465,7 +57464,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt122=2; int LA122_0 = input.LA(1); - if ( (LA122_0==100) ) { + if ( (LA122_0==99) ) { alt122=1; } @@ -57566,7 +57565,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); } @@ -57808,7 +57807,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); } - match(input,115,FOLLOW_2); if (state.failed) return ; + match(input,114,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); } @@ -58439,7 +58438,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt126=2; int LA126_0 = input.LA(1); - if ( (LA126_0==100) ) { + if ( (LA126_0==99) ) { alt126=1; } @@ -58614,7 +58613,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); } @@ -58870,7 +58869,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt127=2; int LA127_0 = input.LA(1); - if ( ((LA127_0>=RULE_ID && LA127_0<=RULE_DECIMAL)||LA127_0==27||LA127_0==31||(LA127_0>=34 && LA127_0<=35)||LA127_0==40||(LA127_0>=45 && LA127_0<=50)||LA127_0==54||LA127_0==98||(LA127_0>=102 && LA127_0<=103)||LA127_0==106||LA127_0==108||(LA127_0>=112 && LA127_0<=120)||LA127_0==122||LA127_0==132||LA127_0==134) ) { + if ( ((LA127_0>=RULE_ID && LA127_0<=RULE_DECIMAL)||LA127_0==27||LA127_0==31||(LA127_0>=34 && LA127_0<=35)||LA127_0==40||(LA127_0>=45 && LA127_0<=50)||LA127_0==54||LA127_0==97||(LA127_0>=101 && LA127_0<=102)||LA127_0==105||LA127_0==107||(LA127_0>=111 && LA127_0<=119)||LA127_0==121||LA127_0==131||LA127_0==133) ) { alt127=1; } switch (alt127) { @@ -58961,7 +58960,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); } @@ -59130,7 +59129,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt128=2; int LA128_0 = input.LA(1); - if ( (LA128_0==100) ) { + if ( (LA128_0==99) ) { alt128=1; } @@ -59231,7 +59230,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); } @@ -59631,7 +59630,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); } - match(input,116,FOLLOW_2); if (state.failed) return ; + match(input,115,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); } @@ -60115,7 +60114,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); } - match(input,117,FOLLOW_2); if (state.failed) return ; + match(input,116,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); } @@ -60194,7 +60193,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); } @@ -60368,7 +60367,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt129=2; int LA129_0 = input.LA(1); - if ( (LA129_0==103) ) { + if ( (LA129_0==102) ) { alt129=1; } @@ -60464,7 +60463,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); } @@ -60622,7 +60621,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); } - match(input,118,FOLLOW_2); if (state.failed) return ; + match(input,117,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); } @@ -60864,7 +60863,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); } - match(input,119,FOLLOW_2); if (state.failed) return ; + match(input,118,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); } @@ -61113,7 +61112,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); } - match(input,120,FOLLOW_2); if (state.failed) return ; + match(input,119,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); } @@ -61397,7 +61396,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt131=2; int LA131_0 = input.LA(1); - if ( (LA131_0==123) ) { + if ( (LA131_0==122) ) { int LA131_2 = input.LA(2); if ( (synpred190_InternalPerspectiveDsl()) ) { @@ -61506,7 +61505,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt132=2; int LA132_0 = input.LA(1); - if ( (LA132_0==121) ) { + if ( (LA132_0==120) ) { int LA132_1 = input.LA(2); if ( (synpred191_InternalPerspectiveDsl()) ) { @@ -61609,7 +61608,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP // InternalPerspectiveDsl.g:18812:2: ( 'finally' ) // InternalPerspectiveDsl.g:18812:3: 'finally' { - match(input,121,FOLLOW_2); if (state.failed) return ; + match(input,120,FOLLOW_2); if (state.failed) return ; } @@ -61775,7 +61774,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); } - match(input,121,FOLLOW_2); if (state.failed) return ; + match(input,120,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); } @@ -62116,7 +62115,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); } @@ -62442,7 +62441,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); } - match(input,122,FOLLOW_2); if (state.failed) return ; + match(input,121,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); } @@ -62516,7 +62515,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); } @@ -62598,7 +62597,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP // InternalPerspectiveDsl.g:19136:2: ( 'catch' ) // InternalPerspectiveDsl.g:19136:3: 'catch' { - match(input,123,FOLLOW_2); if (state.failed) return ; + match(input,122,FOLLOW_2); if (state.failed) return ; } @@ -62680,7 +62679,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); } @@ -62848,7 +62847,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); } @@ -63806,10 +63805,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt135=2; int LA135_0 = input.LA(1); - if ( (LA135_0==103) ) { + if ( (LA135_0==102) ) { int LA135_2 = input.LA(2); - if ( (LA135_2==101) ) { + if ( (LA135_2==100) ) { int LA135_3 = input.LA(3); if ( (synpred194_InternalPerspectiveDsl()) ) { @@ -64160,7 +64159,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); } - match(input,103,FOLLOW_2); if (state.failed) return ; + match(input,102,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); } @@ -64234,7 +64233,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); } - match(input,101,FOLLOW_2); if (state.failed) return ; + match(input,100,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getArrayBracketsAccess().getRightSquareBracketKeyword_1()); } @@ -64317,7 +64316,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt136=2; int LA136_0 = input.LA(1); - if ( (LA136_0==98) ) { + if ( (LA136_0==97) ) { alt136=1; } switch (alt136) { @@ -64576,7 +64575,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); } @@ -64659,7 +64658,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt137=2; int LA137_0 = input.LA(1); - if ( (LA137_0==RULE_ID||LA137_0==31||LA137_0==98) ) { + if ( (LA137_0==RULE_ID||LA137_0==31||LA137_0==97) ) { alt137=1; } switch (alt137) { @@ -64750,7 +64749,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); } - match(input,99,FOLLOW_2); if (state.failed) return ; + match(input,98,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); } @@ -64919,7 +64918,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt138=2; int LA138_0 = input.LA(1); - if ( (LA138_0==100) ) { + if ( (LA138_0==99) ) { alt138=1; } @@ -65020,7 +65019,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); } @@ -65543,7 +65542,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt140=2; int LA140_0 = input.LA(1); - if ( (LA140_0==100) ) { + if ( (LA140_0==99) ) { alt140=1; } @@ -65837,7 +65836,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); } @@ -66686,7 +66685,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt143=2; int LA143_0 = input.LA(1); - if ( (LA143_0==100) ) { + if ( (LA143_0==99) ) { alt143=1; } @@ -66861,7 +66860,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); } @@ -67103,7 +67102,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); } - match(input,124,FOLLOW_2); if (state.failed) return ; + match(input,123,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); } @@ -67367,7 +67366,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt145=2; int LA145_0 = input.LA(1); - if ( (LA145_0==125) ) { + if ( (LA145_0==124) ) { alt145=1; } @@ -67558,7 +67557,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt146=2; int LA146_0 = input.LA(1); - if ( (LA146_0==125) ) { + if ( (LA146_0==124) ) { alt146=1; } @@ -67822,7 +67821,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); } - match(input,125,FOLLOW_2); if (state.failed) return ; + match(input,124,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); } @@ -68148,7 +68147,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); } - match(input,125,FOLLOW_2); if (state.failed) return ; + match(input,124,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); } @@ -70144,13 +70143,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP else if ( LA161_0 == 60 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 1) ) { alt161=1; } - else if ( LA161_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { + else if ( LA161_0 == 59 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { alt161=1; } - else if ( LA161_0 == 71 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { + else if ( LA161_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { alt161=1; } - else if ( LA161_0 == 127 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { + else if ( LA161_0 == 126 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { alt161=1; } switch (alt161) { @@ -70208,13 +70207,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP else if ( LA162_0 == 60 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 1) ) { alt162=2; } - else if ( LA162_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { + else if ( LA162_0 == 59 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { alt162=3; } - else if ( LA162_0 == 71 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { + else if ( LA162_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { alt162=4; } - else if ( LA162_0 == 127 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { + else if ( LA162_0 == 126 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { alt162=5; } else { @@ -70508,13 +70507,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP else if ( LA163_0 == 60 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 1) ) { alt163=1; } - else if ( LA163_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { + else if ( LA163_0 == 59 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { alt163=1; } - else if ( LA163_0 == 71 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { + else if ( LA163_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { alt163=1; } - else if ( LA163_0 == 127 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { + else if ( LA163_0 == 126 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { alt163=1; } switch (alt163) { @@ -70575,13 +70574,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP else if ( LA164_0 == 60 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 1) ) { alt164=1; } - else if ( LA164_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { + else if ( LA164_0 == 59 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { alt164=1; } - else if ( LA164_0 == 71 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { + else if ( LA164_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { alt164=1; } - else if ( LA164_0 == 127 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { + else if ( LA164_0 == 126 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { alt164=1; } switch (alt164) { @@ -70642,13 +70641,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP else if ( LA165_0 == 60 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 1) ) { alt165=1; } - else if ( LA165_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { + else if ( LA165_0 == 59 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { alt165=1; } - else if ( LA165_0 == 71 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { + else if ( LA165_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { alt165=1; } - else if ( LA165_0 == 127 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { + else if ( LA165_0 == 126 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { alt165=1; } switch (alt165) { @@ -70709,13 +70708,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP else if ( LA166_0 == 60 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 1) ) { alt166=1; } - else if ( LA166_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { + else if ( LA166_0 == 59 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { alt166=1; } - else if ( LA166_0 == 71 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { + else if ( LA166_0 == 70 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { alt166=1; } - else if ( LA166_0 == 127 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { + else if ( LA166_0 == 126 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { alt166=1; } switch (alt166) { @@ -70799,10 +70798,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt167=2; int LA167_0 = input.LA(1); - if ( LA167_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 0) ) { + if ( LA167_0 == 88 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 0) ) { alt167=1; } - else if ( LA167_0 == 90 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 1) ) { + else if ( LA167_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 1) ) { alt167=1; } switch (alt167) { @@ -70854,10 +70853,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt168=2; int LA168_0 = input.LA(1); - if ( LA168_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 0) ) { + if ( LA168_0 == 88 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 0) ) { alt168=1; } - else if ( LA168_0 == 90 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 1) ) { + else if ( LA168_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 1) ) { alt168=2; } else { @@ -71004,10 +71003,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP int alt169=2; int LA169_0 = input.LA(1); - if ( LA169_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 0) ) { + if ( LA169_0 == 88 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 0) ) { alt169=1; } - else if ( LA169_0 == 90 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 1) ) { + else if ( LA169_0 == 89 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 1) ) { alt169=1; } switch (alt169) { @@ -71323,7 +71322,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveAccess().getDescriptionDescribedByKeyword_3_0_0()); } - match(input,126,FOLLOW_2); if (state.failed) return ; + match(input,125,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveAccess().getDescriptionDescribedByKeyword_3_0_0()); } @@ -72505,7 +72504,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectivePartAccess().getIsClosableIsClosableKeyword_3_4_0()); } - match(input,127,FOLLOW_2); if (state.failed) return ; + match(input,126,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectivePartAccess().getIsClosableIsClosableKeyword_3_4_0()); } @@ -73644,7 +73643,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getPerspectiveBrowserAccess().getCubeViewCubeViewKeyword_2_1_0()); } - match(input,128,FOLLOW_2); if (state.failed) return ; + match(input,127,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getPerspectiveBrowserAccess().getCubeViewCubeViewKeyword_2_1_0()); } @@ -74060,7 +74059,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0()); } - match(input,129,FOLLOW_2); if (state.failed) return ; + match(input,128,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0()); } @@ -75844,7 +75843,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); } - match(input,130,FOLLOW_2); if (state.failed) return ; + match(input,129,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); } @@ -75999,7 +75998,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); } - match(input,131,FOLLOW_2); if (state.failed) return ; + match(input,130,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); } @@ -76052,7 +76051,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); } - match(input,130,FOLLOW_2); if (state.failed) return ; + match(input,129,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); } @@ -76252,7 +76251,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); } @@ -76755,7 +76754,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); } - match(input,132,FOLLOW_2); if (state.failed) return ; + match(input,131,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); } @@ -76988,7 +76987,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); } - match(input,132,FOLLOW_2); if (state.failed) return ; + match(input,131,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); } @@ -77626,7 +77625,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); } @@ -78309,7 +78308,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); } - match(input,133,FOLLOW_2); if (state.failed) return ; + match(input,132,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); } @@ -78869,7 +78868,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); } @@ -79249,7 +79248,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); } - match(input,98,FOLLOW_2); if (state.failed) return ; + match(input,97,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); } @@ -79482,7 +79481,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP if ( state.backtracking==0 ) { before(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); } - match(input,134,FOLLOW_2); if (state.failed) return ; + match(input,133,FOLLOW_2); if (state.failed) return ; if ( state.backtracking==0 ) { after(grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); } @@ -83684,17 +83683,17 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP static final String dfa_1s = "\10\uffff"; static final String dfa_2s = "\2\uffff\1\5\3\uffff\1\5\1\uffff"; static final String dfa_3s = "\1\4\1\uffff\1\53\1\uffff\1\4\1\uffff\1\53\1\uffff"; - static final String dfa_4s = "\1\u0081\1\uffff\1\140\1\uffff\1\44\1\uffff\1\140\1\uffff"; + static final String dfa_4s = "\1\u0080\1\uffff\1\137\1\uffff\1\44\1\uffff\1\137\1\uffff"; static final String dfa_5s = "\1\uffff\1\1\1\uffff\1\4\1\uffff\1\2\1\uffff\1\3"; static final String dfa_6s = "\10\uffff}>"; static final String[] dfa_7s = { - "\1\2\51\uffff\1\1\122\uffff\1\3", + "\1\2\51\uffff\1\1\121\uffff\1\3", "", - "\1\4\3\uffff\1\5\5\uffff\1\5\52\uffff\1\5", + "\1\4\3\uffff\1\5\5\uffff\1\5\51\uffff\1\5", "", "\1\6\37\uffff\1\7", "", - "\1\4\3\uffff\1\5\5\uffff\1\5\52\uffff\1\5", + "\1\4\3\uffff\1\5\5\uffff\1\5\51\uffff\1\5", "" }; @@ -83725,11 +83724,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } static final String dfa_8s = "\43\uffff"; static final String dfa_9s = "\1\4\1\0\41\uffff"; - static final String dfa_10s = "\1\u0086\1\0\41\uffff"; + static final String dfa_10s = "\1\u0085\1\0\41\uffff"; static final String dfa_11s = "\2\uffff\1\2\37\uffff\1\1"; static final String dfa_12s = "\1\uffff\1\0\41\uffff}>"; static final String[] dfa_13s = { - "\1\1\4\2\22\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\6\2\3\uffff\1\2\52\uffff\2\2\3\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\13\uffff\1\2", + "\1\1\4\2\22\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\6\2\3\uffff\1\2\51\uffff\2\2\3\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\13\uffff\1\2", "\1\uffff", "", "", @@ -83817,7 +83816,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } } static final String[] dfa_14s = { - "\5\2\22\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\6\2\3\uffff\1\2\52\uffff\2\2\3\uffff\1\1\1\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\13\uffff\1\2", + "\5\2\22\uffff\1\2\6\uffff\2\2\4\uffff\1\2\4\uffff\6\2\3\uffff\1\2\51\uffff\2\2\3\uffff\1\1\1\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\13\uffff\1\2", "\1\uffff", "", "", @@ -83988,19 +83987,19 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP static final String dfa_21s = "\12\uffff"; static final String dfa_22s = "\4\uffff\5\3\1\uffff"; static final String dfa_23s = "\1\53\2\4\1\uffff\5\4\1\uffff"; - static final String dfa_24s = "\1\u0083\2\61\1\uffff\5\u0086\1\uffff"; + static final String dfa_24s = "\1\u0082\2\61\1\uffff\5\u0085\1\uffff"; static final String dfa_25s = "\3\uffff\1\2\5\uffff\1\1"; static final String dfa_26s = "\12\uffff}>"; static final String[] dfa_27s = { - "\1\1\126\uffff\1\2\1\3", + "\1\1\125\uffff\1\2\1\3", "\1\4\26\uffff\1\3\21\uffff\1\5\1\6\1\7\1\10\1\3", "\1\4\26\uffff\1\3\21\uffff\1\5\1\6\1\7\1\10\1\3", "", - "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\50\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", - "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\50\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", - "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\50\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", - "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\50\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", - "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\50\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", + "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\47\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", + "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\47\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", + "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\47\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", + "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\47\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", + "\5\3\4\uffff\1\11\45\3\3\uffff\2\3\47\uffff\1\3\1\uffff\32\3\6\uffff\2\3\1\uffff\2\3", "" }; @@ -84030,11 +84029,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } } static final String dfa_28s = "\1\4\2\0\40\uffff"; - static final String dfa_29s = "\1\u0086\2\0\40\uffff"; + static final String dfa_29s = "\1\u0085\2\0\40\uffff"; static final String dfa_30s = "\3\uffff\1\1\1\uffff\1\2\35\uffff"; static final String dfa_31s = "\1\uffff\1\0\1\1\40\uffff}>"; static final String[] dfa_32s = { - "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\4\uffff\6\5\3\uffff\1\5\53\uffff\1\2\3\uffff\2\5\2\uffff\1\5\1\uffff\1\5\3\uffff\11\5\1\uffff\1\5\11\uffff\1\3\1\uffff\1\5", + "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\4\uffff\6\5\3\uffff\1\5\52\uffff\1\2\3\uffff\2\5\2\uffff\1\5\1\uffff\1\5\3\uffff\11\5\1\uffff\1\5\11\uffff\1\3\1\uffff\1\5", "\1\uffff", "\1\uffff", "", @@ -84136,11 +84135,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } static final String dfa_33s = "\40\uffff"; static final String dfa_34s = "\1\4\26\uffff\1\0\10\uffff"; - static final String dfa_35s = "\1\u0086\26\uffff\1\0\10\uffff"; + static final String dfa_35s = "\1\u0085\26\uffff\1\0\10\uffff"; static final String dfa_36s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\6\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11"; static final String dfa_37s = "\27\uffff\1\0\10\uffff}>"; static final String[] dfa_38s = { - "\1\5\4\14\22\uffff\1\5\21\uffff\5\5\1\14\3\uffff\1\2\53\uffff\1\35\3\uffff\2\14\2\uffff\1\26\1\uffff\1\3\3\uffff\1\27\1\30\1\31\1\1\2\14\1\32\1\33\1\34\1\uffff\1\4\13\uffff\1\14", + "\1\5\4\14\22\uffff\1\5\21\uffff\5\5\1\14\3\uffff\1\2\52\uffff\1\35\3\uffff\2\14\2\uffff\1\26\1\uffff\1\3\3\uffff\1\27\1\30\1\31\1\1\2\14\1\32\1\33\1\34\1\uffff\1\4\13\uffff\1\14", "", "", "", @@ -84225,7 +84224,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } } static final String[] dfa_39s = { - "\5\2\22\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff\1\2\4\uffff\6\2\3\uffff\1\2\53\uffff\1\1\3\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\13\uffff\1\2", + "\5\2\22\uffff\1\2\3\uffff\1\2\2\uffff\2\2\4\uffff\1\2\4\uffff\6\2\3\uffff\1\2\52\uffff\1\1\3\uffff\2\2\2\uffff\1\2\1\uffff\1\2\3\uffff\11\2\1\uffff\1\2\13\uffff\1\2", "\1\uffff", "", "", @@ -84426,11 +84425,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } static final String dfa_40s = "\1\10\11\uffff"; static final String dfa_41s = "\1\4\7\0\2\uffff"; - static final String dfa_42s = "\1\u0086\7\0\2\uffff"; + static final String dfa_42s = "\1\u0085\7\0\2\uffff"; static final String dfa_43s = "\10\uffff\1\2\1\1"; static final String dfa_44s = "\1\uffff\1\4\1\3\1\0\1\6\1\5\1\1\1\2\2\uffff}>"; static final String[] dfa_45s = { - "\5\10\5\uffff\2\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\27\10\3\uffff\2\10\50\uffff\1\10\1\uffff\32\10\6\uffff\2\10\1\uffff\2\10", + "\5\10\5\uffff\2\10\1\1\1\2\1\3\1\4\1\5\5\10\1\7\1\6\27\10\3\uffff\2\10\47\uffff\1\10\1\uffff\32\10\6\uffff\2\10\1\uffff\2\10", "\1\uffff", "\1\uffff", "\1\uffff", @@ -84583,11 +84582,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } static final String dfa_46s = "\1\1\12\uffff"; static final String dfa_47s = "\1\4\1\uffff\10\0\1\uffff"; - static final String dfa_48s = "\1\u0086\1\uffff\10\0\1\uffff"; + static final String dfa_48s = "\1\u0085\1\uffff\10\0\1\uffff"; static final String dfa_49s = "\1\uffff\1\2\10\uffff\1\1"; static final String dfa_50s = "\2\uffff\1\7\1\6\1\5\1\2\1\1\1\0\1\4\1\3\1\uffff}>"; static final String[] dfa_51s = { - "\5\1\5\uffff\14\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\21\1\3\uffff\2\1\50\uffff\1\1\1\uffff\32\1\6\uffff\2\1\1\uffff\2\1", + "\5\1\5\uffff\14\1\1\3\1\2\1\4\1\5\1\6\1\7\1\10\1\11\21\1\3\uffff\2\1\47\uffff\1\1\1\uffff\32\1\6\uffff\2\1\1\uffff\2\1", "", "\1\uffff", "\1\uffff", @@ -84757,11 +84756,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP static final String dfa_52s = "\116\uffff"; static final String dfa_53s = "\1\2\115\uffff"; static final String dfa_54s = "\1\4\1\0\114\uffff"; - static final String dfa_55s = "\1\u0086\1\0\114\uffff"; + static final String dfa_55s = "\1\u0085\1\0\114\uffff"; static final String dfa_56s = "\2\uffff\1\2\112\uffff\1\1"; static final String dfa_57s = "\1\uffff\1\0\114\uffff}>"; static final String[] dfa_58s = { - "\5\2\5\uffff\45\2\3\uffff\2\2\50\uffff\1\2\1\uffff\1\1\31\2\6\uffff\2\2\1\uffff\2\2", + "\5\2\5\uffff\45\2\3\uffff\2\2\47\uffff\1\2\1\uffff\1\1\31\2\6\uffff\2\2\1\uffff\2\2", "\1\uffff", "", "", @@ -84893,7 +84892,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } } static final String[] dfa_59s = { - "\5\2\5\uffff\45\2\3\uffff\2\2\50\uffff\1\2\1\uffff\5\2\1\1\24\2\6\uffff\2\2\1\uffff\2\2", + "\5\2\5\uffff\45\2\3\uffff\2\2\47\uffff\1\2\1\uffff\5\2\1\1\24\2\6\uffff\2\2\1\uffff\2\2", "\1\uffff", "", "", @@ -85019,11 +85018,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } static final String dfa_60s = "\46\uffff"; static final String dfa_61s = "\1\4\2\0\43\uffff"; - static final String dfa_62s = "\1\u0086\2\0\43\uffff"; + static final String dfa_62s = "\1\u0085\2\0\43\uffff"; static final String dfa_63s = "\3\uffff\1\1\1\uffff\1\2\40\uffff"; static final String dfa_64s = "\1\uffff\1\0\1\1\43\uffff}>"; static final String[] dfa_65s = { - "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\3\uffff\7\5\3\uffff\1\5\53\uffff\1\2\2\uffff\3\5\2\uffff\1\5\1\uffff\1\5\3\uffff\11\5\1\uffff\1\5\11\uffff\1\3\2\5", + "\1\1\4\5\22\uffff\1\5\3\uffff\1\3\2\uffff\2\5\4\uffff\1\5\3\uffff\7\5\3\uffff\1\5\52\uffff\1\2\2\uffff\3\5\2\uffff\1\5\1\uffff\1\5\3\uffff\11\5\1\uffff\1\5\11\uffff\1\3\2\5", "\1\uffff", "\1\uffff", "", @@ -85130,11 +85129,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } static final String dfa_66s = "\42\uffff"; static final String dfa_67s = "\1\4\2\0\37\uffff"; - static final String dfa_68s = "\1\u0086\2\0\37\uffff"; + static final String dfa_68s = "\1\u0085\2\0\37\uffff"; static final String dfa_69s = "\3\uffff\1\1\1\2\35\uffff"; static final String dfa_70s = "\1\uffff\1\0\1\1\37\uffff}>"; static final String[] dfa_71s = { - "\1\1\4\4\22\uffff\1\4\3\uffff\1\3\2\uffff\2\4\4\uffff\1\4\4\uffff\6\4\3\uffff\1\4\53\uffff\1\2\3\uffff\2\4\2\uffff\1\4\1\uffff\1\4\3\uffff\11\4\1\uffff\1\4\13\uffff\1\4", + "\1\1\4\4\22\uffff\1\4\3\uffff\1\3\2\uffff\2\4\4\uffff\1\4\4\uffff\6\4\3\uffff\1\4\52\uffff\1\2\3\uffff\2\4\2\uffff\1\4\1\uffff\1\4\3\uffff\11\4\1\uffff\1\4\13\uffff\1\4", "\1\uffff", "\1\uffff", "", @@ -85324,7 +85323,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } } static final String[] dfa_72s = { - "\5\2\5\uffff\15\2\1\1\27\2\3\uffff\2\2\50\uffff\1\2\1\uffff\32\2\6\uffff\2\2\1\uffff\2\2", + "\5\2\5\uffff\15\2\1\1\27\2\3\uffff\2\2\47\uffff\1\2\1\uffff\32\2\6\uffff\2\2\1\uffff\2\2", "\1\uffff", "", "", @@ -85538,11 +85537,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP } static final String dfa_73s = "\1\41\115\uffff"; static final String dfa_74s = "\1\4\40\0\55\uffff"; - static final String dfa_75s = "\1\u0086\40\0\55\uffff"; + static final String dfa_75s = "\1\u0085\40\0\55\uffff"; static final String dfa_76s = "\41\uffff\1\2\53\uffff\1\1"; static final String dfa_77s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\55\uffff}>"; static final String[] dfa_78s = { - "\1\1\1\27\1\23\1\24\1\25\5\uffff\15\41\1\15\6\41\1\10\1\7\4\41\1\6\4\41\1\2\1\3\1\4\1\5\1\16\1\21\3\uffff\1\12\1\41\50\uffff\1\41\1\uffff\1\40\3\41\1\17\1\20\2\41\1\31\1\41\1\13\3\41\1\32\1\33\1\34\1\11\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41\6\uffff\2\41\1\uffff\1\41\1\22", + "\1\1\1\27\1\23\1\24\1\25\5\uffff\15\41\1\15\6\41\1\10\1\7\4\41\1\6\4\41\1\2\1\3\1\4\1\5\1\16\1\21\3\uffff\1\12\1\41\47\uffff\1\41\1\uffff\1\40\3\41\1\17\1\20\2\41\1\31\1\41\1\13\3\41\1\32\1\33\1\34\1\11\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41\6\uffff\2\41\1\uffff\1\41\1\22", "\1\uffff", "\1\uffff", "\1\uffff", @@ -86139,11 +86138,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP static final String dfa_79s = "\117\uffff"; static final String dfa_80s = "\1\2\116\uffff"; static final String dfa_81s = "\1\4\1\0\115\uffff"; - static final String dfa_82s = "\1\u0086\1\0\115\uffff"; + static final String dfa_82s = "\1\u0085\1\0\115\uffff"; static final String dfa_83s = "\2\uffff\1\2\113\uffff\1\1"; static final String dfa_84s = "\1\uffff\1\0\115\uffff}>"; static final String[] dfa_85s = { - "\5\2\5\uffff\15\2\1\1\27\2\3\uffff\2\2\50\uffff\1\2\1\uffff\32\2\1\uffff\1\2\4\uffff\2\2\1\uffff\2\2", + "\5\2\5\uffff\15\2\1\1\27\2\3\uffff\2\2\47\uffff\1\2\1\uffff\32\2\1\uffff\1\2\4\uffff\2\2\1\uffff\2\2", "\1\uffff", "", "", @@ -86332,7 +86331,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0180000000000000L}); public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0100000000000002L}); public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0100000000000000L}); - public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x3A00000000000000L,0x4000000000000000L}); + public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x3A00000000000000L,0x2000000000000000L}); public static final BitSet FOLLOW_13 = new BitSet(new long[]{0xC080000000000000L,0x0000000000000028L}); public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x8000000000000002L,0x0000000000000028L}); public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000000020L}); @@ -86344,49 +86343,49 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L}); public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x1000000000000000L,0x0000000000000016L}); public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000028L}); - public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x1000000000000000L,0x80000000000000C4L}); - public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000000L,0x0000000078CFFC00L}); - public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0080000000000000L,0x0000000000000100L}); - public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000100L}); - public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L}); - public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L}); + public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x1800000000000000L,0x4000000000000044L}); + public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000000L,0x000000003C67FE00L}); + public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0080000000000000L,0x0000000000000080L}); + public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L}); + public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L}); + public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L}); public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0080000000000010L}); - public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L}); - public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L}); - public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L}); - public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L}); - public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L}); - public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L}); - public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L}); - public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L}); - public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L}); - public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L}); - public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L}); - public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L}); - public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L}); - public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L}); - public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L}); - public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000000L,0x0000000006000000L}); + public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000200L}); + public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000400L}); + public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000800L}); + public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L}); + public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L}); + public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L}); + public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L}); + public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L}); + public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L}); + public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L}); + public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L}); + public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L}); + public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L}); + public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L}); + public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L}); + public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000000L,0x0000000003000000L}); public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L}); - public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L}); - public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L}); - public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L,0x0000000000000001L}); + public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L}); + public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L}); + public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L}); + public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000000000L,0x8000000040000000L}); public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000400000000010L,0x0000000000000000L,0x0000000000000002L}); - public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L}); + public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000400000000010L,0x0000000000000000L,0x0000000000000001L}); + public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L}); public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0001000000000010L}); public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000001000000010L}); - public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L}); - public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000000L,0x0000000400000000L}); - public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0047E10C080001F0L,0x05FF14CE00000000L,0x0000000000000040L}); - public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000000L,0x0000001000000000L}); - public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L}); - public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0047E10C080001F0L,0x05FF14C600000000L,0x0000000000000040L}); + public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L}); + public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L}); + public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x0047E10C080001F0L,0x02FF8A6700000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L}); + public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L}); + public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0047E10C080001F0L,0x02FF8A6300000000L,0x0000000000000020L}); public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0047E10C080001F0L,0x05FF14E600000000L,0x0000000000000040L}); - public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L}); - public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L}); + public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x0047E10C080001F0L,0x02FF8A7300000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L}); + public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L}); public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0001E00000000010L}); public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x000000000C1F0000L}); public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000008000000L}); @@ -86397,10 +86396,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x0000000000008002L}); public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000001E00000L}); public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x0000000001E00002L}); - public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x000000000E000000L,0x0000010000000000L}); - public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x000000000E000002L,0x0000010000000000L}); - public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000080000010L,0x0000000400000000L}); - public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000000000000000L,0x0000010000000000L}); + public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x000000000E000000L,0x0000008000000000L}); + public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x000000000E000002L,0x0000008000000000L}); + public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000080000010L,0x0000000200000000L}); + public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L}); public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x00000003FC000000L}); public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x00000003FC000002L}); public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000000040000000L}); @@ -86411,66 +86410,66 @@ public class InternalPerspectiveDslParser extends AbstractInternalContentAssistP public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x000000F000000000L}); public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x000000F000000002L}); public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000010C00000000L}); - public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000000000L,0x0000020000000000L}); - public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000002L,0x0000020000000000L}); + public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x0000000000000000L,0x0000010000000000L}); + public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x0000000000000002L,0x0000010000000000L}); public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000060000000000L}); - public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000080000000000L,0x0000000000000000L,0x000000000000000CL}); - public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000080000000002L,0x0000000000000000L,0x000000000000000CL}); - public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000080000000000L,0x0000000000000000L,0x0000000000000004L}); + public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000080000000000L,0x0000000000000000L,0x0000000000000006L}); + public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000080000000002L,0x0000000000000000L,0x0000000000000006L}); + public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000080000000000L,0x0000000000000000L,0x0000000000000002L}); public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0003E00008000010L}); - public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0000008400000000L}); - public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000080000010L,0x1000000400000000L}); - public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000004000000L,0x0000001000000000L}); - public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0047E10C880001F0L,0x05FF14CE00000000L,0x0000000000000050L}); - public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x00C7E10C080001F0L,0x05FF14C600000000L,0x0000000000000040L}); - public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0047F10C880001F0L,0x05FF14C600000000L,0x0000000000000070L}); - public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0000002000000000L}); - public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000080000010L,0x0000000400000000L,0x0000000000000010L}); - public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0047F10C080001F2L,0x05FF14C600000000L,0x0000000000000060L}); - public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L}); - public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000000000L,0x0000040000000000L}); - public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000000L}); - public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000000000L,0x0000100000000000L}); - public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0047E10C880001F0L,0x05FF14C600000000L,0x0000000000000040L}); - public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0080000080000010L,0x0000E01400000000L}); - public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x0000000080000012L,0x0000A01400000000L}); - public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x0000000000000000L,0x0000200000000000L}); - public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x0000000080000010L,0x0000A01400000000L}); - public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L}); - public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0047F10C080001F0L,0x05FF14C700000000L,0x0000000000000060L}); - public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x0047E10C080001F0L,0x05FF14C700000000L,0x0000000000000040L}); - public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x0047F10C080001F0L,0x05FF14C600000000L,0x0000000000000060L}); - public static final BitSet FOLLOW_120 = new BitSet(new long[]{0x0000000000000000L,0x0002000000000000L}); - public static final BitSet FOLLOW_121 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L}); - public static final BitSet FOLLOW_122 = new BitSet(new long[]{0x00C7F10C080001F0L,0x05FF14C600000000L,0x0000000000000060L}); - public static final BitSet FOLLOW_123 = new BitSet(new long[]{0x0000100000000000L,0x0000000000000000L,0x0000000000000020L}); - public static final BitSet FOLLOW_124 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L}); - public static final BitSet FOLLOW_125 = new BitSet(new long[]{0x0000000008000000L,0x0000008400000000L}); - public static final BitSet FOLLOW_126 = new BitSet(new long[]{0x0004000000000000L,0x0000000000000000L,0x0000000000000040L}); - public static final BitSet FOLLOW_127 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L}); + public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0000004200000000L}); + public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000080000010L,0x0800000200000000L}); + public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000004000000L,0x0000000800000000L}); + public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0047E10C880001F0L,0x02FF8A6700000000L,0x0000000000000028L}); + public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x00C7E10C080001F0L,0x02FF8A6300000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0047F10C880001F0L,0x02FF8A6300000000L,0x0000000000000038L}); + public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0000001000000000L}); + public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000080000010L,0x0000000200000000L,0x0000000000000008L}); + public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0047F10C080001F2L,0x02FF8A6300000000L,0x0000000000000030L}); + public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000000000000L,0x0000000400000000L}); + public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000000000L,0x0000020000000000L}); + public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000000000L,0x0000040000000000L}); + public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x0000000000000000L,0x0000080000000000L}); + public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0047E10C880001F0L,0x02FF8A6300000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0080000080000010L,0x0000700A00000000L}); + public static final BitSet FOLLOW_113 = new BitSet(new long[]{0x0000000080000012L,0x0000500A00000000L}); + public static final BitSet FOLLOW_114 = new BitSet(new long[]{0x0000000000000000L,0x0000100000000000L}); + public static final BitSet FOLLOW_115 = new BitSet(new long[]{0x0000000080000010L,0x0000500A00000000L}); + public static final BitSet FOLLOW_116 = new BitSet(new long[]{0x0000000000000000L,0x0000800000000000L}); + public static final BitSet FOLLOW_117 = new BitSet(new long[]{0x0047F10C080001F0L,0x02FF8A6380000000L,0x0000000000000030L}); + public static final BitSet FOLLOW_118 = new BitSet(new long[]{0x0047E10C080001F0L,0x02FF8A6380000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_119 = new BitSet(new long[]{0x0047F10C080001F0L,0x02FF8A6300000000L,0x0000000000000030L}); + public static final BitSet FOLLOW_120 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L}); + public static final BitSet FOLLOW_121 = new BitSet(new long[]{0x0000000000000000L,0x0002000000000000L}); + public static final BitSet FOLLOW_122 = new BitSet(new long[]{0x00C7F10C080001F0L,0x02FF8A6300000000L,0x0000000000000030L}); + public static final BitSet FOLLOW_123 = new BitSet(new long[]{0x0000100000000000L,0x0000000000000000L,0x0000000000000010L}); + public static final BitSet FOLLOW_124 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L}); + public static final BitSet FOLLOW_125 = new BitSet(new long[]{0x0000000008000000L,0x0000004200000000L}); + public static final BitSet FOLLOW_126 = new BitSet(new long[]{0x0004000000000000L,0x0000000000000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_127 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L}); public static final BitSet FOLLOW_128 = new BitSet(new long[]{0x00000000000001C0L}); - public static final BitSet FOLLOW_129 = new BitSet(new long[]{0x00040000000001E0L,0x003000C000000000L,0x0000000000000040L}); - public static final BitSet FOLLOW_130 = new BitSet(new long[]{0x0000000000000000L,0x0000008800000000L}); - public static final BitSet FOLLOW_131 = new BitSet(new long[]{0x0000000000000002L,0x0000008000000000L}); - public static final BitSet FOLLOW_132 = new BitSet(new long[]{0x0000000000000000L,0x0040000000000000L}); - public static final BitSet FOLLOW_133 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L}); - public static final BitSet FOLLOW_134 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L}); - public static final BitSet FOLLOW_135 = new BitSet(new long[]{0x0000000000000000L,0x0A00000000000000L}); - public static final BitSet FOLLOW_136 = new BitSet(new long[]{0x0000000000000000L,0x0200000000000000L}); - public static final BitSet FOLLOW_137 = new BitSet(new long[]{0x0000000000000002L,0x0800000000000000L}); - public static final BitSet FOLLOW_138 = new BitSet(new long[]{0x0000000000000000L,0x0400000000000000L}); + public static final BitSet FOLLOW_129 = new BitSet(new long[]{0x00040000000001E0L,0x0018006000000000L,0x0000000000000020L}); + public static final BitSet FOLLOW_130 = new BitSet(new long[]{0x0000000000000000L,0x0000004400000000L}); + public static final BitSet FOLLOW_131 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L}); + public static final BitSet FOLLOW_132 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L}); + public static final BitSet FOLLOW_133 = new BitSet(new long[]{0x0000000000000000L,0x0040000000000000L}); + public static final BitSet FOLLOW_134 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L}); + public static final BitSet FOLLOW_135 = new BitSet(new long[]{0x0000000000000000L,0x0500000000000000L}); + public static final BitSet FOLLOW_136 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L}); + public static final BitSet FOLLOW_137 = new BitSet(new long[]{0x0000000000000002L,0x0400000000000000L}); + public static final BitSet FOLLOW_138 = new BitSet(new long[]{0x0000000000000000L,0x0200000000000000L}); public static final BitSet FOLLOW_139 = new BitSet(new long[]{0x0000080000000000L}); public static final BitSet FOLLOW_140 = new BitSet(new long[]{0x0000080000000002L}); public static final BitSet FOLLOW_141 = new BitSet(new long[]{0x0000000000000180L}); - public static final BitSet FOLLOW_142 = new BitSet(new long[]{0x0000000080000010L,0x0000000C00000000L}); + public static final BitSet FOLLOW_142 = new BitSet(new long[]{0x0000000080000010L,0x0000000600000000L}); public static final BitSet FOLLOW_143 = new BitSet(new long[]{0x0002200000000000L}); - public static final BitSet FOLLOW_144 = new BitSet(new long[]{0x0000000000000000L,0x2000000000000000L}); - public static final BitSet FOLLOW_145 = new BitSet(new long[]{0x0000000000000002L,0x2000000000000000L}); + public static final BitSet FOLLOW_144 = new BitSet(new long[]{0x0000000000000000L,0x1000000000000000L}); + public static final BitSet FOLLOW_145 = new BitSet(new long[]{0x0000000000000002L,0x1000000000000000L}); public static final BitSet FOLLOW_146 = new BitSet(new long[]{0x0000001000000000L}); public static final BitSet FOLLOW_147 = new BitSet(new long[]{0x3800000000000002L}); public static final BitSet FOLLOW_148 = new BitSet(new long[]{0x1000000000000002L,0x0000000000000007L}); public static final BitSet FOLLOW_149 = new BitSet(new long[]{0x1000000000000002L,0x0000000000000016L}); - public static final BitSet FOLLOW_150 = new BitSet(new long[]{0x1000000000000002L,0x80000000000000C4L}); - public static final BitSet FOLLOW_151 = new BitSet(new long[]{0x0000000000000002L,0x0000000006000000L}); + public static final BitSet FOLLOW_150 = new BitSet(new long[]{0x1800000000000002L,0x4000000000000044L}); + public static final BitSet FOLLOW_151 = new BitSet(new long[]{0x0000000000000002L,0x0000000003000000L}); } diff --git a/org.eclipse.osbp.xtext.perspective.ui/i18n/I18N.properties b/org.eclipse.osbp.xtext.perspective.ui/i18n/I18N.properties index 6eb50f8..2767bc7 100644 --- a/org.eclipse.osbp.xtext.perspective.ui/i18n/I18N.properties +++ b/org.eclipse.osbp.xtext.perspective.ui/i18n/I18N.properties @@ -1,67 +1,92 @@ +#Generated by Eclipse Messages Editor (Eclipse Babel) # #Mon Dec 12 14:08:04 CET 2016 -org.eclipse.osbp.xtext.perspective.Perspective= -org.eclipse.osbp.xtext.perspective.Perspective.accessibility=A rule string describing the conditions of accessibility of this container. -org.eclipse.osbp.xtext.perspective.Perspective.described\ by=The documentation string which is used by the automated documentation generator -org.eclipse.osbp.xtext.perspective.Perspective.humantask= -org.eclipse.osbp.xtext.perspective.Perspective.iconURI=The identifier for a resource, e.g. icon file -org.eclipse.osbp.xtext.perspective.Perspective.perspective=Each Workbench window contains one or more perspectives. A perspective defines the initial set and layout of views in the Workbench window. Each perspective provides a set of functionality aimed at accomplishing a specific type of task or works with specific types of resources. -org.eclipse.osbp.xtext.perspective.Perspective.process= -org.eclipse.osbp.xtext.perspective.Perspective.toolbar=Graphical control element on which on-screen buttons, icons, menus, or other input or output elements are placed. -org.eclipse.osbp.xtext.perspective.PerspectiveDataInterchange.dataInterchange=Create a dataInterchange view to trigger imports and exports. -org.eclipse.osbp.xtext.perspective.Perspective.usertask= -org.eclipse.osbp.xtext.perspective.PerspectiveBPMN= -org.eclipse.osbp.xtext.perspective.PerspectiveBPMN.bpmn=Assign the bpmn view to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveBasicTable= -org.eclipse.osbp.xtext.perspective.PerspectiveChart=Assign a chart to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveChart.chart=Assign a chart to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveDialog=Assign a dialog to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveDialog.dialog=Assign a dialog to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveElement= -org.eclipse.osbp.xtext.perspective.PerspectiveGrid=Assign a grid to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveGrid.grid=Assign a grid to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveImport= -org.eclipse.osbp.xtext.perspective.PerspectiveImport.import= -org.eclipse.osbp.xtext.perspective.PerspectiveModel= -org.eclipse.osbp.xtext.perspective.PerspectiveOrganization=Assign an organigram to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveOrganization.organigram=Assign an organigram to this container. -org.eclipse.osbp.xtext.perspective.PerspectivePackage= -org.eclipse.osbp.xtext.perspective.PerspectivePackage.package= -org.eclipse.osbp.xtext.perspective.PerspectivePart=A part is a container for a view. -org.eclipse.osbp.xtext.perspective.PerspectivePart.accessibility=A rule string describing the conditions of accessibility of this container. -org.eclipse.osbp.xtext.perspective.PerspectivePart.described\ by=The documentation string which is used by the automated documentation generator -org.eclipse.osbp.xtext.perspective.PerspectivePart.iconURI=Assign an icon via its URI. -org.eclipse.osbp.xtext.perspective.PerspectivePart.isClosable=Allow the user to close this container. -org.eclipse.osbp.xtext.perspective.PerspectivePart.part=A part is a container for a view. -org.eclipse.osbp.xtext.perspective.PerspectivePart.spaceVolume=A number representing the relative size of this container. -org.eclipse.osbp.xtext.perspective.PerspectivePart.view=Assign a predefined view to this container. -org.eclipse.osbp.xtext.perspective.PerspectivePartStack=A part stack contains a stack of parts showing the content of one part while displaying only the headers of the other parts. -org.eclipse.osbp.xtext.perspective.PerspectivePartStack.accessibility=A rule string describing the conditions of accessibility of this container. -org.eclipse.osbp.xtext.perspective.PerspectivePartStack.partStack=A part stack contains a stack of parts showing the content of one part while displaying only the headers of the other parts. -org.eclipse.osbp.xtext.perspective.PerspectivePartStack.selectedElement=Select the container that is selected in the first place. -org.eclipse.osbp.xtext.perspective.PerspectivePartStack.spaceVolume=A number representing the relative size of this container. -org.eclipse.osbp.xtext.perspective.PerspectiveQualifiedNameWithWildCard= -org.eclipse.osbp.xtext.perspective.PerspectiveReport=Assign a report to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveReport.report=Assign a report to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer=A sash container displays all its children at the same time either horizontally or vertically aligned. Default is vertically aligned. -org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.accessibility=A rule string describing the conditions of accessibility of this container. -org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.orientation=Vertical or horizontal alignment. Default is vertically aligned. -org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.sashContainer=A sash container displays all its children at the same time either horizontally or vertically aligned. Default is vertically aligned. -org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.selectedElement=Select the container that is selected in the first place. -org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.spaceVolume=A number representing the relative size of this container. -org.eclipse.osbp.xtext.perspective.PerspectiveSelection=Assign a select table to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveSelection.select=Assign a select table to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveTable=Assign a table to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveTable.table=Assign a table to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveTopology=Assign a topology to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveTopology.topology=Assign a topology to this container. -org.eclipse.osbp.xtext.perspective.PerspectiveUserTaskReference= -org.eclipse.osbp.xtext.perspective.PerspectiveUserTaskReference.user\ task= -org.eclipse.osbp.xtext.perspective.PerspectiveView=Assign a predefined view to this container. -org.eclipse.osbp.xtext.perspective.QualifiedName= -org.eclipse.osbp.xtext.perspective.SashOrientation=Vertical or horizontal alignment. Default is vertically aligned. -org.eclipse.osbp.xtext.perspective.SashOrientation.horizontal=horizontally aligned -org.eclipse.osbp.xtext.perspective.SashOrientation.vertical=vertically aligned -org.eclipse.osbp.xtext.perspective.TRANSLATABLEID=The inserted id will be listed in the i18n properties as key and translations can be assigned to it. -org.eclipse.osbp.xtext.perspective.TRANSLATABLESTRING=The inserted string will be listed in the i18n properties as key and translations can be assigned to it. -org.eclipse.osbp.xtext.perspective.ValidID= + +org.eclipse.osbp.xtext.perspective.ID = A name / ID that can freely be assigned by the user +org.eclipse.osbp.xtext.perspective.Perspective = +org.eclipse.osbp.xtext.perspective.Perspective.accessibility = A rule string describing the conditions of accessibility of this container. +org.eclipse.osbp.xtext.perspective.Perspective.describedBy = The documentation string which is used by the automated documentation generator +org.eclipse.osbp.xtext.perspective.Perspective.eventManager = Define an event manager in order to restrict the automatic effects that a change in one perspective part has on other parts. +org.eclipse.osbp.xtext.perspective.Perspective.humantask = +org.eclipse.osbp.xtext.perspective.Perspective.icon = Keyword introducing the declaration of a resource, e.g. icon file. +org.eclipse.osbp.xtext.perspective.Perspective.iconURI = The identifier for a resource, e.g. icon file +org.eclipse.osbp.xtext.perspective.Perspective.perspective = Each Workbench window contains one or more perspectives. A perspective defines the initial set and layout of views in the Workbench window. Each perspective provides a set of functionality aimed at accomplishing a specific type of task or works with specific types of resources. +org.eclipse.osbp.xtext.perspective.Perspective.process = Keyword introducing the declaration of a BLIP (Business Logic Implementation Process) for this perspective, referencing to a BLIP DSL. +org.eclipse.osbp.xtext.perspective.Perspective.toolbar = Graphical control element on which on-screen buttons, icons, menus, or other input or output elements are placed. +org.eclipse.osbp.xtext.perspective.Perspective.usertask = Keyword introducing the declaration of a user task from a BLIP (Business Logic Implementation Process) for this perspective, referencing to a BLIP DSL. +org.eclipse.osbp.xtext.perspective.PerspectiveBPMN = +org.eclipse.osbp.xtext.perspective.PerspectiveBPMN.bpmn = Assign the bpmn view to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveBasicTable = +org.eclipse.osbp.xtext.perspective.PerspectiveBrowser = Assign a web browser to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveBrowser.browser = Assign a web browser to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveBrowser.cubeView = Set the cube view option for the browser. +org.eclipse.osbp.xtext.perspective.PerspectiveBrowser.url = Name the URL of the site to be shown in the web browser. +org.eclipse.osbp.xtext.perspective.PerspectiveChart = Assign a chart to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveChart.chart = Assign a chart to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveDashboard.name = Assign a dashboard to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveDataInterchange.dataInterchange = Create a dataInterchange view to trigger imports and exports. +org.eclipse.osbp.xtext.perspective.PerspectiveDialog = Assign a dialog to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveDialog.dialog = Assign a dialog to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveElement = +org.eclipse.osbp.xtext.perspective.PerspectiveEvent.allowedSources = Explicitly define which other parts may automatically affect the target part. All parts not listed here then may not have automatic effects on the target part. +org.eclipse.osbp.xtext.perspective.PerspectiveEvent.targetPart = Define for which part you want to restrict the effects other perspective parts can make to this part. +org.eclipse.osbp.xtext.perspective.PerspectiveGrid = Assign a grid to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveGrid.editableTable = Assign an editable table to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveGrid.grid = Assign a grid to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveImport = +org.eclipse.osbp.xtext.perspective.PerspectiveImport.import = +org.eclipse.osbp.xtext.perspective.PerspectiveKanban.card = Define the card dialog to which the Kanban refers. +org.eclipse.osbp.xtext.perspective.PerspectiveKanban.dialog = Define the dialog to which the Kanban refers. +org.eclipse.osbp.xtext.perspective.PerspectiveKanban.kanban = Assign a Kanban view to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveKanban.of = Define the DTO to which the Kanban refers. +org.eclipse.osbp.xtext.perspective.PerspectiveModel = +org.eclipse.osbp.xtext.perspective.PerspectiveOrganization = Assign an organigram to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveOrganization.organigram = Assign an organigram to this container. +org.eclipse.osbp.xtext.perspective.PerspectivePackage = +org.eclipse.osbp.xtext.perspective.PerspectivePackage.package = +org.eclipse.osbp.xtext.perspective.PerspectivePart = A part is a container for a view. +org.eclipse.osbp.xtext.perspective.PerspectivePart.accessibility = A rule string describing the conditions of accessibility of this container. +org.eclipse.osbp.xtext.perspective.PerspectivePart.describedby = The documentation string which is used by the automated documentation generator +org.eclipse.osbp.xtext.perspective.PerspectivePart.icon = Keyword introducing the declaration of a resource, e.g. icon file. +org.eclipse.osbp.xtext.perspective.PerspectivePart.isClosable = Allow the user to close this container. +org.eclipse.osbp.xtext.perspective.PerspectivePart.part = A part is a container for a view. +org.eclipse.osbp.xtext.perspective.PerspectivePart.spaceVolume = A number representing the relative size of this container. +org.eclipse.osbp.xtext.perspective.PerspectivePart.view = Assign a predefined view to this container. +org.eclipse.osbp.xtext.perspective.PerspectivePartStack = A part stack contains a stack of parts showing the content of one part while displaying only the headers of the other parts. +org.eclipse.osbp.xtext.perspective.PerspectivePartStack.accessibility = A rule string describing the conditions of accessibility of this container. +org.eclipse.osbp.xtext.perspective.PerspectivePartStack.partStack = A part stack contains a stack of parts showing the content of one part while displaying only the headers of the other parts. +org.eclipse.osbp.xtext.perspective.PerspectivePartStack.selectedElement = Select the container that is selected in the first place. +org.eclipse.osbp.xtext.perspective.PerspectivePartStack.spaceVolume = A number representing the relative size of this container. +org.eclipse.osbp.xtext.perspective.PerspectivePartStack.synchronize = Synchronize two part stacks in the way that clicking on the n-th part of the first stack automatically also switches to the n-th part within the second stack. +org.eclipse.osbp.xtext.perspective.PerspectiveQualifiedNameWithWildCard = +org.eclipse.osbp.xtext.perspective.PerspectiveReport = Assign a report to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveReport.report = Assign a report to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer = A sash container displays all its children at the same time either horizontally or vertically aligned. Default is vertically aligned. +org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.accessibility = A rule string describing the conditions of accessibility of this container. +org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.orientation = Vertical or horizontal alignment. Default is vertically aligned. +org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.sashContainer = A sash container displays all its children at the same time either horizontally or vertically aligned. Default is vertically aligned. +org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.selectedElement = Select the container that is selected in the first place. +org.eclipse.osbp.xtext.perspective.PerspectiveSashContainer.spaceVolume = A number representing the relative size of this container. +org.eclipse.osbp.xtext.perspective.PerspectiveSearch.depth = Define the search depth. +org.eclipse.osbp.xtext.perspective.PerspectiveSearch.filterColumns = Define the columns for which the search shall apply. +org.eclipse.osbp.xtext.perspective.PerspectiveSearch.in = Define the DTO to which the search shall refer. +org.eclipse.osbp.xtext.perspective.PerspectiveSearch.search = Assign a search dialog to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveSelection = Assign a select table to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveSelection.select = Assign a select table to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveTable = Assign a table to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveTable.readOnlyTable = Assign a read-only table to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveTable.table = Assign a table to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveTitle.title = Assign a title to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveTopology = Assign a topology to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveTopology.topology = Assign a topology to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveUserTaskReference = +org.eclipse.osbp.xtext.perspective.PerspectiveUserTaskReference.usertask = +org.eclipse.osbp.xtext.perspective.PerspectiveView = Assign a predefined view to this container. +org.eclipse.osbp.xtext.perspective.PerspectiveWelcome.welcome = Assign a welcome view to this container. +org.eclipse.osbp.xtext.perspective.QualifiedName = +org.eclipse.osbp.xtext.perspective.SashOrientation = Vertical or horizontal alignment. Default is vertically aligned. +org.eclipse.osbp.xtext.perspective.SashOrientation.horizontal = horizontally aligned +org.eclipse.osbp.xtext.perspective.SashOrientation.vertical = vertically aligned +org.eclipse.osbp.xtext.perspective.TRANSLATABLEID = The inserted id will be listed in the i18n properties as key and translations can be assigned to it. +org.eclipse.osbp.xtext.perspective.TRANSLATABLESTRING = The inserted string will be listed in the i18n properties as key and translations can be assigned to it. +org.eclipse.osbp.xtext.perspective.ValidID = diff --git a/org.eclipse.osbp.xtext.perspective.ui/src/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.xtend b/org.eclipse.osbp.xtext.perspective.ui/src/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.xtend index d853b40..631cdf2 100644 --- a/org.eclipse.osbp.xtext.perspective.ui/src/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.xtend +++ b/org.eclipse.osbp.xtext.perspective.ui/src/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.xtend @@ -33,12 +33,12 @@ import org.eclipse.swt.widgets.Shell import org.eclipse.xtext.Assignment import org.eclipse.xtext.Keyword import org.eclipse.xtext.RuleCall -import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider import org.eclipse.xtext.ui.editor.contentassist.ConfigurableCompletionProposal import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor import org.eclipse.xtext.ui.editor.contentassist.ReplacementTextApplier import org.mihalis.opal.imageSelector.ImageSelectorDialog +import org.eclipse.osbp.xtext.basic.ui.contentassist.TerminalsProposalProviderWithDescription class IconNameTextApplier extends ReplacementTextApplier { var ContentAssistContext context @@ -67,7 +67,7 @@ class IconNameTextApplier extends ReplacementTextApplier { class PerspectiveDslProposalProvider extends AbstractPerspectiveDslProposalProvider { - @Inject TerminalsProposalProvider provider + @Inject TerminalsProposalProviderWithDescription provider @Inject BasicDSLProposalProviderHelper providerHelper def StyledString getProposalString(ProcessImpl process, UserTaskImpl userTask) { @@ -147,6 +147,7 @@ class PerspectiveDslProposalProvider extends AbstractPerspectiveDslProposalProvi // ------------------------ delegates to TerminalsProposalProvider ----------------- override complete_ID(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + provider.setDocumentationTranslator(PerspectiveDSLDocumentationTranslator.instance()); provider.complete_ID(model, ruleCall, context, acceptor) } diff --git a/org.eclipse.osbp.xtext.perspective.ui/xtend-gen/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.java b/org.eclipse.osbp.xtext.perspective.ui/xtend-gen/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.java index 7559f3c..44a7e65 100644 --- a/org.eclipse.osbp.xtext.perspective.ui/xtend-gen/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.java +++ b/org.eclipse.osbp.xtext.perspective.ui/xtend-gen/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.java @@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.viewers.StyledString; import org.eclipse.osbp.xtext.basic.ui.contentassist.BasicDSLProposalProviderHelper; +import org.eclipse.osbp.xtext.basic.ui.contentassist.TerminalsProposalProviderWithDescription; import org.eclipse.osbp.xtext.perspective.PerspectivePart; import org.eclipse.osbp.xtext.perspective.PerspectivePartStack; import org.eclipse.osbp.xtext.perspective.ui.PerspectiveDSLDocumentationTranslator; @@ -34,7 +35,6 @@ import org.eclipse.xtext.AbstractElement; import org.eclipse.xtext.Assignment; import org.eclipse.xtext.Keyword; import org.eclipse.xtext.RuleCall; -import org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider; import org.eclipse.xtext.ui.editor.contentassist.ConfigurableCompletionProposal; import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext; import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor; @@ -42,7 +42,7 @@ import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor; @SuppressWarnings("all") public class PerspectiveDslProposalProvider extends AbstractPerspectiveDslProposalProvider { @Inject - private TerminalsProposalProvider provider; + private TerminalsProposalProviderWithDescription provider; @Inject private BasicDSLProposalProviderHelper providerHelper; @@ -131,6 +131,7 @@ public class PerspectiveDslProposalProvider extends AbstractPerspectiveDslPropos @Override public void complete_ID(final EObject model, final RuleCall ruleCall, final ContentAssistContext context, final ICompletionProposalAcceptor acceptor) { + this.provider.setDocumentationTranslator(PerspectiveDSLDocumentationTranslator.instance()); this.provider.complete_ID(model, ruleCall, context, acceptor); } diff --git a/org.eclipse.osbp.xtext.perspective/emf-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDslPackage.java b/org.eclipse.osbp.xtext.perspective/emf-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDslPackage.java index 644b0de..b42f151 100644 --- a/org.eclipse.osbp.xtext.perspective/emf-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDslPackage.java +++ b/org.eclipse.osbp.xtext.perspective/emf-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDslPackage.java @@ -203,7 +203,7 @@ public interface PerspectiveDslPackage extends EPackage { * @generated * @ordered */ - int PERSPECTIVE_PACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT; + int PERSPECTIVE_PACKAGE___ERESOLVE_PROXY__OBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT; /** * The number of operations of the '<em>Perspective Package</em>' class. diff --git a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDsl.xtextbin b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDsl.xtextbin Binary files differindex cf04b6f..8a53379 100644 --- a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDsl.xtextbin +++ b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDsl.xtextbin diff --git a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDsl.g b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDsl.g index 1d5fd1e..bf10bea 100644 --- a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDsl.g +++ b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDsl.g @@ -1088,9 +1088,9 @@ rulePerspectivePart returns [EObject current=null] { getUnorderedGroupHelper().select(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2); } - ({true}?=>(otherlv_8='iconURI' + ({true}?=>(otherlv_8='icon' { - newLeafNode(otherlv_8, grammarAccess.getPerspectivePartAccess().getIconURIKeyword_3_2_0()); + newLeafNode(otherlv_8, grammarAccess.getPerspectivePartAccess().getIconKeyword_3_2_0()); } ( ( diff --git a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDsl.tokens b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDsl.tokens index 1378b8b..3eefefb 100644 --- a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDsl.tokens +++ b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDsl.tokens @@ -1,124 +1,123 @@ -'!'=99 -'!='=84 -'!=='=86 -'#'=70 -'%'=98 -'%='=77 -'&&'=82 -'&'=132 -'('=66 -')'=68 -'*'=62 -'**'=96 -'*='=75 -'+'=94 -'++'=101 -'+='=73 -','=67 -'-'=95 -'--'=102 -'-='=74 -'->'=88 -'.'=103 -'..'=90 -'..<'=89 -'/'=97 -'/='=76 -':'=110 -'::'=104 -';'=64 -'<'=78 -'<>'=92 -'='=69 -'=='=83 -'==='=85 -'=>'=91 -'>'=79 -'>='=80 -'?'=131 -'?.'=105 -'?:'=93 -'@'=65 -'['=71 -']'=72 +'!'=98 +'!='=83 +'!=='=85 +'#'=69 +'%'=97 +'%='=76 +'&&'=81 +'&'=131 +'('=65 +')'=67 +'*'=61 +'**'=95 +'*='=74 +'+'=93 +'++'=100 +'+='=72 +','=66 +'-'=94 +'--'=101 +'-='=73 +'->'=87 +'.'=102 +'..'=89 +'..<'=88 +'/'=96 +'/='=75 +':'=109 +'::'=103 +';'=63 +'<'=77 +'<>'=91 +'='=68 +'=='=82 +'==='=84 +'=>'=90 +'>'=78 +'>='=79 +'?'=130 +'?.'=104 +'?:'=92 +'@'=64 +'['=70 +']'=71 'accessibility'=21 -'allowedSources'=35 -'as'=100 -'bpmn'=44 -'browser'=56 -'card'=47 -'case'=112 -'catch'=130 -'chart'=39 -'cubeView'=58 -'dataInterchange'=53 -'default'=111 -'depth'=51 +'allowedSources'=34 +'as'=99 +'bpmn'=43 +'browser'=55 +'card'=46 +'case'=111 +'catch'=129 +'chart'=38 +'cubeView'=57 +'dataInterchange'=52 +'default'=110 +'depth'=50 'describedBy'=17 -'dialog'=43 -'do'=115 -'editableTable'=38 -'else'=108 +'dialog'=42 +'do'=114 +'editableTable'=37 +'else'=107 'eventManager'=23 -'extends'=118 -'extension'=61 -'false'=121 -'filterColumns'=52 -'finally'=128 -'for'=113 -'horizontal'=133 +'extends'=117 +'extension'=60 +'false'=120 +'filterColumns'=51 +'finally'=127 +'for'=112 +'horizontal'=132 'icon'=20 -'iconURI'=31 -'if'=107 -'import'=59 -'in'=50 -'instanceof'=87 -'isClosable'=33 -'kanban'=45 -'name'=55 -'new'=120 -'ns'=63 -'null'=123 -'of'=46 -'organigram'=41 +'if'=106 +'import'=58 +'in'=49 +'instanceof'=86 +'isClosable'=32 +'kanban'=44 +'name'=54 +'new'=119 +'ns'=62 +'null'=122 +'of'=45 +'organigram'=40 'orientation'=25 'package'=13 'part'=30 'partStack'=28 'perspective'=16 'process'=18 -'readOnlyTable'=37 -'report'=40 -'return'=126 +'readOnlyTable'=36 +'report'=39 +'return'=125 'sashContainer'=24 -'search'=49 -'select'=36 +'search'=48 +'select'=35 'selectedElement'=26 'spaceVolume'=27 -'static'=60 -'super'=119 -'switch'=109 +'static'=59 +'super'=118 +'switch'=108 'synchronize'=29 -'synchronized'=129 -'targetPart'=34 -'throw'=125 -'title'=54 +'synchronized'=128 +'targetPart'=33 +'throw'=124 +'title'=53 'toolbar'=22 -'topology'=42 -'true'=122 -'try'=127 -'typeof'=124 -'url'=57 +'topology'=41 +'true'=121 +'try'=126 +'typeof'=123 +'url'=56 'usertask'=19 -'val'=117 -'var'=116 -'vertical'=134 -'view'=32 -'welcome'=48 -'while'=114 +'val'=116 +'var'=115 +'vertical'=133 +'view'=31 +'welcome'=47 +'while'=113 '{'=14 -'|'=106 -'||'=81 +'|'=105 +'||'=80 '}'=15 RULE_ANY_OTHER=12 RULE_DECIMAL=8 @@ -163,7 +162,6 @@ T__130=130 T__131=131 T__132=132 T__133=133 -T__134=134 T__13=13 T__14=14 T__15=15 diff --git a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDslLexer.java b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDslLexer.java index d10aa05..e987fe3 100644 --- a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDslLexer.java +++ b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDslLexer.java @@ -27,7 +27,6 @@ public class InternalPerspectiveDslLexer extends Lexer { public static final int T__132=132; public static final int T__60=60; public static final int T__61=61; - public static final int T__134=134; public static final int RULE_ID=4; public static final int T__131=131; public static final int T__130=130; @@ -539,10 +538,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__31; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:29:7: ( 'iconURI' ) - // InternalPerspectiveDsl.g:29:9: 'iconURI' + // InternalPerspectiveDsl.g:29:7: ( 'view' ) + // InternalPerspectiveDsl.g:29:9: 'view' { - match("iconURI"); + match("view"); } @@ -560,10 +559,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__32; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:30:7: ( 'view' ) - // InternalPerspectiveDsl.g:30:9: 'view' + // InternalPerspectiveDsl.g:30:7: ( 'isClosable' ) + // InternalPerspectiveDsl.g:30:9: 'isClosable' { - match("view"); + match("isClosable"); } @@ -581,10 +580,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__33; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:31:7: ( 'isClosable' ) - // InternalPerspectiveDsl.g:31:9: 'isClosable' + // InternalPerspectiveDsl.g:31:7: ( 'targetPart' ) + // InternalPerspectiveDsl.g:31:9: 'targetPart' { - match("isClosable"); + match("targetPart"); } @@ -602,10 +601,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__34; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:32:7: ( 'targetPart' ) - // InternalPerspectiveDsl.g:32:9: 'targetPart' + // InternalPerspectiveDsl.g:32:7: ( 'allowedSources' ) + // InternalPerspectiveDsl.g:32:9: 'allowedSources' { - match("targetPart"); + match("allowedSources"); } @@ -623,10 +622,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__35; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:33:7: ( 'allowedSources' ) - // InternalPerspectiveDsl.g:33:9: 'allowedSources' + // InternalPerspectiveDsl.g:33:7: ( 'select' ) + // InternalPerspectiveDsl.g:33:9: 'select' { - match("allowedSources"); + match("select"); } @@ -644,10 +643,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__36; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:34:7: ( 'select' ) - // InternalPerspectiveDsl.g:34:9: 'select' + // InternalPerspectiveDsl.g:34:7: ( 'readOnlyTable' ) + // InternalPerspectiveDsl.g:34:9: 'readOnlyTable' { - match("select"); + match("readOnlyTable"); } @@ -665,10 +664,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__37; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:35:7: ( 'readOnlyTable' ) - // InternalPerspectiveDsl.g:35:9: 'readOnlyTable' + // InternalPerspectiveDsl.g:35:7: ( 'editableTable' ) + // InternalPerspectiveDsl.g:35:9: 'editableTable' { - match("readOnlyTable"); + match("editableTable"); } @@ -686,10 +685,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__38; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:36:7: ( 'editableTable' ) - // InternalPerspectiveDsl.g:36:9: 'editableTable' + // InternalPerspectiveDsl.g:36:7: ( 'chart' ) + // InternalPerspectiveDsl.g:36:9: 'chart' { - match("editableTable"); + match("chart"); } @@ -707,10 +706,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__39; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:37:7: ( 'chart' ) - // InternalPerspectiveDsl.g:37:9: 'chart' + // InternalPerspectiveDsl.g:37:7: ( 'report' ) + // InternalPerspectiveDsl.g:37:9: 'report' { - match("chart"); + match("report"); } @@ -728,10 +727,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__40; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:38:7: ( 'report' ) - // InternalPerspectiveDsl.g:38:9: 'report' + // InternalPerspectiveDsl.g:38:7: ( 'organigram' ) + // InternalPerspectiveDsl.g:38:9: 'organigram' { - match("report"); + match("organigram"); } @@ -749,10 +748,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__41; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:39:7: ( 'organigram' ) - // InternalPerspectiveDsl.g:39:9: 'organigram' + // InternalPerspectiveDsl.g:39:7: ( 'topology' ) + // InternalPerspectiveDsl.g:39:9: 'topology' { - match("organigram"); + match("topology"); } @@ -770,10 +769,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__42; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:40:7: ( 'topology' ) - // InternalPerspectiveDsl.g:40:9: 'topology' + // InternalPerspectiveDsl.g:40:7: ( 'dialog' ) + // InternalPerspectiveDsl.g:40:9: 'dialog' { - match("topology"); + match("dialog"); } @@ -791,10 +790,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__43; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:41:7: ( 'dialog' ) - // InternalPerspectiveDsl.g:41:9: 'dialog' + // InternalPerspectiveDsl.g:41:7: ( 'bpmn' ) + // InternalPerspectiveDsl.g:41:9: 'bpmn' { - match("dialog"); + match("bpmn"); } @@ -812,10 +811,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__44; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:42:7: ( 'bpmn' ) - // InternalPerspectiveDsl.g:42:9: 'bpmn' + // InternalPerspectiveDsl.g:42:7: ( 'kanban' ) + // InternalPerspectiveDsl.g:42:9: 'kanban' { - match("bpmn"); + match("kanban"); } @@ -833,10 +832,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__45; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:43:7: ( 'kanban' ) - // InternalPerspectiveDsl.g:43:9: 'kanban' + // InternalPerspectiveDsl.g:43:7: ( 'of' ) + // InternalPerspectiveDsl.g:43:9: 'of' { - match("kanban"); + match("of"); } @@ -854,10 +853,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__46; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:44:7: ( 'of' ) - // InternalPerspectiveDsl.g:44:9: 'of' + // InternalPerspectiveDsl.g:44:7: ( 'card' ) + // InternalPerspectiveDsl.g:44:9: 'card' { - match("of"); + match("card"); } @@ -875,10 +874,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__47; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:45:7: ( 'card' ) - // InternalPerspectiveDsl.g:45:9: 'card' + // InternalPerspectiveDsl.g:45:7: ( 'welcome' ) + // InternalPerspectiveDsl.g:45:9: 'welcome' { - match("card"); + match("welcome"); } @@ -896,10 +895,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__48; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:46:7: ( 'welcome' ) - // InternalPerspectiveDsl.g:46:9: 'welcome' + // InternalPerspectiveDsl.g:46:7: ( 'search' ) + // InternalPerspectiveDsl.g:46:9: 'search' { - match("welcome"); + match("search"); } @@ -917,10 +916,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__49; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:47:7: ( 'search' ) - // InternalPerspectiveDsl.g:47:9: 'search' + // InternalPerspectiveDsl.g:47:7: ( 'in' ) + // InternalPerspectiveDsl.g:47:9: 'in' { - match("search"); + match("in"); } @@ -938,10 +937,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__50; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:48:7: ( 'in' ) - // InternalPerspectiveDsl.g:48:9: 'in' + // InternalPerspectiveDsl.g:48:7: ( 'depth' ) + // InternalPerspectiveDsl.g:48:9: 'depth' { - match("in"); + match("depth"); } @@ -959,10 +958,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__51; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:49:7: ( 'depth' ) - // InternalPerspectiveDsl.g:49:9: 'depth' + // InternalPerspectiveDsl.g:49:7: ( 'filterColumns' ) + // InternalPerspectiveDsl.g:49:9: 'filterColumns' { - match("depth"); + match("filterColumns"); } @@ -980,10 +979,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__52; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:50:7: ( 'filterColumns' ) - // InternalPerspectiveDsl.g:50:9: 'filterColumns' + // InternalPerspectiveDsl.g:50:7: ( 'dataInterchange' ) + // InternalPerspectiveDsl.g:50:9: 'dataInterchange' { - match("filterColumns"); + match("dataInterchange"); } @@ -1001,10 +1000,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__53; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:51:7: ( 'dataInterchange' ) - // InternalPerspectiveDsl.g:51:9: 'dataInterchange' + // InternalPerspectiveDsl.g:51:7: ( 'title' ) + // InternalPerspectiveDsl.g:51:9: 'title' { - match("dataInterchange"); + match("title"); } @@ -1022,10 +1021,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__54; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:52:7: ( 'title' ) - // InternalPerspectiveDsl.g:52:9: 'title' + // InternalPerspectiveDsl.g:52:7: ( 'name' ) + // InternalPerspectiveDsl.g:52:9: 'name' { - match("title"); + match("name"); } @@ -1043,10 +1042,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__55; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:53:7: ( 'name' ) - // InternalPerspectiveDsl.g:53:9: 'name' + // InternalPerspectiveDsl.g:53:7: ( 'browser' ) + // InternalPerspectiveDsl.g:53:9: 'browser' { - match("name"); + match("browser"); } @@ -1064,10 +1063,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__56; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:54:7: ( 'browser' ) - // InternalPerspectiveDsl.g:54:9: 'browser' + // InternalPerspectiveDsl.g:54:7: ( 'url' ) + // InternalPerspectiveDsl.g:54:9: 'url' { - match("browser"); + match("url"); } @@ -1085,10 +1084,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__57; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:55:7: ( 'url' ) - // InternalPerspectiveDsl.g:55:9: 'url' + // InternalPerspectiveDsl.g:55:7: ( 'cubeView' ) + // InternalPerspectiveDsl.g:55:9: 'cubeView' { - match("url"); + match("cubeView"); } @@ -1106,10 +1105,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__58; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:56:7: ( 'cubeView' ) - // InternalPerspectiveDsl.g:56:9: 'cubeView' + // InternalPerspectiveDsl.g:56:7: ( 'import' ) + // InternalPerspectiveDsl.g:56:9: 'import' { - match("cubeView"); + match("import"); } @@ -1127,10 +1126,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__59; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:57:7: ( 'import' ) - // InternalPerspectiveDsl.g:57:9: 'import' + // InternalPerspectiveDsl.g:57:7: ( 'static' ) + // InternalPerspectiveDsl.g:57:9: 'static' { - match("import"); + match("static"); } @@ -1148,10 +1147,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__60; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:58:7: ( 'static' ) - // InternalPerspectiveDsl.g:58:9: 'static' + // InternalPerspectiveDsl.g:58:7: ( 'extension' ) + // InternalPerspectiveDsl.g:58:9: 'extension' { - match("static"); + match("extension"); } @@ -1169,11 +1168,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__61; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:59:7: ( 'extension' ) - // InternalPerspectiveDsl.g:59:9: 'extension' + // InternalPerspectiveDsl.g:59:7: ( '*' ) + // InternalPerspectiveDsl.g:59:9: '*' { - match("extension"); - + match('*'); } @@ -1190,10 +1188,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__62; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:60:7: ( '*' ) - // InternalPerspectiveDsl.g:60:9: '*' + // InternalPerspectiveDsl.g:60:7: ( 'ns' ) + // InternalPerspectiveDsl.g:60:9: 'ns' { - match('*'); + match("ns"); + } @@ -1210,11 +1209,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__63; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:61:7: ( 'ns' ) - // InternalPerspectiveDsl.g:61:9: 'ns' + // InternalPerspectiveDsl.g:61:7: ( ';' ) + // InternalPerspectiveDsl.g:61:9: ';' { - match("ns"); - + match(';'); } @@ -1231,10 +1229,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__64; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:62:7: ( ';' ) - // InternalPerspectiveDsl.g:62:9: ';' + // InternalPerspectiveDsl.g:62:7: ( '@' ) + // InternalPerspectiveDsl.g:62:9: '@' { - match(';'); + match('@'); } @@ -1251,10 +1249,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__65; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:63:7: ( '@' ) - // InternalPerspectiveDsl.g:63:9: '@' + // InternalPerspectiveDsl.g:63:7: ( '(' ) + // InternalPerspectiveDsl.g:63:9: '(' { - match('@'); + match('('); } @@ -1271,10 +1269,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__66; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:64:7: ( '(' ) - // InternalPerspectiveDsl.g:64:9: '(' + // InternalPerspectiveDsl.g:64:7: ( ',' ) + // InternalPerspectiveDsl.g:64:9: ',' { - match('('); + match(','); } @@ -1291,10 +1289,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__67; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:65:7: ( ',' ) - // InternalPerspectiveDsl.g:65:9: ',' + // InternalPerspectiveDsl.g:65:7: ( ')' ) + // InternalPerspectiveDsl.g:65:9: ')' { - match(','); + match(')'); } @@ -1311,10 +1309,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__68; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:66:7: ( ')' ) - // InternalPerspectiveDsl.g:66:9: ')' + // InternalPerspectiveDsl.g:66:7: ( '=' ) + // InternalPerspectiveDsl.g:66:9: '=' { - match(')'); + match('='); } @@ -1331,10 +1329,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__69; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:67:7: ( '=' ) - // InternalPerspectiveDsl.g:67:9: '=' + // InternalPerspectiveDsl.g:67:7: ( '#' ) + // InternalPerspectiveDsl.g:67:9: '#' { - match('='); + match('#'); } @@ -1351,10 +1349,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__70; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:68:7: ( '#' ) - // InternalPerspectiveDsl.g:68:9: '#' + // InternalPerspectiveDsl.g:68:7: ( '[' ) + // InternalPerspectiveDsl.g:68:9: '[' { - match('#'); + match('['); } @@ -1371,10 +1369,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__71; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:69:7: ( '[' ) - // InternalPerspectiveDsl.g:69:9: '[' + // InternalPerspectiveDsl.g:69:7: ( ']' ) + // InternalPerspectiveDsl.g:69:9: ']' { - match('['); + match(']'); } @@ -1391,10 +1389,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__72; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:70:7: ( ']' ) - // InternalPerspectiveDsl.g:70:9: ']' + // InternalPerspectiveDsl.g:70:7: ( '+=' ) + // InternalPerspectiveDsl.g:70:9: '+=' { - match(']'); + match("+="); + } @@ -1411,10 +1410,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__73; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:71:7: ( '+=' ) - // InternalPerspectiveDsl.g:71:9: '+=' + // InternalPerspectiveDsl.g:71:7: ( '-=' ) + // InternalPerspectiveDsl.g:71:9: '-=' { - match("+="); + match("-="); } @@ -1432,10 +1431,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__74; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:72:7: ( '-=' ) - // InternalPerspectiveDsl.g:72:9: '-=' + // InternalPerspectiveDsl.g:72:7: ( '*=' ) + // InternalPerspectiveDsl.g:72:9: '*=' { - match("-="); + match("*="); } @@ -1453,10 +1452,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__75; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:73:7: ( '*=' ) - // InternalPerspectiveDsl.g:73:9: '*=' + // InternalPerspectiveDsl.g:73:7: ( '/=' ) + // InternalPerspectiveDsl.g:73:9: '/=' { - match("*="); + match("/="); } @@ -1474,10 +1473,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__76; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:74:7: ( '/=' ) - // InternalPerspectiveDsl.g:74:9: '/=' + // InternalPerspectiveDsl.g:74:7: ( '%=' ) + // InternalPerspectiveDsl.g:74:9: '%=' { - match("/="); + match("%="); } @@ -1495,11 +1494,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__77; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:75:7: ( '%=' ) - // InternalPerspectiveDsl.g:75:9: '%=' + // InternalPerspectiveDsl.g:75:7: ( '<' ) + // InternalPerspectiveDsl.g:75:9: '<' { - match("%="); - + match('<'); } @@ -1516,10 +1514,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__78; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:76:7: ( '<' ) - // InternalPerspectiveDsl.g:76:9: '<' + // InternalPerspectiveDsl.g:76:7: ( '>' ) + // InternalPerspectiveDsl.g:76:9: '>' { - match('<'); + match('>'); } @@ -1536,10 +1534,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__79; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:77:7: ( '>' ) - // InternalPerspectiveDsl.g:77:9: '>' + // InternalPerspectiveDsl.g:77:7: ( '>=' ) + // InternalPerspectiveDsl.g:77:9: '>=' { - match('>'); + match(">="); + } @@ -1556,10 +1555,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__80; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:78:7: ( '>=' ) - // InternalPerspectiveDsl.g:78:9: '>=' + // InternalPerspectiveDsl.g:78:7: ( '||' ) + // InternalPerspectiveDsl.g:78:9: '||' { - match(">="); + match("||"); } @@ -1577,10 +1576,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__81; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:79:7: ( '||' ) - // InternalPerspectiveDsl.g:79:9: '||' + // InternalPerspectiveDsl.g:79:7: ( '&&' ) + // InternalPerspectiveDsl.g:79:9: '&&' { - match("||"); + match("&&"); } @@ -1598,10 +1597,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__82; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:80:7: ( '&&' ) - // InternalPerspectiveDsl.g:80:9: '&&' + // InternalPerspectiveDsl.g:80:7: ( '==' ) + // InternalPerspectiveDsl.g:80:9: '==' { - match("&&"); + match("=="); } @@ -1619,10 +1618,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__83; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:81:7: ( '==' ) - // InternalPerspectiveDsl.g:81:9: '==' + // InternalPerspectiveDsl.g:81:7: ( '!=' ) + // InternalPerspectiveDsl.g:81:9: '!=' { - match("=="); + match("!="); } @@ -1640,10 +1639,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__84; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:82:7: ( '!=' ) - // InternalPerspectiveDsl.g:82:9: '!=' + // InternalPerspectiveDsl.g:82:7: ( '===' ) + // InternalPerspectiveDsl.g:82:9: '===' { - match("!="); + match("==="); } @@ -1661,10 +1660,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__85; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:83:7: ( '===' ) - // InternalPerspectiveDsl.g:83:9: '===' + // InternalPerspectiveDsl.g:83:7: ( '!==' ) + // InternalPerspectiveDsl.g:83:9: '!==' { - match("==="); + match("!=="); } @@ -1682,10 +1681,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__86; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:84:7: ( '!==' ) - // InternalPerspectiveDsl.g:84:9: '!==' + // InternalPerspectiveDsl.g:84:7: ( 'instanceof' ) + // InternalPerspectiveDsl.g:84:9: 'instanceof' { - match("!=="); + match("instanceof"); } @@ -1703,10 +1702,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__87; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:85:7: ( 'instanceof' ) - // InternalPerspectiveDsl.g:85:9: 'instanceof' + // InternalPerspectiveDsl.g:85:7: ( '->' ) + // InternalPerspectiveDsl.g:85:9: '->' { - match("instanceof"); + match("->"); } @@ -1724,10 +1723,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__88; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:86:7: ( '->' ) - // InternalPerspectiveDsl.g:86:9: '->' + // InternalPerspectiveDsl.g:86:7: ( '..<' ) + // InternalPerspectiveDsl.g:86:9: '..<' { - match("->"); + match("..<"); } @@ -1745,10 +1744,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__89; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:87:7: ( '..<' ) - // InternalPerspectiveDsl.g:87:9: '..<' + // InternalPerspectiveDsl.g:87:7: ( '..' ) + // InternalPerspectiveDsl.g:87:9: '..' { - match("..<"); + match(".."); } @@ -1766,10 +1765,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__90; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:88:7: ( '..' ) - // InternalPerspectiveDsl.g:88:9: '..' + // InternalPerspectiveDsl.g:88:7: ( '=>' ) + // InternalPerspectiveDsl.g:88:9: '=>' { - match(".."); + match("=>"); } @@ -1787,10 +1786,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__91; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:89:7: ( '=>' ) - // InternalPerspectiveDsl.g:89:9: '=>' + // InternalPerspectiveDsl.g:89:7: ( '<>' ) + // InternalPerspectiveDsl.g:89:9: '<>' { - match("=>"); + match("<>"); } @@ -1808,10 +1807,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__92; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:90:7: ( '<>' ) - // InternalPerspectiveDsl.g:90:9: '<>' + // InternalPerspectiveDsl.g:90:7: ( '?:' ) + // InternalPerspectiveDsl.g:90:9: '?:' { - match("<>"); + match("?:"); } @@ -1829,11 +1828,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__93; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:91:7: ( '?:' ) - // InternalPerspectiveDsl.g:91:9: '?:' + // InternalPerspectiveDsl.g:91:7: ( '+' ) + // InternalPerspectiveDsl.g:91:9: '+' { - match("?:"); - + match('+'); } @@ -1850,10 +1848,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__94; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:92:7: ( '+' ) - // InternalPerspectiveDsl.g:92:9: '+' + // InternalPerspectiveDsl.g:92:7: ( '-' ) + // InternalPerspectiveDsl.g:92:9: '-' { - match('+'); + match('-'); } @@ -1870,10 +1868,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__95; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:93:7: ( '-' ) - // InternalPerspectiveDsl.g:93:9: '-' + // InternalPerspectiveDsl.g:93:7: ( '**' ) + // InternalPerspectiveDsl.g:93:9: '**' { - match('-'); + match("**"); + } @@ -1890,11 +1889,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__96; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:94:7: ( '**' ) - // InternalPerspectiveDsl.g:94:9: '**' + // InternalPerspectiveDsl.g:94:7: ( '/' ) + // InternalPerspectiveDsl.g:94:9: '/' { - match("**"); - + match('/'); } @@ -1911,10 +1909,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__97; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:95:7: ( '/' ) - // InternalPerspectiveDsl.g:95:9: '/' + // InternalPerspectiveDsl.g:95:7: ( '%' ) + // InternalPerspectiveDsl.g:95:9: '%' { - match('/'); + match('%'); } @@ -1931,10 +1929,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__98; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:96:7: ( '%' ) - // InternalPerspectiveDsl.g:96:9: '%' + // InternalPerspectiveDsl.g:96:7: ( '!' ) + // InternalPerspectiveDsl.g:96:9: '!' { - match('%'); + match('!'); } @@ -1951,10 +1949,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__99; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:97:7: ( '!' ) - // InternalPerspectiveDsl.g:97:9: '!' + // InternalPerspectiveDsl.g:97:7: ( 'as' ) + // InternalPerspectiveDsl.g:97:9: 'as' { - match('!'); + match("as"); + } @@ -1971,10 +1970,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__100; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:98:8: ( 'as' ) - // InternalPerspectiveDsl.g:98:10: 'as' + // InternalPerspectiveDsl.g:98:8: ( '++' ) + // InternalPerspectiveDsl.g:98:10: '++' { - match("as"); + match("++"); } @@ -1992,10 +1991,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__101; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:99:8: ( '++' ) - // InternalPerspectiveDsl.g:99:10: '++' + // InternalPerspectiveDsl.g:99:8: ( '--' ) + // InternalPerspectiveDsl.g:99:10: '--' { - match("++"); + match("--"); } @@ -2013,11 +2012,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__102; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:100:8: ( '--' ) - // InternalPerspectiveDsl.g:100:10: '--' + // InternalPerspectiveDsl.g:100:8: ( '.' ) + // InternalPerspectiveDsl.g:100:10: '.' { - match("--"); - + match('.'); } @@ -2034,10 +2032,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__103; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:101:8: ( '.' ) - // InternalPerspectiveDsl.g:101:10: '.' + // InternalPerspectiveDsl.g:101:8: ( '::' ) + // InternalPerspectiveDsl.g:101:10: '::' { - match('.'); + match("::"); + } @@ -2054,10 +2053,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__104; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:102:8: ( '::' ) - // InternalPerspectiveDsl.g:102:10: '::' + // InternalPerspectiveDsl.g:102:8: ( '?.' ) + // InternalPerspectiveDsl.g:102:10: '?.' { - match("::"); + match("?."); } @@ -2075,11 +2074,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__105; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:103:8: ( '?.' ) - // InternalPerspectiveDsl.g:103:10: '?.' + // InternalPerspectiveDsl.g:103:8: ( '|' ) + // InternalPerspectiveDsl.g:103:10: '|' { - match("?."); - + match('|'); } @@ -2096,10 +2094,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__106; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:104:8: ( '|' ) - // InternalPerspectiveDsl.g:104:10: '|' + // InternalPerspectiveDsl.g:104:8: ( 'if' ) + // InternalPerspectiveDsl.g:104:10: 'if' { - match('|'); + match("if"); + } @@ -2116,10 +2115,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__107; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:105:8: ( 'if' ) - // InternalPerspectiveDsl.g:105:10: 'if' + // InternalPerspectiveDsl.g:105:8: ( 'else' ) + // InternalPerspectiveDsl.g:105:10: 'else' { - match("if"); + match("else"); } @@ -2137,10 +2136,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__108; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:106:8: ( 'else' ) - // InternalPerspectiveDsl.g:106:10: 'else' + // InternalPerspectiveDsl.g:106:8: ( 'switch' ) + // InternalPerspectiveDsl.g:106:10: 'switch' { - match("else"); + match("switch"); } @@ -2158,11 +2157,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__109; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:107:8: ( 'switch' ) - // InternalPerspectiveDsl.g:107:10: 'switch' + // InternalPerspectiveDsl.g:107:8: ( ':' ) + // InternalPerspectiveDsl.g:107:10: ':' { - match("switch"); - + match(':'); } @@ -2179,10 +2177,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__110; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:108:8: ( ':' ) - // InternalPerspectiveDsl.g:108:10: ':' + // InternalPerspectiveDsl.g:108:8: ( 'default' ) + // InternalPerspectiveDsl.g:108:10: 'default' { - match(':'); + match("default"); + } @@ -2199,10 +2198,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__111; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:109:8: ( 'default' ) - // InternalPerspectiveDsl.g:109:10: 'default' + // InternalPerspectiveDsl.g:109:8: ( 'case' ) + // InternalPerspectiveDsl.g:109:10: 'case' { - match("default"); + match("case"); } @@ -2220,10 +2219,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__112; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:110:8: ( 'case' ) - // InternalPerspectiveDsl.g:110:10: 'case' + // InternalPerspectiveDsl.g:110:8: ( 'for' ) + // InternalPerspectiveDsl.g:110:10: 'for' { - match("case"); + match("for"); } @@ -2241,10 +2240,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__113; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:111:8: ( 'for' ) - // InternalPerspectiveDsl.g:111:10: 'for' + // InternalPerspectiveDsl.g:111:8: ( 'while' ) + // InternalPerspectiveDsl.g:111:10: 'while' { - match("for"); + match("while"); } @@ -2262,10 +2261,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__114; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:112:8: ( 'while' ) - // InternalPerspectiveDsl.g:112:10: 'while' + // InternalPerspectiveDsl.g:112:8: ( 'do' ) + // InternalPerspectiveDsl.g:112:10: 'do' { - match("while"); + match("do"); } @@ -2283,10 +2282,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__115; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:113:8: ( 'do' ) - // InternalPerspectiveDsl.g:113:10: 'do' + // InternalPerspectiveDsl.g:113:8: ( 'var' ) + // InternalPerspectiveDsl.g:113:10: 'var' { - match("do"); + match("var"); } @@ -2304,10 +2303,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__116; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:114:8: ( 'var' ) - // InternalPerspectiveDsl.g:114:10: 'var' + // InternalPerspectiveDsl.g:114:8: ( 'val' ) + // InternalPerspectiveDsl.g:114:10: 'val' { - match("var"); + match("val"); } @@ -2325,10 +2324,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__117; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:115:8: ( 'val' ) - // InternalPerspectiveDsl.g:115:10: 'val' + // InternalPerspectiveDsl.g:115:8: ( 'extends' ) + // InternalPerspectiveDsl.g:115:10: 'extends' { - match("val"); + match("extends"); } @@ -2346,10 +2345,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__118; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:116:8: ( 'extends' ) - // InternalPerspectiveDsl.g:116:10: 'extends' + // InternalPerspectiveDsl.g:116:8: ( 'super' ) + // InternalPerspectiveDsl.g:116:10: 'super' { - match("extends"); + match("super"); } @@ -2367,10 +2366,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__119; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:117:8: ( 'super' ) - // InternalPerspectiveDsl.g:117:10: 'super' + // InternalPerspectiveDsl.g:117:8: ( 'new' ) + // InternalPerspectiveDsl.g:117:10: 'new' { - match("super"); + match("new"); } @@ -2388,10 +2387,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__120; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:118:8: ( 'new' ) - // InternalPerspectiveDsl.g:118:10: 'new' + // InternalPerspectiveDsl.g:118:8: ( 'false' ) + // InternalPerspectiveDsl.g:118:10: 'false' { - match("new"); + match("false"); } @@ -2409,10 +2408,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__121; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:119:8: ( 'false' ) - // InternalPerspectiveDsl.g:119:10: 'false' + // InternalPerspectiveDsl.g:119:8: ( 'true' ) + // InternalPerspectiveDsl.g:119:10: 'true' { - match("false"); + match("true"); } @@ -2430,10 +2429,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__122; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:120:8: ( 'true' ) - // InternalPerspectiveDsl.g:120:10: 'true' + // InternalPerspectiveDsl.g:120:8: ( 'null' ) + // InternalPerspectiveDsl.g:120:10: 'null' { - match("true"); + match("null"); } @@ -2451,10 +2450,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__123; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:121:8: ( 'null' ) - // InternalPerspectiveDsl.g:121:10: 'null' + // InternalPerspectiveDsl.g:121:8: ( 'typeof' ) + // InternalPerspectiveDsl.g:121:10: 'typeof' { - match("null"); + match("typeof"); } @@ -2472,10 +2471,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__124; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:122:8: ( 'typeof' ) - // InternalPerspectiveDsl.g:122:10: 'typeof' + // InternalPerspectiveDsl.g:122:8: ( 'throw' ) + // InternalPerspectiveDsl.g:122:10: 'throw' { - match("typeof"); + match("throw"); } @@ -2493,10 +2492,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__125; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:123:8: ( 'throw' ) - // InternalPerspectiveDsl.g:123:10: 'throw' + // InternalPerspectiveDsl.g:123:8: ( 'return' ) + // InternalPerspectiveDsl.g:123:10: 'return' { - match("throw"); + match("return"); } @@ -2514,10 +2513,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__126; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:124:8: ( 'return' ) - // InternalPerspectiveDsl.g:124:10: 'return' + // InternalPerspectiveDsl.g:124:8: ( 'try' ) + // InternalPerspectiveDsl.g:124:10: 'try' { - match("return"); + match("try"); } @@ -2535,10 +2534,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__127; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:125:8: ( 'try' ) - // InternalPerspectiveDsl.g:125:10: 'try' + // InternalPerspectiveDsl.g:125:8: ( 'finally' ) + // InternalPerspectiveDsl.g:125:10: 'finally' { - match("try"); + match("finally"); } @@ -2556,10 +2555,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__128; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:126:8: ( 'finally' ) - // InternalPerspectiveDsl.g:126:10: 'finally' + // InternalPerspectiveDsl.g:126:8: ( 'synchronized' ) + // InternalPerspectiveDsl.g:126:10: 'synchronized' { - match("finally"); + match("synchronized"); } @@ -2577,10 +2576,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__129; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:127:8: ( 'synchronized' ) - // InternalPerspectiveDsl.g:127:10: 'synchronized' + // InternalPerspectiveDsl.g:127:8: ( 'catch' ) + // InternalPerspectiveDsl.g:127:10: 'catch' { - match("synchronized"); + match("catch"); } @@ -2598,11 +2597,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__130; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:128:8: ( 'catch' ) - // InternalPerspectiveDsl.g:128:10: 'catch' + // InternalPerspectiveDsl.g:128:8: ( '?' ) + // InternalPerspectiveDsl.g:128:10: '?' { - match("catch"); - + match('?'); } @@ -2619,10 +2617,10 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__131; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:129:8: ( '?' ) - // InternalPerspectiveDsl.g:129:10: '?' + // InternalPerspectiveDsl.g:129:8: ( '&' ) + // InternalPerspectiveDsl.g:129:10: '&' { - match('?'); + match('&'); } @@ -2639,10 +2637,11 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__132; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:130:8: ( '&' ) - // InternalPerspectiveDsl.g:130:10: '&' + // InternalPerspectiveDsl.g:130:8: ( 'horizontal' ) + // InternalPerspectiveDsl.g:130:10: 'horizontal' { - match('&'); + match("horizontal"); + } @@ -2659,29 +2658,8 @@ public class InternalPerspectiveDslLexer extends Lexer { try { int _type = T__133; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:131:8: ( 'horizontal' ) - // InternalPerspectiveDsl.g:131:10: 'horizontal' - { - match("horizontal"); - - - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "T__133" - - // $ANTLR start "T__134" - public final void mT__134() throws RecognitionException { - try { - int _type = T__134; - int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalPerspectiveDsl.g:132:8: ( 'vertical' ) - // InternalPerspectiveDsl.g:132:10: 'vertical' + // InternalPerspectiveDsl.g:131:8: ( 'vertical' ) + // InternalPerspectiveDsl.g:131:10: 'vertical' { match("vertical"); @@ -2694,7 +2672,7 @@ public class InternalPerspectiveDslLexer extends Lexer { finally { } } - // $ANTLR end "T__134" + // $ANTLR end "T__133" // $ANTLR start "RULE_HEX" public final void mRULE_HEX() throws RecognitionException { @@ -3539,8 +3517,8 @@ public class InternalPerspectiveDslLexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // InternalPerspectiveDsl.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt21=131; + // InternalPerspectiveDsl.g:1:8: ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt21=130; alt21 = dfa21.predict(input); switch (alt21) { case 1 : @@ -4391,70 +4369,63 @@ public class InternalPerspectiveDslLexer extends Lexer { } break; case 122 : - // InternalPerspectiveDsl.g:1:770: T__134 - { - mT__134(); - - } - break; - case 123 : - // InternalPerspectiveDsl.g:1:777: RULE_HEX + // InternalPerspectiveDsl.g:1:770: RULE_HEX { mRULE_HEX(); } break; - case 124 : - // InternalPerspectiveDsl.g:1:786: RULE_INT + case 123 : + // InternalPerspectiveDsl.g:1:779: RULE_INT { mRULE_INT(); } break; - case 125 : - // InternalPerspectiveDsl.g:1:795: RULE_DECIMAL + case 124 : + // InternalPerspectiveDsl.g:1:788: RULE_DECIMAL { mRULE_DECIMAL(); } break; - case 126 : - // InternalPerspectiveDsl.g:1:808: RULE_ID + case 125 : + // InternalPerspectiveDsl.g:1:801: RULE_ID { mRULE_ID(); } break; - case 127 : - // InternalPerspectiveDsl.g:1:816: RULE_STRING + case 126 : + // InternalPerspectiveDsl.g:1:809: RULE_STRING { mRULE_STRING(); } break; - case 128 : - // InternalPerspectiveDsl.g:1:828: RULE_ML_COMMENT + case 127 : + // InternalPerspectiveDsl.g:1:821: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; - case 129 : - // InternalPerspectiveDsl.g:1:844: RULE_SL_COMMENT + case 128 : + // InternalPerspectiveDsl.g:1:837: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; - case 130 : - // InternalPerspectiveDsl.g:1:860: RULE_WS + case 129 : + // InternalPerspectiveDsl.g:1:853: RULE_WS { mRULE_WS(); } break; - case 131 : - // InternalPerspectiveDsl.g:1:868: RULE_ANY_OTHER + case 130 : + // InternalPerspectiveDsl.g:1:861: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -4468,17 +4439,17 @@ public class InternalPerspectiveDslLexer extends Lexer { protected DFA21 dfa21 = new DFA21(this); static final String DFA21_eotS = - "\1\uffff\1\66\2\uffff\20\66\1\157\5\uffff\1\167\3\uffff\1\175\1\u0081\1\u0085\1\u0087\1\u0089\1\u008b\1\u008d\1\u008f\1\u0091\1\u0093\1\u0096\1\u0098\1\66\2\u009c\1\62\5\uffff\3\66\3\uffff\3\66\1\u00a9\4\66\1\u00af\1\66\1\u00b1\2\66\1\u00b4\22\66\1\u00cb\20\66\1\u00e2\2\66\10\uffff\1\u00e6\32\uffff\1\u00e8\1\uffff\1\u00ea\6\uffff\1\66\1\uffff\1\u009c\4\uffff\11\66\1\uffff\1\66\1\u00f6\3\66\1\uffff\1\66\1\uffff\2\66\1\uffff\5\66\1\u0102\20\66\1\uffff\1\66\1\u0114\1\u0115\20\66\1\u0126\2\66\1\uffff\1\u0129\1\66\6\uffff\2\66\1\u012e\10\66\1\uffff\1\u0138\11\66\1\u0142\1\uffff\5\66\1\u0148\12\66\1\u0153\2\uffff\5\66\1\u0159\1\u015a\2\66\1\u015d\6\66\1\uffff\1\66\1\u0165\1\uffff\1\u0166\3\66\1\uffff\3\66\1\u016d\5\66\1\uffff\10\66\1\u017b\1\uffff\1\66\1\u017d\3\66\1\uffff\7\66\1\u0189\2\66\1\uffff\4\66\1\u0190\2\uffff\1\u0191\1\66\1\uffff\3\66\1\u0196\2\66\1\u0199\2\uffff\6\66\1\uffff\1\66\1\u01a1\5\66\1\u01a7\5\66\1\uffff\1\u01ad\1\uffff\5\66\1\u01b4\1\u01b5\2\66\1\u01b8\1\u01b9\1\uffff\4\66\1\u01be\1\u01bf\2\uffff\2\66\1\u01c2\1\66\1\uffff\2\66\1\uffff\1\66\1\u01c7\2\66\1\u01ca\1\66\1\u01cc\1\uffff\2\66\1\u01cf\2\66\1\uffff\2\66\1\u01d4\2\66\1\uffff\3\66\1\u01da\2\66\2\uffff\2\66\2\uffff\4\66\2\uffff\1\66\1\u01e4\1\uffff\1\u01e5\1\66\1\u01e7\1\66\1\uffff\2\66\1\uffff\1\66\1\uffff\1\66\1\u01ed\1\uffff\4\66\1\uffff\1\u01f2\4\66\1\uffff\6\66\1\u01fd\1\66\1\u01ff\2\uffff\1\66\1\uffff\1\66\1\u0202\3\66\1\uffff\4\66\1\uffff\3\66\1\u020d\6\66\1\uffff\1\66\1\uffff\2\66\1\uffff\3\66\1\u021a\1\u021b\2\66\1\u021e\2\66\1\uffff\5\66\1\u0226\2\66\1\u0229\1\u022a\1\u022b\1\66\2\uffff\2\66\1\uffff\4\66\1\u0233\1\u0235\1\u0236\1\uffff\2\66\3\uffff\3\66\1\u023c\3\66\1\uffff\1\u0240\2\uffff\3\66\1\u0244\1\66\1\uffff\1\u0246\1\u0247\1\66\1\uffff\1\u0249\1\u024a\1\66\1\uffff\1\u024c\2\uffff\1\66\2\uffff\1\u024e\1\uffff\1\u024f\2\uffff"; + "\1\uffff\1\66\2\uffff\20\66\1\157\5\uffff\1\167\3\uffff\1\175\1\u0081\1\u0085\1\u0087\1\u0089\1\u008b\1\u008d\1\u008f\1\u0091\1\u0093\1\u0096\1\u0098\1\66\2\u009c\1\62\5\uffff\3\66\3\uffff\3\66\1\u00a9\4\66\1\u00af\1\66\1\u00b1\2\66\1\u00b4\22\66\1\u00cb\20\66\1\u00e2\2\66\10\uffff\1\u00e6\32\uffff\1\u00e8\1\uffff\1\u00ea\6\uffff\1\66\1\uffff\1\u009c\4\uffff\11\66\1\uffff\1\66\1\u00f6\3\66\1\uffff\1\66\1\uffff\2\66\1\uffff\5\66\1\u0102\20\66\1\uffff\1\66\1\u0114\1\u0115\20\66\1\u0126\2\66\1\uffff\1\u0129\1\66\6\uffff\2\66\1\u012e\10\66\1\uffff\1\u0137\11\66\1\u0141\1\uffff\5\66\1\u0147\12\66\1\u0152\2\uffff\5\66\1\u0158\1\u0159\2\66\1\u015c\6\66\1\uffff\1\66\1\u0164\1\uffff\1\u0165\3\66\1\uffff\3\66\1\u016c\4\66\1\uffff\10\66\1\u0179\1\uffff\1\66\1\u017b\3\66\1\uffff\7\66\1\u0187\2\66\1\uffff\4\66\1\u018e\2\uffff\1\u018f\1\66\1\uffff\3\66\1\u0194\2\66\1\u0197\2\uffff\6\66\1\uffff\1\66\1\u019f\4\66\1\u01a4\5\66\1\uffff\1\u01aa\1\uffff\5\66\1\u01b1\1\u01b2\2\66\1\u01b5\1\u01b6\1\uffff\4\66\1\u01bb\1\u01bc\2\uffff\2\66\1\u01bf\1\66\1\uffff\2\66\1\uffff\1\66\1\u01c4\2\66\1\u01c7\1\66\1\u01c9\1\uffff\4\66\1\uffff\2\66\1\u01d0\2\66\1\uffff\3\66\1\u01d6\2\66\2\uffff\2\66\2\uffff\4\66\2\uffff\1\66\1\u01e0\1\uffff\1\u01e1\1\66\1\u01e3\1\66\1\uffff\2\66\1\uffff\1\66\1\uffff\1\66\1\u01e9\4\66\1\uffff\1\u01ee\4\66\1\uffff\6\66\1\u01f9\1\66\1\u01fb\2\uffff\1\66\1\uffff\1\66\1\u01fe\3\66\1\uffff\4\66\1\uffff\3\66\1\u0209\6\66\1\uffff\1\66\1\uffff\2\66\1\uffff\3\66\1\u0216\1\u0217\2\66\1\u021a\2\66\1\uffff\5\66\1\u0222\2\66\1\u0225\1\u0226\1\u0227\1\66\2\uffff\2\66\1\uffff\4\66\1\u022f\1\u0231\1\u0232\1\uffff\2\66\3\uffff\3\66\1\u0238\3\66\1\uffff\1\u023c\2\uffff\3\66\1\u0240\1\66\1\uffff\1\u0242\1\u0243\1\66\1\uffff\1\u0245\1\u0246\1\66\1\uffff\1\u0248\2\uffff\1\66\2\uffff\1\u024a\1\uffff\1\u024b\2\uffff"; static final String DFA21_eofS = - "\u0250\uffff"; + "\u024c\uffff"; static final String DFA21_minS = - "\1\0\1\141\2\uffff\1\141\1\162\2\143\1\141\1\144\1\141\1\146\1\141\1\145\1\141\1\160\1\141\1\145\2\141\1\52\5\uffff\1\75\3\uffff\1\53\1\55\1\52\1\75\1\76\1\75\1\174\1\46\1\75\2\56\1\72\1\157\2\60\1\44\5\uffff\1\143\1\162\1\157\3\uffff\1\146\1\141\1\164\1\44\1\145\1\154\1\157\1\103\1\44\1\160\1\44\1\143\1\154\1\44\1\157\1\162\1\164\1\165\1\160\1\162\1\145\1\151\1\164\2\163\2\141\1\156\1\141\1\151\1\160\1\147\1\44\1\145\1\154\1\162\2\141\1\162\1\142\1\155\1\157\1\156\1\154\1\151\1\154\1\162\1\154\1\155\1\44\1\167\1\154\10\uffff\1\75\32\uffff\1\75\1\uffff\1\74\6\uffff\1\162\1\uffff\1\60\4\uffff\1\153\1\164\1\163\2\143\1\164\1\141\1\154\1\141\1\uffff\1\162\1\44\1\156\1\154\1\164\1\uffff\1\157\1\uffff\1\145\1\157\1\uffff\1\154\1\157\1\147\1\154\1\145\1\44\1\145\1\157\1\156\1\164\2\145\1\150\1\145\1\162\2\143\2\164\2\145\1\141\1\uffff\1\167\2\44\1\164\1\144\1\157\1\165\1\162\1\144\1\145\1\143\1\145\1\156\1\167\1\142\1\143\1\154\1\164\1\141\1\44\1\163\1\145\1\uffff\1\44\1\154\6\uffff\1\151\1\141\1\44\1\160\1\145\1\162\1\150\1\165\1\157\1\111\1\164\1\uffff\1\44\1\157\1\141\1\162\1\163\1\167\1\142\1\154\2\145\1\44\1\uffff\1\157\1\167\1\164\1\141\1\156\1\44\1\103\2\143\1\145\1\150\1\151\1\143\1\162\2\156\1\44\2\uffff\1\151\1\117\2\162\1\164\2\44\1\150\1\126\1\44\1\163\1\141\1\157\2\145\1\154\1\uffff\1\145\1\44\1\uffff\1\44\1\172\1\147\1\164\1\uffff\1\145\1\163\1\151\1\44\1\154\1\147\1\156\1\141\1\122\1\uffff\1\163\1\156\1\164\1\163\1\145\1\141\1\157\1\164\1\44\1\uffff\1\146\1\44\1\115\1\142\1\144\1\uffff\1\157\1\164\1\150\1\126\1\162\1\143\1\150\1\44\1\164\1\151\1\uffff\1\143\1\156\1\164\1\156\1\44\2\uffff\1\44\1\151\1\uffff\1\145\1\156\1\155\1\44\1\162\1\154\1\44\2\uffff\1\157\1\145\1\141\1\143\1\163\1\142\1\uffff\1\164\1\44\1\164\1\163\1\111\1\141\1\143\1\44\1\151\1\144\1\162\1\147\1\120\1\uffff\1\44\1\uffff\1\141\1\154\1\151\1\163\1\156\2\44\2\157\2\44\1\uffff\1\141\1\147\1\141\1\154\2\44\2\uffff\1\145\1\162\1\44\1\145\1\uffff\1\103\1\171\1\uffff\1\156\1\44\1\143\1\164\1\44\1\145\1\44\1\uffff\1\145\1\153\1\44\1\142\1\145\1\uffff\1\142\1\123\1\44\1\171\1\141\1\uffff\1\156\1\145\1\157\1\44\1\164\1\144\2\uffff\1\154\1\156\2\uffff\1\164\1\162\1\154\1\171\2\uffff\1\167\1\44\1\uffff\1\44\1\157\1\44\1\164\1\uffff\1\153\1\151\1\uffff\1\144\1\uffff\1\162\1\44\1\uffff\1\154\1\157\1\151\1\157\1\uffff\1\44\1\162\1\141\1\124\1\156\1\uffff\1\141\1\105\1\165\2\151\1\141\1\44\1\124\1\44\2\uffff\1\154\1\uffff\1\141\1\44\1\166\1\102\1\143\1\uffff\1\145\1\146\1\154\1\165\1\uffff\1\164\1\147\1\141\1\44\1\151\1\154\1\155\1\172\1\157\1\155\1\uffff\1\141\1\uffff\1\165\1\154\1\uffff\1\145\1\171\1\150\2\44\1\151\1\162\1\44\1\145\1\142\1\uffff\1\156\3\145\1\156\1\44\1\142\1\155\3\44\1\141\2\uffff\1\164\1\143\1\uffff\1\162\1\154\1\145\1\155\3\44\1\uffff\1\154\1\156\3\uffff\1\156\1\171\1\145\1\44\1\145\1\162\1\145\1\uffff\1\44\2\uffff\1\145\1\163\1\147\1\44\1\163\1\uffff\2\44\1\156\1\uffff\2\44\1\145\1\uffff\1\44\2\uffff\1\164\2\uffff\1\44\1\uffff\1\44\2\uffff"; + "\1\0\1\141\2\uffff\1\141\1\162\2\143\1\141\1\144\1\141\1\146\1\141\1\145\1\141\1\160\1\141\1\145\2\141\1\52\5\uffff\1\75\3\uffff\1\53\1\55\1\52\1\75\1\76\1\75\1\174\1\46\1\75\2\56\1\72\1\157\2\60\1\44\5\uffff\1\143\1\162\1\157\3\uffff\1\146\1\141\1\164\1\44\1\145\1\154\1\157\1\103\1\44\1\160\1\44\1\143\1\154\1\44\1\157\1\162\1\164\1\165\1\160\1\162\1\145\1\151\1\164\2\163\2\141\1\156\1\141\1\151\1\160\1\147\1\44\1\145\1\154\1\162\2\141\1\162\1\142\1\155\1\157\1\156\1\154\1\151\1\154\1\162\1\154\1\155\1\44\1\167\1\154\10\uffff\1\75\32\uffff\1\75\1\uffff\1\74\6\uffff\1\162\1\uffff\1\60\4\uffff\1\153\1\164\1\163\2\143\1\164\1\141\1\154\1\141\1\uffff\1\162\1\44\1\156\1\154\1\164\1\uffff\1\157\1\uffff\1\145\1\157\1\uffff\1\154\1\157\1\147\1\154\1\145\1\44\1\145\1\157\1\156\1\164\2\145\1\150\1\145\1\162\2\143\2\164\2\145\1\141\1\uffff\1\167\2\44\1\164\1\144\1\157\1\165\1\162\1\144\1\145\1\143\1\145\1\156\1\167\1\142\1\143\1\154\1\164\1\141\1\44\1\163\1\145\1\uffff\1\44\1\154\6\uffff\1\151\1\141\1\44\1\160\1\145\1\162\1\150\1\165\1\157\1\111\1\164\1\uffff\1\44\1\157\1\141\1\162\1\163\1\167\1\142\1\154\2\145\1\44\1\uffff\1\157\1\167\1\164\1\141\1\156\1\44\1\103\2\143\1\145\1\150\1\151\1\143\1\162\2\156\1\44\2\uffff\1\151\1\117\2\162\1\164\2\44\1\150\1\126\1\44\1\163\1\141\1\157\2\145\1\154\1\uffff\1\145\1\44\1\uffff\1\44\1\172\1\147\1\164\1\uffff\1\145\1\163\1\151\1\44\1\154\1\147\1\156\1\141\1\uffff\1\163\1\156\1\164\1\163\1\145\1\141\1\157\1\164\1\44\1\uffff\1\146\1\44\1\115\1\142\1\144\1\uffff\1\157\1\164\1\150\1\126\1\162\1\143\1\150\1\44\1\164\1\151\1\uffff\1\143\1\156\1\164\1\156\1\44\2\uffff\1\44\1\151\1\uffff\1\145\1\156\1\155\1\44\1\162\1\154\1\44\2\uffff\1\157\1\145\1\141\1\143\1\163\1\142\1\uffff\1\164\1\44\1\164\1\163\1\141\1\143\1\44\1\151\1\144\1\162\1\147\1\120\1\uffff\1\44\1\uffff\1\141\1\154\1\151\1\163\1\156\2\44\2\157\2\44\1\uffff\1\141\1\147\1\141\1\154\2\44\2\uffff\1\145\1\162\1\44\1\145\1\uffff\1\103\1\171\1\uffff\1\156\1\44\1\143\1\164\1\44\1\145\1\44\1\uffff\1\145\1\153\1\142\1\145\1\uffff\1\142\1\123\1\44\1\171\1\141\1\uffff\1\156\1\145\1\157\1\44\1\164\1\144\2\uffff\1\154\1\156\2\uffff\1\164\1\162\1\154\1\171\2\uffff\1\167\1\44\1\uffff\1\44\1\157\1\44\1\164\1\uffff\1\153\1\151\1\uffff\1\144\1\uffff\1\162\1\44\1\154\1\157\1\151\1\157\1\uffff\1\44\1\162\1\141\1\124\1\156\1\uffff\1\141\1\105\1\165\2\151\1\141\1\44\1\124\1\44\2\uffff\1\154\1\uffff\1\141\1\44\1\166\1\102\1\143\1\uffff\1\145\1\146\1\154\1\165\1\uffff\1\164\1\147\1\141\1\44\1\151\1\154\1\155\1\172\1\157\1\155\1\uffff\1\141\1\uffff\1\165\1\154\1\uffff\1\145\1\171\1\150\2\44\1\151\1\162\1\44\1\145\1\142\1\uffff\1\156\3\145\1\156\1\44\1\142\1\155\3\44\1\141\2\uffff\1\164\1\143\1\uffff\1\162\1\154\1\145\1\155\3\44\1\uffff\1\154\1\156\3\uffff\1\156\1\171\1\145\1\44\1\145\1\162\1\145\1\uffff\1\44\2\uffff\1\145\1\163\1\147\1\44\1\163\1\uffff\2\44\1\156\1\uffff\2\44\1\145\1\uffff\1\44\2\uffff\1\164\2\uffff\1\44\1\uffff\1\44\2\uffff"; static final String DFA21_maxS = - "\1\uffff\1\162\2\uffff\1\157\3\163\1\171\1\170\1\171\1\162\1\151\1\145\1\165\1\162\1\141\1\150\1\157\1\165\1\75\5\uffff\1\76\3\uffff\1\75\1\76\2\75\1\76\1\75\1\174\1\46\1\75\1\56\2\72\1\157\1\170\1\154\1\172\5\uffff\2\162\1\157\3\uffff\1\163\1\141\1\164\1\172\1\145\1\154\1\157\1\103\1\172\1\160\1\172\1\143\1\154\1\172\1\160\1\162\1\164\1\171\1\160\1\162\1\145\1\151\1\164\2\163\1\154\1\141\1\156\1\141\1\151\1\160\1\151\1\172\1\145\2\162\1\164\1\141\1\164\1\142\1\155\1\157\1\156\1\154\1\151\1\156\1\162\1\154\1\155\1\172\1\167\1\154\10\uffff\1\75\32\uffff\1\75\1\uffff\1\74\6\uffff\1\162\1\uffff\1\154\4\uffff\1\153\1\164\1\163\2\143\1\164\1\141\1\154\1\141\1\uffff\1\162\1\172\1\156\1\154\1\164\1\uffff\1\157\1\uffff\1\145\1\157\1\uffff\1\154\1\157\1\147\1\154\1\145\1\172\1\145\1\157\1\156\1\164\2\145\1\150\1\145\1\162\2\143\2\164\2\145\1\141\1\uffff\1\167\2\172\1\164\1\144\1\157\1\165\1\162\1\144\1\145\1\143\1\145\1\156\1\167\1\142\1\143\1\154\1\164\1\141\1\172\1\163\1\145\1\uffff\1\172\1\154\6\uffff\1\151\1\141\1\172\1\160\1\145\1\162\1\150\1\165\1\157\1\111\1\164\1\uffff\1\172\1\157\1\141\1\162\1\163\1\167\1\142\1\154\2\145\1\172\1\uffff\1\157\1\167\1\164\1\141\1\156\1\172\1\103\2\143\1\145\1\150\1\151\1\143\1\162\2\156\1\172\2\uffff\1\151\1\117\2\162\1\164\2\172\1\150\1\126\1\172\1\163\1\141\1\157\2\145\1\154\1\uffff\1\145\1\172\1\uffff\2\172\1\147\1\164\1\uffff\1\145\1\163\1\151\1\172\1\154\1\147\1\156\1\141\1\122\1\uffff\1\163\1\156\1\164\1\163\1\145\1\141\1\157\1\164\1\172\1\uffff\1\146\1\172\1\115\1\142\1\163\1\uffff\1\157\1\164\1\150\1\126\1\162\1\143\1\150\1\172\1\164\1\151\1\uffff\1\143\1\156\1\164\1\156\1\172\2\uffff\1\172\1\151\1\uffff\1\145\1\156\1\155\1\172\1\162\1\154\1\172\2\uffff\1\157\1\145\1\141\1\143\1\163\1\142\1\uffff\1\164\1\172\1\164\1\163\1\111\1\141\1\143\1\172\1\151\1\144\1\162\1\147\1\120\1\uffff\1\172\1\uffff\1\141\1\154\1\151\1\163\1\156\2\172\2\157\2\172\1\uffff\1\141\1\147\1\141\1\154\2\172\2\uffff\1\145\1\162\1\172\1\145\1\uffff\1\103\1\171\1\uffff\1\156\1\172\1\143\1\164\1\172\1\145\1\172\1\uffff\1\145\1\153\1\172\1\142\1\145\1\uffff\1\142\1\123\1\172\1\171\1\141\1\uffff\1\156\1\145\1\157\1\172\1\164\1\144\2\uffff\1\154\1\156\2\uffff\1\164\1\162\1\154\1\171\2\uffff\1\167\1\172\1\uffff\1\172\1\157\1\172\1\164\1\uffff\1\153\1\151\1\uffff\1\144\1\uffff\1\162\1\172\1\uffff\1\154\1\157\1\151\1\157\1\uffff\1\172\1\162\1\141\1\124\1\156\1\uffff\1\141\1\105\1\165\2\151\1\141\1\172\1\124\1\172\2\uffff\1\154\1\uffff\1\141\1\172\1\166\1\102\1\143\1\uffff\1\145\1\146\1\154\1\165\1\uffff\1\164\1\147\1\141\1\172\1\151\1\154\1\155\1\172\1\157\1\155\1\uffff\1\141\1\uffff\1\165\1\154\1\uffff\1\145\1\171\1\150\2\172\1\151\1\162\1\172\1\145\1\142\1\uffff\1\156\3\145\1\156\1\172\1\142\1\155\3\172\1\141\2\uffff\1\164\1\143\1\uffff\1\162\1\154\1\145\1\155\3\172\1\uffff\1\154\1\156\3\uffff\1\156\1\171\1\145\1\172\1\145\1\162\1\145\1\uffff\1\172\2\uffff\1\145\1\163\1\147\1\172\1\163\1\uffff\2\172\1\156\1\uffff\2\172\1\145\1\uffff\1\172\2\uffff\1\164\2\uffff\1\172\1\uffff\1\172\2\uffff"; + "\1\uffff\1\162\2\uffff\1\157\3\163\1\171\1\170\1\171\1\162\1\151\1\145\1\165\1\162\1\141\1\150\1\157\1\165\1\75\5\uffff\1\76\3\uffff\1\75\1\76\2\75\1\76\1\75\1\174\1\46\1\75\1\56\2\72\1\157\1\170\1\154\1\172\5\uffff\2\162\1\157\3\uffff\1\163\1\141\1\164\1\172\1\145\1\154\1\157\1\103\1\172\1\160\1\172\1\143\1\154\1\172\1\160\1\162\1\164\1\171\1\160\1\162\1\145\1\151\1\164\2\163\1\154\1\141\1\156\1\141\1\151\1\160\1\151\1\172\1\145\2\162\1\164\1\141\1\164\1\142\1\155\1\157\1\156\1\154\1\151\1\156\1\162\1\154\1\155\1\172\1\167\1\154\10\uffff\1\75\32\uffff\1\75\1\uffff\1\74\6\uffff\1\162\1\uffff\1\154\4\uffff\1\153\1\164\1\163\2\143\1\164\1\141\1\154\1\141\1\uffff\1\162\1\172\1\156\1\154\1\164\1\uffff\1\157\1\uffff\1\145\1\157\1\uffff\1\154\1\157\1\147\1\154\1\145\1\172\1\145\1\157\1\156\1\164\2\145\1\150\1\145\1\162\2\143\2\164\2\145\1\141\1\uffff\1\167\2\172\1\164\1\144\1\157\1\165\1\162\1\144\1\145\1\143\1\145\1\156\1\167\1\142\1\143\1\154\1\164\1\141\1\172\1\163\1\145\1\uffff\1\172\1\154\6\uffff\1\151\1\141\1\172\1\160\1\145\1\162\1\150\1\165\1\157\1\111\1\164\1\uffff\1\172\1\157\1\141\1\162\1\163\1\167\1\142\1\154\2\145\1\172\1\uffff\1\157\1\167\1\164\1\141\1\156\1\172\1\103\2\143\1\145\1\150\1\151\1\143\1\162\2\156\1\172\2\uffff\1\151\1\117\2\162\1\164\2\172\1\150\1\126\1\172\1\163\1\141\1\157\2\145\1\154\1\uffff\1\145\1\172\1\uffff\2\172\1\147\1\164\1\uffff\1\145\1\163\1\151\1\172\1\154\1\147\1\156\1\141\1\uffff\1\163\1\156\1\164\1\163\1\145\1\141\1\157\1\164\1\172\1\uffff\1\146\1\172\1\115\1\142\1\163\1\uffff\1\157\1\164\1\150\1\126\1\162\1\143\1\150\1\172\1\164\1\151\1\uffff\1\143\1\156\1\164\1\156\1\172\2\uffff\1\172\1\151\1\uffff\1\145\1\156\1\155\1\172\1\162\1\154\1\172\2\uffff\1\157\1\145\1\141\1\143\1\163\1\142\1\uffff\1\164\1\172\1\164\1\163\1\141\1\143\1\172\1\151\1\144\1\162\1\147\1\120\1\uffff\1\172\1\uffff\1\141\1\154\1\151\1\163\1\156\2\172\2\157\2\172\1\uffff\1\141\1\147\1\141\1\154\2\172\2\uffff\1\145\1\162\1\172\1\145\1\uffff\1\103\1\171\1\uffff\1\156\1\172\1\143\1\164\1\172\1\145\1\172\1\uffff\1\145\1\153\1\142\1\145\1\uffff\1\142\1\123\1\172\1\171\1\141\1\uffff\1\156\1\145\1\157\1\172\1\164\1\144\2\uffff\1\154\1\156\2\uffff\1\164\1\162\1\154\1\171\2\uffff\1\167\1\172\1\uffff\1\172\1\157\1\172\1\164\1\uffff\1\153\1\151\1\uffff\1\144\1\uffff\1\162\1\172\1\154\1\157\1\151\1\157\1\uffff\1\172\1\162\1\141\1\124\1\156\1\uffff\1\141\1\105\1\165\2\151\1\141\1\172\1\124\1\172\2\uffff\1\154\1\uffff\1\141\1\172\1\166\1\102\1\143\1\uffff\1\145\1\146\1\154\1\165\1\uffff\1\164\1\147\1\141\1\172\1\151\1\154\1\155\1\172\1\157\1\155\1\uffff\1\141\1\uffff\1\165\1\154\1\uffff\1\145\1\171\1\150\2\172\1\151\1\162\1\172\1\145\1\142\1\uffff\1\156\3\145\1\156\1\172\1\142\1\155\3\172\1\141\2\uffff\1\164\1\143\1\uffff\1\162\1\154\1\145\1\155\3\172\1\uffff\1\154\1\156\3\uffff\1\156\1\171\1\145\1\172\1\145\1\162\1\145\1\uffff\1\172\2\uffff\1\145\1\163\1\147\1\172\1\163\1\uffff\2\172\1\156\1\uffff\2\172\1\145\1\uffff\1\172\2\uffff\1\164\2\uffff\1\172\1\uffff\1\172\2\uffff"; static final String DFA21_acceptS = - "\2\uffff\1\2\1\3\21\uffff\1\64\1\65\1\66\1\67\1\70\1\uffff\1\72\1\73\1\74\20\uffff\1\176\2\177\1\u0082\1\u0083\3\uffff\1\176\1\2\1\3\64\uffff\1\77\1\124\1\62\1\64\1\65\1\66\1\67\1\70\1\uffff\1\117\1\71\1\72\1\73\1\74\1\75\1\131\1\122\1\76\1\114\1\132\1\123\1\100\1\u0080\1\u0081\1\125\1\101\1\126\1\120\1\102\1\104\1\103\1\105\1\136\1\106\1\170\1\uffff\1\127\1\uffff\1\133\1\121\1\135\1\167\1\134\1\142\1\uffff\1\173\1\uffff\1\174\1\175\1\177\1\u0082\11\uffff\1\147\5\uffff\1\46\1\uffff\1\137\2\uffff\1\130\26\uffff\1\42\26\uffff\1\63\2\uffff\1\111\1\107\1\112\1\110\1\115\1\116\13\uffff\1\55\13\uffff\1\163\21\uffff\1\150\1\151\20\uffff\1\145\2\uffff\1\154\4\uffff\1\22\11\uffff\1\10\11\uffff\1\156\5\uffff\1\140\12\uffff\1\24\5\uffff\1\43\1\144\2\uffff\1\40\7\uffff\1\53\1\157\6\uffff\1\47\15\uffff\1\52\1\uffff\1\161\13\uffff\1\153\6\uffff\1\33\1\166\4\uffff\1\146\2\uffff\1\155\7\uffff\1\37\5\uffff\1\57\5\uffff\1\160\6\uffff\1\30\1\45\2\uffff\1\60\1\141\4\uffff\1\34\1\162\2\uffff\1\41\4\uffff\1\1\2\uffff\1\6\1\uffff\1\143\2\uffff\1\23\4\uffff\1\12\5\uffff\1\152\11\uffff\1\54\1\44\1\uffff\1\164\5\uffff\1\7\4\uffff\1\36\12\uffff\1\172\1\uffff\1\56\2\uffff\1\20\12\uffff\1\61\14\uffff\1\25\1\113\2\uffff\1\26\7\uffff\1\35\2\uffff\1\171\1\4\1\5\7\uffff\1\17\1\uffff\1\21\1\15\5\uffff\1\13\3\uffff\1\165\3\uffff\1\11\1\uffff\1\32\1\14\1\uffff\1\31\1\50\1\uffff\1\27\1\uffff\1\51\1\16"; + "\2\uffff\1\2\1\3\21\uffff\1\63\1\64\1\65\1\66\1\67\1\uffff\1\71\1\72\1\73\20\uffff\1\175\2\176\1\u0081\1\u0082\3\uffff\1\175\1\2\1\3\64\uffff\1\76\1\123\1\61\1\63\1\64\1\65\1\66\1\67\1\uffff\1\116\1\70\1\71\1\72\1\73\1\74\1\130\1\121\1\75\1\113\1\131\1\122\1\77\1\177\1\u0080\1\124\1\100\1\125\1\117\1\101\1\103\1\102\1\104\1\135\1\105\1\167\1\uffff\1\126\1\uffff\1\132\1\120\1\134\1\166\1\133\1\141\1\uffff\1\172\1\uffff\1\173\1\174\1\176\1\u0081\11\uffff\1\146\5\uffff\1\45\1\uffff\1\136\2\uffff\1\127\26\uffff\1\41\26\uffff\1\62\2\uffff\1\110\1\106\1\111\1\107\1\114\1\115\13\uffff\1\54\13\uffff\1\162\21\uffff\1\147\1\150\20\uffff\1\144\2\uffff\1\153\4\uffff\1\22\10\uffff\1\10\11\uffff\1\155\5\uffff\1\137\12\uffff\1\23\5\uffff\1\42\1\143\2\uffff\1\37\7\uffff\1\52\1\156\6\uffff\1\46\14\uffff\1\51\1\uffff\1\160\13\uffff\1\152\6\uffff\1\32\1\165\4\uffff\1\145\2\uffff\1\154\7\uffff\1\36\4\uffff\1\56\5\uffff\1\157\6\uffff\1\27\1\44\2\uffff\1\57\1\140\4\uffff\1\33\1\161\2\uffff\1\40\4\uffff\1\1\2\uffff\1\6\1\uffff\1\142\6\uffff\1\12\5\uffff\1\151\11\uffff\1\53\1\43\1\uffff\1\163\5\uffff\1\7\4\uffff\1\35\12\uffff\1\171\1\uffff\1\55\2\uffff\1\20\12\uffff\1\60\14\uffff\1\24\1\112\2\uffff\1\25\7\uffff\1\34\2\uffff\1\170\1\4\1\5\7\uffff\1\17\1\uffff\1\21\1\15\5\uffff\1\13\3\uffff\1\164\3\uffff\1\11\1\uffff\1\31\1\14\1\uffff\1\30\1\47\1\uffff\1\26\1\uffff\1\50\1\16"; static final String DFA21_specialS = - "\1\0\u024f\uffff}>"; + "\1\0\u024b\uffff}>"; static final String[] DFA21_transitionS = { "\11\62\2\61\2\62\1\61\22\62\1\61\1\46\1\57\1\33\1\56\1\41\1\45\1\60\1\27\1\31\1\24\1\36\1\30\1\37\1\47\1\40\1\53\11\54\1\51\1\25\1\42\1\32\1\43\1\50\1\26\32\56\1\34\1\62\1\35\1\55\1\56\1\62\1\7\1\17\1\16\1\4\1\11\1\22\1\56\1\52\1\6\1\56\1\20\2\56\1\23\1\13\1\1\1\56\1\15\1\12\1\10\1\5\1\14\1\21\3\56\1\2\1\44\1\3\uff82\62", "\1\63\3\uffff\1\64\14\uffff\1\65", @@ -4727,7 +4698,8 @@ public class InternalPerspectiveDslLexer extends Lexer { "\1\u0135", "\1\u0136", "", - "\1\66\13\uffff\12\66\7\uffff\24\66\1\u0137\5\66\4\uffff\1\66\1\uffff\32\66", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u0138", "\1\u0139", "\1\u013a", "\1\u013b", @@ -4736,15 +4708,15 @@ public class InternalPerspectiveDslLexer extends Lexer { "\1\u013e", "\1\u013f", "\1\u0140", - "\1\u0141", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", + "\1\u0142", "\1\u0143", "\1\u0144", "\1\u0145", "\1\u0146", - "\1\u0147", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u0148", "\1\u0149", "\1\u014a", "\1\u014b", @@ -4754,222 +4726,222 @@ public class InternalPerspectiveDslLexer extends Lexer { "\1\u014f", "\1\u0150", "\1\u0151", - "\1\u0152", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", "", + "\1\u0153", "\1\u0154", "\1\u0155", "\1\u0156", "\1\u0157", - "\1\u0158", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u015a", "\1\u015b", - "\1\u015c", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u015d", "\1\u015e", "\1\u015f", "\1\u0160", "\1\u0161", "\1\u0162", - "\1\u0163", "", - "\1\u0164", + "\1\u0163", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u0166", "\1\u0167", "\1\u0168", - "\1\u0169", "", + "\1\u0169", "\1\u016a", "\1\u016b", - "\1\u016c", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u016d", "\1\u016e", "\1\u016f", "\1\u0170", + "", "\1\u0171", "\1\u0172", - "", "\1\u0173", "\1\u0174", "\1\u0175", "\1\u0176", "\1\u0177", "\1\u0178", - "\1\u0179", - "\1\u017a", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", - "\1\u017c", + "\1\u017a", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u017e", - "\1\u017f", - "\1\u0181\16\uffff\1\u0180", + "\1\u017c", + "\1\u017d", + "\1\u017f\16\uffff\1\u017e", "", + "\1\u0180", + "\1\u0181", "\1\u0182", "\1\u0183", "\1\u0184", "\1\u0185", "\1\u0186", - "\1\u0187", - "\1\u0188", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u0188", + "\1\u0189", + "", "\1\u018a", "\1\u018b", - "", "\1\u018c", "\1\u018d", - "\1\u018e", - "\1\u018f", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u0192", + "\1\u0190", "", + "\1\u0191", + "\1\u0192", "\1\u0193", - "\1\u0194", - "\1\u0195", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u0197", - "\1\u0198", + "\1\u0195", + "\1\u0196", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", "", + "\1\u0198", + "\1\u0199", "\1\u019a", "\1\u019b", "\1\u019c", "\1\u019d", - "\1\u019e", - "\1\u019f", "", - "\1\u01a0", + "\1\u019e", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u01a0", + "\1\u01a1", "\1\u01a2", "\1\u01a3", - "\1\u01a4", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u01a5", "\1\u01a6", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u01a7", "\1\u01a8", "\1\u01a9", - "\1\u01aa", - "\1\u01ab", - "\1\u01ac", "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", + "\1\u01ab", + "\1\u01ac", + "\1\u01ad", "\1\u01ae", "\1\u01af", - "\1\u01b0", - "\1\u01b1", - "\1\u01b2", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\4\66\1\u01b3\25\66", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\4\66\1\u01b0\25\66", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u01b6", - "\1\u01b7", + "\1\u01b3", + "\1\u01b4", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", + "\1\u01b7", + "\1\u01b8", + "\1\u01b9", "\1\u01ba", - "\1\u01bb", - "\1\u01bc", - "\1\u01bd", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", "", + "\1\u01bd", + "\1\u01be", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u01c0", + "", "\1\u01c1", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u01c3", + "\1\u01c2", "", - "\1\u01c4", + "\1\u01c3", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u01c5", - "", "\1\u01c6", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u01c8", - "\1\u01c9", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u01cb", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", + "\1\u01ca", + "\1\u01cb", + "\1\u01cc", "\1\u01cd", + "", "\1\u01ce", + "\1\u01cf", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u01d0", "\1\u01d1", - "", "\1\u01d2", + "", "\1\u01d3", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u01d4", "\1\u01d5", - "\1\u01d6", - "", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u01d7", "\1\u01d8", + "", + "", "\1\u01d9", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u01db", - "\1\u01dc", + "\1\u01da", "", "", + "\1\u01db", + "\1\u01dc", "\1\u01dd", "\1\u01de", "", "", "\1\u01df", - "\1\u01e0", - "\1\u01e1", - "\1\u01e2", - "", - "", - "\1\u01e3", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u01e6", + "\1\u01e2", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u01e8", + "\1\u01e4", "", - "\1\u01e9", - "\1\u01ea", + "\1\u01e5", + "\1\u01e6", "", - "\1\u01eb", + "\1\u01e7", "", - "\1\u01ec", + "\1\u01e8", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u01ea", + "\1\u01eb", + "\1\u01ec", + "\1\u01ed", "", - "\1\u01ee", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u01ef", "\1\u01f0", "\1\u01f1", + "\1\u01f2", "", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u01f3", "\1\u01f4", "\1\u01f5", "\1\u01f6", - "", "\1\u01f7", "\1\u01f8", - "\1\u01f9", - "\1\u01fa", - "\1\u01fb", - "\1\u01fc", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u01fe", + "\1\u01fa", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", "", - "\1\u0200", + "\1\u01fc", "", - "\1\u0201", + "\1\u01fd", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u01ff", + "\1\u0200", + "\1\u0201", + "", + "\1\u0202", "\1\u0203", "\1\u0204", "\1\u0205", @@ -4977,94 +4949,89 @@ public class InternalPerspectiveDslLexer extends Lexer { "\1\u0206", "\1\u0207", "\1\u0208", - "\1\u0209", - "", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u020a", "\1\u020b", "\1\u020c", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u020d", "\1\u020e", "\1\u020f", + "", "\1\u0210", + "", "\1\u0211", "\1\u0212", - "\1\u0213", "", + "\1\u0213", "\1\u0214", - "", "\1\u0215", - "\1\u0216", - "", - "\1\u0217", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u0218", "\1\u0219", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u021b", "\1\u021c", + "", "\1\u021d", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "\1\u021e", "\1\u021f", "\1\u0220", - "", "\1\u0221", - "\1\u0222", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u0223", "\1\u0224", - "\1\u0225", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u0227", - "\1\u0228", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u022c", + "\1\u0228", + "", "", + "\1\u0229", + "\1\u022a", "", + "\1\u022b", + "\1\u022c", "\1\u022d", "\1\u022e", - "", - "\1\u022f", - "\1\u0230", - "\1\u0231", - "\1\u0232", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\3\66\1\u0234\26\66", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\3\66\1\u0230\26\66", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", - "\1\u0237", - "\1\u0238", + "\1\u0233", + "\1\u0234", "", "", "", + "\1\u0235", + "\1\u0236", + "\1\u0237", + "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\u0239", "\1\u023a", "\1\u023b", + "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", + "", + "", "\1\u023d", "\1\u023e", "\1\u023f", - "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "", - "", "\1\u0241", - "\1\u0242", - "\1\u0243", - "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u0245", "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u0248", + "\1\u0244", "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", - "\1\u024b", + "\1\u0247", "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", "", "", - "\1\u024d", + "\1\u0249", "", "", "\1\66\13\uffff\12\66\7\uffff\32\66\4\uffff\1\66\1\uffff\32\66", @@ -5104,7 +5071,7 @@ public class InternalPerspectiveDslLexer extends Lexer { this.transition = DFA21_transition; } public String getDescription() { - return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_ID | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; diff --git a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDslParser.java b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDslParser.java index 9f13196..b6bda2d 100644 --- a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDslParser.java +++ b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/parser/antlr/internal/InternalPerspectiveDslParser.java @@ -40,7 +40,7 @@ import java.util.HashMap; @SuppressWarnings("all") public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_HEX", "RULE_DECIMAL", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'{'", "'}'", "'perspective'", "'describedBy'", "'process'", "'usertask'", "'icon'", "'accessibility'", "'toolbar'", "'eventManager'", "'sashContainer'", "'orientation'", "'selectedElement'", "'spaceVolume'", "'partStack'", "'synchronize'", "'part'", "'iconURI'", "'view'", "'isClosable'", "'targetPart'", "'allowedSources'", "'select'", "'readOnlyTable'", "'editableTable'", "'chart'", "'report'", "'organigram'", "'topology'", "'dialog'", "'bpmn'", "'kanban'", "'of'", "'card'", "'welcome'", "'search'", "'in'", "'depth'", "'filterColumns'", "'dataInterchange'", "'title'", "'name'", "'browser'", "'url'", "'cubeView'", "'import'", "'static'", "'extension'", "'*'", "'ns'", "';'", "'@'", "'('", "','", "')'", "'='", "'#'", "'['", "']'", "'+='", "'-='", "'*='", "'/='", "'%='", "'<'", "'>'", "'>='", "'||'", "'&&'", "'=='", "'!='", "'==='", "'!=='", "'instanceof'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'**'", "'/'", "'%'", "'!'", "'as'", "'++'", "'--'", "'.'", "'::'", "'?.'", "'|'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'var'", "'val'", "'extends'", "'super'", "'new'", "'false'", "'true'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'horizontal'", "'vertical'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_HEX", "RULE_DECIMAL", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'package'", "'{'", "'}'", "'perspective'", "'describedBy'", "'process'", "'usertask'", "'icon'", "'accessibility'", "'toolbar'", "'eventManager'", "'sashContainer'", "'orientation'", "'selectedElement'", "'spaceVolume'", "'partStack'", "'synchronize'", "'part'", "'view'", "'isClosable'", "'targetPart'", "'allowedSources'", "'select'", "'readOnlyTable'", "'editableTable'", "'chart'", "'report'", "'organigram'", "'topology'", "'dialog'", "'bpmn'", "'kanban'", "'of'", "'card'", "'welcome'", "'search'", "'in'", "'depth'", "'filterColumns'", "'dataInterchange'", "'title'", "'name'", "'browser'", "'url'", "'cubeView'", "'import'", "'static'", "'extension'", "'*'", "'ns'", "';'", "'@'", "'('", "','", "')'", "'='", "'#'", "'['", "']'", "'+='", "'-='", "'*='", "'/='", "'%='", "'<'", "'>'", "'>='", "'||'", "'&&'", "'=='", "'!='", "'==='", "'!=='", "'instanceof'", "'->'", "'..<'", "'..'", "'=>'", "'<>'", "'?:'", "'+'", "'-'", "'**'", "'/'", "'%'", "'!'", "'as'", "'++'", "'--'", "'.'", "'::'", "'?.'", "'|'", "'if'", "'else'", "'switch'", "':'", "'default'", "'case'", "'for'", "'while'", "'do'", "'var'", "'val'", "'extends'", "'super'", "'new'", "'false'", "'true'", "'null'", "'typeof'", "'throw'", "'return'", "'try'", "'finally'", "'synchronized'", "'catch'", "'?'", "'&'", "'horizontal'", "'vertical'" }; public static final int RULE_HEX=7; public static final int T__50=50; @@ -57,7 +57,6 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { public static final int T__132=132; public static final int T__60=60; public static final int T__61=61; - public static final int T__134=134; public static final int RULE_ID=4; public static final int T__131=131; public static final int T__130=130; @@ -278,7 +277,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt1=2; int LA1_0 = input.LA(1); - if ( (LA1_0==59) ) { + if ( (LA1_0==58) ) { alt1=1; } switch (alt1) { @@ -2650,7 +2649,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // $ANTLR start "rulePerspectivePart" - // InternalPerspectiveDsl.g:975:1: rulePerspectivePart returns [EObject current=null] : ( () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) ) ; + // InternalPerspectiveDsl.g:975:1: rulePerspectivePart returns [EObject current=null] : ( () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) ) ; public final EObject rulePerspectivePart() throws RecognitionException { EObject current = null; @@ -2672,11 +2671,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { enterRule(); try { - // InternalPerspectiveDsl.g:981:2: ( ( () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) ) ) - // InternalPerspectiveDsl.g:982:2: ( () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) ) + // InternalPerspectiveDsl.g:981:2: ( ( () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) ) ) + // InternalPerspectiveDsl.g:982:2: ( () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) ) { - // InternalPerspectiveDsl.g:982:2: ( () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) ) - // InternalPerspectiveDsl.g:983:3: () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) + // InternalPerspectiveDsl.g:982:2: ( () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) ) + // InternalPerspectiveDsl.g:983:3: () otherlv_1= 'part' ( (lv_elementId_2_0= ruleTRANSLATABLEID ) ) ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) { // InternalPerspectiveDsl.g:983:3: () // InternalPerspectiveDsl.g:984:4: @@ -2732,17 +2731,17 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - // InternalPerspectiveDsl.g:1013:3: ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) - // InternalPerspectiveDsl.g:1014:4: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) + // InternalPerspectiveDsl.g:1013:3: ( ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) ) + // InternalPerspectiveDsl.g:1014:4: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) { - // InternalPerspectiveDsl.g:1014:4: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) - // InternalPerspectiveDsl.g:1015:5: ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) + // InternalPerspectiveDsl.g:1014:4: ( ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) ) + // InternalPerspectiveDsl.g:1015:5: ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) { getUnorderedGroupHelper().enter(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3()); - // InternalPerspectiveDsl.g:1018:5: ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) - // InternalPerspectiveDsl.g:1019:6: ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* + // InternalPerspectiveDsl.g:1018:5: ( ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* ) + // InternalPerspectiveDsl.g:1019:6: ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* { - // InternalPerspectiveDsl.g:1019:6: ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* + // InternalPerspectiveDsl.g:1019:6: ( ({...}? => ( ({...}? => (otherlv_4= 'spaceVolume' ( (lv_containerData_5_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_6= 'accessibility' ( (lv_accessibilityPhrase_7_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) | ({...}? => ( ({...}? => (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) ) ) ) | ({...}? => ( ({...}? => ( (lv_isClosable_12_0= 'isClosable' ) ) ) ) ) )* loop15: do { int alt15=6; @@ -2754,13 +2753,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { else if ( LA15_0 == 21 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 1) ) { alt15=2; } - else if ( LA15_0 == 31 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { + else if ( LA15_0 == 20 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { alt15=3; } - else if ( LA15_0 == 32 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { + else if ( LA15_0 == 31 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 3) ) { alt15=4; } - else if ( LA15_0 == 33 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { + else if ( LA15_0 == 32 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 4) ) { alt15=5; } @@ -2919,33 +2918,33 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; case 3 : - // InternalPerspectiveDsl.g:1086:4: ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) + // InternalPerspectiveDsl.g:1086:4: ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) { - // InternalPerspectiveDsl.g:1086:4: ({...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) - // InternalPerspectiveDsl.g:1087:5: {...}? => ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) + // InternalPerspectiveDsl.g:1086:4: ({...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) ) + // InternalPerspectiveDsl.g:1087:5: {...}? => ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) { if ( ! getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2) ) { if (state.backtracking>0) {state.failed=true; return current;} throw new FailedPredicateException(input, "rulePerspectivePart", "getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2)"); } - // InternalPerspectiveDsl.g:1087:112: ( ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) - // InternalPerspectiveDsl.g:1088:6: ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) + // InternalPerspectiveDsl.g:1087:112: ( ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) ) + // InternalPerspectiveDsl.g:1088:6: ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) { getUnorderedGroupHelper().select(grammarAccess.getPerspectivePartAccess().getUnorderedGroup_3(), 2); - // InternalPerspectiveDsl.g:1091:9: ({...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) - // InternalPerspectiveDsl.g:1091:10: {...}? => (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) + // InternalPerspectiveDsl.g:1091:9: ({...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) ) + // InternalPerspectiveDsl.g:1091:10: {...}? => (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) { if ( !((true)) ) { if (state.backtracking>0) {state.failed=true; return current;} throw new FailedPredicateException(input, "rulePerspectivePart", "true"); } - // InternalPerspectiveDsl.g:1091:19: (otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) ) - // InternalPerspectiveDsl.g:1091:20: otherlv_8= 'iconURI' ( (lv_iconURI_9_0= RULE_STRING ) ) + // InternalPerspectiveDsl.g:1091:19: (otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) ) + // InternalPerspectiveDsl.g:1091:20: otherlv_8= 'icon' ( (lv_iconURI_9_0= RULE_STRING ) ) { - otherlv_8=(Token)match(input,31,FOLLOW_8); if (state.failed) return current; + otherlv_8=(Token)match(input,20,FOLLOW_8); if (state.failed) return current; if ( state.backtracking==0 ) { - newLeafNode(otherlv_8, grammarAccess.getPerspectivePartAccess().getIconURIKeyword_3_2_0()); + newLeafNode(otherlv_8, grammarAccess.getPerspectivePartAccess().getIconKeyword_3_2_0()); } // InternalPerspectiveDsl.g:1095:9: ( (lv_iconURI_9_0= RULE_STRING ) ) @@ -3018,7 +3017,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:1124:19: (otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) ) // InternalPerspectiveDsl.g:1124:20: otherlv_10= 'view' ( (lv_view_11_0= rulePerspectiveView ) ) { - otherlv_10=(Token)match(input,32,FOLLOW_19); if (state.failed) return current; + otherlv_10=(Token)match(input,31,FOLLOW_19); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_10, grammarAccess.getPerspectivePartAccess().getViewKeyword_3_3_0()); @@ -3102,7 +3101,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:1158:20: (lv_isClosable_12_0= 'isClosable' ) // InternalPerspectiveDsl.g:1159:10: lv_isClosable_12_0= 'isClosable' { - lv_isClosable_12_0=(Token)match(input,33,FOLLOW_18); if (state.failed) return current; + lv_isClosable_12_0=(Token)match(input,32,FOLLOW_18); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_isClosable_12_0, grammarAccess.getPerspectivePartAccess().getIsClosableIsClosableKeyword_3_4_0()); @@ -3291,7 +3290,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt16=2; int LA16_0 = input.LA(1); - if ( (LA16_0==34) ) { + if ( (LA16_0==33) ) { alt16=1; } @@ -3443,7 +3442,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,34,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,33,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveEventAccess().getTargetPartKeyword_1()); @@ -3474,7 +3473,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,35,FOLLOW_20); if (state.failed) return current; + otherlv_3=(Token)match(input,34,FOLLOW_20); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getPerspectiveEventAccess().getAllowedSourcesKeyword_3()); @@ -3647,82 +3646,82 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:1340:2: (this_PerspectiveSelection_0= rulePerspectiveSelection | this_PerspectiveTable_1= rulePerspectiveTable | this_PerspectiveChart_2= rulePerspectiveChart | this_PerspectiveReport_3= rulePerspectiveReport | this_PerspectiveOrganization_4= rulePerspectiveOrganization | this_PerspectiveTopology_5= rulePerspectiveTopology | this_PerspectiveDialog_6= rulePerspectiveDialog | this_PerspectiveGrid_7= rulePerspectiveGrid | this_PerspectiveWelcome_8= rulePerspectiveWelcome | this_PerspectiveSearch_9= rulePerspectiveSearch | this_PerspectiveDataInterchange_10= rulePerspectiveDataInterchange | this_PerspectiveBPMN_11= rulePerspectiveBPMN | this_PerspectiveKanban_12= rulePerspectiveKanban | this_PerspectiveTitle_13= rulePerspectiveTitle | this_PerspectiveDashboard_14= rulePerspectiveDashboard | this_PerspectiveBrowser_15= rulePerspectiveBrowser ) int alt18=16; switch ( input.LA(1) ) { - case 36: + case 35: { alt18=1; } break; - case 37: + case 36: { alt18=2; } break; - case 39: + case 38: { alt18=3; } break; - case 40: + case 39: { alt18=4; } break; - case 41: + case 40: { alt18=5; } break; - case 42: + case 41: { alt18=6; } break; - case 43: + case 42: { alt18=7; } break; - case 38: + case 37: { alt18=8; } break; - case 48: + case 47: { alt18=9; } break; - case 49: + case 48: { alt18=10; } break; - case 53: + case 52: { alt18=11; } break; - case 44: + case 43: { alt18=12; } break; - case 45: + case 44: { alt18=13; } break; - case 54: + case 53: { alt18=14; } break; - case 55: + case 54: { alt18=15; } break; - case 56: + case 55: { alt18=16; } @@ -4183,7 +4182,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,36,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,35,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveSelectionAccess().getSelectKeyword_1()); @@ -4309,7 +4308,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,37,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,36,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveTableAccess().getReadOnlyTableKeyword_1()); @@ -4435,7 +4434,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,38,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,37,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveGridAccess().getEditableTableKeyword_1()); @@ -4561,7 +4560,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,39,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,38,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveChartAccess().getChartKeyword_1()); @@ -4687,7 +4686,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,40,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,39,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveReportAccess().getReportKeyword_1()); @@ -4813,7 +4812,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,41,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,40,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveOrganizationAccess().getOrganigramKeyword_1()); @@ -4939,7 +4938,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,42,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,41,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveTopologyAccess().getTopologyKeyword_1()); @@ -5065,7 +5064,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,43,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,42,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveDialogAccess().getDialogKeyword_1()); @@ -5190,7 +5189,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,44,FOLLOW_2); if (state.failed) return current; + otherlv_1=(Token)match(input,43,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveBPMNAccess().getBpmnKeyword_1()); @@ -5296,13 +5295,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,45,FOLLOW_24); if (state.failed) return current; + otherlv_1=(Token)match(input,44,FOLLOW_24); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveKanbanAccess().getKanbanKeyword_1()); } - otherlv_2=(Token)match(input,46,FOLLOW_4); if (state.failed) return current; + otherlv_2=(Token)match(input,45,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getPerspectiveKanbanAccess().getOfKeyword_2()); @@ -5333,7 +5332,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_4=(Token)match(input,47,FOLLOW_4); if (state.failed) return current; + otherlv_4=(Token)match(input,46,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getPerspectiveKanbanAccess().getCardKeyword_4()); @@ -5364,7 +5363,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,43,FOLLOW_4); if (state.failed) return current; + otherlv_6=(Token)match(input,42,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getPerspectiveKanbanAccess().getDialogKeyword_6()); @@ -5489,7 +5488,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,48,FOLLOW_2); if (state.failed) return current; + otherlv_1=(Token)match(input,47,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveWelcomeAccess().getWelcomeKeyword_1()); @@ -5595,13 +5594,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,49,FOLLOW_27); if (state.failed) return current; + otherlv_1=(Token)match(input,48,FOLLOW_27); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveSearchAccess().getSearchKeyword_1()); } - otherlv_2=(Token)match(input,50,FOLLOW_4); if (state.failed) return current; + otherlv_2=(Token)match(input,49,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getPerspectiveSearchAccess().getInKeyword_2()); @@ -5648,10 +5647,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt19=3; int LA19_0 = input.LA(1); - if ( LA19_0 == 51 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 0) ) { + if ( LA19_0 == 50 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 0) ) { alt19=1; } - else if ( LA19_0 == 52 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 1) ) { + else if ( LA19_0 == 51 && getUnorderedGroupHelper().canSelect(grammarAccess.getPerspectiveSearchAccess().getUnorderedGroup_4(), 1) ) { alt19=2; } @@ -5681,7 +5680,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2028:19: (otherlv_5= 'depth' ( (lv_depth_6_0= RULE_INT ) ) ) // InternalPerspectiveDsl.g:2028:20: otherlv_5= 'depth' ( (lv_depth_6_0= RULE_INT ) ) { - otherlv_5=(Token)match(input,51,FOLLOW_29); if (state.failed) return current; + otherlv_5=(Token)match(input,50,FOLLOW_29); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_5, grammarAccess.getPerspectiveSearchAccess().getDepthKeyword_4_0_0()); @@ -5757,7 +5756,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2061:19: (otherlv_7= 'filterColumns' ( (lv_filterCols_8_0= RULE_INT ) ) ) // InternalPerspectiveDsl.g:2061:20: otherlv_7= 'filterColumns' ( (lv_filterCols_8_0= RULE_INT ) ) { - otherlv_7=(Token)match(input,52,FOLLOW_29); if (state.failed) return current; + otherlv_7=(Token)match(input,51,FOLLOW_29); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_7, grammarAccess.getPerspectiveSearchAccess().getFilterColumnsKeyword_4_1_0()); @@ -5920,7 +5919,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,53,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,52,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveDataInterchangeAccess().getDataInterchangeKeyword_1()); @@ -6046,7 +6045,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,54,FOLLOW_8); if (state.failed) return current; + otherlv_1=(Token)match(input,53,FOLLOW_8); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveTitleAccess().getTitleKeyword_1()); @@ -6177,7 +6176,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,55,FOLLOW_8); if (state.failed) return current; + otherlv_1=(Token)match(input,54,FOLLOW_8); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveDashboardAccess().getNameKeyword_1()); @@ -6310,7 +6309,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,56,FOLLOW_30); if (state.failed) return current; + otherlv_1=(Token)match(input,55,FOLLOW_30); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPerspectiveBrowserAccess().getBrowserKeyword_1()); @@ -6320,10 +6319,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt20=2; int LA20_0 = input.LA(1); - if ( (LA20_0==57) ) { + if ( (LA20_0==56) ) { alt20=1; } - else if ( (LA20_0==58) ) { + else if ( (LA20_0==57) ) { alt20=2; } else { @@ -6340,7 +6339,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2266:4: (otherlv_2= 'url' ( (lv_url_3_0= RULE_STRING ) ) ) // InternalPerspectiveDsl.g:2267:5: otherlv_2= 'url' ( (lv_url_3_0= RULE_STRING ) ) { - otherlv_2=(Token)match(input,57,FOLLOW_8); if (state.failed) return current; + otherlv_2=(Token)match(input,56,FOLLOW_8); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getPerspectiveBrowserAccess().getUrlKeyword_2_0_0()); @@ -6391,7 +6390,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2292:5: (lv_cubeView_4_0= 'cubeView' ) // InternalPerspectiveDsl.g:2293:6: lv_cubeView_4_0= 'cubeView' { - lv_cubeView_4_0=(Token)match(input,58,FOLLOW_2); if (state.failed) return current; + lv_cubeView_4_0=(Token)match(input,57,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_cubeView_4_0, grammarAccess.getPerspectiveBrowserAccess().getCubeViewCubeViewKeyword_2_1_0()); @@ -6694,7 +6693,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,59,FOLLOW_31); if (state.failed) return current; + otherlv_1=(Token)match(input,58,FOLLOW_31); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXImportDeclarationAccess().getImportKeyword_1()); @@ -6716,7 +6715,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2387:6: (lv_static_2_0= 'static' ) // InternalPerspectiveDsl.g:2388:7: lv_static_2_0= 'static' { - lv_static_2_0=(Token)match(input,60,FOLLOW_32); if (state.failed) return current; + lv_static_2_0=(Token)match(input,59,FOLLOW_32); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_static_2_0, grammarAccess.getXImportDeclarationAccess().getStaticStaticKeyword_2_0_0_0()); @@ -6740,7 +6739,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt21=2; int LA21_0 = input.LA(1); - if ( (LA21_0==61) ) { + if ( (LA21_0==60) ) { alt21=1; } switch (alt21) { @@ -6750,7 +6749,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2401:6: (lv_extension_3_0= 'extension' ) // InternalPerspectiveDsl.g:2402:7: lv_extension_3_0= 'extension' { - lv_extension_3_0=(Token)match(input,61,FOLLOW_32); if (state.failed) return current; + lv_extension_3_0=(Token)match(input,60,FOLLOW_32); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_extension_3_0, grammarAccess.getXImportDeclarationAccess().getExtensionExtensionKeyword_2_0_1_0()); @@ -6811,7 +6810,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt22=2; int LA22_0 = input.LA(1); - if ( (LA22_0==62) ) { + if ( (LA22_0==61) ) { alt22=1; } else if ( (LA22_0==RULE_ID) ) { @@ -6834,7 +6833,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2432:7: (lv_wildcard_5_0= '*' ) // InternalPerspectiveDsl.g:2433:8: lv_wildcard_5_0= '*' { - lv_wildcard_5_0=(Token)match(input,62,FOLLOW_34); if (state.failed) return current; + lv_wildcard_5_0=(Token)match(input,61,FOLLOW_34); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_wildcard_5_0, grammarAccess.getXImportDeclarationAccess().getWildcardAsteriskKeyword_2_0_3_0_0()); @@ -7000,7 +6999,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2507:6: (lv_fqnImport_9_0= 'ns' ) // InternalPerspectiveDsl.g:2508:7: lv_fqnImport_9_0= 'ns' { - lv_fqnImport_9_0=(Token)match(input,63,FOLLOW_4); if (state.failed) return current; + lv_fqnImport_9_0=(Token)match(input,62,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_fqnImport_9_0, grammarAccess.getXImportDeclarationAccess().getFqnImportNsKeyword_2_3_0_0()); @@ -7068,14 +7067,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt24=2; int LA24_0 = input.LA(1); - if ( (LA24_0==64) ) { + if ( (LA24_0==63) ) { alt24=1; } switch (alt24) { case 1 : // InternalPerspectiveDsl.g:2542:4: otherlv_11= ';' { - otherlv_11=(Token)match(input,64,FOLLOW_2); if (state.failed) return current; + otherlv_11=(Token)match(input,63,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_11, grammarAccess.getXImportDeclarationAccess().getSemicolonKeyword_3()); @@ -7190,7 +7189,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,65,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,64,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXAnnotationAccess().getCommercialAtKeyword_1()); @@ -7234,7 +7233,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt27=2; int LA27_0 = input.LA(1); - if ( (LA27_0==66) && (synpred1_InternalPerspectiveDsl())) { + if ( (LA27_0==65) && (synpred1_InternalPerspectiveDsl())) { alt27=1; } switch (alt27) { @@ -7244,7 +7243,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2594:4: ( ( '(' )=>otherlv_3= '(' ) // InternalPerspectiveDsl.g:2595:5: ( '(' )=>otherlv_3= '(' { - otherlv_3=(Token)match(input,66,FOLLOW_36); if (state.failed) return current; + otherlv_3=(Token)match(input,65,FOLLOW_36); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getXAnnotationAccess().getLeftParenthesisKeyword_3_0()); @@ -7304,7 +7303,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt25=2; int LA25_0 = input.LA(1); - if ( (LA25_0==67) ) { + if ( (LA25_0==66) ) { alt25=1; } @@ -7313,7 +7312,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:2632:7: otherlv_5= ',' ( ( ( ( ( ruleValidID ) ) '=' ) )=> (lv_elementValuePairs_6_0= ruleXAnnotationElementValuePair ) ) { - otherlv_5=(Token)match(input,67,FOLLOW_4); if (state.failed) return current; + otherlv_5=(Token)match(input,66,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_5, grammarAccess.getXAnnotationAccess().getCommaKeyword_3_1_0_1_0()); @@ -7413,7 +7412,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_8=(Token)match(input,68,FOLLOW_2); if (state.failed) return current; + otherlv_8=(Token)match(input,67,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_8, grammarAccess.getXAnnotationAccess().getRightParenthesisKeyword_3_2()); @@ -7548,7 +7547,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,69,FOLLOW_40); if (state.failed) return current; + otherlv_1=(Token)match(input,68,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValuePairAccess().getEqualsSignKeyword_0_0_1()); @@ -7714,13 +7713,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,70,FOLLOW_41); if (state.failed) return current; + otherlv_1=(Token)match(input,69,FOLLOW_41); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getNumberSignKeyword_0_0_0_1()); } - otherlv_2=(Token)match(input,71,FOLLOW_42); if (state.failed) return current; + otherlv_2=(Token)match(input,70,FOLLOW_42); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getLeftSquareBracketKeyword_0_0_0_2()); @@ -7736,7 +7735,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt29=2; int LA29_0 = input.LA(1); - if ( ((LA29_0>=RULE_ID && LA29_0<=RULE_DECIMAL)||LA29_0==14||(LA29_0>=59 && LA29_0<=61)||(LA29_0>=65 && LA29_0<=66)||(LA29_0>=70 && LA29_0<=71)||LA29_0==78||(LA29_0>=94 && LA29_0<=95)||LA29_0==99||LA29_0==107||LA29_0==109||(LA29_0>=113 && LA29_0<=115)||(LA29_0>=118 && LA29_0<=127)||LA29_0==129) ) { + if ( ((LA29_0>=RULE_ID && LA29_0<=RULE_DECIMAL)||LA29_0==14||(LA29_0>=58 && LA29_0<=60)||(LA29_0>=64 && LA29_0<=65)||(LA29_0>=69 && LA29_0<=70)||LA29_0==77||(LA29_0>=93 && LA29_0<=94)||LA29_0==98||LA29_0==106||LA29_0==108||(LA29_0>=112 && LA29_0<=114)||(LA29_0>=117 && LA29_0<=126)||LA29_0==128) ) { alt29=1; } switch (alt29) { @@ -7784,7 +7783,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt28=2; int LA28_0 = input.LA(1); - if ( (LA28_0==67) ) { + if ( (LA28_0==66) ) { alt28=1; } @@ -7793,7 +7792,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:2830:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) { - otherlv_4=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_0_1_1_0()); @@ -7849,7 +7848,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,72,FOLLOW_2); if (state.failed) return current; + otherlv_6=(Token)match(input,71,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getRightSquareBracketKeyword_0_2()); @@ -7887,7 +7886,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt31=2; int LA31_0 = input.LA(1); - if ( (LA31_0==67) ) { + if ( (LA31_0==66) ) { alt31=1; } switch (alt31) { @@ -7914,7 +7913,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt30=2; int LA30_0 = input.LA(1); - if ( (LA30_0==67) ) { + if ( (LA30_0==66) ) { alt30=1; } @@ -7923,7 +7922,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:2879:6: otherlv_9= ',' ( (lv_elements_10_0= ruleXAnnotationOrExpression ) ) { - otherlv_9=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; + otherlv_9=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_9, grammarAccess.getXAnnotationElementValueOrCommaListAccess().getCommaKeyword_1_1_1_0()); @@ -8106,13 +8105,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,70,FOLLOW_41); if (state.failed) return current; + otherlv_1=(Token)match(input,69,FOLLOW_41); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXAnnotationElementValueAccess().getNumberSignKeyword_0_0_0_1()); } - otherlv_2=(Token)match(input,71,FOLLOW_42); if (state.failed) return current; + otherlv_2=(Token)match(input,70,FOLLOW_42); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXAnnotationElementValueAccess().getLeftSquareBracketKeyword_0_0_0_2()); @@ -8128,7 +8127,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt34=2; int LA34_0 = input.LA(1); - if ( ((LA34_0>=RULE_ID && LA34_0<=RULE_DECIMAL)||LA34_0==14||(LA34_0>=59 && LA34_0<=61)||(LA34_0>=65 && LA34_0<=66)||(LA34_0>=70 && LA34_0<=71)||LA34_0==78||(LA34_0>=94 && LA34_0<=95)||LA34_0==99||LA34_0==107||LA34_0==109||(LA34_0>=113 && LA34_0<=115)||(LA34_0>=118 && LA34_0<=127)||LA34_0==129) ) { + if ( ((LA34_0>=RULE_ID && LA34_0<=RULE_DECIMAL)||LA34_0==14||(LA34_0>=58 && LA34_0<=60)||(LA34_0>=64 && LA34_0<=65)||(LA34_0>=69 && LA34_0<=70)||LA34_0==77||(LA34_0>=93 && LA34_0<=94)||LA34_0==98||LA34_0==106||LA34_0==108||(LA34_0>=112 && LA34_0<=114)||(LA34_0>=117 && LA34_0<=126)||LA34_0==128) ) { alt34=1; } switch (alt34) { @@ -8176,7 +8175,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt33=2; int LA33_0 = input.LA(1); - if ( (LA33_0==67) ) { + if ( (LA33_0==66) ) { alt33=1; } @@ -8185,7 +8184,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:2972:6: otherlv_4= ',' ( (lv_elements_5_0= ruleXAnnotationOrExpression ) ) { - otherlv_4=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXAnnotationElementValueAccess().getCommaKeyword_0_1_1_0()); @@ -8241,7 +8240,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,72,FOLLOW_2); if (state.failed) return current; + otherlv_6=(Token)match(input,71,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXAnnotationElementValueAccess().getRightSquareBracketKeyword_0_2()); @@ -8360,10 +8359,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt36=2; int LA36_0 = input.LA(1); - if ( (LA36_0==65) ) { + if ( (LA36_0==64) ) { alt36=1; } - else if ( ((LA36_0>=RULE_ID && LA36_0<=RULE_DECIMAL)||LA36_0==14||(LA36_0>=59 && LA36_0<=61)||LA36_0==66||(LA36_0>=70 && LA36_0<=71)||LA36_0==78||(LA36_0>=94 && LA36_0<=95)||LA36_0==99||LA36_0==107||LA36_0==109||(LA36_0>=113 && LA36_0<=115)||(LA36_0>=118 && LA36_0<=127)||LA36_0==129) ) { + else if ( ((LA36_0>=RULE_ID && LA36_0<=RULE_DECIMAL)||LA36_0==14||(LA36_0>=58 && LA36_0<=60)||LA36_0==65||(LA36_0>=69 && LA36_0<=70)||LA36_0==77||(LA36_0>=93 && LA36_0<=94)||LA36_0==98||LA36_0==106||LA36_0==108||(LA36_0>=112 && LA36_0<=114)||(LA36_0>=117 && LA36_0<=126)||LA36_0==128) ) { alt36=2; } else { @@ -8600,10 +8599,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { int LA38_1 = input.LA(2); - if ( (LA38_1==69) ) { + if ( (LA38_1==68) ) { alt38=1; } - else if ( (LA38_1==EOF||(LA38_1>=RULE_ID && LA38_1<=RULE_DECIMAL)||(LA38_1>=14 && LA38_1<=15)||(LA38_1>=59 && LA38_1<=62)||LA38_1==64||(LA38_1>=66 && LA38_1<=68)||(LA38_1>=70 && LA38_1<=105)||(LA38_1>=107 && LA38_1<=130)) ) { + else if ( (LA38_1==EOF||(LA38_1>=RULE_ID && LA38_1<=RULE_DECIMAL)||(LA38_1>=14 && LA38_1<=15)||(LA38_1>=58 && LA38_1<=61)||LA38_1==63||(LA38_1>=65 && LA38_1<=67)||(LA38_1>=69 && LA38_1<=104)||(LA38_1>=106 && LA38_1<=129)) ) { alt38=2; } else { @@ -8615,14 +8614,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } break; - case 118: + case 117: { int LA38_2 = input.LA(2); - if ( (LA38_2==69) ) { + if ( (LA38_2==68) ) { alt38=1; } - else if ( (LA38_2==EOF||(LA38_2>=RULE_ID && LA38_2<=RULE_DECIMAL)||(LA38_2>=14 && LA38_2<=15)||(LA38_2>=59 && LA38_2<=62)||LA38_2==64||(LA38_2>=66 && LA38_2<=68)||(LA38_2>=70 && LA38_2<=105)||(LA38_2>=107 && LA38_2<=130)) ) { + else if ( (LA38_2==EOF||(LA38_2>=RULE_ID && LA38_2<=RULE_DECIMAL)||(LA38_2>=14 && LA38_2<=15)||(LA38_2>=58 && LA38_2<=61)||LA38_2==63||(LA38_2>=65 && LA38_2<=67)||(LA38_2>=69 && LA38_2<=104)||(LA38_2>=106 && LA38_2<=129)) ) { alt38=2; } else { @@ -8634,14 +8633,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } break; - case 60: + case 59: { int LA38_3 = input.LA(2); - if ( (LA38_3==69) ) { + if ( (LA38_3==68) ) { alt38=1; } - else if ( (LA38_3==EOF||(LA38_3>=RULE_ID && LA38_3<=RULE_DECIMAL)||(LA38_3>=14 && LA38_3<=15)||(LA38_3>=59 && LA38_3<=62)||LA38_3==64||(LA38_3>=66 && LA38_3<=68)||(LA38_3>=70 && LA38_3<=105)||(LA38_3>=107 && LA38_3<=130)) ) { + else if ( (LA38_3==EOF||(LA38_3>=RULE_ID && LA38_3<=RULE_DECIMAL)||(LA38_3>=14 && LA38_3<=15)||(LA38_3>=58 && LA38_3<=61)||LA38_3==63||(LA38_3>=65 && LA38_3<=67)||(LA38_3>=69 && LA38_3<=104)||(LA38_3>=106 && LA38_3<=129)) ) { alt38=2; } else { @@ -8653,14 +8652,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } break; - case 59: + case 58: { int LA38_4 = input.LA(2); - if ( (LA38_4==69) ) { + if ( (LA38_4==68) ) { alt38=1; } - else if ( (LA38_4==EOF||(LA38_4>=RULE_ID && LA38_4<=RULE_DECIMAL)||(LA38_4>=14 && LA38_4<=15)||(LA38_4>=59 && LA38_4<=62)||LA38_4==64||(LA38_4>=66 && LA38_4<=68)||(LA38_4>=70 && LA38_4<=105)||(LA38_4>=107 && LA38_4<=130)) ) { + else if ( (LA38_4==EOF||(LA38_4>=RULE_ID && LA38_4<=RULE_DECIMAL)||(LA38_4>=14 && LA38_4<=15)||(LA38_4>=58 && LA38_4<=61)||LA38_4==63||(LA38_4>=65 && LA38_4<=67)||(LA38_4>=69 && LA38_4<=104)||(LA38_4>=106 && LA38_4<=129)) ) { alt38=2; } else { @@ -8672,14 +8671,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } break; - case 61: + case 60: { int LA38_5 = input.LA(2); - if ( (LA38_5==69) ) { + if ( (LA38_5==68) ) { alt38=1; } - else if ( (LA38_5==EOF||(LA38_5>=RULE_ID && LA38_5<=RULE_DECIMAL)||(LA38_5>=14 && LA38_5<=15)||(LA38_5>=59 && LA38_5<=62)||LA38_5==64||(LA38_5>=66 && LA38_5<=68)||(LA38_5>=70 && LA38_5<=105)||(LA38_5>=107 && LA38_5<=130)) ) { + else if ( (LA38_5==EOF||(LA38_5>=RULE_ID && LA38_5<=RULE_DECIMAL)||(LA38_5>=14 && LA38_5<=15)||(LA38_5>=58 && LA38_5<=61)||LA38_5==63||(LA38_5>=65 && LA38_5<=67)||(LA38_5>=69 && LA38_5<=104)||(LA38_5>=106 && LA38_5<=129)) ) { alt38=2; } else { @@ -8696,18 +8695,19 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case RULE_HEX: case RULE_DECIMAL: case 14: - case 66: + case 65: + case 69: case 70: - case 71: - case 78: + case 77: + case 93: case 94: - case 95: - case 99: - case 107: - case 109: + case 98: + case 106: + case 108: + case 112: case 113: case 114: - case 115: + case 118: case 119: case 120: case 121: @@ -8716,8 +8716,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 124: case 125: case 126: - case 127: - case 129: + case 128: { alt38=2; } @@ -9053,7 +9052,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3228:2: (kw= '=' ) // InternalPerspectiveDsl.g:3229:2: kw= '=' { - kw=(Token)match(input,69,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,68,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9138,37 +9137,37 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3251:2: (kw= '+=' | kw= '-=' | kw= '*=' | kw= '/=' | kw= '%=' | (kw= '<' kw= '<' kw= '=' ) | (kw= '>' (kw= '>' )? kw= '>=' ) ) int alt40=7; switch ( input.LA(1) ) { - case 73: + case 72: { alt40=1; } break; - case 74: + case 73: { alt40=2; } break; - case 75: + case 74: { alt40=3; } break; - case 76: + case 75: { alt40=4; } break; - case 77: + case 76: { alt40=5; } break; - case 78: + case 77: { alt40=6; } break; - case 79: + case 78: { alt40=7; } @@ -9185,7 +9184,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:3252:3: kw= '+=' { - kw=(Token)match(input,73,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,72,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9198,7 +9197,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:3258:3: kw= '-=' { - kw=(Token)match(input,74,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,73,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9211,7 +9210,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 3 : // InternalPerspectiveDsl.g:3264:3: kw= '*=' { - kw=(Token)match(input,75,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,74,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9224,7 +9223,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 4 : // InternalPerspectiveDsl.g:3270:3: kw= '/=' { - kw=(Token)match(input,76,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,75,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9237,7 +9236,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 5 : // InternalPerspectiveDsl.g:3276:3: kw= '%=' { - kw=(Token)match(input,77,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,76,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9253,21 +9252,21 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3282:3: (kw= '<' kw= '<' kw= '=' ) // InternalPerspectiveDsl.g:3283:4: kw= '<' kw= '<' kw= '=' { - kw=(Token)match(input,78,FOLLOW_46); if (state.failed) return current; + kw=(Token)match(input,77,FOLLOW_46); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_0()); } - kw=(Token)match(input,78,FOLLOW_39); if (state.failed) return current; + kw=(Token)match(input,77,FOLLOW_39); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); newLeafNode(kw, grammarAccess.getOpMultiAssignAccess().getLessThanSignKeyword_5_1()); } - kw=(Token)match(input,69,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,68,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9286,7 +9285,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3300:3: (kw= '>' (kw= '>' )? kw= '>=' ) // InternalPerspectiveDsl.g:3301:4: kw= '>' (kw= '>' )? kw= '>=' { - kw=(Token)match(input,79,FOLLOW_47); if (state.failed) return current; + kw=(Token)match(input,78,FOLLOW_47); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9297,14 +9296,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt39=2; int LA39_0 = input.LA(1); - if ( (LA39_0==79) ) { + if ( (LA39_0==78) ) { alt39=1; } switch (alt39) { case 1 : // InternalPerspectiveDsl.g:3307:5: kw= '>' { - kw=(Token)match(input,79,FOLLOW_48); if (state.failed) return current; + kw=(Token)match(input,78,FOLLOW_48); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9317,7 +9316,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - kw=(Token)match(input,80,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,79,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9436,7 +9435,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt41=2; int LA41_0 = input.LA(1); - if ( (LA41_0==81) ) { + if ( (LA41_0==80) ) { int LA41_2 = input.LA(2); if ( (synpred8_InternalPerspectiveDsl()) ) { @@ -9632,7 +9631,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3421:2: (kw= '||' ) // InternalPerspectiveDsl.g:3422:2: kw= '||' { - kw=(Token)match(input,81,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,80,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -9742,7 +9741,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt42=2; int LA42_0 = input.LA(1); - if ( (LA42_0==82) ) { + if ( (LA42_0==81) ) { int LA42_2 = input.LA(2); if ( (synpred9_InternalPerspectiveDsl()) ) { @@ -9938,7 +9937,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3528:2: (kw= '&&' ) // InternalPerspectiveDsl.g:3529:2: kw= '&&' { - kw=(Token)match(input,82,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,81,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -10047,7 +10046,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { do { int alt43=2; switch ( input.LA(1) ) { - case 83: + case 82: { int LA43_2 = input.LA(2); @@ -10058,7 +10057,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 84: + case 83: { int LA43_3 = input.LA(2); @@ -10069,7 +10068,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 85: + case 84: { int LA43_4 = input.LA(2); @@ -10080,7 +10079,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 86: + case 85: { int LA43_5 = input.LA(2); @@ -10282,22 +10281,22 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3636:2: (kw= '==' | kw= '!=' | kw= '===' | kw= '!==' ) int alt44=4; switch ( input.LA(1) ) { - case 83: + case 82: { alt44=1; } break; - case 84: + case 83: { alt44=2; } break; - case 85: + case 84: { alt44=3; } break; - case 86: + case 85: { alt44=4; } @@ -10314,7 +10313,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:3637:3: kw= '==' { - kw=(Token)match(input,83,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,82,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -10327,7 +10326,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:3643:3: kw= '!=' { - kw=(Token)match(input,84,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,83,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -10340,7 +10339,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 3 : // InternalPerspectiveDsl.g:3649:3: kw= '===' { - kw=(Token)match(input,85,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,84,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -10353,7 +10352,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 4 : // InternalPerspectiveDsl.g:3655:3: kw= '!==' { - kw=(Token)match(input,86,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,85,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -10471,7 +10470,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { do { int alt45=3; switch ( input.LA(1) ) { - case 78: + case 77: { int LA45_2 = input.LA(2); @@ -10482,7 +10481,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 79: + case 78: { int LA45_3 = input.LA(2); @@ -10493,7 +10492,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 87: + case 86: { int LA45_4 = input.LA(2); @@ -10504,7 +10503,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 80: + case 79: { int LA45_5 = input.LA(2); @@ -10544,7 +10543,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_2=(Token)match(input,87,FOLLOW_53); if (state.failed) return current; + otherlv_2=(Token)match(input,86,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXRelationalExpressionAccess().getInstanceofKeyword_1_0_0_0_1()); @@ -10790,19 +10789,19 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3808:2: (kw= '>=' | (kw= '<' kw= '=' ) | kw= '>' | kw= '<' ) int alt46=4; switch ( input.LA(1) ) { - case 80: + case 79: { alt46=1; } break; - case 78: + case 77: { int LA46_2 = input.LA(2); - if ( (LA46_2==EOF||(LA46_2>=RULE_ID && LA46_2<=RULE_DECIMAL)||LA46_2==14||(LA46_2>=59 && LA46_2<=61)||LA46_2==66||(LA46_2>=70 && LA46_2<=71)||LA46_2==78||(LA46_2>=94 && LA46_2<=95)||LA46_2==99||LA46_2==107||LA46_2==109||(LA46_2>=113 && LA46_2<=115)||(LA46_2>=118 && LA46_2<=127)||LA46_2==129) ) { + if ( (LA46_2==EOF||(LA46_2>=RULE_ID && LA46_2<=RULE_DECIMAL)||LA46_2==14||(LA46_2>=58 && LA46_2<=60)||LA46_2==65||(LA46_2>=69 && LA46_2<=70)||LA46_2==77||(LA46_2>=93 && LA46_2<=94)||LA46_2==98||LA46_2==106||LA46_2==108||(LA46_2>=112 && LA46_2<=114)||(LA46_2>=117 && LA46_2<=126)||LA46_2==128) ) { alt46=4; } - else if ( (LA46_2==69) ) { + else if ( (LA46_2==68) ) { alt46=2; } else { @@ -10814,7 +10813,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } break; - case 79: + case 78: { alt46=3; } @@ -10831,7 +10830,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:3809:3: kw= '>=' { - kw=(Token)match(input,80,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,79,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -10847,14 +10846,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3815:3: (kw= '<' kw= '=' ) // InternalPerspectiveDsl.g:3816:4: kw= '<' kw= '=' { - kw=(Token)match(input,78,FOLLOW_39); if (state.failed) return current; + kw=(Token)match(input,77,FOLLOW_39); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); newLeafNode(kw, grammarAccess.getOpCompareAccess().getLessThanSignKeyword_1_0()); } - kw=(Token)match(input,69,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,68,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -10870,7 +10869,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 3 : // InternalPerspectiveDsl.g:3828:3: kw= '>' { - kw=(Token)match(input,79,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,78,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -10883,7 +10882,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 4 : // InternalPerspectiveDsl.g:3834:3: kw= '<' { - kw=(Token)match(input,78,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,77,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11190,7 +11189,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:3943:3: kw= '->' { - kw=(Token)match(input,88,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,87,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11203,7 +11202,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:3949:3: kw= '..<' { - kw=(Token)match(input,89,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,88,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11219,14 +11218,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3955:3: (kw= '>' kw= '..' ) // InternalPerspectiveDsl.g:3956:4: kw= '>' kw= '..' { - kw=(Token)match(input,79,FOLLOW_55); if (state.failed) return current; + kw=(Token)match(input,78,FOLLOW_55); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_2_0()); } - kw=(Token)match(input,90,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,89,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11242,7 +11241,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 4 : // InternalPerspectiveDsl.g:3968:3: kw= '..' { - kw=(Token)match(input,90,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,89,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11255,7 +11254,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 5 : // InternalPerspectiveDsl.g:3974:3: kw= '=>' { - kw=(Token)match(input,91,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,90,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11271,7 +11270,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3980:3: (kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) ) // InternalPerspectiveDsl.g:3981:4: kw= '>' ( ( ( ( '>' '>' ) )=> (kw= '>' kw= '>' ) ) | kw= '>' ) { - kw=(Token)match(input,79,FOLLOW_56); if (state.failed) return current; + kw=(Token)match(input,78,FOLLOW_56); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11282,13 +11281,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt48=2; int LA48_0 = input.LA(1); - if ( (LA48_0==79) ) { + if ( (LA48_0==78) ) { int LA48_1 = input.LA(2); - if ( (LA48_1==EOF||(LA48_1>=RULE_ID && LA48_1<=RULE_DECIMAL)||LA48_1==14||(LA48_1>=59 && LA48_1<=61)||LA48_1==66||(LA48_1>=70 && LA48_1<=71)||LA48_1==78||(LA48_1>=94 && LA48_1<=95)||LA48_1==99||LA48_1==107||LA48_1==109||(LA48_1>=113 && LA48_1<=115)||(LA48_1>=118 && LA48_1<=127)||LA48_1==129) ) { + if ( (LA48_1==EOF||(LA48_1>=RULE_ID && LA48_1<=RULE_DECIMAL)||LA48_1==14||(LA48_1>=58 && LA48_1<=60)||LA48_1==65||(LA48_1>=69 && LA48_1<=70)||LA48_1==77||(LA48_1>=93 && LA48_1<=94)||LA48_1==98||LA48_1==106||LA48_1==108||(LA48_1>=112 && LA48_1<=114)||(LA48_1>=117 && LA48_1<=126)||LA48_1==128) ) { alt48=2; } - else if ( (LA48_1==79) && (synpred14_InternalPerspectiveDsl())) { + else if ( (LA48_1==78) && (synpred14_InternalPerspectiveDsl())) { alt48=1; } else { @@ -11316,14 +11315,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3993:6: (kw= '>' kw= '>' ) // InternalPerspectiveDsl.g:3994:7: kw= '>' kw= '>' { - kw=(Token)match(input,79,FOLLOW_56); if (state.failed) return current; + kw=(Token)match(input,78,FOLLOW_56); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); newLeafNode(kw, grammarAccess.getOpOtherAccess().getGreaterThanSignKeyword_5_1_0_0_0()); } - kw=(Token)match(input,79,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,78,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11342,7 +11341,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:4007:5: kw= '>' { - kw=(Token)match(input,79,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,78,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11367,7 +11366,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4015:3: (kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) ) // InternalPerspectiveDsl.g:4016:4: kw= '<' ( ( ( ( '<' '<' ) )=> (kw= '<' kw= '<' ) ) | kw= '<' | kw= '=>' ) { - kw=(Token)match(input,78,FOLLOW_57); if (state.failed) return current; + kw=(Token)match(input,77,FOLLOW_57); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11378,7 +11377,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt49=3; int LA49_0 = input.LA(1); - if ( (LA49_0==78) ) { + if ( (LA49_0==77) ) { int LA49_1 = input.LA(2); if ( (synpred15_InternalPerspectiveDsl()) ) { @@ -11395,7 +11394,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { throw nvae; } } - else if ( (LA49_0==91) ) { + else if ( (LA49_0==90) ) { alt49=3; } else { @@ -11415,14 +11414,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4028:6: (kw= '<' kw= '<' ) // InternalPerspectiveDsl.g:4029:7: kw= '<' kw= '<' { - kw=(Token)match(input,78,FOLLOW_46); if (state.failed) return current; + kw=(Token)match(input,77,FOLLOW_46); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); newLeafNode(kw, grammarAccess.getOpOtherAccess().getLessThanSignKeyword_6_1_0_0_0()); } - kw=(Token)match(input,78,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,77,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11441,7 +11440,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:4042:5: kw= '<' { - kw=(Token)match(input,78,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,77,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11454,7 +11453,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 3 : // InternalPerspectiveDsl.g:4048:5: kw= '=>' { - kw=(Token)match(input,91,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,90,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11476,7 +11475,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 8 : // InternalPerspectiveDsl.g:4056:3: kw= '<>' { - kw=(Token)match(input,92,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,91,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11489,7 +11488,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 9 : // InternalPerspectiveDsl.g:4062:3: kw= '?:' { - kw=(Token)match(input,93,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,92,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11605,7 +11604,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt51=2; int LA51_0 = input.LA(1); - if ( (LA51_0==94) ) { + if ( (LA51_0==93) ) { int LA51_2 = input.LA(2); if ( (synpred16_InternalPerspectiveDsl()) ) { @@ -11614,7 +11613,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - else if ( (LA51_0==95) ) { + else if ( (LA51_0==94) ) { int LA51_3 = input.LA(2); if ( (synpred16_InternalPerspectiveDsl()) ) { @@ -11814,10 +11813,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt52=2; int LA52_0 = input.LA(1); - if ( (LA52_0==94) ) { + if ( (LA52_0==93) ) { alt52=1; } - else if ( (LA52_0==95) ) { + else if ( (LA52_0==94) ) { alt52=2; } else { @@ -11831,7 +11830,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4171:3: kw= '+' { - kw=(Token)match(input,94,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,93,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11844,7 +11843,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:4177:3: kw= '-' { - kw=(Token)match(input,95,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,94,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -11959,7 +11958,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { do { int alt53=2; switch ( input.LA(1) ) { - case 62: + case 61: { int LA53_2 = input.LA(2); @@ -11970,7 +11969,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 96: + case 95: { int LA53_3 = input.LA(2); @@ -11981,7 +11980,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 97: + case 96: { int LA53_4 = input.LA(2); @@ -11992,7 +11991,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 98: + case 97: { int LA53_5 = input.LA(2); @@ -12194,22 +12193,22 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4285:2: (kw= '*' | kw= '**' | kw= '/' | kw= '%' ) int alt54=4; switch ( input.LA(1) ) { - case 62: + case 61: { alt54=1; } break; - case 96: + case 95: { alt54=2; } break; - case 97: + case 96: { alt54=3; } break; - case 98: + case 97: { alt54=4; } @@ -12226,7 +12225,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4286:3: kw= '*' { - kw=(Token)match(input,62,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,61,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -12239,7 +12238,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:4292:3: kw= '**' { - kw=(Token)match(input,96,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,95,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -12252,7 +12251,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 3 : // InternalPerspectiveDsl.g:4298:3: kw= '/' { - kw=(Token)match(input,97,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,96,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -12265,7 +12264,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 4 : // InternalPerspectiveDsl.g:4304:3: kw= '%' { - kw=(Token)match(input,98,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,97,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -12360,10 +12359,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt55=2; int LA55_0 = input.LA(1); - if ( ((LA55_0>=94 && LA55_0<=95)||LA55_0==99) ) { + if ( ((LA55_0>=93 && LA55_0<=94)||LA55_0==98) ) { alt55=1; } - else if ( ((LA55_0>=RULE_ID && LA55_0<=RULE_DECIMAL)||LA55_0==14||(LA55_0>=59 && LA55_0<=61)||LA55_0==66||(LA55_0>=70 && LA55_0<=71)||LA55_0==78||LA55_0==107||LA55_0==109||(LA55_0>=113 && LA55_0<=115)||(LA55_0>=118 && LA55_0<=127)||LA55_0==129) ) { + else if ( ((LA55_0>=RULE_ID && LA55_0<=RULE_DECIMAL)||LA55_0==14||(LA55_0>=58 && LA55_0<=60)||LA55_0==65||(LA55_0>=69 && LA55_0<=70)||LA55_0==77||LA55_0==106||LA55_0==108||(LA55_0>=112 && LA55_0<=114)||(LA55_0>=117 && LA55_0<=126)||LA55_0==128) ) { alt55=2; } else { @@ -12571,17 +12570,17 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4399:2: (kw= '!' | kw= '-' | kw= '+' ) int alt56=3; switch ( input.LA(1) ) { - case 99: + case 98: { alt56=1; } break; - case 95: + case 94: { alt56=2; } break; - case 94: + case 93: { alt56=3; } @@ -12598,7 +12597,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4400:3: kw= '!' { - kw=(Token)match(input,99,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,98,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -12611,7 +12610,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:4406:3: kw= '-' { - kw=(Token)match(input,95,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,94,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -12624,7 +12623,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 3 : // InternalPerspectiveDsl.g:4412:3: kw= '+' { - kw=(Token)match(input,94,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,93,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -12741,7 +12740,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt57=2; int LA57_0 = input.LA(1); - if ( (LA57_0==100) ) { + if ( (LA57_0==99) ) { int LA57_2 = input.LA(2); if ( (synpred18_InternalPerspectiveDsl()) ) { @@ -12775,7 +12774,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_2=(Token)match(input,100,FOLLOW_53); if (state.failed) return current; + otherlv_2=(Token)match(input,99,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXCastedExpressionAccess().getAsKeyword_1_0_0_1()); @@ -12933,14 +12932,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt58=2; int LA58_0 = input.LA(1); - if ( (LA58_0==101) ) { + if ( (LA58_0==100) ) { int LA58_1 = input.LA(2); if ( (synpred19_InternalPerspectiveDsl()) ) { alt58=1; } } - else if ( (LA58_0==102) ) { + else if ( (LA58_0==101) ) { int LA58_2 = input.LA(2); if ( (synpred19_InternalPerspectiveDsl()) ) { @@ -13092,10 +13091,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt59=2; int LA59_0 = input.LA(1); - if ( (LA59_0==101) ) { + if ( (LA59_0==100) ) { alt59=1; } - else if ( (LA59_0==102) ) { + else if ( (LA59_0==101) ) { alt59=2; } else { @@ -13109,7 +13108,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4569:3: kw= '++' { - kw=(Token)match(input,101,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,100,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -13122,7 +13121,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:4575:3: kw= '--' { - kw=(Token)match(input,102,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,101,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -13260,7 +13259,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { do { int alt68=3; switch ( input.LA(1) ) { - case 103: + case 102: { int LA68_2 = input.LA(2); @@ -13274,7 +13273,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 104: + case 103: { int LA68_3 = input.LA(2); @@ -13288,7 +13287,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } break; - case 105: + case 104: { int LA68_4 = input.LA(2); @@ -13332,10 +13331,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt60=2; int LA60_0 = input.LA(1); - if ( (LA60_0==103) ) { + if ( (LA60_0==102) ) { alt60=1; } - else if ( (LA60_0==104) ) { + else if ( (LA60_0==103) ) { alt60=2; } else { @@ -13349,7 +13348,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4639:8: otherlv_2= '.' { - otherlv_2=(Token)match(input,103,FOLLOW_63); if (state.failed) return current; + otherlv_2=(Token)match(input,102,FOLLOW_63); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_0_0_0_1_0()); @@ -13367,7 +13366,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4645:9: (lv_explicitStatic_3_0= '::' ) // InternalPerspectiveDsl.g:4646:10: lv_explicitStatic_3_0= '::' { - lv_explicitStatic_3_0=(Token)match(input,104,FOLLOW_63); if (state.failed) return current; + lv_explicitStatic_3_0=(Token)match(input,103,FOLLOW_63); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_explicitStatic_3_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_0_0_0_1_1_0()); @@ -13517,17 +13516,17 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4735:7: (otherlv_8= '.' | ( (lv_nullSafe_9_0= '?.' ) ) | ( (lv_explicitStatic_10_0= '::' ) ) ) int alt61=3; switch ( input.LA(1) ) { - case 103: + case 102: { alt61=1; } break; - case 105: + case 104: { alt61=2; } break; - case 104: + case 103: { alt61=3; } @@ -13544,7 +13543,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4736:8: otherlv_8= '.' { - otherlv_8=(Token)match(input,103,FOLLOW_64); if (state.failed) return current; + otherlv_8=(Token)match(input,102,FOLLOW_64); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_8, grammarAccess.getXMemberFeatureCallAccess().getFullStopKeyword_1_1_0_0_1_0()); @@ -13562,7 +13561,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4742:9: (lv_nullSafe_9_0= '?.' ) // InternalPerspectiveDsl.g:4743:10: lv_nullSafe_9_0= '?.' { - lv_nullSafe_9_0=(Token)match(input,105,FOLLOW_64); if (state.failed) return current; + lv_nullSafe_9_0=(Token)match(input,104,FOLLOW_64); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_nullSafe_9_0, grammarAccess.getXMemberFeatureCallAccess().getNullSafeQuestionMarkFullStopKeyword_1_1_0_0_1_1_0()); @@ -13594,7 +13593,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4757:9: (lv_explicitStatic_10_0= '::' ) // InternalPerspectiveDsl.g:4758:10: lv_explicitStatic_10_0= '::' { - lv_explicitStatic_10_0=(Token)match(input,104,FOLLOW_64); if (state.failed) return current; + lv_explicitStatic_10_0=(Token)match(input,103,FOLLOW_64); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_explicitStatic_10_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitStaticColonColonKeyword_1_1_0_0_1_2_0()); @@ -13630,14 +13629,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt63=2; int LA63_0 = input.LA(1); - if ( (LA63_0==78) ) { + if ( (LA63_0==77) ) { alt63=1; } switch (alt63) { case 1 : // InternalPerspectiveDsl.g:4774:6: otherlv_11= '<' ( (lv_typeArguments_12_0= ruleJvmArgumentTypeReference ) ) (otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) )* otherlv_15= '>' { - otherlv_11=(Token)match(input,78,FOLLOW_65); if (state.failed) return current; + otherlv_11=(Token)match(input,77,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_11, grammarAccess.getXMemberFeatureCallAccess().getLessThanSignKeyword_1_1_1_0()); @@ -13684,7 +13683,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt62=2; int LA62_0 = input.LA(1); - if ( (LA62_0==67) ) { + if ( (LA62_0==66) ) { alt62=1; } @@ -13693,7 +13692,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4798:7: otherlv_13= ',' ( (lv_typeArguments_14_0= ruleJvmArgumentTypeReference ) ) { - otherlv_13=(Token)match(input,67,FOLLOW_65); if (state.failed) return current; + otherlv_13=(Token)match(input,66,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_13, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_1_2_0()); @@ -13743,7 +13742,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_15=(Token)match(input,79,FOLLOW_64); if (state.failed) return current; + otherlv_15=(Token)match(input,78,FOLLOW_64); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_15, grammarAccess.getXMemberFeatureCallAccess().getGreaterThanSignKeyword_1_1_1_3()); @@ -13802,7 +13801,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4849:7: (lv_explicitOperationCall_17_0= '(' ) // InternalPerspectiveDsl.g:4850:8: lv_explicitOperationCall_17_0= '(' { - lv_explicitOperationCall_17_0=(Token)match(input,66,FOLLOW_68); if (state.failed) return current; + lv_explicitOperationCall_17_0=(Token)match(input,65,FOLLOW_68); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_explicitOperationCall_17_0, grammarAccess.getXMemberFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_1_1_3_0_0()); @@ -13914,7 +13913,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt64=2; int LA64_0 = input.LA(1); - if ( (LA64_0==67) ) { + if ( (LA64_0==66) ) { alt64=1; } @@ -13923,7 +13922,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4929:9: otherlv_20= ',' ( (lv_memberCallArguments_21_0= ruleXExpression ) ) { - otherlv_20=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; + otherlv_20=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_20, grammarAccess.getXMemberFeatureCallAccess().getCommaKeyword_1_1_3_1_1_1_0()); @@ -13982,7 +13981,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_22=(Token)match(input,68,FOLLOW_69); if (state.failed) return current; + otherlv_22=(Token)match(input,67,FOLLOW_69); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_22, grammarAccess.getXMemberFeatureCallAccess().getRightParenthesisKeyword_1_1_3_2()); @@ -14596,25 +14595,25 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt70=7; int LA70_0 = input.LA(1); - if ( (LA70_0==70) ) { + if ( (LA70_0==69) ) { alt70=1; } - else if ( (LA70_0==71) && (synpred27_InternalPerspectiveDsl())) { + else if ( (LA70_0==70) && (synpred27_InternalPerspectiveDsl())) { alt70=2; } - else if ( ((LA70_0>=121 && LA70_0<=122)) ) { + else if ( ((LA70_0>=120 && LA70_0<=121)) ) { alt70=3; } else if ( ((LA70_0>=RULE_INT && LA70_0<=RULE_DECIMAL)) ) { alt70=4; } - else if ( (LA70_0==123) ) { + else if ( (LA70_0==122) ) { alt70=5; } else if ( (LA70_0==RULE_STRING) ) { alt70=6; } - else if ( (LA70_0==124) ) { + else if ( (LA70_0==123) ) { alt70=7; } else { @@ -14870,10 +14869,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt71=2; int LA71_0 = input.LA(1); - if ( (LA71_0==70) ) { + if ( (LA71_0==69) ) { int LA71_1 = input.LA(2); - if ( (LA71_1==71) ) { + if ( (LA71_1==70) ) { alt71=2; } else if ( (LA71_1==14) ) { @@ -15040,7 +15039,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,70,FOLLOW_20); if (state.failed) return current; + otherlv_1=(Token)match(input,69,FOLLOW_20); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXSetLiteralAccess().getNumberSignKeyword_1()); @@ -15056,7 +15055,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt73=2; int LA73_0 = input.LA(1); - if ( ((LA73_0>=RULE_ID && LA73_0<=RULE_DECIMAL)||LA73_0==14||(LA73_0>=59 && LA73_0<=61)||LA73_0==66||(LA73_0>=70 && LA73_0<=71)||LA73_0==78||(LA73_0>=94 && LA73_0<=95)||LA73_0==99||LA73_0==107||LA73_0==109||(LA73_0>=113 && LA73_0<=115)||(LA73_0>=118 && LA73_0<=127)||LA73_0==129) ) { + if ( ((LA73_0>=RULE_ID && LA73_0<=RULE_DECIMAL)||LA73_0==14||(LA73_0>=58 && LA73_0<=60)||LA73_0==65||(LA73_0>=69 && LA73_0<=70)||LA73_0==77||(LA73_0>=93 && LA73_0<=94)||LA73_0==98||LA73_0==106||LA73_0==108||(LA73_0>=112 && LA73_0<=114)||(LA73_0>=117 && LA73_0<=126)||LA73_0==128) ) { alt73=1; } switch (alt73) { @@ -15104,7 +15103,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt72=2; int LA72_0 = input.LA(1); - if ( (LA72_0==67) ) { + if ( (LA72_0==66) ) { alt72=1; } @@ -15113,7 +15112,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:5344:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) { - otherlv_4=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXSetLiteralAccess().getCommaKeyword_3_1_0()); @@ -15276,13 +15275,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,70,FOLLOW_41); if (state.failed) return current; + otherlv_1=(Token)match(input,69,FOLLOW_41); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXListLiteralAccess().getNumberSignKeyword_1()); } - otherlv_2=(Token)match(input,71,FOLLOW_42); if (state.failed) return current; + otherlv_2=(Token)match(input,70,FOLLOW_42); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXListLiteralAccess().getLeftSquareBracketKeyword_2()); @@ -15292,7 +15291,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt75=2; int LA75_0 = input.LA(1); - if ( ((LA75_0>=RULE_ID && LA75_0<=RULE_DECIMAL)||LA75_0==14||(LA75_0>=59 && LA75_0<=61)||LA75_0==66||(LA75_0>=70 && LA75_0<=71)||LA75_0==78||(LA75_0>=94 && LA75_0<=95)||LA75_0==99||LA75_0==107||LA75_0==109||(LA75_0>=113 && LA75_0<=115)||(LA75_0>=118 && LA75_0<=127)||LA75_0==129) ) { + if ( ((LA75_0>=RULE_ID && LA75_0<=RULE_DECIMAL)||LA75_0==14||(LA75_0>=58 && LA75_0<=60)||LA75_0==65||(LA75_0>=69 && LA75_0<=70)||LA75_0==77||(LA75_0>=93 && LA75_0<=94)||LA75_0==98||LA75_0==106||LA75_0==108||(LA75_0>=112 && LA75_0<=114)||(LA75_0>=117 && LA75_0<=126)||LA75_0==128) ) { alt75=1; } switch (alt75) { @@ -15340,7 +15339,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt74=2; int LA74_0 = input.LA(1); - if ( (LA74_0==67) ) { + if ( (LA74_0==66) ) { alt74=1; } @@ -15349,7 +15348,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:5428:5: otherlv_4= ',' ( (lv_elements_5_0= ruleXExpression ) ) { - otherlv_4=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXListLiteralAccess().getCommaKeyword_3_1_0()); @@ -15405,7 +15404,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,72,FOLLOW_2); if (state.failed) return current; + otherlv_6=(Token)match(input,71,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXListLiteralAccess().getRightSquareBracketKeyword_4()); @@ -15520,7 +15519,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,71,FOLLOW_72); if (state.failed) return current; + otherlv_1=(Token)match(input,70,FOLLOW_72); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXClosureAccess().getLeftSquareBracketKeyword_0_0_1()); @@ -15546,7 +15545,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt77=2; int LA77_0 = input.LA(1); - if ( (LA77_0==RULE_ID||LA77_0==66||LA77_0==91) ) { + if ( (LA77_0==RULE_ID||LA77_0==65||LA77_0==90) ) { alt77=1; } switch (alt77) { @@ -15594,7 +15593,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt76=2; int LA76_0 = input.LA(1); - if ( (LA76_0==67) ) { + if ( (LA76_0==66) ) { alt76=1; } @@ -15603,7 +15602,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:5543:7: otherlv_3= ',' ( (lv_declaredFormalParameters_4_0= ruleJvmFormalParameter ) ) { - otherlv_3=(Token)match(input,67,FOLLOW_53); if (state.failed) return current; + otherlv_3=(Token)match(input,66,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getXClosureAccess().getCommaKeyword_1_0_0_1_0()); @@ -15665,7 +15664,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:5569:6: (lv_explicitSyntax_5_0= '|' ) // InternalPerspectiveDsl.g:5570:7: lv_explicitSyntax_5_0= '|' { - lv_explicitSyntax_5_0=(Token)match(input,106,FOLLOW_74); if (state.failed) return current; + lv_explicitSyntax_5_0=(Token)match(input,105,FOLLOW_74); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_explicitSyntax_5_0, grammarAccess.getXClosureAccess().getExplicitSyntaxVerticalLineKeyword_1_0_1_0()); @@ -15729,7 +15728,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_7=(Token)match(input,72,FOLLOW_2); if (state.failed) return current; + otherlv_7=(Token)match(input,71,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_7, grammarAccess.getXClosureAccess().getRightSquareBracketKeyword_3()); @@ -15837,7 +15836,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt80=2; int LA80_0 = input.LA(1); - if ( ((LA80_0>=RULE_ID && LA80_0<=RULE_DECIMAL)||LA80_0==14||(LA80_0>=59 && LA80_0<=61)||LA80_0==66||(LA80_0>=70 && LA80_0<=71)||LA80_0==78||(LA80_0>=94 && LA80_0<=95)||LA80_0==99||LA80_0==107||LA80_0==109||(LA80_0>=113 && LA80_0<=127)||LA80_0==129) ) { + if ( ((LA80_0>=RULE_ID && LA80_0<=RULE_DECIMAL)||LA80_0==14||(LA80_0>=58 && LA80_0<=60)||LA80_0==65||(LA80_0>=69 && LA80_0<=70)||LA80_0==77||(LA80_0>=93 && LA80_0<=94)||LA80_0==98||LA80_0==106||LA80_0==108||(LA80_0>=112 && LA80_0<=126)||LA80_0==128) ) { alt80=1; } @@ -15885,14 +15884,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt79=2; int LA79_0 = input.LA(1); - if ( (LA79_0==64) ) { + if ( (LA79_0==63) ) { alt79=1; } switch (alt79) { case 1 : // InternalPerspectiveDsl.g:5654:5: otherlv_2= ';' { - otherlv_2=(Token)match(input,64,FOLLOW_77); if (state.failed) return current; + otherlv_2=(Token)match(input,63,FOLLOW_77); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXExpressionInClosureAccess().getSemicolonKeyword_1_1()); @@ -16024,7 +16023,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt82=2; int LA82_0 = input.LA(1); - if ( (LA82_0==RULE_ID||LA82_0==66||LA82_0==91) ) { + if ( (LA82_0==RULE_ID||LA82_0==65||LA82_0==90) ) { alt82=1; } switch (alt82) { @@ -16072,7 +16071,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt81=2; int LA81_0 = input.LA(1); - if ( (LA81_0==67) ) { + if ( (LA81_0==66) ) { alt81=1; } @@ -16081,7 +16080,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:5734:7: otherlv_2= ',' ( (lv_declaredFormalParameters_3_0= ruleJvmFormalParameter ) ) { - otherlv_2=(Token)match(input,67,FOLLOW_53); if (state.failed) return current; + otherlv_2=(Token)match(input,66,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXShortClosureAccess().getCommaKeyword_0_0_1_1_0()); @@ -16143,7 +16142,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:5760:6: (lv_explicitSyntax_4_0= '|' ) // InternalPerspectiveDsl.g:5761:7: lv_explicitSyntax_4_0= '|' { - lv_explicitSyntax_4_0=(Token)match(input,106,FOLLOW_40); if (state.failed) return current; + lv_explicitSyntax_4_0=(Token)match(input,105,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_explicitSyntax_4_0, grammarAccess.getXShortClosureAccess().getExplicitSyntaxVerticalLineKeyword_0_0_2_0()); @@ -16288,7 +16287,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:5812:2: (otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' ) // InternalPerspectiveDsl.g:5813:3: otherlv_0= '(' this_XExpression_1= ruleXExpression otherlv_2= ')' { - otherlv_0=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; + otherlv_0=(Token)match(input,65,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getXParenthesizedExpressionAccess().getLeftParenthesisKeyword_0()); @@ -16310,7 +16309,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { afterParserOrEnumRuleCall(); } - otherlv_2=(Token)match(input,68,FOLLOW_2); if (state.failed) return current; + otherlv_2=(Token)match(input,67,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXParenthesizedExpressionAccess().getRightParenthesisKeyword_2()); @@ -16419,13 +16418,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,107,FOLLOW_78); if (state.failed) return current; + otherlv_1=(Token)match(input,106,FOLLOW_78); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXIfExpressionAccess().getIfKeyword_1()); } - otherlv_2=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; + otherlv_2=(Token)match(input,65,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXIfExpressionAccess().getLeftParenthesisKeyword_2()); @@ -16466,7 +16465,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_4=(Token)match(input,68,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXIfExpressionAccess().getRightParenthesisKeyword_4()); @@ -16511,7 +16510,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt83=2; int LA83_0 = input.LA(1); - if ( (LA83_0==108) ) { + if ( (LA83_0==107) ) { int LA83_1 = input.LA(2); if ( (synpred31_InternalPerspectiveDsl()) ) { @@ -16525,7 +16524,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:5906:4: ( ( 'else' )=>otherlv_6= 'else' ) // InternalPerspectiveDsl.g:5907:5: ( 'else' )=>otherlv_6= 'else' { - otherlv_6=(Token)match(input,108,FOLLOW_40); if (state.failed) return current; + otherlv_6=(Token)match(input,107,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXIfExpressionAccess().getElseKeyword_6_0()); @@ -16689,7 +16688,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,109,FOLLOW_80); if (state.failed) return current; + otherlv_1=(Token)match(input,108,FOLLOW_80); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXSwitchExpressionAccess().getSwitchKeyword_1()); @@ -16711,7 +16710,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:5976:6: (otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' ) // InternalPerspectiveDsl.g:5977:7: otherlv_2= '(' ( (lv_declaredParam_3_0= ruleJvmFormalParameter ) ) otherlv_4= ':' { - otherlv_2=(Token)match(input,66,FOLLOW_53); if (state.failed) return current; + otherlv_2=(Token)match(input,65,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXSwitchExpressionAccess().getLeftParenthesisKeyword_2_0_0_0_0()); @@ -16752,7 +16751,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_4=(Token)match(input,110,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,109,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_0_0_0_2()); @@ -16799,7 +16798,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,68,FOLLOW_20); if (state.failed) return current; + otherlv_6=(Token)match(input,67,FOLLOW_20); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXSwitchExpressionAccess().getRightParenthesisKeyword_2_0_2()); @@ -16862,7 +16861,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_8=(Token)match(input,110,FOLLOW_40); if (state.failed) return current; + otherlv_8=(Token)match(input,109,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_8, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_2_1_0_0_1()); @@ -16933,7 +16932,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt86=2; int LA86_0 = input.LA(1); - if ( (LA86_0==RULE_ID||(LA86_0>=66 && LA86_0<=67)||LA86_0==91||LA86_0==110||LA86_0==112) ) { + if ( (LA86_0==RULE_ID||(LA86_0>=65 && LA86_0<=66)||LA86_0==90||LA86_0==109||LA86_0==111) ) { alt86=1; } @@ -16984,20 +16983,20 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt87=2; int LA87_0 = input.LA(1); - if ( (LA87_0==111) ) { + if ( (LA87_0==110) ) { alt87=1; } switch (alt87) { case 1 : // InternalPerspectiveDsl.g:6113:4: otherlv_12= 'default' otherlv_13= ':' ( (lv_default_14_0= ruleXExpression ) ) { - otherlv_12=(Token)match(input,111,FOLLOW_81); if (state.failed) return current; + otherlv_12=(Token)match(input,110,FOLLOW_81); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_12, grammarAccess.getXSwitchExpressionAccess().getDefaultKeyword_5_0()); } - otherlv_13=(Token)match(input,110,FOLLOW_40); if (state.failed) return current; + otherlv_13=(Token)match(input,109,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_13, grammarAccess.getXSwitchExpressionAccess().getColonKeyword_5_1()); @@ -17156,7 +17155,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt88=2; int LA88_0 = input.LA(1); - if ( (LA88_0==RULE_ID||LA88_0==66||LA88_0==91) ) { + if ( (LA88_0==RULE_ID||LA88_0==65||LA88_0==90) ) { alt88=1; } switch (alt88) { @@ -17202,14 +17201,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt89=2; int LA89_0 = input.LA(1); - if ( (LA89_0==112) ) { + if ( (LA89_0==111) ) { alt89=1; } switch (alt89) { case 1 : // InternalPerspectiveDsl.g:6191:4: otherlv_2= 'case' ( (lv_case_3_0= ruleXExpression ) ) { - otherlv_2=(Token)match(input,112,FOLLOW_40); if (state.failed) return current; + otherlv_2=(Token)match(input,111,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXCasePartAccess().getCaseKeyword_2_0()); @@ -17260,10 +17259,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt90=2; int LA90_0 = input.LA(1); - if ( (LA90_0==110) ) { + if ( (LA90_0==109) ) { alt90=1; } - else if ( (LA90_0==67) ) { + else if ( (LA90_0==66) ) { alt90=2; } else { @@ -17280,7 +17279,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:6216:4: (otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) ) // InternalPerspectiveDsl.g:6217:5: otherlv_4= ':' ( (lv_then_5_0= ruleXExpression ) ) { - otherlv_4=(Token)match(input,110,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,109,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXCasePartAccess().getColonKeyword_3_0_0()); @@ -17336,7 +17335,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:6243:5: (lv_fallThrough_6_0= ',' ) // InternalPerspectiveDsl.g:6244:6: lv_fallThrough_6_0= ',' { - lv_fallThrough_6_0=(Token)match(input,67,FOLLOW_2); if (state.failed) return current; + lv_fallThrough_6_0=(Token)match(input,66,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_fallThrough_6_0, grammarAccess.getXCasePartAccess().getFallThroughCommaKeyword_3_1_0()); @@ -17471,13 +17470,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,113,FOLLOW_78); if (state.failed) return current; + otherlv_1=(Token)match(input,112,FOLLOW_78); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXForLoopExpressionAccess().getForKeyword_0_0_1()); } - otherlv_2=(Token)match(input,66,FOLLOW_53); if (state.failed) return current; + otherlv_2=(Token)match(input,65,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXForLoopExpressionAccess().getLeftParenthesisKeyword_0_0_2()); @@ -17518,7 +17517,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_4=(Token)match(input,110,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,109,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXForLoopExpressionAccess().getColonKeyword_0_0_4()); @@ -17565,7 +17564,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,68,FOLLOW_40); if (state.failed) return current; + otherlv_6=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXForLoopExpressionAccess().getRightParenthesisKeyword_2()); @@ -17718,13 +17717,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,113,FOLLOW_78); if (state.failed) return current; + otherlv_1=(Token)match(input,112,FOLLOW_78); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXBasicForLoopExpressionAccess().getForKeyword_1()); } - otherlv_2=(Token)match(input,66,FOLLOW_85); if (state.failed) return current; + otherlv_2=(Token)match(input,65,FOLLOW_85); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXBasicForLoopExpressionAccess().getLeftParenthesisKeyword_2()); @@ -17734,7 +17733,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt92=2; int LA92_0 = input.LA(1); - if ( ((LA92_0>=RULE_ID && LA92_0<=RULE_DECIMAL)||LA92_0==14||(LA92_0>=59 && LA92_0<=61)||LA92_0==66||(LA92_0>=70 && LA92_0<=71)||LA92_0==78||(LA92_0>=94 && LA92_0<=95)||LA92_0==99||LA92_0==107||LA92_0==109||(LA92_0>=113 && LA92_0<=127)||LA92_0==129) ) { + if ( ((LA92_0>=RULE_ID && LA92_0<=RULE_DECIMAL)||LA92_0==14||(LA92_0>=58 && LA92_0<=60)||LA92_0==65||(LA92_0>=69 && LA92_0<=70)||LA92_0==77||(LA92_0>=93 && LA92_0<=94)||LA92_0==98||LA92_0==106||LA92_0==108||(LA92_0>=112 && LA92_0<=126)||LA92_0==128) ) { alt92=1; } switch (alt92) { @@ -17782,7 +17781,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt91=2; int LA91_0 = input.LA(1); - if ( (LA91_0==67) ) { + if ( (LA91_0==66) ) { alt91=1; } @@ -17791,7 +17790,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:6428:5: otherlv_4= ',' ( (lv_initExpressions_5_0= ruleXExpressionOrVarDeclaration ) ) { - otherlv_4=(Token)match(input,67,FOLLOW_87); if (state.failed) return current; + otherlv_4=(Token)match(input,66,FOLLOW_87); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_3_1_0()); @@ -17847,7 +17846,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,64,FOLLOW_88); if (state.failed) return current; + otherlv_6=(Token)match(input,63,FOLLOW_88); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_4()); @@ -17857,7 +17856,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt93=2; int LA93_0 = input.LA(1); - if ( ((LA93_0>=RULE_ID && LA93_0<=RULE_DECIMAL)||LA93_0==14||(LA93_0>=59 && LA93_0<=61)||LA93_0==66||(LA93_0>=70 && LA93_0<=71)||LA93_0==78||(LA93_0>=94 && LA93_0<=95)||LA93_0==99||LA93_0==107||LA93_0==109||(LA93_0>=113 && LA93_0<=115)||(LA93_0>=118 && LA93_0<=127)||LA93_0==129) ) { + if ( ((LA93_0>=RULE_ID && LA93_0<=RULE_DECIMAL)||LA93_0==14||(LA93_0>=58 && LA93_0<=60)||LA93_0==65||(LA93_0>=69 && LA93_0<=70)||LA93_0==77||(LA93_0>=93 && LA93_0<=94)||LA93_0==98||LA93_0==106||LA93_0==108||(LA93_0>=112 && LA93_0<=114)||(LA93_0>=117 && LA93_0<=126)||LA93_0==128) ) { alt93=1; } switch (alt93) { @@ -17899,7 +17898,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_8=(Token)match(input,64,FOLLOW_36); if (state.failed) return current; + otherlv_8=(Token)match(input,63,FOLLOW_36); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_8, grammarAccess.getXBasicForLoopExpressionAccess().getSemicolonKeyword_6()); @@ -17909,7 +17908,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt95=2; int LA95_0 = input.LA(1); - if ( ((LA95_0>=RULE_ID && LA95_0<=RULE_DECIMAL)||LA95_0==14||(LA95_0>=59 && LA95_0<=61)||LA95_0==66||(LA95_0>=70 && LA95_0<=71)||LA95_0==78||(LA95_0>=94 && LA95_0<=95)||LA95_0==99||LA95_0==107||LA95_0==109||(LA95_0>=113 && LA95_0<=115)||(LA95_0>=118 && LA95_0<=127)||LA95_0==129) ) { + if ( ((LA95_0>=RULE_ID && LA95_0<=RULE_DECIMAL)||LA95_0==14||(LA95_0>=58 && LA95_0<=60)||LA95_0==65||(LA95_0>=69 && LA95_0<=70)||LA95_0==77||(LA95_0>=93 && LA95_0<=94)||LA95_0==98||LA95_0==106||LA95_0==108||(LA95_0>=112 && LA95_0<=114)||(LA95_0>=117 && LA95_0<=126)||LA95_0==128) ) { alt95=1; } switch (alt95) { @@ -17957,7 +17956,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt94=2; int LA94_0 = input.LA(1); - if ( (LA94_0==67) ) { + if ( (LA94_0==66) ) { alt94=1; } @@ -17966,7 +17965,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:6501:5: otherlv_10= ',' ( (lv_updateExpressions_11_0= ruleXExpression ) ) { - otherlv_10=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; + otherlv_10=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_10, grammarAccess.getXBasicForLoopExpressionAccess().getCommaKeyword_7_1_0()); @@ -18022,7 +18021,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_12=(Token)match(input,68,FOLLOW_40); if (state.failed) return current; + otherlv_12=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_12, grammarAccess.getXBasicForLoopExpressionAccess().getRightParenthesisKeyword_8()); @@ -18163,13 +18162,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,114,FOLLOW_78); if (state.failed) return current; + otherlv_1=(Token)match(input,113,FOLLOW_78); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXWhileExpressionAccess().getWhileKeyword_1()); } - otherlv_2=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; + otherlv_2=(Token)match(input,65,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXWhileExpressionAccess().getLeftParenthesisKeyword_2()); @@ -18210,7 +18209,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_4=(Token)match(input,68,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXWhileExpressionAccess().getRightParenthesisKeyword_4()); @@ -18352,7 +18351,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,115,FOLLOW_40); if (state.failed) return current; + otherlv_1=(Token)match(input,114,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXDoWhileExpressionAccess().getDoKeyword_1()); @@ -18393,13 +18392,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,114,FOLLOW_78); if (state.failed) return current; + otherlv_3=(Token)match(input,113,FOLLOW_78); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getXDoWhileExpressionAccess().getWhileKeyword_3()); } - otherlv_4=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,65,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXDoWhileExpressionAccess().getLeftParenthesisKeyword_4()); @@ -18440,7 +18439,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,68,FOLLOW_2); if (state.failed) return current; + otherlv_6=(Token)match(input,67,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXDoWhileExpressionAccess().getRightParenthesisKeyword_6()); @@ -18556,7 +18555,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt97=2; int LA97_0 = input.LA(1); - if ( ((LA97_0>=RULE_ID && LA97_0<=RULE_DECIMAL)||LA97_0==14||(LA97_0>=59 && LA97_0<=61)||LA97_0==66||(LA97_0>=70 && LA97_0<=71)||LA97_0==78||(LA97_0>=94 && LA97_0<=95)||LA97_0==99||LA97_0==107||LA97_0==109||(LA97_0>=113 && LA97_0<=127)||LA97_0==129) ) { + if ( ((LA97_0>=RULE_ID && LA97_0<=RULE_DECIMAL)||LA97_0==14||(LA97_0>=58 && LA97_0<=60)||LA97_0==65||(LA97_0>=69 && LA97_0<=70)||LA97_0==77||(LA97_0>=93 && LA97_0<=94)||LA97_0==98||LA97_0==106||LA97_0==108||(LA97_0>=112 && LA97_0<=126)||LA97_0==128) ) { alt97=1; } @@ -18604,14 +18603,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt96=2; int LA96_0 = input.LA(1); - if ( (LA96_0==64) ) { + if ( (LA96_0==63) ) { alt96=1; } switch (alt96) { case 1 : // InternalPerspectiveDsl.g:6756:5: otherlv_3= ';' { - otherlv_3=(Token)match(input,64,FOLLOW_91); if (state.failed) return current; + otherlv_3=(Token)match(input,63,FOLLOW_91); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getXBlockExpressionAccess().getSemicolonKeyword_2_1()); @@ -18723,10 +18722,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt98=2; int LA98_0 = input.LA(1); - if ( ((LA98_0>=116 && LA98_0<=117)) ) { + if ( ((LA98_0>=115 && LA98_0<=116)) ) { alt98=1; } - else if ( ((LA98_0>=RULE_ID && LA98_0<=RULE_DECIMAL)||LA98_0==14||(LA98_0>=59 && LA98_0<=61)||LA98_0==66||(LA98_0>=70 && LA98_0<=71)||LA98_0==78||(LA98_0>=94 && LA98_0<=95)||LA98_0==99||LA98_0==107||LA98_0==109||(LA98_0>=113 && LA98_0<=115)||(LA98_0>=118 && LA98_0<=127)||LA98_0==129) ) { + else if ( ((LA98_0>=RULE_ID && LA98_0<=RULE_DECIMAL)||LA98_0==14||(LA98_0>=58 && LA98_0<=60)||LA98_0==65||(LA98_0>=69 && LA98_0<=70)||LA98_0==77||(LA98_0>=93 && LA98_0<=94)||LA98_0==98||LA98_0==106||LA98_0==108||(LA98_0>=112 && LA98_0<=114)||(LA98_0>=117 && LA98_0<=126)||LA98_0==128) ) { alt98=2; } else { @@ -18889,10 +18888,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt99=2; int LA99_0 = input.LA(1); - if ( (LA99_0==116) ) { + if ( (LA99_0==115) ) { alt99=1; } - else if ( (LA99_0==117) ) { + else if ( (LA99_0==116) ) { alt99=2; } else { @@ -18912,7 +18911,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:6830:5: (lv_writeable_1_0= 'var' ) // InternalPerspectiveDsl.g:6831:6: lv_writeable_1_0= 'var' { - lv_writeable_1_0=(Token)match(input,116,FOLLOW_53); if (state.failed) return current; + lv_writeable_1_0=(Token)match(input,115,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_writeable_1_0, grammarAccess.getXVariableDeclarationAccess().getWriteableVarKeyword_1_0_0()); @@ -18938,7 +18937,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:6844:4: otherlv_2= 'val' { - otherlv_2=(Token)match(input,117,FOLLOW_53); if (state.failed) return current; + otherlv_2=(Token)match(input,116,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXVariableDeclarationAccess().getValKeyword_1_1()); @@ -18971,10 +18970,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { throw nvae; } } - else if ( (LA100_0==66) && (synpred35_InternalPerspectiveDsl())) { + else if ( (LA100_0==65) && (synpred35_InternalPerspectiveDsl())) { alt100=1; } - else if ( (LA100_0==91) && (synpred35_InternalPerspectiveDsl())) { + else if ( (LA100_0==90) && (synpred35_InternalPerspectiveDsl())) { alt100=1; } else { @@ -19121,14 +19120,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt101=2; int LA101_0 = input.LA(1); - if ( (LA101_0==69) ) { + if ( (LA101_0==68) ) { alt101=1; } switch (alt101) { case 1 : // InternalPerspectiveDsl.g:6927:4: otherlv_6= '=' ( (lv_right_7_0= ruleXExpression ) ) { - otherlv_6=(Token)match(input,69,FOLLOW_40); if (state.failed) return current; + otherlv_6=(Token)match(input,68,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXVariableDeclarationAccess().getEqualsSignKeyword_3_0()); @@ -19266,11 +19265,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { if ( (LA102_0==RULE_ID) ) { int LA102_1 = input.LA(2); - if ( (LA102_1==RULE_ID||LA102_1==71||LA102_1==78||LA102_1==103) ) { + if ( (LA102_1==RULE_ID||LA102_1==70||LA102_1==77||LA102_1==102) ) { alt102=1; } } - else if ( (LA102_0==66||LA102_0==91) ) { + else if ( (LA102_0==65||LA102_0==90) ) { alt102=1; } switch (alt102) { @@ -19616,14 +19615,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt104=2; int LA104_0 = input.LA(1); - if ( (LA104_0==78) ) { + if ( (LA104_0==77) ) { alt104=1; } switch (alt104) { case 1 : // InternalPerspectiveDsl.g:7092:4: otherlv_1= '<' ( (lv_typeArguments_2_0= ruleJvmArgumentTypeReference ) ) (otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) )* otherlv_5= '>' { - otherlv_1=(Token)match(input,78,FOLLOW_65); if (state.failed) return current; + otherlv_1=(Token)match(input,77,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXFeatureCallAccess().getLessThanSignKeyword_1_0()); @@ -19670,7 +19669,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt103=2; int LA103_0 = input.LA(1); - if ( (LA103_0==67) ) { + if ( (LA103_0==66) ) { alt103=1; } @@ -19679,7 +19678,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:7116:5: otherlv_3= ',' ( (lv_typeArguments_4_0= ruleJvmArgumentTypeReference ) ) { - otherlv_3=(Token)match(input,67,FOLLOW_65); if (state.failed) return current; + otherlv_3=(Token)match(input,66,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getXFeatureCallAccess().getCommaKeyword_1_2_0()); @@ -19729,7 +19728,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_5=(Token)match(input,79,FOLLOW_64); if (state.failed) return current; + otherlv_5=(Token)match(input,78,FOLLOW_64); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_5, grammarAccess.getXFeatureCallAccess().getGreaterThanSignKeyword_1_3()); @@ -19788,7 +19787,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7167:5: (lv_explicitOperationCall_7_0= '(' ) // InternalPerspectiveDsl.g:7168:6: lv_explicitOperationCall_7_0= '(' { - lv_explicitOperationCall_7_0=(Token)match(input,66,FOLLOW_68); if (state.failed) return current; + lv_explicitOperationCall_7_0=(Token)match(input,65,FOLLOW_68); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_explicitOperationCall_7_0, grammarAccess.getXFeatureCallAccess().getExplicitOperationCallLeftParenthesisKeyword_3_0_0()); @@ -19900,7 +19899,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt105=2; int LA105_0 = input.LA(1); - if ( (LA105_0==67) ) { + if ( (LA105_0==66) ) { alt105=1; } @@ -19909,7 +19908,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:7247:7: otherlv_10= ',' ( (lv_featureCallArguments_11_0= ruleXExpression ) ) { - otherlv_10=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; + otherlv_10=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_10, grammarAccess.getXFeatureCallAccess().getCommaKeyword_3_1_1_1_0()); @@ -19968,7 +19967,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_12=(Token)match(input,68,FOLLOW_95); if (state.failed) return current; + otherlv_12=(Token)match(input,67,FOLLOW_95); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_12, grammarAccess.getXFeatureCallAccess().getRightParenthesisKeyword_3_2()); @@ -20110,22 +20109,22 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { alt109=1; } break; - case 118: + case 117: { alt109=2; } break; - case 60: + case 59: { alt109=3; } break; - case 59: + case 58: { alt109=4; } break; - case 61: + case 60: { alt109=5; } @@ -20168,7 +20167,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:7333:3: kw= 'extends' { - kw=(Token)match(input,118,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,117,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -20181,7 +20180,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 3 : // InternalPerspectiveDsl.g:7339:3: kw= 'static' { - kw=(Token)match(input,60,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,59,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -20194,7 +20193,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 4 : // InternalPerspectiveDsl.g:7345:3: kw= 'import' { - kw=(Token)match(input,59,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,58,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -20207,7 +20206,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 5 : // InternalPerspectiveDsl.g:7351:3: kw= 'extension' { - kw=(Token)match(input,61,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,60,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -20301,10 +20300,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt110=2; int LA110_0 = input.LA(1); - if ( (LA110_0==RULE_ID||(LA110_0>=59 && LA110_0<=61)||LA110_0==118) ) { + if ( (LA110_0==RULE_ID||(LA110_0>=58 && LA110_0<=60)||LA110_0==117) ) { alt110=1; } - else if ( (LA110_0==119) ) { + else if ( (LA110_0==118) ) { alt110=2; } else { @@ -20344,7 +20343,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 2 : // InternalPerspectiveDsl.g:7386:3: kw= 'super' { - kw=(Token)match(input,119,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,118,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -20466,7 +20465,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,120,FOLLOW_4); if (state.failed) return current; + otherlv_1=(Token)match(input,119,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXConstructorCallAccess().getNewKeyword_1()); @@ -20516,7 +20515,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7438:4: ( ( '<' )=>otherlv_3= '<' ) // InternalPerspectiveDsl.g:7439:5: ( '<' )=>otherlv_3= '<' { - otherlv_3=(Token)match(input,78,FOLLOW_65); if (state.failed) return current; + otherlv_3=(Token)match(input,77,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getXConstructorCallAccess().getLessThanSignKeyword_3_0()); @@ -20566,7 +20565,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt111=2; int LA111_0 = input.LA(1); - if ( (LA111_0==67) ) { + if ( (LA111_0==66) ) { alt111=1; } @@ -20575,7 +20574,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:7465:5: otherlv_5= ',' ( (lv_typeArguments_6_0= ruleJvmArgumentTypeReference ) ) { - otherlv_5=(Token)match(input,67,FOLLOW_65); if (state.failed) return current; + otherlv_5=(Token)match(input,66,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_5, grammarAccess.getXConstructorCallAccess().getCommaKeyword_3_2_0()); @@ -20625,7 +20624,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_7=(Token)match(input,79,FOLLOW_94); if (state.failed) return current; + otherlv_7=(Token)match(input,78,FOLLOW_94); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_7, grammarAccess.getXConstructorCallAccess().getGreaterThanSignKeyword_3_3()); @@ -20650,7 +20649,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7500:5: (lv_explicitConstructorCall_8_0= '(' ) // InternalPerspectiveDsl.g:7501:6: lv_explicitConstructorCall_8_0= '(' { - lv_explicitConstructorCall_8_0=(Token)match(input,66,FOLLOW_68); if (state.failed) return current; + lv_explicitConstructorCall_8_0=(Token)match(input,65,FOLLOW_68); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_explicitConstructorCall_8_0, grammarAccess.getXConstructorCallAccess().getExplicitConstructorCallLeftParenthesisKeyword_4_0_0()); @@ -20762,7 +20761,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt113=2; int LA113_0 = input.LA(1); - if ( (LA113_0==67) ) { + if ( (LA113_0==66) ) { alt113=1; } @@ -20771,7 +20770,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:7580:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleXExpression ) ) { - otherlv_11=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; + otherlv_11=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_11, grammarAccess.getXConstructorCallAccess().getCommaKeyword_4_1_1_1_0()); @@ -20830,7 +20829,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_13=(Token)match(input,68,FOLLOW_95); if (state.failed) return current; + otherlv_13=(Token)match(input,67,FOLLOW_95); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_13, grammarAccess.getXConstructorCallAccess().getRightParenthesisKeyword_4_2()); @@ -20983,10 +20982,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt117=2; int LA117_0 = input.LA(1); - if ( (LA117_0==121) ) { + if ( (LA117_0==120) ) { alt117=1; } - else if ( (LA117_0==122) ) { + else if ( (LA117_0==121) ) { alt117=2; } else { @@ -21000,7 +20999,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:7663:4: otherlv_1= 'false' { - otherlv_1=(Token)match(input,121,FOLLOW_2); if (state.failed) return current; + otherlv_1=(Token)match(input,120,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXBooleanLiteralAccess().getFalseKeyword_1_0()); @@ -21018,7 +21017,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7669:5: (lv_isTrue_2_0= 'true' ) // InternalPerspectiveDsl.g:7670:6: lv_isTrue_2_0= 'true' { - lv_isTrue_2_0=(Token)match(input,122,FOLLOW_2); if (state.failed) return current; + lv_isTrue_2_0=(Token)match(input,121,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_isTrue_2_0, grammarAccess.getXBooleanLiteralAccess().getIsTrueTrueKeyword_1_1_0()); @@ -21138,7 +21137,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,123,FOLLOW_2); if (state.failed) return current; + otherlv_1=(Token)match(input,122,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXNullLiteralAccess().getNullKeyword_1()); @@ -21496,13 +21495,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,124,FOLLOW_78); if (state.failed) return current; + otherlv_1=(Token)match(input,123,FOLLOW_78); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXTypeLiteralAccess().getTypeofKeyword_1()); } - otherlv_2=(Token)match(input,66,FOLLOW_4); if (state.failed) return current; + otherlv_2=(Token)match(input,65,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXTypeLiteralAccess().getLeftParenthesisKeyword_2()); @@ -21548,7 +21547,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt118=2; int LA118_0 = input.LA(1); - if ( (LA118_0==71) ) { + if ( (LA118_0==70) ) { alt118=1; } @@ -21595,7 +21594,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_5=(Token)match(input,68,FOLLOW_2); if (state.failed) return current; + otherlv_5=(Token)match(input,67,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_5, grammarAccess.getXTypeLiteralAccess().getRightParenthesisKeyword_5()); @@ -21697,7 +21696,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,125,FOLLOW_40); if (state.failed) return current; + otherlv_1=(Token)match(input,124,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXThrowExpressionAccess().getThrowKeyword_1()); @@ -21834,7 +21833,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,126,FOLLOW_98); if (state.failed) return current; + otherlv_1=(Token)match(input,125,FOLLOW_98); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXReturnExpressionAccess().getReturnKeyword_1()); @@ -21986,7 +21985,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,127,FOLLOW_40); if (state.failed) return current; + otherlv_1=(Token)match(input,126,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXTryCatchFinallyExpressionAccess().getTryKeyword_1()); @@ -22031,10 +22030,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt122=2; int LA122_0 = input.LA(1); - if ( (LA122_0==130) ) { + if ( (LA122_0==129) ) { alt122=1; } - else if ( (LA122_0==128) ) { + else if ( (LA122_0==127) ) { alt122=2; } else { @@ -22058,7 +22057,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt120=2; int LA120_0 = input.LA(1); - if ( (LA120_0==130) ) { + if ( (LA120_0==129) ) { int LA120_2 = input.LA(2); if ( (synpred44_InternalPerspectiveDsl()) ) { @@ -22120,7 +22119,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt121=2; int LA121_0 = input.LA(1); - if ( (LA121_0==128) ) { + if ( (LA121_0==127) ) { int LA121_1 = input.LA(2); if ( (synpred45_InternalPerspectiveDsl()) ) { @@ -22134,7 +22133,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8046:6: ( ( 'finally' )=>otherlv_4= 'finally' ) // InternalPerspectiveDsl.g:8047:7: ( 'finally' )=>otherlv_4= 'finally' { - otherlv_4=(Token)match(input,128,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,127,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_0_1_0()); @@ -22196,7 +22195,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8075:4: (otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) ) // InternalPerspectiveDsl.g:8076:5: otherlv_6= 'finally' ( (lv_finallyExpression_7_0= ruleXExpression ) ) { - otherlv_6=(Token)match(input,128,FOLLOW_40); if (state.failed) return current; + otherlv_6=(Token)match(input,127,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_6, grammarAccess.getXTryCatchFinallyExpressionAccess().getFinallyKeyword_3_1_0()); @@ -22352,13 +22351,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,129,FOLLOW_78); if (state.failed) return current; + otherlv_1=(Token)match(input,128,FOLLOW_78); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXSynchronizedExpressionAccess().getSynchronizedKeyword_0_0_1()); } - otherlv_2=(Token)match(input,66,FOLLOW_40); if (state.failed) return current; + otherlv_2=(Token)match(input,65,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXSynchronizedExpressionAccess().getLeftParenthesisKeyword_0_0_2()); @@ -22405,7 +22404,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_4=(Token)match(input,68,FOLLOW_40); if (state.failed) return current; + otherlv_4=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXSynchronizedExpressionAccess().getRightParenthesisKeyword_2()); @@ -22536,7 +22535,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8207:3: ( ( 'catch' )=>otherlv_0= 'catch' ) // InternalPerspectiveDsl.g:8208:4: ( 'catch' )=>otherlv_0= 'catch' { - otherlv_0=(Token)match(input,130,FOLLOW_78); if (state.failed) return current; + otherlv_0=(Token)match(input,129,FOLLOW_78); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getXCatchClauseAccess().getCatchKeyword_0()); @@ -22545,7 +22544,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,66,FOLLOW_53); if (state.failed) return current; + otherlv_1=(Token)match(input,65,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getXCatchClauseAccess().getLeftParenthesisKeyword_1()); @@ -22586,7 +22585,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,68,FOLLOW_40); if (state.failed) return current; + otherlv_3=(Token)match(input,67,FOLLOW_40); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getXCatchClauseAccess().getRightParenthesisKeyword_3()); @@ -22738,7 +22737,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt123=2; int LA123_0 = input.LA(1); - if ( (LA123_0==103) ) { + if ( (LA123_0==102) ) { int LA123_2 = input.LA(2); if ( (LA123_2==RULE_ID) ) { @@ -22762,7 +22761,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8290:4: ( ( '.' )=>kw= '.' ) // InternalPerspectiveDsl.g:8291:5: ( '.' )=>kw= '.' { - kw=(Token)match(input,103,FOLLOW_4); if (state.failed) return current; + kw=(Token)match(input,102,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -22991,7 +22990,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt126=2; int LA126_0 = input.LA(1); - if ( (LA126_0==103) ) { + if ( (LA126_0==102) ) { int LA126_1 = input.LA(2); if ( (LA126_1==RULE_INT||LA126_1==RULE_DECIMAL) ) { @@ -23002,7 +23001,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:8361:5: kw= '.' (this_INT_4= RULE_INT | this_DECIMAL_5= RULE_DECIMAL ) { - kw=(Token)match(input,103,FOLLOW_102); if (state.failed) return current; + kw=(Token)match(input,102,FOLLOW_102); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -23167,7 +23166,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { if ( (LA129_0==RULE_ID) ) { alt129=1; } - else if ( (LA129_0==66||LA129_0==91) ) { + else if ( (LA129_0==65||LA129_0==90) ) { alt129=2; } else { @@ -23206,10 +23205,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt128=2; int LA128_0 = input.LA(1); - if ( (LA128_0==71) ) { + if ( (LA128_0==70) ) { int LA128_2 = input.LA(2); - if ( (LA128_2==72) ) { + if ( (LA128_2==71) ) { int LA128_3 = input.LA(3); if ( (synpred49_InternalPerspectiveDsl()) ) { @@ -23379,14 +23378,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8468:2: (kw= '[' kw= ']' ) // InternalPerspectiveDsl.g:8469:3: kw= '[' kw= ']' { - kw=(Token)match(input,71,FOLLOW_75); if (state.failed) return current; + kw=(Token)match(input,70,FOLLOW_75); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); newLeafNode(kw, grammarAccess.getArrayBracketsAccess().getLeftSquareBracketKeyword_0()); } - kw=(Token)match(input,72,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,71,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -23487,14 +23486,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt132=2; int LA132_0 = input.LA(1); - if ( (LA132_0==66) ) { + if ( (LA132_0==65) ) { alt132=1; } switch (alt132) { case 1 : // InternalPerspectiveDsl.g:8499:4: otherlv_0= '(' ( ( (lv_paramTypes_1_0= ruleJvmTypeReference ) ) (otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) )* )? otherlv_4= ')' { - otherlv_0=(Token)match(input,66,FOLLOW_103); if (state.failed) return current; + otherlv_0=(Token)match(input,65,FOLLOW_103); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getXFunctionTypeRefAccess().getLeftParenthesisKeyword_0_0()); @@ -23504,7 +23503,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt131=2; int LA131_0 = input.LA(1); - if ( (LA131_0==RULE_ID||LA131_0==66||LA131_0==91) ) { + if ( (LA131_0==RULE_ID||LA131_0==65||LA131_0==90) ) { alt131=1; } switch (alt131) { @@ -23552,7 +23551,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt130=2; int LA130_0 = input.LA(1); - if ( (LA130_0==67) ) { + if ( (LA130_0==66) ) { alt130=1; } @@ -23561,7 +23560,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:8524:6: otherlv_2= ',' ( (lv_paramTypes_3_0= ruleJvmTypeReference ) ) { - otherlv_2=(Token)match(input,67,FOLLOW_53); if (state.failed) return current; + otherlv_2=(Token)match(input,66,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getXFunctionTypeRefAccess().getCommaKeyword_0_1_1_0()); @@ -23617,7 +23616,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_4=(Token)match(input,68,FOLLOW_104); if (state.failed) return current; + otherlv_4=(Token)match(input,67,FOLLOW_104); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_4, grammarAccess.getXFunctionTypeRefAccess().getRightParenthesisKeyword_0_2()); @@ -23629,7 +23628,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_5=(Token)match(input,91,FOLLOW_53); if (state.failed) return current; + otherlv_5=(Token)match(input,90,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_5, grammarAccess.getXFunctionTypeRefAccess().getEqualsSignGreaterThanSignKeyword_1()); @@ -23809,7 +23808,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8613:4: ( ( '<' )=>otherlv_1= '<' ) // InternalPerspectiveDsl.g:8614:5: ( '<' )=>otherlv_1= '<' { - otherlv_1=(Token)match(input,78,FOLLOW_65); if (state.failed) return current; + otherlv_1=(Token)match(input,77,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_0()); @@ -23859,7 +23858,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt133=2; int LA133_0 = input.LA(1); - if ( (LA133_0==67) ) { + if ( (LA133_0==66) ) { alt133=1; } @@ -23868,7 +23867,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:8640:5: otherlv_3= ',' ( (lv_arguments_4_0= ruleJvmArgumentTypeReference ) ) { - otherlv_3=(Token)match(input,67,FOLLOW_65); if (state.failed) return current; + otherlv_3=(Token)match(input,66,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_2_0()); @@ -23918,7 +23917,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_5=(Token)match(input,79,FOLLOW_101); if (state.failed) return current; + otherlv_5=(Token)match(input,78,FOLLOW_101); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_5, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_3()); @@ -23930,7 +23929,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt136=2; int LA136_0 = input.LA(1); - if ( (LA136_0==103) ) { + if ( (LA136_0==102) ) { int LA136_2 = input.LA(2); if ( (LA136_2==RULE_ID) ) { @@ -23970,7 +23969,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_7=(Token)match(input,103,FOLLOW_4); if (state.failed) return current; + otherlv_7=(Token)match(input,102,FOLLOW_4); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_7, grammarAccess.getJvmParameterizedTypeReferenceAccess().getFullStopKeyword_1_4_0_0_1()); @@ -24026,7 +24025,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8707:6: ( ( '<' )=>otherlv_9= '<' ) // InternalPerspectiveDsl.g:8708:7: ( '<' )=>otherlv_9= '<' { - otherlv_9=(Token)match(input,78,FOLLOW_65); if (state.failed) return current; + otherlv_9=(Token)match(input,77,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_9, grammarAccess.getJvmParameterizedTypeReferenceAccess().getLessThanSignKeyword_1_4_2_0()); @@ -24076,7 +24075,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt134=2; int LA134_0 = input.LA(1); - if ( (LA134_0==67) ) { + if ( (LA134_0==66) ) { alt134=1; } @@ -24085,7 +24084,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:8734:7: otherlv_11= ',' ( (lv_arguments_12_0= ruleJvmArgumentTypeReference ) ) { - otherlv_11=(Token)match(input,67,FOLLOW_65); if (state.failed) return current; + otherlv_11=(Token)match(input,66,FOLLOW_65); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_11, grammarAccess.getJvmParameterizedTypeReferenceAccess().getCommaKeyword_1_4_2_2_0()); @@ -24135,7 +24134,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_13=(Token)match(input,79,FOLLOW_101); if (state.failed) return current; + otherlv_13=(Token)match(input,78,FOLLOW_101); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_13, grammarAccess.getJvmParameterizedTypeReferenceAccess().getGreaterThanSignKeyword_1_4_2_3()); @@ -24247,10 +24246,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt138=2; int LA138_0 = input.LA(1); - if ( (LA138_0==RULE_ID||LA138_0==66||LA138_0==91) ) { + if ( (LA138_0==RULE_ID||LA138_0==65||LA138_0==90) ) { alt138=1; } - else if ( (LA138_0==131) ) { + else if ( (LA138_0==130) ) { alt138=2; } else { @@ -24407,7 +24406,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,131,FOLLOW_107); if (state.failed) return current; + otherlv_1=(Token)match(input,130,FOLLOW_107); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getJvmWildcardTypeReferenceAccess().getQuestionMarkKeyword_1()); @@ -24417,10 +24416,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt141=3; int LA141_0 = input.LA(1); - if ( (LA141_0==118) ) { + if ( (LA141_0==117) ) { alt141=1; } - else if ( (LA141_0==119) ) { + else if ( (LA141_0==118) ) { alt141=2; } switch (alt141) { @@ -24471,7 +24470,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt139=2; int LA139_0 = input.LA(1); - if ( (LA139_0==132) ) { + if ( (LA139_0==131) ) { alt139=1; } @@ -24571,7 +24570,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt140=2; int LA140_0 = input.LA(1); - if ( (LA140_0==132) ) { + if ( (LA140_0==131) ) { alt140=1; } @@ -24710,7 +24709,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8932:2: (otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) // InternalPerspectiveDsl.g:8933:3: otherlv_0= 'extends' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) { - otherlv_0=(Token)match(input,118,FOLLOW_53); if (state.failed) return current; + otherlv_0=(Token)match(input,117,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAccess().getExtendsKeyword_0()); @@ -24834,7 +24833,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8974:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) // InternalPerspectiveDsl.g:8975:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) { - otherlv_0=(Token)match(input,132,FOLLOW_53); if (state.failed) return current; + otherlv_0=(Token)match(input,131,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getJvmUpperBoundAndedAccess().getAmpersandKeyword_0()); @@ -24958,7 +24957,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:9016:2: (otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) // InternalPerspectiveDsl.g:9017:3: otherlv_0= 'super' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) { - otherlv_0=(Token)match(input,119,FOLLOW_53); if (state.failed) return current; + otherlv_0=(Token)match(input,118,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAccess().getSuperKeyword_0()); @@ -25082,7 +25081,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:9058:2: (otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) ) // InternalPerspectiveDsl.g:9059:3: otherlv_0= '&' ( (lv_typeReference_1_0= ruleJvmTypeReference ) ) { - otherlv_0=(Token)match(input,132,FOLLOW_53); if (state.failed) return current; + otherlv_0=(Token)match(input,131,FOLLOW_53); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_0, grammarAccess.getJvmLowerBoundAndedAccess().getAmpersandKeyword_0()); @@ -25226,14 +25225,14 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { afterParserOrEnumRuleCall(); } - kw=(Token)match(input,103,FOLLOW_110); if (state.failed) return current; + kw=(Token)match(input,102,FOLLOW_110); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); newLeafNode(kw, grammarAccess.getQualifiedNameWithWildcardAccess().getFullStopKeyword_1()); } - kw=(Token)match(input,62,FOLLOW_2); if (state.failed) return current; + kw=(Token)match(input,61,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -25412,7 +25411,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt142=2; int LA142_0 = input.LA(1); - if ( (LA142_0==59) ) { + if ( (LA142_0==58) ) { alt142=1; } @@ -25551,7 +25550,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { if ( (LA143_0==RULE_ID) ) { int LA143_2 = input.LA(2); - if ( (LA143_2==103) ) { + if ( (LA143_2==102) ) { alt143=1; } @@ -25583,7 +25582,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { afterParserOrEnumRuleCall(); } - kw=(Token)match(input,103,FOLLOW_112); if (state.failed) return current; + kw=(Token)match(input,102,FOLLOW_112); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -25644,10 +25643,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt144=2; int LA144_0 = input.LA(1); - if ( (LA144_0==133) ) { + if ( (LA144_0==132) ) { alt144=1; } - else if ( (LA144_0==134) ) { + else if ( (LA144_0==133) ) { alt144=2; } else { @@ -25664,7 +25663,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:9227:3: (enumLiteral_0= 'horizontal' ) // InternalPerspectiveDsl.g:9228:4: enumLiteral_0= 'horizontal' { - enumLiteral_0=(Token)match(input,133,FOLLOW_2); if (state.failed) return current; + enumLiteral_0=(Token)match(input,132,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current = grammarAccess.getSashOrientationAccess().getHORIZONTALEnumLiteralDeclaration_0().getEnumLiteral().getInstance(); @@ -25683,7 +25682,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:9235:3: (enumLiteral_1= 'vertical' ) // InternalPerspectiveDsl.g:9236:4: enumLiteral_1= 'vertical' { - enumLiteral_1=(Token)match(input,134,FOLLOW_2); if (state.failed) return current; + enumLiteral_1=(Token)match(input,133,FOLLOW_2); if (state.failed) return current; if ( state.backtracking==0 ) { current = grammarAccess.getSashOrientationAccess().getVERTICALEnumLiteralDeclaration_1().getEnumLiteral().getInstance(); @@ -25724,7 +25723,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:2595:5: ( '(' ) // InternalPerspectiveDsl.g:2595:6: '(' { - match(input,66,FOLLOW_2); if (state.failed) return ; + match(input,65,FOLLOW_2); if (state.failed) return ; } } @@ -25755,7 +25754,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - match(input,69,FOLLOW_2); if (state.failed) return ; + match(input,68,FOLLOW_2); if (state.failed) return ; } @@ -25777,8 +25776,8 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,70,FOLLOW_41); if (state.failed) return ; - match(input,71,FOLLOW_2); if (state.failed) return ; + match(input,69,FOLLOW_41); if (state.failed) return ; + match(input,70,FOLLOW_2); if (state.failed) return ; } @@ -25800,8 +25799,8 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,70,FOLLOW_41); if (state.failed) return ; - match(input,71,FOLLOW_2); if (state.failed) return ; + match(input,69,FOLLOW_41); if (state.failed) return ; + match(input,70,FOLLOW_2); if (state.failed) return ; } @@ -25975,7 +25974,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,87,FOLLOW_2); if (state.failed) return ; + match(input,86,FOLLOW_2); if (state.failed) return ; } @@ -26068,8 +26067,8 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:3988:7: ( '>' '>' ) // InternalPerspectiveDsl.g:3989:7: '>' '>' { - match(input,79,FOLLOW_56); if (state.failed) return ; - match(input,79,FOLLOW_2); if (state.failed) return ; + match(input,78,FOLLOW_56); if (state.failed) return ; + match(input,78,FOLLOW_2); if (state.failed) return ; } @@ -26086,8 +26085,8 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4023:7: ( '<' '<' ) // InternalPerspectiveDsl.g:4024:7: '<' '<' { - match(input,78,FOLLOW_46); if (state.failed) return ; - match(input,78,FOLLOW_2); if (state.failed) return ; + match(input,77,FOLLOW_46); if (state.failed) return ; + match(input,77,FOLLOW_2); if (state.failed) return ; } @@ -26185,7 +26184,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,100,FOLLOW_2); if (state.failed) return ; + match(input,99,FOLLOW_2); if (state.failed) return ; } @@ -26249,10 +26248,10 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt145=2; int LA145_0 = input.LA(1); - if ( (LA145_0==103) ) { + if ( (LA145_0==102) ) { alt145=1; } - else if ( (LA145_0==104) ) { + else if ( (LA145_0==103) ) { alt145=2; } else { @@ -26266,7 +26265,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4614:8: '.' { - match(input,103,FOLLOW_63); if (state.failed) return ; + match(input,102,FOLLOW_63); if (state.failed) return ; } break; @@ -26279,7 +26278,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4617:9: ( '::' ) // InternalPerspectiveDsl.g:4618:10: '::' { - match(input,104,FOLLOW_63); if (state.failed) return ; + match(input,103,FOLLOW_63); if (state.failed) return ; } @@ -26338,17 +26337,17 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4710:7: ( '.' | ( ( '?.' ) ) | ( ( '::' ) ) ) int alt146=3; switch ( input.LA(1) ) { - case 103: + case 102: { alt146=1; } break; - case 105: + case 104: { alt146=2; } break; - case 104: + case 103: { alt146=3; } @@ -26365,7 +26364,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4711:8: '.' { - match(input,103,FOLLOW_2); if (state.failed) return ; + match(input,102,FOLLOW_2); if (state.failed) return ; } break; @@ -26378,7 +26377,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4714:9: ( '?.' ) // InternalPerspectiveDsl.g:4715:10: '?.' { - match(input,105,FOLLOW_2); if (state.failed) return ; + match(input,104,FOLLOW_2); if (state.failed) return ; } @@ -26397,7 +26396,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4720:9: ( '::' ) // InternalPerspectiveDsl.g:4721:10: '::' { - match(input,104,FOLLOW_2); if (state.failed) return ; + match(input,103,FOLLOW_2); if (state.failed) return ; } @@ -26426,7 +26425,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4845:8: ( '(' ) // InternalPerspectiveDsl.g:4846:8: '(' { - match(input,66,FOLLOW_2); if (state.failed) return ; + match(input,65,FOLLOW_2); if (state.failed) return ; } @@ -26452,7 +26451,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt148=2; int LA148_0 = input.LA(1); - if ( (LA148_0==RULE_ID||LA148_0==66||LA148_0==91) ) { + if ( (LA148_0==RULE_ID||LA148_0==65||LA148_0==90) ) { alt148=1; } switch (alt148) { @@ -26482,7 +26481,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt147=2; int LA147_0 = input.LA(1); - if ( (LA147_0==67) ) { + if ( (LA147_0==66) ) { alt147=1; } @@ -26491,7 +26490,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:4874:11: ',' ( ( ruleJvmFormalParameter ) ) { - match(input,67,FOLLOW_53); if (state.failed) return ; + match(input,66,FOLLOW_53); if (state.failed) return ; // InternalPerspectiveDsl.g:4875:11: ( ( ruleJvmFormalParameter ) ) // InternalPerspectiveDsl.g:4876:12: ( ruleJvmFormalParameter ) { @@ -26530,7 +26529,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:4883:10: ( '|' ) // InternalPerspectiveDsl.g:4884:11: '|' { - match(input,106,FOLLOW_2); if (state.failed) return ; + match(input,105,FOLLOW_2); if (state.failed) return ; } @@ -26558,7 +26557,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,71,FOLLOW_2); if (state.failed) return ; + match(input,70,FOLLOW_2); if (state.failed) return ; } @@ -26580,8 +26579,8 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,129,FOLLOW_78); if (state.failed) return ; - match(input,66,FOLLOW_2); if (state.failed) return ; + match(input,128,FOLLOW_78); if (state.failed) return ; + match(input,65,FOLLOW_2); if (state.failed) return ; } @@ -26603,8 +26602,8 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,113,FOLLOW_78); if (state.failed) return ; - match(input,66,FOLLOW_53); if (state.failed) return ; + match(input,112,FOLLOW_78); if (state.failed) return ; + match(input,65,FOLLOW_53); if (state.failed) return ; // InternalPerspectiveDsl.g:5084:5: ( ( ruleJvmFormalParameter ) ) // InternalPerspectiveDsl.g:5085:6: ( ruleJvmFormalParameter ) { @@ -26622,7 +26621,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - match(input,110,FOLLOW_2); if (state.failed) return ; + match(input,109,FOLLOW_2); if (state.failed) return ; } @@ -26644,7 +26643,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,71,FOLLOW_2); if (state.failed) return ; + match(input,70,FOLLOW_2); if (state.failed) return ; } @@ -26665,7 +26664,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt150=2; int LA150_0 = input.LA(1); - if ( (LA150_0==RULE_ID||LA150_0==66||LA150_0==91) ) { + if ( (LA150_0==RULE_ID||LA150_0==65||LA150_0==90) ) { alt150=1; } switch (alt150) { @@ -26695,7 +26694,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt149=2; int LA149_0 = input.LA(1); - if ( (LA149_0==67) ) { + if ( (LA149_0==66) ) { alt149=1; } @@ -26704,7 +26703,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:5506:7: ',' ( ( ruleJvmFormalParameter ) ) { - match(input,67,FOLLOW_53); if (state.failed) return ; + match(input,66,FOLLOW_53); if (state.failed) return ; // InternalPerspectiveDsl.g:5507:7: ( ( ruleJvmFormalParameter ) ) // InternalPerspectiveDsl.g:5508:8: ( ruleJvmFormalParameter ) { @@ -26743,7 +26742,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:5515:6: ( '|' ) // InternalPerspectiveDsl.g:5516:7: '|' { - match(input,106,FOLLOW_2); if (state.failed) return ; + match(input,105,FOLLOW_2); if (state.failed) return ; } @@ -26763,7 +26762,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:5907:5: ( 'else' ) // InternalPerspectiveDsl.g:5907:6: 'else' { - match(input,108,FOLLOW_2); if (state.failed) return ; + match(input,107,FOLLOW_2); if (state.failed) return ; } } @@ -26777,7 +26776,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:5966:7: ( '(' ( ( ruleJvmFormalParameter ) ) ':' ) // InternalPerspectiveDsl.g:5967:7: '(' ( ( ruleJvmFormalParameter ) ) ':' { - match(input,66,FOLLOW_53); if (state.failed) return ; + match(input,65,FOLLOW_53); if (state.failed) return ; // InternalPerspectiveDsl.g:5968:7: ( ( ruleJvmFormalParameter ) ) // InternalPerspectiveDsl.g:5969:8: ( ruleJvmFormalParameter ) { @@ -26795,7 +26794,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - match(input,110,FOLLOW_2); if (state.failed) return ; + match(input,109,FOLLOW_2); if (state.failed) return ; } @@ -26829,7 +26828,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } - match(input,110,FOLLOW_2); if (state.failed) return ; + match(input,109,FOLLOW_2); if (state.failed) return ; } @@ -26896,7 +26895,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7163:6: ( '(' ) // InternalPerspectiveDsl.g:7164:6: '(' { - match(input,66,FOLLOW_2); if (state.failed) return ; + match(input,65,FOLLOW_2); if (state.failed) return ; } @@ -26922,7 +26921,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt154=2; int LA154_0 = input.LA(1); - if ( (LA154_0==RULE_ID||LA154_0==66||LA154_0==91) ) { + if ( (LA154_0==RULE_ID||LA154_0==65||LA154_0==90) ) { alt154=1; } switch (alt154) { @@ -26952,7 +26951,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt153=2; int LA153_0 = input.LA(1); - if ( (LA153_0==67) ) { + if ( (LA153_0==66) ) { alt153=1; } @@ -26961,7 +26960,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:7192:9: ',' ( ( ruleJvmFormalParameter ) ) { - match(input,67,FOLLOW_53); if (state.failed) return ; + match(input,66,FOLLOW_53); if (state.failed) return ; // InternalPerspectiveDsl.g:7193:9: ( ( ruleJvmFormalParameter ) ) // InternalPerspectiveDsl.g:7194:10: ( ruleJvmFormalParameter ) { @@ -27000,7 +26999,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7201:8: ( '|' ) // InternalPerspectiveDsl.g:7202:9: '|' { - match(input,106,FOLLOW_2); if (state.failed) return ; + match(input,105,FOLLOW_2); if (state.failed) return ; } @@ -27028,7 +27027,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,71,FOLLOW_2); if (state.failed) return ; + match(input,70,FOLLOW_2); if (state.failed) return ; } @@ -27042,7 +27041,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7439:5: ( '<' ) // InternalPerspectiveDsl.g:7439:6: '<' { - match(input,78,FOLLOW_2); if (state.failed) return ; + match(input,77,FOLLOW_2); if (state.failed) return ; } } @@ -27056,7 +27055,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7496:6: ( '(' ) // InternalPerspectiveDsl.g:7497:6: '(' { - match(input,66,FOLLOW_2); if (state.failed) return ; + match(input,65,FOLLOW_2); if (state.failed) return ; } @@ -27082,7 +27081,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt156=2; int LA156_0 = input.LA(1); - if ( (LA156_0==RULE_ID||LA156_0==66||LA156_0==91) ) { + if ( (LA156_0==RULE_ID||LA156_0==65||LA156_0==90) ) { alt156=1; } switch (alt156) { @@ -27112,7 +27111,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int alt155=2; int LA155_0 = input.LA(1); - if ( (LA155_0==67) ) { + if ( (LA155_0==66) ) { alt155=1; } @@ -27121,7 +27120,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { case 1 : // InternalPerspectiveDsl.g:7525:9: ',' ( ( ruleJvmFormalParameter ) ) { - match(input,67,FOLLOW_53); if (state.failed) return ; + match(input,66,FOLLOW_53); if (state.failed) return ; // InternalPerspectiveDsl.g:7526:9: ( ( ruleJvmFormalParameter ) ) // InternalPerspectiveDsl.g:7527:10: ( ruleJvmFormalParameter ) { @@ -27160,7 +27159,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7534:8: ( '|' ) // InternalPerspectiveDsl.g:7535:9: '|' { - match(input,106,FOLLOW_2); if (state.failed) return ; + match(input,105,FOLLOW_2); if (state.failed) return ; } @@ -27188,7 +27187,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,71,FOLLOW_2); if (state.failed) return ; + match(input,70,FOLLOW_2); if (state.failed) return ; } @@ -27202,7 +27201,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:7955:4: ( 'extends' | 'static' | 'import' | 'extension' | '!' | '-' | '+' | 'new' | '{' | 'switch' | 'synchronized' | '<' | 'super' | '#' | '[' | 'false' | 'true' | 'null' | 'typeof' | 'if' | 'for' | 'while' | 'do' | 'throw' | 'return' | 'try' | '(' | RULE_ID | RULE_HEX | RULE_INT | RULE_DECIMAL | RULE_STRING ) // InternalPerspectiveDsl.g: { - if ( (input.LA(1)>=RULE_ID && input.LA(1)<=RULE_DECIMAL)||input.LA(1)==14||(input.LA(1)>=59 && input.LA(1)<=61)||input.LA(1)==66||(input.LA(1)>=70 && input.LA(1)<=71)||input.LA(1)==78||(input.LA(1)>=94 && input.LA(1)<=95)||input.LA(1)==99||input.LA(1)==107||input.LA(1)==109||(input.LA(1)>=113 && input.LA(1)<=115)||(input.LA(1)>=118 && input.LA(1)<=127)||input.LA(1)==129 ) { + if ( (input.LA(1)>=RULE_ID && input.LA(1)<=RULE_DECIMAL)||input.LA(1)==14||(input.LA(1)>=58 && input.LA(1)<=60)||input.LA(1)==65||(input.LA(1)>=69 && input.LA(1)<=70)||input.LA(1)==77||(input.LA(1)>=93 && input.LA(1)<=94)||input.LA(1)==98||input.LA(1)==106||input.LA(1)==108||(input.LA(1)>=112 && input.LA(1)<=114)||(input.LA(1)>=117 && input.LA(1)<=126)||input.LA(1)==128 ) { input.consume(); state.errorRecovery=false;state.failed=false; } @@ -27222,7 +27221,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8026:6: ( 'catch' ) // InternalPerspectiveDsl.g:8026:7: 'catch' { - match(input,130,FOLLOW_2); if (state.failed) return ; + match(input,129,FOLLOW_2); if (state.failed) return ; } } @@ -27233,7 +27232,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8047:7: ( 'finally' ) // InternalPerspectiveDsl.g:8047:8: 'finally' { - match(input,128,FOLLOW_2); if (state.failed) return ; + match(input,127,FOLLOW_2); if (state.failed) return ; } } @@ -27244,7 +27243,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8291:5: ( '.' ) // InternalPerspectiveDsl.g:8291:6: '.' { - match(input,103,FOLLOW_2); if (state.failed) return ; + match(input,102,FOLLOW_2); if (state.failed) return ; } } @@ -27281,7 +27280,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8614:5: ( '<' ) // InternalPerspectiveDsl.g:8614:6: '<' { - match(input,78,FOLLOW_2); if (state.failed) return ; + match(input,77,FOLLOW_2); if (state.failed) return ; } } @@ -27300,7 +27299,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { { } - match(input,103,FOLLOW_2); if (state.failed) return ; + match(input,102,FOLLOW_2); if (state.failed) return ; } @@ -27314,7 +27313,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { // InternalPerspectiveDsl.g:8708:7: ( '<' ) // InternalPerspectiveDsl.g:8708:8: '<' { - match(input,78,FOLLOW_2); if (state.failed) return ; + match(input,77,FOLLOW_2); if (state.failed) return ; } } @@ -27981,18 +27980,18 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { static final String dfa_1s = "\10\uffff"; static final String dfa_2s = "\2\uffff\1\5\4\uffff\1\5"; static final String dfa_3s = "\1\4\1\uffff\1\15\1\uffff\1\4\2\uffff\1\15"; - static final String dfa_4s = "\1\77\1\uffff\1\147\1\uffff\1\76\2\uffff\1\147"; + static final String dfa_4s = "\1\76\1\uffff\1\146\1\uffff\1\75\2\uffff\1\146"; static final String dfa_5s = "\1\uffff\1\1\1\uffff\1\4\1\uffff\1\2\1\3\1\uffff"; static final String dfa_6s = "\10\uffff}>"; static final String[] dfa_7s = { - "\1\2\67\uffff\1\1\2\uffff\1\3", + "\1\2\66\uffff\1\1\2\uffff\1\3", "", - "\1\5\55\uffff\1\5\4\uffff\1\5\46\uffff\1\4", + "\1\5\54\uffff\1\5\4\uffff\1\5\46\uffff\1\4", "", - "\1\7\71\uffff\1\6", + "\1\7\70\uffff\1\6", "", "", - "\1\5\55\uffff\1\5\4\uffff\1\5\46\uffff\1\4" + "\1\5\54\uffff\1\5\4\uffff\1\5\46\uffff\1\4" }; static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s); @@ -28022,11 +28021,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } static final String dfa_8s = "\44\uffff"; static final String dfa_9s = "\1\4\1\0\42\uffff"; - static final String dfa_10s = "\1\u0081\1\0\42\uffff"; + static final String dfa_10s = "\1\u0080\1\0\42\uffff"; static final String dfa_11s = "\2\uffff\1\2\37\uffff\1\3\1\1"; static final String dfa_12s = "\1\uffff\1\0\42\uffff}>"; static final String[] dfa_13s = { - "\1\1\4\2\5\uffff\1\2\54\uffff\3\2\3\uffff\2\2\1\uffff\1\42\1\uffff\2\2\6\uffff\1\2\17\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2", + "\1\1\4\2\5\uffff\1\2\53\uffff\3\2\3\uffff\2\2\1\uffff\1\42\1\uffff\2\2\6\uffff\1\2\17\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2", "\1\uffff", "", "", @@ -28116,11 +28115,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } static final String dfa_14s = "\43\uffff"; static final String dfa_15s = "\1\4\1\0\41\uffff"; - static final String dfa_16s = "\1\u0081\1\0\41\uffff"; + static final String dfa_16s = "\1\u0080\1\0\41\uffff"; static final String dfa_17s = "\2\uffff\1\2\37\uffff\1\1"; static final String dfa_18s = "\1\uffff\1\0\41\uffff}>"; static final String[] dfa_19s = { - "\5\2\5\uffff\1\2\54\uffff\3\2\3\uffff\2\2\3\uffff\1\1\1\2\6\uffff\1\2\17\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2", + "\5\2\5\uffff\1\2\53\uffff\3\2\3\uffff\2\2\3\uffff\1\1\1\2\6\uffff\1\2\17\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2", "\1\uffff", "", "", @@ -28254,11 +28253,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { static final String dfa_20s = "\12\uffff"; static final String dfa_21s = "\1\10\11\uffff"; static final String dfa_22s = "\1\4\7\0\2\uffff"; - static final String dfa_23s = "\1\u0082\7\0\2\uffff"; + static final String dfa_23s = "\1\u0081\7\0\2\uffff"; static final String dfa_24s = "\10\uffff\1\2\1\1"; static final String dfa_25s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\6\1\0\2\uffff}>"; static final String[] dfa_26s = { - "\5\10\5\uffff\2\10\53\uffff\4\10\1\uffff\1\10\1\uffff\3\10\1\uffff\3\10\1\1\1\2\1\3\1\4\1\5\1\6\1\7\32\10\1\uffff\30\10", + "\5\10\5\uffff\2\10\52\uffff\4\10\1\uffff\1\10\1\uffff\3\10\1\uffff\3\10\1\1\1\2\1\3\1\4\1\5\1\6\1\7\32\10\1\uffff\30\10", "\1\uffff", "\1\uffff", "\1\uffff", @@ -28414,11 +28413,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { static final String dfa_27s = "\13\uffff"; static final String dfa_28s = "\1\1\12\uffff"; static final String dfa_29s = "\1\4\1\uffff\10\0\1\uffff"; - static final String dfa_30s = "\1\u0082\1\uffff\10\0\1\uffff"; + static final String dfa_30s = "\1\u0081\1\uffff\10\0\1\uffff"; static final String dfa_31s = "\1\uffff\1\2\10\uffff\1\1"; static final String dfa_32s = "\2\uffff\1\5\1\3\1\6\1\7\1\4\1\0\1\1\1\2\1\uffff}>"; static final String[] dfa_33s = { - "\5\1\5\uffff\2\1\53\uffff\4\1\1\uffff\1\1\1\uffff\3\1\1\uffff\10\1\1\2\1\3\10\1\1\4\1\5\1\6\1\7\1\10\1\11\14\1\1\uffff\30\1", + "\5\1\5\uffff\2\1\52\uffff\4\1\1\uffff\1\1\1\uffff\3\1\1\uffff\10\1\1\2\1\3\10\1\1\4\1\5\1\6\1\7\1\10\1\11\14\1\1\uffff\30\1", "", "\1\uffff", "\1\uffff", @@ -28587,8 +28586,8 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { throw nvae; } } - static final String dfa_34s = "\1\116\2\uffff\1\117\7\uffff"; - static final String dfa_35s = "\1\135\2\uffff\1\132\7\uffff"; + static final String dfa_34s = "\1\115\2\uffff\1\116\7\uffff"; + static final String dfa_35s = "\1\134\2\uffff\1\131\7\uffff"; static final String dfa_36s = "\1\uffff\1\1\1\2\1\uffff\1\4\1\5\1\7\1\10\1\11\1\3\1\6"; static final String dfa_37s = "\13\uffff}>"; static final String[] dfa_38s = { @@ -28630,11 +28629,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { static final String dfa_39s = "\116\uffff"; static final String dfa_40s = "\1\2\115\uffff"; static final String dfa_41s = "\1\4\1\0\114\uffff"; - static final String dfa_42s = "\1\u0082\1\0\114\uffff"; + static final String dfa_42s = "\1\u0081\1\0\114\uffff"; static final String dfa_43s = "\2\uffff\1\2\112\uffff\1\1"; static final String dfa_44s = "\1\uffff\1\0\114\uffff}>"; static final String[] dfa_45s = { - "\5\2\5\uffff\2\2\53\uffff\4\2\1\uffff\1\2\1\uffff\1\1\2\2\1\uffff\44\2\1\uffff\30\2", + "\5\2\5\uffff\2\2\52\uffff\4\2\1\uffff\1\2\1\uffff\1\1\2\2\1\uffff\44\2\1\uffff\30\2", "\1\uffff", "", "", @@ -28766,11 +28765,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } static final String dfa_46s = "\1\4\2\0\41\uffff"; - static final String dfa_47s = "\1\u0081\2\0\41\uffff"; + static final String dfa_47s = "\1\u0080\2\0\41\uffff"; static final String dfa_48s = "\3\uffff\2\1\1\2\35\uffff\1\3"; static final String dfa_49s = "\1\0\1\1\1\2\41\uffff}>"; static final String[] dfa_50s = { - "\1\1\4\5\5\uffff\1\5\54\uffff\3\5\4\uffff\1\2\1\uffff\1\43\1\uffff\2\5\6\uffff\1\5\14\uffff\1\3\2\uffff\2\5\3\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\3\5\2\uffff\12\5\1\uffff\1\5", + "\1\1\4\5\5\uffff\1\5\53\uffff\3\5\4\uffff\1\2\1\uffff\1\43\1\uffff\2\5\6\uffff\1\5\14\uffff\1\3\2\uffff\2\5\3\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\3\5\2\uffff\12\5\1\uffff\1\5", "\1\uffff", "\1\uffff", "", @@ -28842,15 +28841,15 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { s = -1; if ( (LA65_0==RULE_ID) ) {s = 1;} - else if ( (LA65_0==66) ) {s = 2;} + else if ( (LA65_0==65) ) {s = 2;} - else if ( (LA65_0==91) && (synpred23_InternalPerspectiveDsl())) {s = 3;} + else if ( (LA65_0==90) && (synpred23_InternalPerspectiveDsl())) {s = 3;} - else if ( (LA65_0==106) && (synpred23_InternalPerspectiveDsl())) {s = 4;} + else if ( (LA65_0==105) && (synpred23_InternalPerspectiveDsl())) {s = 4;} - else if ( ((LA65_0>=RULE_STRING && LA65_0<=RULE_DECIMAL)||LA65_0==14||(LA65_0>=59 && LA65_0<=61)||(LA65_0>=70 && LA65_0<=71)||LA65_0==78||(LA65_0>=94 && LA65_0<=95)||LA65_0==99||LA65_0==107||LA65_0==109||(LA65_0>=113 && LA65_0<=115)||(LA65_0>=118 && LA65_0<=127)||LA65_0==129) ) {s = 5;} + else if ( ((LA65_0>=RULE_STRING && LA65_0<=RULE_DECIMAL)||LA65_0==14||(LA65_0>=58 && LA65_0<=60)||(LA65_0>=69 && LA65_0<=70)||LA65_0==77||(LA65_0>=93 && LA65_0<=94)||LA65_0==98||LA65_0==106||LA65_0==108||(LA65_0>=112 && LA65_0<=114)||(LA65_0>=117 && LA65_0<=126)||LA65_0==128) ) {s = 5;} - else if ( (LA65_0==68) ) {s = 35;} + else if ( (LA65_0==67) ) {s = 35;} input.seek(index65_0); @@ -28895,7 +28894,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } static final String[] dfa_51s = { - "\5\2\5\uffff\2\2\53\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\1\2\1\1\42\2\1\uffff\30\2", + "\5\2\5\uffff\2\2\52\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\1\2\1\1\42\2\1\uffff\30\2", "\1\uffff", "", "", @@ -29021,11 +29020,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } static final String dfa_52s = "\40\uffff"; static final String dfa_53s = "\1\4\26\uffff\1\0\10\uffff"; - static final String dfa_54s = "\1\u0081\26\uffff\1\0\10\uffff"; + static final String dfa_54s = "\1\u0080\26\uffff\1\0\10\uffff"; static final String dfa_55s = "\1\uffff\1\1\1\2\1\3\1\4\1\5\6\uffff\1\6\11\uffff\1\7\1\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1\10\1\11"; static final String dfa_56s = "\1\0\26\uffff\1\1\10\uffff}>"; static final String[] dfa_57s = { - "\1\5\4\14\5\uffff\1\2\54\uffff\3\5\4\uffff\1\35\3\uffff\2\14\6\uffff\1\5\34\uffff\1\26\1\uffff\1\3\3\uffff\1\27\1\30\1\31\2\uffff\2\5\1\1\4\14\1\32\1\33\1\34\1\uffff\1\4", + "\1\5\4\14\5\uffff\1\2\53\uffff\3\5\4\uffff\1\35\3\uffff\2\14\6\uffff\1\5\34\uffff\1\26\1\uffff\1\3\3\uffff\1\27\1\30\1\31\2\uffff\2\5\1\1\4\14\1\32\1\33\1\34\1\uffff\1\4", "", "", "", @@ -29093,33 +29092,33 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { int index69_0 = input.index(); input.rewind(); s = -1; - if ( (LA69_0==120) ) {s = 1;} + if ( (LA69_0==119) ) {s = 1;} else if ( (LA69_0==14) ) {s = 2;} - else if ( (LA69_0==109) ) {s = 3;} + else if ( (LA69_0==108) ) {s = 3;} - else if ( (LA69_0==129) && (synpred25_InternalPerspectiveDsl())) {s = 4;} + else if ( (LA69_0==128) && (synpred25_InternalPerspectiveDsl())) {s = 4;} - else if ( (LA69_0==RULE_ID||(LA69_0>=59 && LA69_0<=61)||LA69_0==78||(LA69_0>=118 && LA69_0<=119)) ) {s = 5;} + else if ( (LA69_0==RULE_ID||(LA69_0>=58 && LA69_0<=60)||LA69_0==77||(LA69_0>=117 && LA69_0<=118)) ) {s = 5;} - else if ( ((LA69_0>=RULE_STRING && LA69_0<=RULE_DECIMAL)||(LA69_0>=70 && LA69_0<=71)||(LA69_0>=121 && LA69_0<=124)) ) {s = 12;} + else if ( ((LA69_0>=RULE_STRING && LA69_0<=RULE_DECIMAL)||(LA69_0>=69 && LA69_0<=70)||(LA69_0>=120 && LA69_0<=123)) ) {s = 12;} - else if ( (LA69_0==107) ) {s = 22;} + else if ( (LA69_0==106) ) {s = 22;} - else if ( (LA69_0==113) ) {s = 23;} + else if ( (LA69_0==112) ) {s = 23;} - else if ( (LA69_0==114) ) {s = 24;} + else if ( (LA69_0==113) ) {s = 24;} - else if ( (LA69_0==115) ) {s = 25;} + else if ( (LA69_0==114) ) {s = 25;} - else if ( (LA69_0==125) ) {s = 26;} + else if ( (LA69_0==124) ) {s = 26;} - else if ( (LA69_0==126) ) {s = 27;} + else if ( (LA69_0==125) ) {s = 27;} - else if ( (LA69_0==127) ) {s = 28;} + else if ( (LA69_0==126) ) {s = 28;} - else if ( (LA69_0==66) ) {s = 29;} + else if ( (LA69_0==65) ) {s = 29;} input.seek(index69_0); @@ -29150,11 +29149,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } static final String dfa_58s = "\46\uffff"; static final String dfa_59s = "\1\4\2\0\43\uffff"; - static final String dfa_60s = "\1\u0081\2\0\43\uffff"; + static final String dfa_60s = "\1\u0080\2\0\43\uffff"; static final String dfa_61s = "\3\uffff\2\1\1\2\40\uffff"; static final String dfa_62s = "\1\0\1\1\1\2\43\uffff}>"; static final String[] dfa_63s = { - "\1\1\4\5\5\uffff\1\5\54\uffff\3\5\4\uffff\1\2\3\uffff\3\5\5\uffff\1\5\14\uffff\1\3\2\uffff\2\5\3\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\17\5\1\uffff\1\5", + "\1\1\4\5\5\uffff\1\5\53\uffff\3\5\4\uffff\1\2\3\uffff\3\5\5\uffff\1\5\14\uffff\1\3\2\uffff\2\5\3\uffff\1\5\6\uffff\1\4\1\5\1\uffff\1\5\3\uffff\17\5\1\uffff\1\5", "\1\uffff", "\1\uffff", "", @@ -29230,13 +29229,13 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { s = -1; if ( (LA78_0==RULE_ID) ) {s = 1;} - else if ( (LA78_0==66) ) {s = 2;} + else if ( (LA78_0==65) ) {s = 2;} - else if ( (LA78_0==91) && (synpred29_InternalPerspectiveDsl())) {s = 3;} + else if ( (LA78_0==90) && (synpred29_InternalPerspectiveDsl())) {s = 3;} - else if ( (LA78_0==106) && (synpred29_InternalPerspectiveDsl())) {s = 4;} + else if ( (LA78_0==105) && (synpred29_InternalPerspectiveDsl())) {s = 4;} - else if ( ((LA78_0>=RULE_STRING && LA78_0<=RULE_DECIMAL)||LA78_0==14||(LA78_0>=59 && LA78_0<=61)||(LA78_0>=70 && LA78_0<=72)||LA78_0==78||(LA78_0>=94 && LA78_0<=95)||LA78_0==99||LA78_0==107||LA78_0==109||(LA78_0>=113 && LA78_0<=127)||LA78_0==129) ) {s = 5;} + else if ( ((LA78_0>=RULE_STRING && LA78_0<=RULE_DECIMAL)||LA78_0==14||(LA78_0>=58 && LA78_0<=60)||(LA78_0>=69 && LA78_0<=71)||LA78_0==77||(LA78_0>=93 && LA78_0<=94)||LA78_0==98||LA78_0==106||LA78_0==108||(LA78_0>=112 && LA78_0<=126)||LA78_0==128) ) {s = 5;} input.seek(index78_0); @@ -29281,7 +29280,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } static final String[] dfa_64s = { - "\5\2\5\uffff\1\2\54\uffff\3\2\4\uffff\1\1\3\uffff\2\2\6\uffff\1\2\14\uffff\1\2\2\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2", + "\5\2\5\uffff\1\2\53\uffff\3\2\4\uffff\1\1\3\uffff\2\2\6\uffff\1\2\14\uffff\1\2\2\uffff\2\2\3\uffff\1\2\7\uffff\1\2\1\uffff\1\2\3\uffff\3\2\2\uffff\12\2\1\uffff\1\2", "\1\uffff", "", "", @@ -29364,11 +29363,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } static final String dfa_65s = "\42\uffff"; static final String dfa_66s = "\1\4\2\0\37\uffff"; - static final String dfa_67s = "\1\u0081\2\0\37\uffff"; + static final String dfa_67s = "\1\u0080\2\0\37\uffff"; static final String dfa_68s = "\3\uffff\1\1\1\2\35\uffff"; static final String dfa_69s = "\1\0\1\1\1\2\37\uffff}>"; static final String[] dfa_70s = { - "\1\1\4\4\5\uffff\1\4\54\uffff\3\4\4\uffff\1\2\3\uffff\2\4\6\uffff\1\4\14\uffff\1\3\2\uffff\2\4\3\uffff\1\4\7\uffff\1\4\1\uffff\1\4\3\uffff\3\4\2\uffff\12\4\1\uffff\1\4", + "\1\1\4\4\5\uffff\1\4\53\uffff\3\4\4\uffff\1\2\3\uffff\2\4\6\uffff\1\4\14\uffff\1\3\2\uffff\2\4\3\uffff\1\4\7\uffff\1\4\1\uffff\1\4\3\uffff\3\4\2\uffff\12\4\1\uffff\1\4", "\1\uffff", "\1\uffff", "", @@ -29440,11 +29439,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { s = -1; if ( (LA84_0==RULE_ID) ) {s = 1;} - else if ( (LA84_0==66) ) {s = 2;} + else if ( (LA84_0==65) ) {s = 2;} - else if ( (LA84_0==91) && (synpred33_InternalPerspectiveDsl())) {s = 3;} + else if ( (LA84_0==90) && (synpred33_InternalPerspectiveDsl())) {s = 3;} - else if ( ((LA84_0>=RULE_STRING && LA84_0<=RULE_DECIMAL)||LA84_0==14||(LA84_0>=59 && LA84_0<=61)||(LA84_0>=70 && LA84_0<=71)||LA84_0==78||(LA84_0>=94 && LA84_0<=95)||LA84_0==99||LA84_0==107||LA84_0==109||(LA84_0>=113 && LA84_0<=115)||(LA84_0>=118 && LA84_0<=127)||LA84_0==129) ) {s = 4;} + else if ( ((LA84_0>=RULE_STRING && LA84_0<=RULE_DECIMAL)||LA84_0==14||(LA84_0>=58 && LA84_0<=60)||(LA84_0>=69 && LA84_0<=70)||LA84_0==77||(LA84_0>=93 && LA84_0<=94)||LA84_0==98||LA84_0==106||LA84_0==108||(LA84_0>=112 && LA84_0<=114)||(LA84_0>=117 && LA84_0<=126)||LA84_0==128) ) {s = 4;} input.seek(index84_0); @@ -29562,15 +29561,15 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { s = -1; if ( (LA106_0==RULE_ID) ) {s = 1;} - else if ( (LA106_0==66) ) {s = 2;} + else if ( (LA106_0==65) ) {s = 2;} - else if ( (LA106_0==91) && (synpred37_InternalPerspectiveDsl())) {s = 3;} + else if ( (LA106_0==90) && (synpred37_InternalPerspectiveDsl())) {s = 3;} - else if ( (LA106_0==106) && (synpred37_InternalPerspectiveDsl())) {s = 4;} + else if ( (LA106_0==105) && (synpred37_InternalPerspectiveDsl())) {s = 4;} - else if ( ((LA106_0>=RULE_STRING && LA106_0<=RULE_DECIMAL)||LA106_0==14||(LA106_0>=59 && LA106_0<=61)||(LA106_0>=70 && LA106_0<=71)||LA106_0==78||(LA106_0>=94 && LA106_0<=95)||LA106_0==99||LA106_0==107||LA106_0==109||(LA106_0>=113 && LA106_0<=115)||(LA106_0>=118 && LA106_0<=127)||LA106_0==129) ) {s = 5;} + else if ( ((LA106_0>=RULE_STRING && LA106_0<=RULE_DECIMAL)||LA106_0==14||(LA106_0>=58 && LA106_0<=60)||(LA106_0>=69 && LA106_0<=70)||LA106_0==77||(LA106_0>=93 && LA106_0<=94)||LA106_0==98||LA106_0==106||LA106_0==108||(LA106_0>=112 && LA106_0<=114)||(LA106_0>=117 && LA106_0<=126)||LA106_0==128) ) {s = 5;} - else if ( (LA106_0==68) ) {s = 35;} + else if ( (LA106_0==67) ) {s = 35;} input.seek(index106_0); @@ -29659,7 +29658,7 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } } static final String[] dfa_71s = { - "\5\2\5\uffff\2\2\53\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\33\2\1\uffff\30\2", + "\5\2\5\uffff\2\2\52\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\33\2\1\uffff\30\2", "\1\uffff", "", "", @@ -29857,15 +29856,15 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { s = -1; if ( (LA114_0==RULE_ID) ) {s = 1;} - else if ( (LA114_0==66) ) {s = 2;} + else if ( (LA114_0==65) ) {s = 2;} - else if ( (LA114_0==91) && (synpred41_InternalPerspectiveDsl())) {s = 3;} + else if ( (LA114_0==90) && (synpred41_InternalPerspectiveDsl())) {s = 3;} - else if ( (LA114_0==106) && (synpred41_InternalPerspectiveDsl())) {s = 4;} + else if ( (LA114_0==105) && (synpred41_InternalPerspectiveDsl())) {s = 4;} - else if ( ((LA114_0>=RULE_STRING && LA114_0<=RULE_DECIMAL)||LA114_0==14||(LA114_0>=59 && LA114_0<=61)||(LA114_0>=70 && LA114_0<=71)||LA114_0==78||(LA114_0>=94 && LA114_0<=95)||LA114_0==99||LA114_0==107||LA114_0==109||(LA114_0>=113 && LA114_0<=115)||(LA114_0>=118 && LA114_0<=127)||LA114_0==129) ) {s = 5;} + else if ( ((LA114_0>=RULE_STRING && LA114_0<=RULE_DECIMAL)||LA114_0==14||(LA114_0>=58 && LA114_0<=60)||(LA114_0>=69 && LA114_0<=70)||LA114_0==77||(LA114_0>=93 && LA114_0<=94)||LA114_0==98||LA114_0==106||LA114_0==108||(LA114_0>=112 && LA114_0<=114)||(LA114_0>=117 && LA114_0<=126)||LA114_0==128) ) {s = 5;} - else if ( (LA114_0==68) ) {s = 35;} + else if ( (LA114_0==67) ) {s = 35;} input.seek(index114_0); @@ -29955,11 +29954,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { } static final String dfa_72s = "\1\41\115\uffff"; static final String dfa_73s = "\1\4\40\0\55\uffff"; - static final String dfa_74s = "\1\u0082\40\0\55\uffff"; + static final String dfa_74s = "\1\u0081\40\0\55\uffff"; static final String dfa_75s = "\41\uffff\1\2\53\uffff\1\1"; static final String dfa_76s = "\1\uffff\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\1\37\55\uffff}>"; static final String[] dfa_77s = { - "\1\1\1\27\1\24\1\23\1\25\5\uffff\1\12\1\41\53\uffff\1\4\1\3\1\5\1\41\1\uffff\1\41\1\uffff\1\40\2\41\1\uffff\1\17\1\20\6\41\1\15\17\41\1\10\1\7\3\41\1\6\6\41\1\uffff\1\31\1\41\1\13\3\41\1\32\1\33\1\34\2\41\1\2\1\16\1\11\1\21\1\22\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41", + "\1\1\1\27\1\24\1\23\1\25\5\uffff\1\12\1\41\52\uffff\1\4\1\3\1\5\1\41\1\uffff\1\41\1\uffff\1\40\2\41\1\uffff\1\17\1\20\6\41\1\15\17\41\1\10\1\7\3\41\1\6\6\41\1\uffff\1\31\1\41\1\13\3\41\1\32\1\33\1\34\2\41\1\2\1\16\1\11\1\21\1\22\1\26\1\30\1\35\1\36\1\37\1\41\1\14\1\41", "\1\uffff", "\1\uffff", "\1\uffff", @@ -30556,11 +30555,11 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { static final String dfa_78s = "\117\uffff"; static final String dfa_79s = "\1\2\116\uffff"; static final String dfa_80s = "\1\4\1\0\115\uffff"; - static final String dfa_81s = "\1\u0084\1\0\115\uffff"; + static final String dfa_81s = "\1\u0083\1\0\115\uffff"; static final String dfa_82s = "\2\uffff\1\2\113\uffff\1\1"; static final String dfa_83s = "\1\uffff\1\0\115\uffff}>"; static final String[] dfa_84s = { - "\5\2\5\uffff\2\2\53\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\33\2\1\uffff\30\2\1\uffff\1\2", + "\5\2\5\uffff\2\2\52\uffff\4\2\1\uffff\1\2\1\uffff\3\2\1\uffff\10\2\1\1\33\2\1\uffff\30\2\1\uffff\1\2", "\1\uffff", "", "", @@ -30752,103 +30751,103 @@ public class InternalPerspectiveDslParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000051808000L}); public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000008000L}); public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x000000000E204000L}); - public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000060L}); + public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000030L}); public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000051008000L}); public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x000000002C204000L}); - public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000388200002L}); - public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x01E33FF000000000L}); + public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000188300002L}); + public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x00F19FF800000000L}); public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000400008000L}); - public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000800000000L}); + public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000200008000L}); + public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000400000000L}); public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000008010L}); - public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000400000000000L}); - public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000800000000000L}); - public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000080000000000L}); - public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0004000000000000L}); - public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0018000000000002L}); + public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000200000000000L}); + public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000400000000000L}); + public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000040000000000L}); + public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0002000000000000L}); + public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x000C000000000002L}); public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0600000000000000L}); - public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x9000000000000010L}); - public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x2000000000000010L}); - public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x4000000000000010L}); - public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L}); - public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L}); - public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x38000000000041F0L,0xFFCE2808C00040D6L,0x0000000000000002L}); - public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000018L}); - public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L}); - public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L}); - public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x38000000000041F0L,0xFFCE2808C00040C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L}); - public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x38000000000041F0L,0xFFCE2808C00041C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000108L}); - public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000008L}); - public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000002L,0x000000000000FE00L}); - public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L}); - public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000000L,0x0000000000018000L}); - public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000000L,0x0000000000010000L}); - public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L}); - public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L}); - public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000000002L,0x0000000000780000L}); - public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000000002L,0x000000000081C000L}); - public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000010L,0x0000000008000004L}); - public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000000002L,0x000000003F00C000L}); - public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L}); - public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L}); - public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000000L,0x0000000008004000L}); - public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000002L,0x00000000C0000000L}); - public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x4000000000000002L,0x0000000700000000L}); - public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L}); - public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000000002L,0x0000006000000000L}); - public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000002L,0x0000038000000000L}); - public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x3800000000000010L,0x0040000000000000L}); - public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x3800000000000010L,0x00C0000000004000L}); - public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000000000010L,0x0000000008000004L,0x0000000000000008L}); - public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008008L}); - public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000002L,0x0000038000000084L}); - public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x38000000000041F0L,0xFFCE2C08C80040D6L,0x0000000000000002L}); - public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000002L,0x0000038000000080L}); - public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x380000000000C1F0L,0xFFCE2808C00040C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000008000L,0x0000000000000008L}); - public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x38000000000041F0L,0xFFFE2C08C80041C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000000000L,0x0000040000000008L}); - public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x38000000000041F0L,0xFFFE2808C00041C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000100L}); - public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x38000000000041F2L,0xFFFE2808C00040C7L,0x0000000000000002L}); - public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x38000000000041F2L,0xFFFE2808C00040C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L}); - public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000002L,0x0000100000000000L}); - public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x38000000000041F0L,0xFFCE2808C80040C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000000000L,0x0000400000000000L}); - public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000008010L,0x0001C0000800000CL}); - public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000000000000000L,0x0001400000000008L}); - public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000000000000000L,0x0000400000000008L}); - public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x38000000000041F0L,0xFFFE2808C00040C7L,0x0000000000000002L}); - public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000009L}); - public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x38000000000041F0L,0xFFFE2808C00040C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x38000000000041F0L,0xFFCE2808C00040C7L,0x0000000000000002L}); - public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L}); - public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L}); - public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x380000000000C1F0L,0xFFFE2808C00040C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x380000000000C1F0L,0xFFFE2808C00040C7L,0x0000000000000002L}); - public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L}); - public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000084L}); - public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L}); - public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004084L}); - public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000090L}); - public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x38000000000041F2L,0xFFCE2808C00040C6L,0x0000000000000002L}); - public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000005L}); - public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000000005L}); - public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000000000002L,0x0000008000000000L}); + public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0300000000000000L}); + public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x4800000000000010L}); + public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x1000000000000010L}); + public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x2000000000000010L}); + public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x8000000000000002L}); + public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000002L}); + public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x1C000000000041F0L,0x7FE714046000206BL,0x0000000000000001L}); + public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000000L,0x000000000000000CL}); + public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L}); + public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000010L}); + public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x1C000000000041F0L,0x7FE7140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L}); + public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x1C000000000041F0L,0x7FE71404600020E3L,0x0000000000000001L}); + public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000084L}); + public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L}); + public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000000002L,0x0000000000007F00L}); + public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L}); + public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000000000000000L,0x000000000000C000L}); + public static final BitSet FOLLOW_48 = new BitSet(new long[]{0x0000000000000000L,0x0000000000008000L}); + public static final BitSet FOLLOW_49 = new BitSet(new long[]{0x0000000000000002L,0x0000000000010000L}); + public static final BitSet FOLLOW_50 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L}); + public static final BitSet FOLLOW_51 = new BitSet(new long[]{0x0000000000000002L,0x00000000003C0000L}); + public static final BitSet FOLLOW_52 = new BitSet(new long[]{0x0000000000000002L,0x000000000040E000L}); + public static final BitSet FOLLOW_53 = new BitSet(new long[]{0x0000000000000010L,0x0000000004000002L}); + public static final BitSet FOLLOW_54 = new BitSet(new long[]{0x0000000000000002L,0x000000001F806000L}); + public static final BitSet FOLLOW_55 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L}); + public static final BitSet FOLLOW_56 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L}); + public static final BitSet FOLLOW_57 = new BitSet(new long[]{0x0000000000000000L,0x0000000004002000L}); + public static final BitSet FOLLOW_58 = new BitSet(new long[]{0x0000000000000002L,0x0000000060000000L}); + public static final BitSet FOLLOW_59 = new BitSet(new long[]{0x2000000000000002L,0x0000000380000000L}); + public static final BitSet FOLLOW_60 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L}); + public static final BitSet FOLLOW_61 = new BitSet(new long[]{0x0000000000000002L,0x0000003000000000L}); + public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x0000000000000002L,0x000001C000000000L}); + public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x1C00000000000010L,0x0020000000000000L}); + public static final BitSet FOLLOW_64 = new BitSet(new long[]{0x1C00000000000010L,0x0060000000002000L}); + public static final BitSet FOLLOW_65 = new BitSet(new long[]{0x0000000000000010L,0x0000000004000002L,0x0000000000000004L}); + public static final BitSet FOLLOW_66 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004004L}); + public static final BitSet FOLLOW_67 = new BitSet(new long[]{0x0000000000000002L,0x000001C000000042L}); + public static final BitSet FOLLOW_68 = new BitSet(new long[]{0x1C000000000041F0L,0x7FE716046400206BL,0x0000000000000001L}); + public static final BitSet FOLLOW_69 = new BitSet(new long[]{0x0000000000000002L,0x000001C000000040L}); + public static final BitSet FOLLOW_70 = new BitSet(new long[]{0x1C0000000000C1F0L,0x7FE7140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_71 = new BitSet(new long[]{0x0000000000008000L,0x0000000000000004L}); + public static final BitSet FOLLOW_72 = new BitSet(new long[]{0x1C000000000041F0L,0x7FFF1604640020E3L,0x0000000000000001L}); + public static final BitSet FOLLOW_73 = new BitSet(new long[]{0x0000000000000000L,0x0000020000000004L}); + public static final BitSet FOLLOW_74 = new BitSet(new long[]{0x1C000000000041F0L,0x7FFF1404600020E3L,0x0000000000000001L}); + public static final BitSet FOLLOW_75 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L}); + public static final BitSet FOLLOW_76 = new BitSet(new long[]{0x9C000000000041F2L,0x7FFF140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_77 = new BitSet(new long[]{0x1C000000000041F2L,0x7FFF140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_78 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L}); + public static final BitSet FOLLOW_79 = new BitSet(new long[]{0x0000000000000002L,0x0000080000000000L}); + public static final BitSet FOLLOW_80 = new BitSet(new long[]{0x1C000000000041F0L,0x7FE7140464002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_81 = new BitSet(new long[]{0x0000000000000000L,0x0000200000000000L}); + public static final BitSet FOLLOW_82 = new BitSet(new long[]{0x0000000000008010L,0x0000E00004000006L}); + public static final BitSet FOLLOW_83 = new BitSet(new long[]{0x0000000000000000L,0x0000A00000000004L}); + public static final BitSet FOLLOW_84 = new BitSet(new long[]{0x0000000000000000L,0x0000200000000004L}); + public static final BitSet FOLLOW_85 = new BitSet(new long[]{0x9C000000000041F0L,0x7FFF140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_86 = new BitSet(new long[]{0x8000000000000000L,0x0000000000000004L}); + public static final BitSet FOLLOW_87 = new BitSet(new long[]{0x1C000000000041F0L,0x7FFF140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_88 = new BitSet(new long[]{0x9C000000000041F0L,0x7FE7140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_89 = new BitSet(new long[]{0x8000000000000000L}); + public static final BitSet FOLLOW_90 = new BitSet(new long[]{0x0000000000000000L,0x0002000000000000L}); + public static final BitSet FOLLOW_91 = new BitSet(new long[]{0x1C0000000000C1F0L,0x7FFF140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_92 = new BitSet(new long[]{0x9C0000000000C1F0L,0x7FFF140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_93 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000010L}); + public static final BitSet FOLLOW_94 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000042L}); + public static final BitSet FOLLOW_95 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000040L}); + public static final BitSet FOLLOW_96 = new BitSet(new long[]{0x0000000000000002L,0x0000000000002042L}); + public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000048L}); + public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x1C000000000041F2L,0x7FE7140460002063L,0x0000000000000001L}); + public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000000L,0x8000000000000000L,0x0000000000000002L}); + public static final BitSet FOLLOW_100 = new BitSet(new long[]{0x0000000000000002L,0x8000000000000000L,0x0000000000000002L}); + public static final BitSet FOLLOW_101 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L}); public static final BitSet FOLLOW_102 = new BitSet(new long[]{0x0000000000000140L}); - public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000010L,0x0000000008000014L}); - public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L}); - public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L}); - public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000000000002L,0x0000008000004000L}); - public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000000000002L,0x00C0000000000000L}); - public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000000010L}); - public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000000000L,0x0000008000000000L}); - public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x4000000000000000L}); - public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0800000000000002L}); + public static final BitSet FOLLOW_103 = new BitSet(new long[]{0x0000000000000010L,0x000000000400000AL}); + public static final BitSet FOLLOW_104 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L}); + public static final BitSet FOLLOW_105 = new BitSet(new long[]{0x0000000000000002L,0x0000000000002000L}); + public static final BitSet FOLLOW_106 = new BitSet(new long[]{0x0000000000000002L,0x0000004000002000L}); + public static final BitSet FOLLOW_107 = new BitSet(new long[]{0x0000000000000002L,0x0060000000000000L}); + public static final BitSet FOLLOW_108 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000000L,0x0000000000000008L}); + public static final BitSet FOLLOW_109 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L}); + public static final BitSet FOLLOW_110 = new BitSet(new long[]{0x2000000000000000L}); + public static final BitSet FOLLOW_111 = new BitSet(new long[]{0x0400000000000002L}); public static final BitSet FOLLOW_112 = new BitSet(new long[]{0x0000000000000012L}); } diff --git a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/services/PerspectiveDslGrammarAccess.java b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/services/PerspectiveDslGrammarAccess.java index 690fb88..574505c 100644 --- a/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/services/PerspectiveDslGrammarAccess.java +++ b/org.eclipse.osbp.xtext.perspective/src-gen/org/eclipse/osbp/xtext/perspective/services/PerspectiveDslGrammarAccess.java @@ -585,7 +585,7 @@ public class PerspectiveDslGrammarAccess extends AbstractGrammarElementFinder { private final Assignment cAccessibilityPhraseAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1); private final RuleCall cAccessibilityPhraseSTRINGTerminalRuleCall_3_1_1_0 = (RuleCall)cAccessibilityPhraseAssignment_3_1_1.eContents().get(0); private final Group cGroup_3_2 = (Group)cUnorderedGroup_3.eContents().get(2); - private final Keyword cIconURIKeyword_3_2_0 = (Keyword)cGroup_3_2.eContents().get(0); + private final Keyword cIconKeyword_3_2_0 = (Keyword)cGroup_3_2.eContents().get(0); private final Assignment cIconURIAssignment_3_2_1 = (Assignment)cGroup_3_2.eContents().get(1); private final RuleCall cIconURISTRINGTerminalRuleCall_3_2_1_0 = (RuleCall)cIconURIAssignment_3_2_1.eContents().get(0); private final Group cGroup_3_3 = (Group)cUnorderedGroup_3.eContents().get(3); @@ -597,13 +597,11 @@ public class PerspectiveDslGrammarAccess extends AbstractGrammarElementFinder { //PerspectivePart: // {PerspectivePart} 'part' elementId=TRANSLATABLEID (('spaceVolume' containerData=STRING)? & ('accessibility' - // accessibilityPhrase=STRING)? & ('iconURI' iconURI=STRING)? & ('view' view=PerspectiveView)? & - // isClosable?='isClosable'?); + // accessibilityPhrase=STRING)? & ('icon' iconURI=STRING)? & ('view' view=PerspectiveView)? & isClosable?='isClosable'?); @Override public ParserRule getRule() { return rule; } //{PerspectivePart} 'part' elementId=TRANSLATABLEID (('spaceVolume' containerData=STRING)? & ('accessibility' - //accessibilityPhrase=STRING)? & ('iconURI' iconURI=STRING)? & ('view' view=PerspectiveView)? & - //isClosable?='isClosable'?) + //accessibilityPhrase=STRING)? & ('icon' iconURI=STRING)? & ('view' view=PerspectiveView)? & isClosable?='isClosable'?) public Group getGroup() { return cGroup; } //{PerspectivePart} @@ -618,7 +616,7 @@ public class PerspectiveDslGrammarAccess extends AbstractGrammarElementFinder { //TRANSLATABLEID public RuleCall getElementIdTRANSLATABLEIDParserRuleCall_2_0() { return cElementIdTRANSLATABLEIDParserRuleCall_2_0; } - //('spaceVolume' containerData=STRING)? & ('accessibility' accessibilityPhrase=STRING)? & ('iconURI' iconURI=STRING)? & + //('spaceVolume' containerData=STRING)? & ('accessibility' accessibilityPhrase=STRING)? & ('icon' iconURI=STRING)? & //('view' view=PerspectiveView)? & isClosable?='isClosable'? public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; } @@ -646,11 +644,11 @@ public class PerspectiveDslGrammarAccess extends AbstractGrammarElementFinder { //STRING public RuleCall getAccessibilityPhraseSTRINGTerminalRuleCall_3_1_1_0() { return cAccessibilityPhraseSTRINGTerminalRuleCall_3_1_1_0; } - //('iconURI' iconURI=STRING)? + //('icon' iconURI=STRING)? public Group getGroup_3_2() { return cGroup_3_2; } - //'iconURI' - public Keyword getIconURIKeyword_3_2_0() { return cIconURIKeyword_3_2_0; } + //'icon' + public Keyword getIconKeyword_3_2_0() { return cIconKeyword_3_2_0; } //iconURI=STRING public Assignment getIconURIAssignment_3_2_1() { return cIconURIAssignment_3_2_1; } @@ -1677,8 +1675,7 @@ public class PerspectiveDslGrammarAccess extends AbstractGrammarElementFinder { //PerspectivePart: // {PerspectivePart} 'part' elementId=TRANSLATABLEID (('spaceVolume' containerData=STRING)? & ('accessibility' - // accessibilityPhrase=STRING)? & ('iconURI' iconURI=STRING)? & ('view' view=PerspectiveView)? & - // isClosable?='isClosable'?); + // accessibilityPhrase=STRING)? & ('icon' iconURI=STRING)? & ('view' view=PerspectiveView)? & isClosable?='isClosable'?); public PerspectivePartElements getPerspectivePartAccess() { return pPerspectivePart; } diff --git a/org.eclipse.osbp.xtext.perspective/src/org/eclipse/osbp/xtext/perspective/PerspectiveDsl.xtext b/org.eclipse.osbp.xtext.perspective/src/org/eclipse/osbp/xtext/perspective/PerspectiveDsl.xtext index c18e150..e8eba53 100644 --- a/org.eclipse.osbp.xtext.perspective/src/org/eclipse/osbp/xtext/perspective/PerspectiveDsl.xtext +++ b/org.eclipse.osbp.xtext.perspective/src/org/eclipse/osbp/xtext/perspective/PerspectiveDsl.xtext @@ -73,7 +73,7 @@ PerspectivePart: {PerspectivePart} 'part' elementId=TRANSLATABLEID (('spaceVolume' containerData=STRING)? & ('accessibility' accessibilityPhrase=STRING)? & - ('iconURI' iconURI=STRING)? & + ('icon' iconURI=STRING)? & ('view' view=PerspectiveView)? & (isClosable?='isClosable')?); |