From ae91be7619c003a16e38754ca2a90b5c9377b301 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 12 Sep 2017 13:35:32 +0200 Subject: [PATCH 1/3] Removed unused file --- .../com/minres/rdl/RdlImportUriResolver.java | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RdlImportUriResolver.java diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RdlImportUriResolver.java b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RdlImportUriResolver.java deleted file mode 100644 index f81ce73..0000000 --- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RdlImportUriResolver.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.minres.rdl; - -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.scoping.impl.ImportUriResolver; - -public class RdlImportUriResolver extends ImportUriResolver { - - private static final Logger LOGGER = Logger.getLogger(RdlImportUriResolver.class); - - public RdlImportUriResolver() { - super(); - LOGGER.setLevel(Level.INFO); - } - - @Override - public String resolve(EObject object) { - return super.resolve(object); - } -} From 7c603c65f343366ad21091f063ae3a0991a6a65f Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Wed, 13 Sep 2017 10:42:46 +0200 Subject: [PATCH 2/3] updates by running MWE2 --- .../ide/contentassist/antlr/RDLParser.java | 2 +- .../antlr/internal/InternalRDL.g | 6 +- .../antlr/internal/InternalRDL.tokens | 252 +- .../antlr/internal/InternalRDLLexer.java | 2701 +++++++++-------- .../antlr/internal/InternalRDLParser.java | 870 +++--- .../AbstractRDLProposalProvider.java | 6 + .../minres/rdl/parser/antlr/RDLParser.java | 2 +- .../rdl/parser/antlr/internal/InternalRDL.g | 6 +- .../parser/antlr/internal/InternalRDL.tokens | 252 +- .../antlr/internal/InternalRDLLexer.java | 2681 ++++++++-------- .../antlr/internal/InternalRDLParser.java | 860 +++--- .../minres/rdl/services/RDLGrammarAccess.java | 18 +- 12 files changed, 3856 insertions(+), 3800 deletions(-) diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java index c5cc83a..b6edf25 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java @@ -206,7 +206,7 @@ public class RDLParser extends AbstractContentAssistParser { @Override protected String[] getInitialHiddenTokens() { - return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" }; + return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ESCAPE_JSP", "RULE_ESCAPE_ORDL" }; } public RDLGrammarAccess getGrammarAccess() { diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g index 57ab2dd..ab80566 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g @@ -7643,10 +7643,14 @@ RULE_ID : '\\'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_WS : (' '|'\t'|'\r'|'\n')+; -RULE_ML_COMMENT : ('/*' ( options {greedy=false;} : . )*'*/'|'<%' ( options {greedy=false;} : . )*'%>'|'(' ( options {greedy=false;} : . )*')'); +RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/'; RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; +RULE_ESCAPE_JSP : '<%' ( options {greedy=false;} : . )*'%>'; + +RULE_ESCAPE_ORDL : '(' ( options {greedy=false;} : . )*')'; + RULE_NUM : (('0'..'9')+ '\'b' ('0'|'1'|'_')+|('0'..'9')+ '\'o' ('0'..'7'|'_')+|('0'..'9')+ '\'h' ('0'..'9'|'a'..'f'|'A'..'F'|'_')+|('0'..'9')+ '\'d' ('0'..'9'|'_')+|'0x' ('0'..'9'|'a'..'f'|'A'..'F')+|('0'..'9')+); RULE_STR : '"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'; diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.tokens b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.tokens index e91325a..422c759 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.tokens +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.tokens @@ -1,126 +1,128 @@ -'%='=125 -'+='=124 -','=122 -'->'=129 -'.'=130 -':'=128 -';'=115 -'='=117 -'@'=123 -'UNDEFINED'=95 -'['=126 -']'=127 -'`include'=111 -'accesswidth'=79 -'activehigh'=58 -'activelow'=59 -'addressing'=82 -'addrmap'=13 -'alias'=121 -'alignment'=75 -'all'=19 -'anded'=38 -'arbiter'=22 -'async'=55 -'bigendian'=47 -'boolean'=12 -'bothedge'=108 -'bridge'=50 -'clock'=86 -'compact'=103 -'component'=119 -'counter'=41 -'cpuif_reset'=56 -'decr'=63 -'decrsaturate'=69 -'decrthreshold'=71 -'decrvalue'=67 -'decrwidth'=65 -'default'=118 -'desc'=21 -'dontcompare'=72 -'donttest'=73 -'enable'=88 -'encode'=84 -'enum'=131 -'errextbus'=44 -'external'=132 -'false'=97 -'field'=16 -'field_reset'=57 -'fieldwidth'=77 -'fullalign'=105 -'halt'=93 -'haltenable'=92 -'haltmask'=91 -'hw'=81 -'hwclr'=32 -'hwenable'=89 -'hwmask'=90 -'hwset'=31 -'incr'=62 -'incrvalue'=66 -'incrwidth'=64 -'internal'=74 -'intr'=37 -'level'=109 -'littleendian'=46 -'lsb0'=53 -'mask'=87 -'msb0'=52 -'na'=102 -'name'=20 -'negedge'=107 -'next'=94 -'nonsticky'=110 -'number'=11 -'ored'=39 -'overflow'=42 -'posedge'=106 -'precedence'=83 -'property'=112 -'r'=100 -'rclr'=24 -'ref'=17 -'reg'=14 -'regalign'=104 -'regfile'=15 -'regwidth'=76 -'reset'=45 -'resetsignal'=85 -'rset'=23 -'rsvdset'=48 -'rsvdsetX'=49 -'rw'=98 -'saturate'=68 -'shared'=51 -'sharedextbus'=43 -'signal'=18 -'signalwidth'=78 -'singlepulse'=60 -'sticky'=35 -'stickybit'=36 -'string'=10 -'sw'=80 -'swacc'=34 -'swmod'=33 -'swwe'=29 -'swwel'=30 -'sync'=54 -'threshold'=70 -'true'=96 -'type'=116 -'underflow'=61 -'w'=101 -'we'=27 -'wel'=28 -'woclr'=25 -'woset'=26 -'wr'=99 -'xored'=40 -'{'=113 -'|'=120 -'}'=114 +'%='=127 +'+='=126 +','=124 +'->'=131 +'.'=132 +':'=130 +';'=117 +'='=119 +'@'=125 +'UNDEFINED'=97 +'['=128 +']'=129 +'`include'=113 +'accesswidth'=81 +'activehigh'=60 +'activelow'=61 +'addressing'=84 +'addrmap'=15 +'alias'=123 +'alignment'=77 +'all'=21 +'anded'=40 +'arbiter'=24 +'async'=57 +'bigendian'=49 +'boolean'=14 +'bothedge'=110 +'bridge'=52 +'clock'=88 +'compact'=105 +'component'=121 +'counter'=43 +'cpuif_reset'=58 +'decr'=65 +'decrsaturate'=71 +'decrthreshold'=73 +'decrvalue'=69 +'decrwidth'=67 +'default'=120 +'desc'=23 +'dontcompare'=74 +'donttest'=75 +'enable'=90 +'encode'=86 +'enum'=133 +'errextbus'=46 +'external'=134 +'false'=99 +'field'=18 +'field_reset'=59 +'fieldwidth'=79 +'fullalign'=107 +'halt'=95 +'haltenable'=94 +'haltmask'=93 +'hw'=83 +'hwclr'=34 +'hwenable'=91 +'hwmask'=92 +'hwset'=33 +'incr'=64 +'incrvalue'=68 +'incrwidth'=66 +'internal'=76 +'intr'=39 +'level'=111 +'littleendian'=48 +'lsb0'=55 +'mask'=89 +'msb0'=54 +'na'=104 +'name'=22 +'negedge'=109 +'next'=96 +'nonsticky'=112 +'number'=13 +'ored'=41 +'overflow'=44 +'posedge'=108 +'precedence'=85 +'property'=114 +'r'=102 +'rclr'=26 +'ref'=19 +'reg'=16 +'regalign'=106 +'regfile'=17 +'regwidth'=78 +'reset'=47 +'resetsignal'=87 +'rset'=25 +'rsvdset'=50 +'rsvdsetX'=51 +'rw'=100 +'saturate'=70 +'shared'=53 +'sharedextbus'=45 +'signal'=20 +'signalwidth'=80 +'singlepulse'=62 +'sticky'=37 +'stickybit'=38 +'string'=12 +'sw'=82 +'swacc'=36 +'swmod'=35 +'swwe'=31 +'swwel'=32 +'sync'=56 +'threshold'=72 +'true'=98 +'type'=118 +'underflow'=63 +'w'=103 +'we'=29 +'wel'=30 +'woclr'=27 +'woset'=28 +'wr'=101 +'xored'=42 +'{'=115 +'|'=122 +'}'=116 +RULE_ESCAPE_JSP=10 +RULE_ESCAPE_ORDL=11 RULE_ID=5 RULE_ML_COMMENT=8 RULE_NUM=6 @@ -137,7 +139,6 @@ T__106=106 T__107=107 T__108=108 T__109=109 -T__10=10 T__110=110 T__111=111 T__112=112 @@ -148,7 +149,6 @@ T__116=116 T__117=117 T__118=118 T__119=119 -T__11=11 T__120=120 T__121=121 T__122=122 @@ -163,6 +163,8 @@ T__12=12 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/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDLLexer.java b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDLLexer.java index 9b9af72..c7a06da 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDLLexer.java +++ b/com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDLLexer.java @@ -22,9 +22,11 @@ public class InternalRDLLexer extends Lexer { public static final int T__52=52; public static final int T__53=53; public static final int T__54=54; + public static final int T__133=133; 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=5; public static final int T__131=131; public static final int T__130=130; @@ -76,7 +78,6 @@ public class InternalRDLLexer extends Lexer { public static final int T__16=16; public static final int T__17=17; public static final int T__18=18; - public static final int T__11=11; public static final int T__99=99; public static final int RULE_NUM=6; public static final int T__12=12; @@ -85,8 +86,8 @@ public class InternalRDLLexer extends Lexer { public static final int T__95=95; public static final int T__96=96; public static final int T__97=97; - public static final int T__10=10; public static final int T__98=98; + public static final int RULE_ESCAPE_ORDL=11; public static final int T__26=26; public static final int T__27=27; public static final int T__28=28; @@ -124,6 +125,7 @@ public class InternalRDLLexer extends Lexer { public static final int T__111=111; public static final int T__81=81; public static final int T__110=110; + public static final int RULE_ESCAPE_JSP=10; public static final int T__82=82; public static final int T__113=113; public static final int T__83=83; @@ -156,57 +158,15 @@ public class InternalRDLLexer extends Lexer { } public String getGrammarFileName() { return "InternalRDL.g"; } - // $ANTLR start "T__10" - public final void mT__10() throws RecognitionException { - try { - int _type = T__10; - int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:11:7: ( 'string' ) - // InternalRDL.g:11:9: 'string' - { - match("string"); - - - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "T__10" - - // $ANTLR start "T__11" - public final void mT__11() throws RecognitionException { - try { - int _type = T__11; - int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:12:7: ( 'number' ) - // InternalRDL.g:12:9: 'number' - { - match("number"); - - - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "T__11" - // $ANTLR start "T__12" public final void mT__12() throws RecognitionException { try { int _type = T__12; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:13:7: ( 'boolean' ) - // InternalRDL.g:13:9: 'boolean' + // InternalRDL.g:11:7: ( 'string' ) + // InternalRDL.g:11:9: 'string' { - match("boolean"); + match("string"); } @@ -224,10 +184,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__13; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:14:7: ( 'addrmap' ) - // InternalRDL.g:14:9: 'addrmap' + // InternalRDL.g:12:7: ( 'number' ) + // InternalRDL.g:12:9: 'number' { - match("addrmap"); + match("number"); } @@ -245,10 +205,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__14; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:15:7: ( 'reg' ) - // InternalRDL.g:15:9: 'reg' + // InternalRDL.g:13:7: ( 'boolean' ) + // InternalRDL.g:13:9: 'boolean' { - match("reg"); + match("boolean"); } @@ -266,10 +226,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__15; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:16:7: ( 'regfile' ) - // InternalRDL.g:16:9: 'regfile' + // InternalRDL.g:14:7: ( 'addrmap' ) + // InternalRDL.g:14:9: 'addrmap' { - match("regfile"); + match("addrmap"); } @@ -287,10 +247,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__16; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:17:7: ( 'field' ) - // InternalRDL.g:17:9: 'field' + // InternalRDL.g:15:7: ( 'reg' ) + // InternalRDL.g:15:9: 'reg' { - match("field"); + match("reg"); } @@ -308,10 +268,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__17; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:18:7: ( 'ref' ) - // InternalRDL.g:18:9: 'ref' + // InternalRDL.g:16:7: ( 'regfile' ) + // InternalRDL.g:16:9: 'regfile' { - match("ref"); + match("regfile"); } @@ -329,10 +289,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__18; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:19:7: ( 'signal' ) - // InternalRDL.g:19:9: 'signal' + // InternalRDL.g:17:7: ( 'field' ) + // InternalRDL.g:17:9: 'field' { - match("signal"); + match("field"); } @@ -350,10 +310,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__19; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:20:7: ( 'all' ) - // InternalRDL.g:20:9: 'all' + // InternalRDL.g:18:7: ( 'ref' ) + // InternalRDL.g:18:9: 'ref' { - match("all"); + match("ref"); } @@ -371,10 +331,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__20; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:21:7: ( 'name' ) - // InternalRDL.g:21:9: 'name' + // InternalRDL.g:19:7: ( 'signal' ) + // InternalRDL.g:19:9: 'signal' { - match("name"); + match("signal"); } @@ -392,10 +352,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__21; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:22:7: ( 'desc' ) - // InternalRDL.g:22:9: 'desc' + // InternalRDL.g:20:7: ( 'all' ) + // InternalRDL.g:20:9: 'all' { - match("desc"); + match("all"); } @@ -413,10 +373,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__22; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:23:7: ( 'arbiter' ) - // InternalRDL.g:23:9: 'arbiter' + // InternalRDL.g:21:7: ( 'name' ) + // InternalRDL.g:21:9: 'name' { - match("arbiter"); + match("name"); } @@ -434,10 +394,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__23; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:24:7: ( 'rset' ) - // InternalRDL.g:24:9: 'rset' + // InternalRDL.g:22:7: ( 'desc' ) + // InternalRDL.g:22:9: 'desc' { - match("rset"); + match("desc"); } @@ -455,10 +415,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__24; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:25:7: ( 'rclr' ) - // InternalRDL.g:25:9: 'rclr' + // InternalRDL.g:23:7: ( 'arbiter' ) + // InternalRDL.g:23:9: 'arbiter' { - match("rclr"); + match("arbiter"); } @@ -476,10 +436,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__25; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:26:7: ( 'woclr' ) - // InternalRDL.g:26:9: 'woclr' + // InternalRDL.g:24:7: ( 'rset' ) + // InternalRDL.g:24:9: 'rset' { - match("woclr"); + match("rset"); } @@ -497,10 +457,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__26; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:27:7: ( 'woset' ) - // InternalRDL.g:27:9: 'woset' + // InternalRDL.g:25:7: ( 'rclr' ) + // InternalRDL.g:25:9: 'rclr' { - match("woset"); + match("rclr"); } @@ -518,10 +478,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__27; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:28:7: ( 'we' ) - // InternalRDL.g:28:9: 'we' + // InternalRDL.g:26:7: ( 'woclr' ) + // InternalRDL.g:26:9: 'woclr' { - match("we"); + match("woclr"); } @@ -539,10 +499,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__28; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:29:7: ( 'wel' ) - // InternalRDL.g:29:9: 'wel' + // InternalRDL.g:27:7: ( 'woset' ) + // InternalRDL.g:27:9: 'woset' { - match("wel"); + match("woset"); } @@ -560,10 +520,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__29; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:30:7: ( 'swwe' ) - // InternalRDL.g:30:9: 'swwe' + // InternalRDL.g:28:7: ( 'we' ) + // InternalRDL.g:28:9: 'we' { - match("swwe"); + match("we"); } @@ -581,10 +541,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__30; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:31:7: ( 'swwel' ) - // InternalRDL.g:31:9: 'swwel' + // InternalRDL.g:29:7: ( 'wel' ) + // InternalRDL.g:29:9: 'wel' { - match("swwel"); + match("wel"); } @@ -602,10 +562,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__31; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:32:7: ( 'hwset' ) - // InternalRDL.g:32:9: 'hwset' + // InternalRDL.g:30:7: ( 'swwe' ) + // InternalRDL.g:30:9: 'swwe' { - match("hwset"); + match("swwe"); } @@ -623,10 +583,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__32; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:33:7: ( 'hwclr' ) - // InternalRDL.g:33:9: 'hwclr' + // InternalRDL.g:31:7: ( 'swwel' ) + // InternalRDL.g:31:9: 'swwel' { - match("hwclr"); + match("swwel"); } @@ -644,10 +604,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__33; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:34:7: ( 'swmod' ) - // InternalRDL.g:34:9: 'swmod' + // InternalRDL.g:32:7: ( 'hwset' ) + // InternalRDL.g:32:9: 'hwset' { - match("swmod"); + match("hwset"); } @@ -665,10 +625,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__34; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:35:7: ( 'swacc' ) - // InternalRDL.g:35:9: 'swacc' + // InternalRDL.g:33:7: ( 'hwclr' ) + // InternalRDL.g:33:9: 'hwclr' { - match("swacc"); + match("hwclr"); } @@ -686,10 +646,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__35; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:36:7: ( 'sticky' ) - // InternalRDL.g:36:9: 'sticky' + // InternalRDL.g:34:7: ( 'swmod' ) + // InternalRDL.g:34:9: 'swmod' { - match("sticky"); + match("swmod"); } @@ -707,10 +667,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__36; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:37:7: ( 'stickybit' ) - // InternalRDL.g:37:9: 'stickybit' + // InternalRDL.g:35:7: ( 'swacc' ) + // InternalRDL.g:35:9: 'swacc' { - match("stickybit"); + match("swacc"); } @@ -728,10 +688,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__37; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:38:7: ( 'intr' ) - // InternalRDL.g:38:9: 'intr' + // InternalRDL.g:36:7: ( 'sticky' ) + // InternalRDL.g:36:9: 'sticky' { - match("intr"); + match("sticky"); } @@ -749,10 +709,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__38; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:39:7: ( 'anded' ) - // InternalRDL.g:39:9: 'anded' + // InternalRDL.g:37:7: ( 'stickybit' ) + // InternalRDL.g:37:9: 'stickybit' { - match("anded"); + match("stickybit"); } @@ -770,10 +730,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__39; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:40:7: ( 'ored' ) - // InternalRDL.g:40:9: 'ored' + // InternalRDL.g:38:7: ( 'intr' ) + // InternalRDL.g:38:9: 'intr' { - match("ored"); + match("intr"); } @@ -791,10 +751,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__40; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:41:7: ( 'xored' ) - // InternalRDL.g:41:9: 'xored' + // InternalRDL.g:39:7: ( 'anded' ) + // InternalRDL.g:39:9: 'anded' { - match("xored"); + match("anded"); } @@ -812,10 +772,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__41; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:42:7: ( 'counter' ) - // InternalRDL.g:42:9: 'counter' + // InternalRDL.g:40:7: ( 'ored' ) + // InternalRDL.g:40:9: 'ored' { - match("counter"); + match("ored"); } @@ -833,10 +793,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__42; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:43:7: ( 'overflow' ) - // InternalRDL.g:43:9: 'overflow' + // InternalRDL.g:41:7: ( 'xored' ) + // InternalRDL.g:41:9: 'xored' { - match("overflow"); + match("xored"); } @@ -854,10 +814,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__43; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:44:7: ( 'sharedextbus' ) - // InternalRDL.g:44:9: 'sharedextbus' + // InternalRDL.g:42:7: ( 'counter' ) + // InternalRDL.g:42:9: 'counter' { - match("sharedextbus"); + match("counter"); } @@ -875,10 +835,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__44; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:45:7: ( 'errextbus' ) - // InternalRDL.g:45:9: 'errextbus' + // InternalRDL.g:43:7: ( 'overflow' ) + // InternalRDL.g:43:9: 'overflow' { - match("errextbus"); + match("overflow"); } @@ -896,10 +856,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__45; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:46:7: ( 'reset' ) - // InternalRDL.g:46:9: 'reset' + // InternalRDL.g:44:7: ( 'sharedextbus' ) + // InternalRDL.g:44:9: 'sharedextbus' { - match("reset"); + match("sharedextbus"); } @@ -917,10 +877,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__46; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:47:7: ( 'littleendian' ) - // InternalRDL.g:47:9: 'littleendian' + // InternalRDL.g:45:7: ( 'errextbus' ) + // InternalRDL.g:45:9: 'errextbus' { - match("littleendian"); + match("errextbus"); } @@ -938,10 +898,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__47; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:48:7: ( 'bigendian' ) - // InternalRDL.g:48:9: 'bigendian' + // InternalRDL.g:46:7: ( 'reset' ) + // InternalRDL.g:46:9: 'reset' { - match("bigendian"); + match("reset"); } @@ -959,10 +919,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__48; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:49:7: ( 'rsvdset' ) - // InternalRDL.g:49:9: 'rsvdset' + // InternalRDL.g:47:7: ( 'littleendian' ) + // InternalRDL.g:47:9: 'littleendian' { - match("rsvdset"); + match("littleendian"); } @@ -980,10 +940,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__49; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:50:7: ( 'rsvdsetX' ) - // InternalRDL.g:50:9: 'rsvdsetX' + // InternalRDL.g:48:7: ( 'bigendian' ) + // InternalRDL.g:48:9: 'bigendian' { - match("rsvdsetX"); + match("bigendian"); } @@ -1001,10 +961,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__50; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:51:7: ( 'bridge' ) - // InternalRDL.g:51:9: 'bridge' + // InternalRDL.g:49:7: ( 'rsvdset' ) + // InternalRDL.g:49:9: 'rsvdset' { - match("bridge"); + match("rsvdset"); } @@ -1022,10 +982,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__51; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:52:7: ( 'shared' ) - // InternalRDL.g:52:9: 'shared' + // InternalRDL.g:50:7: ( 'rsvdsetX' ) + // InternalRDL.g:50:9: 'rsvdsetX' { - match("shared"); + match("rsvdsetX"); } @@ -1043,10 +1003,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__52; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:53:7: ( 'msb0' ) - // InternalRDL.g:53:9: 'msb0' + // InternalRDL.g:51:7: ( 'bridge' ) + // InternalRDL.g:51:9: 'bridge' { - match("msb0"); + match("bridge"); } @@ -1064,10 +1024,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__53; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:54:7: ( 'lsb0' ) - // InternalRDL.g:54:9: 'lsb0' + // InternalRDL.g:52:7: ( 'shared' ) + // InternalRDL.g:52:9: 'shared' { - match("lsb0"); + match("shared"); } @@ -1085,10 +1045,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__54; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:55:7: ( 'sync' ) - // InternalRDL.g:55:9: 'sync' + // InternalRDL.g:53:7: ( 'msb0' ) + // InternalRDL.g:53:9: 'msb0' { - match("sync"); + match("msb0"); } @@ -1106,10 +1066,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__55; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:56:7: ( 'async' ) - // InternalRDL.g:56:9: 'async' + // InternalRDL.g:54:7: ( 'lsb0' ) + // InternalRDL.g:54:9: 'lsb0' { - match("async"); + match("lsb0"); } @@ -1127,10 +1087,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__56; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:57:7: ( 'cpuif_reset' ) - // InternalRDL.g:57:9: 'cpuif_reset' + // InternalRDL.g:55:7: ( 'sync' ) + // InternalRDL.g:55:9: 'sync' { - match("cpuif_reset"); + match("sync"); } @@ -1148,10 +1108,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__57; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:58:7: ( 'field_reset' ) - // InternalRDL.g:58:9: 'field_reset' + // InternalRDL.g:56:7: ( 'async' ) + // InternalRDL.g:56:9: 'async' { - match("field_reset"); + match("async"); } @@ -1169,10 +1129,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__58; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:59:7: ( 'activehigh' ) - // InternalRDL.g:59:9: 'activehigh' + // InternalRDL.g:57:7: ( 'cpuif_reset' ) + // InternalRDL.g:57:9: 'cpuif_reset' { - match("activehigh"); + match("cpuif_reset"); } @@ -1190,10 +1150,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__59; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:60:7: ( 'activelow' ) - // InternalRDL.g:60:9: 'activelow' + // InternalRDL.g:58:7: ( 'field_reset' ) + // InternalRDL.g:58:9: 'field_reset' { - match("activelow"); + match("field_reset"); } @@ -1211,10 +1171,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__60; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:61:7: ( 'singlepulse' ) - // InternalRDL.g:61:9: 'singlepulse' + // InternalRDL.g:59:7: ( 'activehigh' ) + // InternalRDL.g:59:9: 'activehigh' { - match("singlepulse"); + match("activehigh"); } @@ -1232,10 +1192,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__61; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:62:7: ( 'underflow' ) - // InternalRDL.g:62:9: 'underflow' + // InternalRDL.g:60:7: ( 'activelow' ) + // InternalRDL.g:60:9: 'activelow' { - match("underflow"); + match("activelow"); } @@ -1253,10 +1213,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__62; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:63:7: ( 'incr' ) - // InternalRDL.g:63:9: 'incr' + // InternalRDL.g:61:7: ( 'singlepulse' ) + // InternalRDL.g:61:9: 'singlepulse' { - match("incr"); + match("singlepulse"); } @@ -1274,10 +1234,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__63; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:64:7: ( 'decr' ) - // InternalRDL.g:64:9: 'decr' + // InternalRDL.g:62:7: ( 'underflow' ) + // InternalRDL.g:62:9: 'underflow' { - match("decr"); + match("underflow"); } @@ -1295,10 +1255,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__64; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:65:7: ( 'incrwidth' ) - // InternalRDL.g:65:9: 'incrwidth' + // InternalRDL.g:63:7: ( 'incr' ) + // InternalRDL.g:63:9: 'incr' { - match("incrwidth"); + match("incr"); } @@ -1316,10 +1276,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__65; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:66:7: ( 'decrwidth' ) - // InternalRDL.g:66:9: 'decrwidth' + // InternalRDL.g:64:7: ( 'decr' ) + // InternalRDL.g:64:9: 'decr' { - match("decrwidth"); + match("decr"); } @@ -1337,10 +1297,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__66; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:67:7: ( 'incrvalue' ) - // InternalRDL.g:67:9: 'incrvalue' + // InternalRDL.g:65:7: ( 'incrwidth' ) + // InternalRDL.g:65:9: 'incrwidth' { - match("incrvalue"); + match("incrwidth"); } @@ -1358,10 +1318,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__67; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:68:7: ( 'decrvalue' ) - // InternalRDL.g:68:9: 'decrvalue' + // InternalRDL.g:66:7: ( 'decrwidth' ) + // InternalRDL.g:66:9: 'decrwidth' { - match("decrvalue"); + match("decrwidth"); } @@ -1379,10 +1339,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__68; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:69:7: ( 'saturate' ) - // InternalRDL.g:69:9: 'saturate' + // InternalRDL.g:67:7: ( 'incrvalue' ) + // InternalRDL.g:67:9: 'incrvalue' { - match("saturate"); + match("incrvalue"); } @@ -1400,10 +1360,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__69; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:70:7: ( 'decrsaturate' ) - // InternalRDL.g:70:9: 'decrsaturate' + // InternalRDL.g:68:7: ( 'decrvalue' ) + // InternalRDL.g:68:9: 'decrvalue' { - match("decrsaturate"); + match("decrvalue"); } @@ -1421,10 +1381,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__70; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:71:7: ( 'threshold' ) - // InternalRDL.g:71:9: 'threshold' + // InternalRDL.g:69:7: ( 'saturate' ) + // InternalRDL.g:69:9: 'saturate' { - match("threshold"); + match("saturate"); } @@ -1442,10 +1402,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__71; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:72:7: ( 'decrthreshold' ) - // InternalRDL.g:72:9: 'decrthreshold' + // InternalRDL.g:70:7: ( 'decrsaturate' ) + // InternalRDL.g:70:9: 'decrsaturate' { - match("decrthreshold"); + match("decrsaturate"); } @@ -1463,10 +1423,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__72; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:73:7: ( 'dontcompare' ) - // InternalRDL.g:73:9: 'dontcompare' + // InternalRDL.g:71:7: ( 'threshold' ) + // InternalRDL.g:71:9: 'threshold' { - match("dontcompare"); + match("threshold"); } @@ -1484,10 +1444,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__73; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:74:7: ( 'donttest' ) - // InternalRDL.g:74:9: 'donttest' + // InternalRDL.g:72:7: ( 'decrthreshold' ) + // InternalRDL.g:72:9: 'decrthreshold' { - match("donttest"); + match("decrthreshold"); } @@ -1505,10 +1465,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__74; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:75:7: ( 'internal' ) - // InternalRDL.g:75:9: 'internal' + // InternalRDL.g:73:7: ( 'dontcompare' ) + // InternalRDL.g:73:9: 'dontcompare' { - match("internal"); + match("dontcompare"); } @@ -1526,10 +1486,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__75; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:76:7: ( 'alignment' ) - // InternalRDL.g:76:9: 'alignment' + // InternalRDL.g:74:7: ( 'donttest' ) + // InternalRDL.g:74:9: 'donttest' { - match("alignment"); + match("donttest"); } @@ -1547,10 +1507,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__76; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:77:7: ( 'regwidth' ) - // InternalRDL.g:77:9: 'regwidth' + // InternalRDL.g:75:7: ( 'internal' ) + // InternalRDL.g:75:9: 'internal' { - match("regwidth"); + match("internal"); } @@ -1568,10 +1528,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__77; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:78:7: ( 'fieldwidth' ) - // InternalRDL.g:78:9: 'fieldwidth' + // InternalRDL.g:76:7: ( 'alignment' ) + // InternalRDL.g:76:9: 'alignment' { - match("fieldwidth"); + match("alignment"); } @@ -1589,10 +1549,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__78; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:79:7: ( 'signalwidth' ) - // InternalRDL.g:79:9: 'signalwidth' + // InternalRDL.g:77:7: ( 'regwidth' ) + // InternalRDL.g:77:9: 'regwidth' { - match("signalwidth"); + match("regwidth"); } @@ -1610,10 +1570,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__79; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:80:7: ( 'accesswidth' ) - // InternalRDL.g:80:9: 'accesswidth' + // InternalRDL.g:78:7: ( 'fieldwidth' ) + // InternalRDL.g:78:9: 'fieldwidth' { - match("accesswidth"); + match("fieldwidth"); } @@ -1631,10 +1591,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__80; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:81:7: ( 'sw' ) - // InternalRDL.g:81:9: 'sw' + // InternalRDL.g:79:7: ( 'signalwidth' ) + // InternalRDL.g:79:9: 'signalwidth' { - match("sw"); + match("signalwidth"); } @@ -1652,10 +1612,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__81; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:82:7: ( 'hw' ) - // InternalRDL.g:82:9: 'hw' + // InternalRDL.g:80:7: ( 'accesswidth' ) + // InternalRDL.g:80:9: 'accesswidth' { - match("hw"); + match("accesswidth"); } @@ -1673,10 +1633,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__82; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:83:7: ( 'addressing' ) - // InternalRDL.g:83:9: 'addressing' + // InternalRDL.g:81:7: ( 'sw' ) + // InternalRDL.g:81:9: 'sw' { - match("addressing"); + match("sw"); } @@ -1694,10 +1654,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__83; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:84:7: ( 'precedence' ) - // InternalRDL.g:84:9: 'precedence' + // InternalRDL.g:82:7: ( 'hw' ) + // InternalRDL.g:82:9: 'hw' { - match("precedence"); + match("hw"); } @@ -1715,10 +1675,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__84; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:85:7: ( 'encode' ) - // InternalRDL.g:85:9: 'encode' + // InternalRDL.g:83:7: ( 'addressing' ) + // InternalRDL.g:83:9: 'addressing' { - match("encode"); + match("addressing"); } @@ -1736,10 +1696,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__85; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:86:7: ( 'resetsignal' ) - // InternalRDL.g:86:9: 'resetsignal' + // InternalRDL.g:84:7: ( 'precedence' ) + // InternalRDL.g:84:9: 'precedence' { - match("resetsignal"); + match("precedence"); } @@ -1757,10 +1717,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__86; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:87:7: ( 'clock' ) - // InternalRDL.g:87:9: 'clock' + // InternalRDL.g:85:7: ( 'encode' ) + // InternalRDL.g:85:9: 'encode' { - match("clock"); + match("encode"); } @@ -1778,10 +1738,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__87; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:88:7: ( 'mask' ) - // InternalRDL.g:88:9: 'mask' + // InternalRDL.g:86:7: ( 'resetsignal' ) + // InternalRDL.g:86:9: 'resetsignal' { - match("mask"); + match("resetsignal"); } @@ -1799,10 +1759,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__88; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:89:7: ( 'enable' ) - // InternalRDL.g:89:9: 'enable' + // InternalRDL.g:87:7: ( 'clock' ) + // InternalRDL.g:87:9: 'clock' { - match("enable"); + match("clock"); } @@ -1820,10 +1780,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__89; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:90:7: ( 'hwenable' ) - // InternalRDL.g:90:9: 'hwenable' + // InternalRDL.g:88:7: ( 'mask' ) + // InternalRDL.g:88:9: 'mask' { - match("hwenable"); + match("mask"); } @@ -1841,10 +1801,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__90; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:91:7: ( 'hwmask' ) - // InternalRDL.g:91:9: 'hwmask' + // InternalRDL.g:89:7: ( 'enable' ) + // InternalRDL.g:89:9: 'enable' { - match("hwmask"); + match("enable"); } @@ -1862,10 +1822,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__91; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:92:7: ( 'haltmask' ) - // InternalRDL.g:92:9: 'haltmask' + // InternalRDL.g:90:7: ( 'hwenable' ) + // InternalRDL.g:90:9: 'hwenable' { - match("haltmask"); + match("hwenable"); } @@ -1883,10 +1843,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__92; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:93:7: ( 'haltenable' ) - // InternalRDL.g:93:9: 'haltenable' + // InternalRDL.g:91:7: ( 'hwmask' ) + // InternalRDL.g:91:9: 'hwmask' { - match("haltenable"); + match("hwmask"); } @@ -1904,10 +1864,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__93; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:94:7: ( 'halt' ) - // InternalRDL.g:94:9: 'halt' + // InternalRDL.g:92:7: ( 'haltmask' ) + // InternalRDL.g:92:9: 'haltmask' { - match("halt"); + match("haltmask"); } @@ -1925,10 +1885,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__94; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:95:7: ( 'next' ) - // InternalRDL.g:95:9: 'next' + // InternalRDL.g:93:7: ( 'haltenable' ) + // InternalRDL.g:93:9: 'haltenable' { - match("next"); + match("haltenable"); } @@ -1946,10 +1906,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__95; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:96:7: ( 'UNDEFINED' ) - // InternalRDL.g:96:9: 'UNDEFINED' + // InternalRDL.g:94:7: ( 'halt' ) + // InternalRDL.g:94:9: 'halt' { - match("UNDEFINED"); + match("halt"); } @@ -1967,10 +1927,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__96; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:97:7: ( 'true' ) - // InternalRDL.g:97:9: 'true' + // InternalRDL.g:95:7: ( 'next' ) + // InternalRDL.g:95:9: 'next' { - match("true"); + match("next"); } @@ -1988,10 +1948,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__97; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:98:7: ( 'false' ) - // InternalRDL.g:98:9: 'false' + // InternalRDL.g:96:7: ( 'UNDEFINED' ) + // InternalRDL.g:96:9: 'UNDEFINED' { - match("false"); + match("UNDEFINED"); } @@ -2009,10 +1969,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__98; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:99:7: ( 'rw' ) - // InternalRDL.g:99:9: 'rw' + // InternalRDL.g:97:7: ( 'true' ) + // InternalRDL.g:97:9: 'true' { - match("rw"); + match("true"); } @@ -2030,10 +1990,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__99; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:100:7: ( 'wr' ) - // InternalRDL.g:100:9: 'wr' + // InternalRDL.g:98:7: ( 'false' ) + // InternalRDL.g:98:9: 'false' { - match("wr"); + match("false"); } @@ -2051,10 +2011,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__100; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:101:8: ( 'r' ) - // InternalRDL.g:101:10: 'r' + // InternalRDL.g:99:8: ( 'rw' ) + // InternalRDL.g:99:10: 'rw' { - match('r'); + match("rw"); + } @@ -2071,10 +2032,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__101; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:102:8: ( 'w' ) - // InternalRDL.g:102:10: 'w' + // InternalRDL.g:100:8: ( 'wr' ) + // InternalRDL.g:100:10: 'wr' { - match('w'); + match("wr"); + } @@ -2091,11 +2053,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__102; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:103:8: ( 'na' ) - // InternalRDL.g:103:10: 'na' + // InternalRDL.g:101:8: ( 'r' ) + // InternalRDL.g:101:10: 'r' { - match("na"); - + match('r'); } @@ -2112,11 +2073,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__103; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:104:8: ( 'compact' ) - // InternalRDL.g:104:10: 'compact' + // InternalRDL.g:102:8: ( 'w' ) + // InternalRDL.g:102:10: 'w' { - match("compact"); - + match('w'); } @@ -2133,10 +2093,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__104; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:105:8: ( 'regalign' ) - // InternalRDL.g:105:10: 'regalign' + // InternalRDL.g:103:8: ( 'na' ) + // InternalRDL.g:103:10: 'na' { - match("regalign"); + match("na"); } @@ -2154,10 +2114,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__105; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:106:8: ( 'fullalign' ) - // InternalRDL.g:106:10: 'fullalign' + // InternalRDL.g:104:8: ( 'compact' ) + // InternalRDL.g:104:10: 'compact' { - match("fullalign"); + match("compact"); } @@ -2175,10 +2135,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__106; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:107:8: ( 'posedge' ) - // InternalRDL.g:107:10: 'posedge' + // InternalRDL.g:105:8: ( 'regalign' ) + // InternalRDL.g:105:10: 'regalign' { - match("posedge"); + match("regalign"); } @@ -2196,10 +2156,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__107; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:108:8: ( 'negedge' ) - // InternalRDL.g:108:10: 'negedge' + // InternalRDL.g:106:8: ( 'fullalign' ) + // InternalRDL.g:106:10: 'fullalign' { - match("negedge"); + match("fullalign"); } @@ -2217,10 +2177,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__108; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:109:8: ( 'bothedge' ) - // InternalRDL.g:109:10: 'bothedge' + // InternalRDL.g:107:8: ( 'posedge' ) + // InternalRDL.g:107:10: 'posedge' { - match("bothedge"); + match("posedge"); } @@ -2238,10 +2198,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__109; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:110:8: ( 'level' ) - // InternalRDL.g:110:10: 'level' + // InternalRDL.g:108:8: ( 'negedge' ) + // InternalRDL.g:108:10: 'negedge' { - match("level"); + match("negedge"); } @@ -2259,10 +2219,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__110; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:111:8: ( 'nonsticky' ) - // InternalRDL.g:111:10: 'nonsticky' + // InternalRDL.g:109:8: ( 'bothedge' ) + // InternalRDL.g:109:10: 'bothedge' { - match("nonsticky"); + match("bothedge"); } @@ -2280,10 +2240,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__111; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:112:8: ( '`include' ) - // InternalRDL.g:112:10: '`include' + // InternalRDL.g:110:8: ( 'level' ) + // InternalRDL.g:110:10: 'level' { - match("`include"); + match("level"); } @@ -2301,10 +2261,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__112; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:113:8: ( 'property' ) - // InternalRDL.g:113:10: 'property' + // InternalRDL.g:111:8: ( 'nonsticky' ) + // InternalRDL.g:111:10: 'nonsticky' { - match("property"); + match("nonsticky"); } @@ -2322,10 +2282,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__113; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:114:8: ( '{' ) - // InternalRDL.g:114:10: '{' + // InternalRDL.g:112:8: ( '`include' ) + // InternalRDL.g:112:10: '`include' { - match('{'); + match("`include"); + } @@ -2342,10 +2303,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__114; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:115:8: ( '}' ) - // InternalRDL.g:115:10: '}' + // InternalRDL.g:113:8: ( 'property' ) + // InternalRDL.g:113:10: 'property' { - match('}'); + match("property"); + } @@ -2362,10 +2324,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__115; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:116:8: ( ';' ) - // InternalRDL.g:116:10: ';' + // InternalRDL.g:114:8: ( '{' ) + // InternalRDL.g:114:10: '{' { - match(';'); + match('{'); } @@ -2382,11 +2344,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__116; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:117:8: ( 'type' ) - // InternalRDL.g:117:10: 'type' + // InternalRDL.g:115:8: ( '}' ) + // InternalRDL.g:115:10: '}' { - match("type"); - + match('}'); } @@ -2403,10 +2364,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__117; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:118:8: ( '=' ) - // InternalRDL.g:118:10: '=' + // InternalRDL.g:116:8: ( ';' ) + // InternalRDL.g:116:10: ';' { - match('='); + match(';'); } @@ -2423,10 +2384,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__118; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:119:8: ( 'default' ) - // InternalRDL.g:119:10: 'default' + // InternalRDL.g:117:8: ( 'type' ) + // InternalRDL.g:117:10: 'type' { - match("default"); + match("type"); } @@ -2444,11 +2405,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__119; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:120:8: ( 'component' ) - // InternalRDL.g:120:10: 'component' + // InternalRDL.g:118:8: ( '=' ) + // InternalRDL.g:118:10: '=' { - match("component"); - + match('='); } @@ -2465,10 +2425,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__120; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:121:8: ( '|' ) - // InternalRDL.g:121:10: '|' + // InternalRDL.g:119:8: ( 'default' ) + // InternalRDL.g:119:10: 'default' { - match('|'); + match("default"); + } @@ -2485,10 +2446,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__121; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:122:8: ( 'alias' ) - // InternalRDL.g:122:10: 'alias' + // InternalRDL.g:120:8: ( 'component' ) + // InternalRDL.g:120:10: 'component' { - match("alias"); + match("component"); } @@ -2506,10 +2467,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__122; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:123:8: ( ',' ) - // InternalRDL.g:123:10: ',' + // InternalRDL.g:121:8: ( '|' ) + // InternalRDL.g:121:10: '|' { - match(','); + match('|'); } @@ -2526,10 +2487,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__123; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:124:8: ( '@' ) - // InternalRDL.g:124:10: '@' + // InternalRDL.g:122:8: ( 'alias' ) + // InternalRDL.g:122:10: 'alias' { - match('@'); + match("alias"); + } @@ -2546,11 +2508,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__124; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:125:8: ( '+=' ) - // InternalRDL.g:125:10: '+=' + // InternalRDL.g:123:8: ( ',' ) + // InternalRDL.g:123:10: ',' { - match("+="); - + match(','); } @@ -2567,11 +2528,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__125; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:126:8: ( '%=' ) - // InternalRDL.g:126:10: '%=' + // InternalRDL.g:124:8: ( '@' ) + // InternalRDL.g:124:10: '@' { - match("%="); - + match('@'); } @@ -2588,10 +2548,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__126; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:127:8: ( '[' ) - // InternalRDL.g:127:10: '[' + // InternalRDL.g:125:8: ( '+=' ) + // InternalRDL.g:125:10: '+=' { - match('['); + match("+="); + } @@ -2608,10 +2569,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__127; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:128:8: ( ']' ) - // InternalRDL.g:128:10: ']' + // InternalRDL.g:126:8: ( '%=' ) + // InternalRDL.g:126:10: '%=' { - match(']'); + match("%="); + } @@ -2628,10 +2590,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__128; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:129:8: ( ':' ) - // InternalRDL.g:129:10: ':' + // InternalRDL.g:127:8: ( '[' ) + // InternalRDL.g:127:10: '[' { - match(':'); + match('['); } @@ -2648,11 +2610,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__129; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:130:8: ( '->' ) - // InternalRDL.g:130:10: '->' + // InternalRDL.g:128:8: ( ']' ) + // InternalRDL.g:128:10: ']' { - match("->"); - + match(']'); } @@ -2669,10 +2630,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__130; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:131:8: ( '.' ) - // InternalRDL.g:131:10: '.' + // InternalRDL.g:129:8: ( ':' ) + // InternalRDL.g:129:10: ':' { - match('.'); + match(':'); } @@ -2689,10 +2650,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__131; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:132:8: ( 'enum' ) - // InternalRDL.g:132:10: 'enum' + // InternalRDL.g:130:8: ( '->' ) + // InternalRDL.g:130:10: '->' { - match("enum"); + match("->"); } @@ -2710,6 +2671,47 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__132; int _channel = DEFAULT_TOKEN_CHANNEL; + // InternalRDL.g:131:8: ( '.' ) + // InternalRDL.g:131:10: '.' + { + match('.'); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__132" + + // $ANTLR start "T__133" + public final void mT__133() throws RecognitionException { + try { + int _type = T__133; + int _channel = DEFAULT_TOKEN_CHANNEL; + // InternalRDL.g:132:8: ( 'enum' ) + // InternalRDL.g:132:10: 'enum' + { + match("enum"); + + + } + + 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; // InternalRDL.g:133:8: ( 'external' ) // InternalRDL.g:133:10: 'external' { @@ -2724,7 +2726,7 @@ public class InternalRDLLexer extends Lexer { finally { } } - // $ANTLR end "T__132" + // $ANTLR end "T__134" // $ANTLR start "RULE_ID" public final void mRULE_ID() throws RecognitionException { @@ -2867,167 +2869,49 @@ public class InternalRDLLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:7646:17: ( ( '/*' ( options {greedy=false; } : . )* '*/' | '<%' ( options {greedy=false; } : . )* '%>' | '(' ( options {greedy=false; } : . )* ')' ) ) - // InternalRDL.g:7646:19: ( '/*' ( options {greedy=false; } : . )* '*/' | '<%' ( options {greedy=false; } : . )* '%>' | '(' ( options {greedy=false; } : . )* ')' ) + // InternalRDL.g:7646:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalRDL.g:7646:19: '/*' ( options {greedy=false; } : . )* '*/' { - // InternalRDL.g:7646:19: ( '/*' ( options {greedy=false; } : . )* '*/' | '<%' ( options {greedy=false; } : . )* '%>' | '(' ( options {greedy=false; } : . )* ')' ) - int alt7=3; - switch ( input.LA(1) ) { - case '/': - { - alt7=1; - } - break; - case '<': - { - alt7=2; - } - break; - case '(': - { - alt7=3; - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("", 7, 0, input); + match("/*"); - throw nvae; - } - - switch (alt7) { - case 1 : - // InternalRDL.g:7646:20: '/*' ( options {greedy=false; } : . )* '*/' - { - match("/*"); - - // InternalRDL.g:7646:25: ( options {greedy=false; } : . )* - loop4: - do { - int alt4=2; - int LA4_0 = input.LA(1); - - if ( (LA4_0=='*') ) { - int LA4_1 = input.LA(2); - - if ( (LA4_1=='/') ) { - alt4=2; - } - else if ( ((LA4_1>='\u0000' && LA4_1<='.')||(LA4_1>='0' && LA4_1<='\uFFFF')) ) { - alt4=1; - } - - - } - else if ( ((LA4_0>='\u0000' && LA4_0<=')')||(LA4_0>='+' && LA4_0<='\uFFFF')) ) { - alt4=1; - } - - - switch (alt4) { - case 1 : - // InternalRDL.g:7646:53: . - { - matchAny(); - - } - break; - - default : - break loop4; - } - } while (true); - - match("*/"); + // InternalRDL.g:7646:24: ( options {greedy=false; } : . )* + loop4: + do { + int alt4=2; + int LA4_0 = input.LA(1); + if ( (LA4_0=='*') ) { + int LA4_1 = input.LA(2); + if ( (LA4_1=='/') ) { + alt4=2; } - break; - case 2 : - // InternalRDL.g:7646:62: '<%' ( options {greedy=false; } : . )* '%>' - { - match("<%"); - - // InternalRDL.g:7646:67: ( options {greedy=false; } : . )* - loop5: - do { - int alt5=2; - int LA5_0 = input.LA(1); - - if ( (LA5_0=='%') ) { - int LA5_1 = input.LA(2); - - if ( (LA5_1=='>') ) { - alt5=2; - } - else if ( ((LA5_1>='\u0000' && LA5_1<='=')||(LA5_1>='?' && LA5_1<='\uFFFF')) ) { - alt5=1; - } - - - } - else if ( ((LA5_0>='\u0000' && LA5_0<='$')||(LA5_0>='&' && LA5_0<='\uFFFF')) ) { - alt5=1; - } - - - switch (alt5) { - case 1 : - // InternalRDL.g:7646:95: . - { - matchAny(); - - } - break; - - default : - break loop5; - } - } while (true); - - match("%>"); - - + else if ( ((LA4_1>='\u0000' && LA4_1<='.')||(LA4_1>='0' && LA4_1<='\uFFFF')) ) { + alt4=1; } - break; - case 3 : - // InternalRDL.g:7646:104: '(' ( options {greedy=false; } : . )* ')' - { - match('('); - // InternalRDL.g:7646:108: ( options {greedy=false; } : . )* - loop6: - do { - int alt6=2; - int LA6_0 = input.LA(1); - - if ( (LA6_0==')') ) { - alt6=2; - } - else if ( ((LA6_0>='\u0000' && LA6_0<='(')||(LA6_0>='*' && LA6_0<='\uFFFF')) ) { - alt6=1; - } - switch (alt6) { - case 1 : - // InternalRDL.g:7646:136: . - { - matchAny(); + } + else if ( ((LA4_0>='\u0000' && LA4_0<=')')||(LA4_0>='+' && LA4_0<='\uFFFF')) ) { + alt4=1; + } - } - break; - default : - break loop6; - } - } while (true); + switch (alt4) { + case 1 : + // InternalRDL.g:7646:52: . + { + matchAny(); - match(')'); + } + break; - } - break; + default : + break loop4; + } + } while (true); - } + match("*/"); } @@ -3051,17 +2935,17 @@ public class InternalRDLLexer extends Lexer { match("//"); // InternalRDL.g:7648:24: (~ ( ( '\\n' | '\\r' ) ) )* - loop8: + loop5: do { - int alt8=2; - int LA8_0 = input.LA(1); + int alt5=2; + int LA5_0 = input.LA(1); - if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) { - alt8=1; + if ( ((LA5_0>='\u0000' && LA5_0<='\t')||(LA5_0>='\u000B' && LA5_0<='\f')||(LA5_0>='\u000E' && LA5_0<='\uFFFF')) ) { + alt5=1; } - switch (alt8) { + switch (alt5) { case 1 : // InternalRDL.g:7648:24: ~ ( ( '\\n' | '\\r' ) ) { @@ -3079,29 +2963,29 @@ public class InternalRDLLexer extends Lexer { break; default : - break loop8; + break loop5; } } while (true); // InternalRDL.g:7648:40: ( ( '\\r' )? '\\n' )? - int alt10=2; - int LA10_0 = input.LA(1); + int alt7=2; + int LA7_0 = input.LA(1); - if ( (LA10_0=='\n'||LA10_0=='\r') ) { - alt10=1; + if ( (LA7_0=='\n'||LA7_0=='\r') ) { + alt7=1; } - switch (alt10) { + switch (alt7) { case 1 : // InternalRDL.g:7648:41: ( '\\r' )? '\\n' { // InternalRDL.g:7648:41: ( '\\r' )? - int alt9=2; - int LA9_0 = input.LA(1); + int alt6=2; + int LA6_0 = input.LA(1); - if ( (LA9_0=='\r') ) { - alt9=1; + if ( (LA6_0=='\r') ) { + alt6=1; } - switch (alt9) { + switch (alt6) { case 1 : // InternalRDL.g:7648:41: '\\r' { @@ -3130,36 +3014,145 @@ public class InternalRDLLexer extends Lexer { } // $ANTLR end "RULE_SL_COMMENT" + // $ANTLR start "RULE_ESCAPE_JSP" + public final void mRULE_ESCAPE_JSP() throws RecognitionException { + try { + int _type = RULE_ESCAPE_JSP; + int _channel = DEFAULT_TOKEN_CHANNEL; + // InternalRDL.g:7650:17: ( '<%' ( options {greedy=false; } : . )* '%>' ) + // InternalRDL.g:7650:19: '<%' ( options {greedy=false; } : . )* '%>' + { + match("<%"); + + // InternalRDL.g:7650:24: ( options {greedy=false; } : . )* + loop8: + do { + int alt8=2; + int LA8_0 = input.LA(1); + + if ( (LA8_0=='%') ) { + int LA8_1 = input.LA(2); + + if ( (LA8_1=='>') ) { + alt8=2; + } + else if ( ((LA8_1>='\u0000' && LA8_1<='=')||(LA8_1>='?' && LA8_1<='\uFFFF')) ) { + alt8=1; + } + + + } + else if ( ((LA8_0>='\u0000' && LA8_0<='$')||(LA8_0>='&' && LA8_0<='\uFFFF')) ) { + alt8=1; + } + + + switch (alt8) { + case 1 : + // InternalRDL.g:7650:52: . + { + matchAny(); + + } + break; + + default : + break loop8; + } + } while (true); + + match("%>"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "RULE_ESCAPE_JSP" + + // $ANTLR start "RULE_ESCAPE_ORDL" + public final void mRULE_ESCAPE_ORDL() throws RecognitionException { + try { + int _type = RULE_ESCAPE_ORDL; + int _channel = DEFAULT_TOKEN_CHANNEL; + // InternalRDL.g:7652:18: ( '(' ( options {greedy=false; } : . )* ')' ) + // InternalRDL.g:7652:20: '(' ( options {greedy=false; } : . )* ')' + { + match('('); + // InternalRDL.g:7652:24: ( options {greedy=false; } : . )* + loop9: + do { + int alt9=2; + int LA9_0 = input.LA(1); + + if ( (LA9_0==')') ) { + alt9=2; + } + else if ( ((LA9_0>='\u0000' && LA9_0<='(')||(LA9_0>='*' && LA9_0<='\uFFFF')) ) { + alt9=1; + } + + + switch (alt9) { + case 1 : + // InternalRDL.g:7652:52: . + { + matchAny(); + + } + break; + + default : + break loop9; + } + } while (true); + + match(')'); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "RULE_ESCAPE_ORDL" + // $ANTLR start "RULE_NUM" public final void mRULE_NUM() throws RecognitionException { try { int _type = RULE_NUM; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:7650:10: ( ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) ) - // InternalRDL.g:7650:12: ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) + // InternalRDL.g:7654:10: ( ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) ) + // InternalRDL.g:7654:12: ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) { - // InternalRDL.g:7650:12: ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) - int alt21=6; - alt21 = dfa21.predict(input); - switch (alt21) { + // InternalRDL.g:7654:12: ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) + int alt20=6; + alt20 = dfa20.predict(input); + switch (alt20) { case 1 : - // InternalRDL.g:7650:13: ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ + // InternalRDL.g:7654:13: ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ { - // InternalRDL.g:7650:13: ( '0' .. '9' )+ - int cnt11=0; - loop11: + // InternalRDL.g:7654:13: ( '0' .. '9' )+ + int cnt10=0; + loop10: do { - int alt11=2; - int LA11_0 = input.LA(1); + int alt10=2; + int LA10_0 = input.LA(1); - if ( ((LA11_0>='0' && LA11_0<='9')) ) { - alt11=1; + if ( ((LA10_0>='0' && LA10_0<='9')) ) { + alt10=1; } - switch (alt11) { + switch (alt10) { case 1 : - // InternalRDL.g:7650:14: '0' .. '9' + // InternalRDL.g:7654:14: '0' .. '9' { matchRange('0','9'); @@ -3167,29 +3160,29 @@ public class InternalRDLLexer extends Lexer { break; default : - if ( cnt11 >= 1 ) break loop11; + if ( cnt10 >= 1 ) break loop10; EarlyExitException eee = - new EarlyExitException(11, input); + new EarlyExitException(10, input); throw eee; } - cnt11++; + cnt10++; } while (true); match("'b"); - // InternalRDL.g:7650:31: ( '0' | '1' | '_' )+ - int cnt12=0; - loop12: + // InternalRDL.g:7654:31: ( '0' | '1' | '_' )+ + int cnt11=0; + loop11: do { - int alt12=2; - int LA12_0 = input.LA(1); + int alt11=2; + int LA11_0 = input.LA(1); - if ( ((LA12_0>='0' && LA12_0<='1')||LA12_0=='_') ) { - alt12=1; + if ( ((LA11_0>='0' && LA11_0<='1')||LA11_0=='_') ) { + alt11=1; } - switch (alt12) { + switch (alt11) { case 1 : // InternalRDL.g: { @@ -3206,6 +3199,42 @@ public class InternalRDLLexer extends Lexer { } break; + default : + if ( cnt11 >= 1 ) break loop11; + EarlyExitException eee = + new EarlyExitException(11, input); + throw eee; + } + cnt11++; + } while (true); + + + } + break; + case 2 : + // InternalRDL.g:7654:46: ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ + { + // InternalRDL.g:7654:46: ( '0' .. '9' )+ + int cnt12=0; + loop12: + do { + int alt12=2; + int LA12_0 = input.LA(1); + + if ( ((LA12_0>='0' && LA12_0<='9')) ) { + alt12=1; + } + + + switch (alt12) { + case 1 : + // InternalRDL.g:7654:47: '0' .. '9' + { + matchRange('0','9'); + + } + break; + default : if ( cnt12 >= 1 ) break loop12; EarlyExitException eee = @@ -3215,57 +3244,21 @@ public class InternalRDLLexer extends Lexer { cnt12++; } while (true); + match("'o"); - } - break; - case 2 : - // InternalRDL.g:7650:46: ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ - { - // InternalRDL.g:7650:46: ( '0' .. '9' )+ + // InternalRDL.g:7654:64: ( '0' .. '7' | '_' )+ int cnt13=0; loop13: do { int alt13=2; int LA13_0 = input.LA(1); - if ( ((LA13_0>='0' && LA13_0<='9')) ) { + if ( ((LA13_0>='0' && LA13_0<='7')||LA13_0=='_') ) { alt13=1; } switch (alt13) { - case 1 : - // InternalRDL.g:7650:47: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt13 >= 1 ) break loop13; - EarlyExitException eee = - new EarlyExitException(13, input); - throw eee; - } - cnt13++; - } while (true); - - match("'o"); - - // InternalRDL.g:7650:64: ( '0' .. '7' | '_' )+ - int cnt14=0; - loop14: - do { - int alt14=2; - int LA14_0 = input.LA(1); - - if ( ((LA14_0>='0' && LA14_0<='7')||LA14_0=='_') ) { - alt14=1; - } - - - switch (alt14) { case 1 : // InternalRDL.g: { @@ -3282,6 +3275,42 @@ public class InternalRDLLexer extends Lexer { } break; + default : + if ( cnt13 >= 1 ) break loop13; + EarlyExitException eee = + new EarlyExitException(13, input); + throw eee; + } + cnt13++; + } while (true); + + + } + break; + case 3 : + // InternalRDL.g:7654:80: ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ + { + // InternalRDL.g:7654:80: ( '0' .. '9' )+ + int cnt14=0; + loop14: + do { + int alt14=2; + int LA14_0 = input.LA(1); + + if ( ((LA14_0>='0' && LA14_0<='9')) ) { + alt14=1; + } + + + switch (alt14) { + case 1 : + // InternalRDL.g:7654:81: '0' .. '9' + { + matchRange('0','9'); + + } + break; + default : if ( cnt14 >= 1 ) break loop14; EarlyExitException eee = @@ -3291,57 +3320,21 @@ public class InternalRDLLexer extends Lexer { cnt14++; } while (true); + match("'h"); - } - break; - case 3 : - // InternalRDL.g:7650:80: ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ - { - // InternalRDL.g:7650:80: ( '0' .. '9' )+ + // InternalRDL.g:7654:98: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ int cnt15=0; loop15: do { int alt15=2; int LA15_0 = input.LA(1); - if ( ((LA15_0>='0' && LA15_0<='9')) ) { + if ( ((LA15_0>='0' && LA15_0<='9')||(LA15_0>='A' && LA15_0<='F')||LA15_0=='_'||(LA15_0>='a' && LA15_0<='f')) ) { alt15=1; } switch (alt15) { - case 1 : - // InternalRDL.g:7650:81: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt15 >= 1 ) break loop15; - EarlyExitException eee = - new EarlyExitException(15, input); - throw eee; - } - cnt15++; - } while (true); - - match("'h"); - - // InternalRDL.g:7650:98: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ - int cnt16=0; - loop16: - do { - int alt16=2; - int LA16_0 = input.LA(1); - - if ( ((LA16_0>='0' && LA16_0<='9')||(LA16_0>='A' && LA16_0<='F')||LA16_0=='_'||(LA16_0>='a' && LA16_0<='f')) ) { - alt16=1; - } - - - switch (alt16) { case 1 : // InternalRDL.g: { @@ -3358,6 +3351,42 @@ public class InternalRDLLexer extends Lexer { } break; + default : + if ( cnt15 >= 1 ) break loop15; + EarlyExitException eee = + new EarlyExitException(15, input); + throw eee; + } + cnt15++; + } while (true); + + + } + break; + case 4 : + // InternalRDL.g:7654:132: ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ + { + // InternalRDL.g:7654:132: ( '0' .. '9' )+ + int cnt16=0; + loop16: + do { + int alt16=2; + int LA16_0 = input.LA(1); + + if ( ((LA16_0>='0' && LA16_0<='9')) ) { + alt16=1; + } + + + switch (alt16) { + case 1 : + // InternalRDL.g:7654:133: '0' .. '9' + { + matchRange('0','9'); + + } + break; + default : if ( cnt16 >= 1 ) break loop16; EarlyExitException eee = @@ -3367,29 +3396,33 @@ public class InternalRDLLexer extends Lexer { cnt16++; } while (true); + match("'d"); - } - break; - case 4 : - // InternalRDL.g:7650:132: ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ - { - // InternalRDL.g:7650:132: ( '0' .. '9' )+ + // InternalRDL.g:7654:150: ( '0' .. '9' | '_' )+ int cnt17=0; loop17: do { int alt17=2; int LA17_0 = input.LA(1); - if ( ((LA17_0>='0' && LA17_0<='9')) ) { + if ( ((LA17_0>='0' && LA17_0<='9')||LA17_0=='_') ) { alt17=1; } switch (alt17) { case 1 : - // InternalRDL.g:7650:133: '0' .. '9' + // InternalRDL.g: { - matchRange('0','9'); + if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) { + input.consume(); + + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} + } break; @@ -3403,16 +3436,22 @@ public class InternalRDLLexer extends Lexer { cnt17++; } while (true); - match("'d"); - // InternalRDL.g:7650:150: ( '0' .. '9' | '_' )+ + } + break; + case 5 : + // InternalRDL.g:7654:166: '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ + { + match("0x"); + + // InternalRDL.g:7654:171: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ int cnt18=0; loop18: do { int alt18=2; int LA18_0 = input.LA(1); - if ( ((LA18_0>='0' && LA18_0<='9')||LA18_0=='_') ) { + if ( ((LA18_0>='0' && LA18_0<='9')||(LA18_0>='A' && LA18_0<='F')||(LA18_0>='a' && LA18_0<='f')) ) { alt18=1; } @@ -3421,7 +3460,7 @@ public class InternalRDLLexer extends Lexer { case 1 : // InternalRDL.g: { - if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) { + if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) { input.consume(); } @@ -3446,36 +3485,26 @@ public class InternalRDLLexer extends Lexer { } break; - case 5 : - // InternalRDL.g:7650:166: '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ + case 6 : + // InternalRDL.g:7654:201: ( '0' .. '9' )+ { - match("0x"); - - // InternalRDL.g:7650:171: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ + // InternalRDL.g:7654:201: ( '0' .. '9' )+ int cnt19=0; loop19: do { int alt19=2; int LA19_0 = input.LA(1); - if ( ((LA19_0>='0' && LA19_0<='9')||(LA19_0>='A' && LA19_0<='F')||(LA19_0>='a' && LA19_0<='f')) ) { + if ( ((LA19_0>='0' && LA19_0<='9')) ) { alt19=1; } switch (alt19) { case 1 : - // InternalRDL.g: + // InternalRDL.g:7654:202: '0' .. '9' { - if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) { - input.consume(); - - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse;} - + matchRange('0','9'); } break; @@ -3490,42 +3519,6 @@ public class InternalRDLLexer extends Lexer { } while (true); - } - break; - case 6 : - // InternalRDL.g:7650:201: ( '0' .. '9' )+ - { - // InternalRDL.g:7650:201: ( '0' .. '9' )+ - int cnt20=0; - loop20: - do { - int alt20=2; - int LA20_0 = input.LA(1); - - if ( ((LA20_0>='0' && LA20_0<='9')) ) { - alt20=1; - } - - - switch (alt20) { - case 1 : - // InternalRDL.g:7650:202: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt20 >= 1 ) break loop20; - EarlyExitException eee = - new EarlyExitException(20, input); - throw eee; - } - cnt20++; - } while (true); - - } break; @@ -3547,27 +3540,27 @@ public class InternalRDLLexer extends Lexer { try { int _type = RULE_STR; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:7652:10: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) - // InternalRDL.g:7652:12: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalRDL.g:7656:10: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) + // InternalRDL.g:7656:12: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalRDL.g:7652:16: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* - loop22: + // InternalRDL.g:7656:16: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* + loop21: do { - int alt22=3; - int LA22_0 = input.LA(1); + int alt21=3; + int LA21_0 = input.LA(1); - if ( (LA22_0=='\\') ) { - alt22=1; + if ( (LA21_0=='\\') ) { + alt21=1; } - else if ( ((LA22_0>='\u0000' && LA22_0<='!')||(LA22_0>='#' && LA22_0<='[')||(LA22_0>=']' && LA22_0<='\uFFFF')) ) { - alt22=2; + else if ( ((LA21_0>='\u0000' && LA21_0<='!')||(LA21_0>='#' && LA21_0<='[')||(LA21_0>=']' && LA21_0<='\uFFFF')) ) { + alt21=2; } - switch (alt22) { + switch (alt21) { case 1 : - // InternalRDL.g:7652:17: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // InternalRDL.g:7656:17: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) { match('\\'); if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) { @@ -3583,7 +3576,7 @@ public class InternalRDLLexer extends Lexer { } break; case 2 : - // InternalRDL.g:7652:62: ~ ( ( '\\\\' | '\"' ) ) + // InternalRDL.g:7656:62: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -3599,7 +3592,7 @@ public class InternalRDLLexer extends Lexer { break; default : - break loop22; + break loop21; } } while (true); @@ -3616,908 +3609,922 @@ public class InternalRDLLexer extends Lexer { // $ANTLR end "RULE_STR" public void mTokens() throws RecognitionException { - // InternalRDL.g:1:8: ( T__10 | T__11 | T__12 | 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 | RULE_ID | RULE_WS | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_NUM | RULE_STR ) - int alt23=129; - alt23 = dfa23.predict(input); - switch (alt23) { + // InternalRDL.g:1:8: ( T__12 | 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_ID | RULE_WS | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_ESCAPE_JSP | RULE_ESCAPE_ORDL | RULE_NUM | RULE_STR ) + int alt22=131; + alt22 = dfa22.predict(input); + switch (alt22) { case 1 : - // InternalRDL.g:1:10: T__10 - { - mT__10(); - - } - break; - case 2 : - // InternalRDL.g:1:16: T__11 - { - mT__11(); - - } - break; - case 3 : - // InternalRDL.g:1:22: T__12 + // InternalRDL.g:1:10: T__12 { mT__12(); } break; - case 4 : - // InternalRDL.g:1:28: T__13 + case 2 : + // InternalRDL.g:1:16: T__13 { mT__13(); } break; - case 5 : - // InternalRDL.g:1:34: T__14 + case 3 : + // InternalRDL.g:1:22: T__14 { mT__14(); } break; - case 6 : - // InternalRDL.g:1:40: T__15 + case 4 : + // InternalRDL.g:1:28: T__15 { mT__15(); } break; - case 7 : - // InternalRDL.g:1:46: T__16 + case 5 : + // InternalRDL.g:1:34: T__16 { mT__16(); } break; - case 8 : - // InternalRDL.g:1:52: T__17 + case 6 : + // InternalRDL.g:1:40: T__17 { mT__17(); } break; - case 9 : - // InternalRDL.g:1:58: T__18 + case 7 : + // InternalRDL.g:1:46: T__18 { mT__18(); } break; - case 10 : - // InternalRDL.g:1:64: T__19 + case 8 : + // InternalRDL.g:1:52: T__19 { mT__19(); } break; - case 11 : - // InternalRDL.g:1:70: T__20 + case 9 : + // InternalRDL.g:1:58: T__20 { mT__20(); } break; - case 12 : - // InternalRDL.g:1:76: T__21 + case 10 : + // InternalRDL.g:1:64: T__21 { mT__21(); } break; - case 13 : - // InternalRDL.g:1:82: T__22 + case 11 : + // InternalRDL.g:1:70: T__22 { mT__22(); } break; - case 14 : - // InternalRDL.g:1:88: T__23 + case 12 : + // InternalRDL.g:1:76: T__23 { mT__23(); } break; - case 15 : - // InternalRDL.g:1:94: T__24 + case 13 : + // InternalRDL.g:1:82: T__24 { mT__24(); } break; - case 16 : - // InternalRDL.g:1:100: T__25 + case 14 : + // InternalRDL.g:1:88: T__25 { mT__25(); } break; - case 17 : - // InternalRDL.g:1:106: T__26 + case 15 : + // InternalRDL.g:1:94: T__26 { mT__26(); } break; - case 18 : - // InternalRDL.g:1:112: T__27 + case 16 : + // InternalRDL.g:1:100: T__27 { mT__27(); } break; - case 19 : - // InternalRDL.g:1:118: T__28 + case 17 : + // InternalRDL.g:1:106: T__28 { mT__28(); } break; - case 20 : - // InternalRDL.g:1:124: T__29 + case 18 : + // InternalRDL.g:1:112: T__29 { mT__29(); } break; - case 21 : - // InternalRDL.g:1:130: T__30 + case 19 : + // InternalRDL.g:1:118: T__30 { mT__30(); } break; - case 22 : - // InternalRDL.g:1:136: T__31 + case 20 : + // InternalRDL.g:1:124: T__31 { mT__31(); } break; - case 23 : - // InternalRDL.g:1:142: T__32 + case 21 : + // InternalRDL.g:1:130: T__32 { mT__32(); } break; - case 24 : - // InternalRDL.g:1:148: T__33 + case 22 : + // InternalRDL.g:1:136: T__33 { mT__33(); } break; - case 25 : - // InternalRDL.g:1:154: T__34 + case 23 : + // InternalRDL.g:1:142: T__34 { mT__34(); } break; - case 26 : - // InternalRDL.g:1:160: T__35 + case 24 : + // InternalRDL.g:1:148: T__35 { mT__35(); } break; - case 27 : - // InternalRDL.g:1:166: T__36 + case 25 : + // InternalRDL.g:1:154: T__36 { mT__36(); } break; - case 28 : - // InternalRDL.g:1:172: T__37 + case 26 : + // InternalRDL.g:1:160: T__37 { mT__37(); } break; - case 29 : - // InternalRDL.g:1:178: T__38 + case 27 : + // InternalRDL.g:1:166: T__38 { mT__38(); } break; - case 30 : - // InternalRDL.g:1:184: T__39 + case 28 : + // InternalRDL.g:1:172: T__39 { mT__39(); } break; - case 31 : - // InternalRDL.g:1:190: T__40 + case 29 : + // InternalRDL.g:1:178: T__40 { mT__40(); } break; - case 32 : - // InternalRDL.g:1:196: T__41 + case 30 : + // InternalRDL.g:1:184: T__41 { mT__41(); } break; - case 33 : - // InternalRDL.g:1:202: T__42 + case 31 : + // InternalRDL.g:1:190: T__42 { mT__42(); } break; - case 34 : - // InternalRDL.g:1:208: T__43 + case 32 : + // InternalRDL.g:1:196: T__43 { mT__43(); } break; - case 35 : - // InternalRDL.g:1:214: T__44 + case 33 : + // InternalRDL.g:1:202: T__44 { mT__44(); } break; - case 36 : - // InternalRDL.g:1:220: T__45 + case 34 : + // InternalRDL.g:1:208: T__45 { mT__45(); } break; - case 37 : - // InternalRDL.g:1:226: T__46 + case 35 : + // InternalRDL.g:1:214: T__46 { mT__46(); } break; - case 38 : - // InternalRDL.g:1:232: T__47 + case 36 : + // InternalRDL.g:1:220: T__47 { mT__47(); } break; - case 39 : - // InternalRDL.g:1:238: T__48 + case 37 : + // InternalRDL.g:1:226: T__48 { mT__48(); } break; - case 40 : - // InternalRDL.g:1:244: T__49 + case 38 : + // InternalRDL.g:1:232: T__49 { mT__49(); } break; - case 41 : - // InternalRDL.g:1:250: T__50 + case 39 : + // InternalRDL.g:1:238: T__50 { mT__50(); } break; - case 42 : - // InternalRDL.g:1:256: T__51 + case 40 : + // InternalRDL.g:1:244: T__51 { mT__51(); } break; - case 43 : - // InternalRDL.g:1:262: T__52 + case 41 : + // InternalRDL.g:1:250: T__52 { mT__52(); } break; - case 44 : - // InternalRDL.g:1:268: T__53 + case 42 : + // InternalRDL.g:1:256: T__53 { mT__53(); } break; - case 45 : - // InternalRDL.g:1:274: T__54 + case 43 : + // InternalRDL.g:1:262: T__54 { mT__54(); } break; - case 46 : - // InternalRDL.g:1:280: T__55 + case 44 : + // InternalRDL.g:1:268: T__55 { mT__55(); } break; - case 47 : - // InternalRDL.g:1:286: T__56 + case 45 : + // InternalRDL.g:1:274: T__56 { mT__56(); } break; - case 48 : - // InternalRDL.g:1:292: T__57 + case 46 : + // InternalRDL.g:1:280: T__57 { mT__57(); } break; - case 49 : - // InternalRDL.g:1:298: T__58 + case 47 : + // InternalRDL.g:1:286: T__58 { mT__58(); } break; - case 50 : - // InternalRDL.g:1:304: T__59 + case 48 : + // InternalRDL.g:1:292: T__59 { mT__59(); } break; - case 51 : - // InternalRDL.g:1:310: T__60 + case 49 : + // InternalRDL.g:1:298: T__60 { mT__60(); } break; - case 52 : - // InternalRDL.g:1:316: T__61 + case 50 : + // InternalRDL.g:1:304: T__61 { mT__61(); } break; - case 53 : - // InternalRDL.g:1:322: T__62 + case 51 : + // InternalRDL.g:1:310: T__62 { mT__62(); } break; - case 54 : - // InternalRDL.g:1:328: T__63 + case 52 : + // InternalRDL.g:1:316: T__63 { mT__63(); } break; - case 55 : - // InternalRDL.g:1:334: T__64 + case 53 : + // InternalRDL.g:1:322: T__64 { mT__64(); } break; - case 56 : - // InternalRDL.g:1:340: T__65 + case 54 : + // InternalRDL.g:1:328: T__65 { mT__65(); } break; - case 57 : - // InternalRDL.g:1:346: T__66 + case 55 : + // InternalRDL.g:1:334: T__66 { mT__66(); } break; - case 58 : - // InternalRDL.g:1:352: T__67 + case 56 : + // InternalRDL.g:1:340: T__67 { mT__67(); } break; - case 59 : - // InternalRDL.g:1:358: T__68 + case 57 : + // InternalRDL.g:1:346: T__68 { mT__68(); } break; - case 60 : - // InternalRDL.g:1:364: T__69 + case 58 : + // InternalRDL.g:1:352: T__69 { mT__69(); } break; - case 61 : - // InternalRDL.g:1:370: T__70 + case 59 : + // InternalRDL.g:1:358: T__70 { mT__70(); } break; - case 62 : - // InternalRDL.g:1:376: T__71 + case 60 : + // InternalRDL.g:1:364: T__71 { mT__71(); } break; - case 63 : - // InternalRDL.g:1:382: T__72 + case 61 : + // InternalRDL.g:1:370: T__72 { mT__72(); } break; - case 64 : - // InternalRDL.g:1:388: T__73 + case 62 : + // InternalRDL.g:1:376: T__73 { mT__73(); } break; - case 65 : - // InternalRDL.g:1:394: T__74 + case 63 : + // InternalRDL.g:1:382: T__74 { mT__74(); } break; - case 66 : - // InternalRDL.g:1:400: T__75 + case 64 : + // InternalRDL.g:1:388: T__75 { mT__75(); } break; - case 67 : - // InternalRDL.g:1:406: T__76 + case 65 : + // InternalRDL.g:1:394: T__76 { mT__76(); } break; - case 68 : - // InternalRDL.g:1:412: T__77 + case 66 : + // InternalRDL.g:1:400: T__77 { mT__77(); } break; - case 69 : - // InternalRDL.g:1:418: T__78 + case 67 : + // InternalRDL.g:1:406: T__78 { mT__78(); } break; - case 70 : - // InternalRDL.g:1:424: T__79 + case 68 : + // InternalRDL.g:1:412: T__79 { mT__79(); } break; - case 71 : - // InternalRDL.g:1:430: T__80 + case 69 : + // InternalRDL.g:1:418: T__80 { mT__80(); } break; - case 72 : - // InternalRDL.g:1:436: T__81 + case 70 : + // InternalRDL.g:1:424: T__81 { mT__81(); } break; - case 73 : - // InternalRDL.g:1:442: T__82 + case 71 : + // InternalRDL.g:1:430: T__82 { mT__82(); } break; - case 74 : - // InternalRDL.g:1:448: T__83 + case 72 : + // InternalRDL.g:1:436: T__83 { mT__83(); } break; - case 75 : - // InternalRDL.g:1:454: T__84 + case 73 : + // InternalRDL.g:1:442: T__84 { mT__84(); } break; - case 76 : - // InternalRDL.g:1:460: T__85 + case 74 : + // InternalRDL.g:1:448: T__85 { mT__85(); } break; - case 77 : - // InternalRDL.g:1:466: T__86 + case 75 : + // InternalRDL.g:1:454: T__86 { mT__86(); } break; - case 78 : - // InternalRDL.g:1:472: T__87 + case 76 : + // InternalRDL.g:1:460: T__87 { mT__87(); } break; - case 79 : - // InternalRDL.g:1:478: T__88 + case 77 : + // InternalRDL.g:1:466: T__88 { mT__88(); } break; - case 80 : - // InternalRDL.g:1:484: T__89 + case 78 : + // InternalRDL.g:1:472: T__89 { mT__89(); } break; - case 81 : - // InternalRDL.g:1:490: T__90 + case 79 : + // InternalRDL.g:1:478: T__90 { mT__90(); } break; - case 82 : - // InternalRDL.g:1:496: T__91 + case 80 : + // InternalRDL.g:1:484: T__91 { mT__91(); } break; - case 83 : - // InternalRDL.g:1:502: T__92 + case 81 : + // InternalRDL.g:1:490: T__92 { mT__92(); } break; - case 84 : - // InternalRDL.g:1:508: T__93 + case 82 : + // InternalRDL.g:1:496: T__93 { mT__93(); } break; - case 85 : - // InternalRDL.g:1:514: T__94 + case 83 : + // InternalRDL.g:1:502: T__94 { mT__94(); } break; - case 86 : - // InternalRDL.g:1:520: T__95 + case 84 : + // InternalRDL.g:1:508: T__95 { mT__95(); } break; - case 87 : - // InternalRDL.g:1:526: T__96 + case 85 : + // InternalRDL.g:1:514: T__96 { mT__96(); } break; - case 88 : - // InternalRDL.g:1:532: T__97 + case 86 : + // InternalRDL.g:1:520: T__97 { mT__97(); } break; - case 89 : - // InternalRDL.g:1:538: T__98 + case 87 : + // InternalRDL.g:1:526: T__98 { mT__98(); } break; - case 90 : - // InternalRDL.g:1:544: T__99 + case 88 : + // InternalRDL.g:1:532: T__99 { mT__99(); } break; - case 91 : - // InternalRDL.g:1:550: T__100 + case 89 : + // InternalRDL.g:1:538: T__100 { mT__100(); } break; - case 92 : - // InternalRDL.g:1:557: T__101 + case 90 : + // InternalRDL.g:1:545: T__101 { mT__101(); } break; - case 93 : - // InternalRDL.g:1:564: T__102 + case 91 : + // InternalRDL.g:1:552: T__102 { mT__102(); } break; - case 94 : - // InternalRDL.g:1:571: T__103 + case 92 : + // InternalRDL.g:1:559: T__103 { mT__103(); } break; - case 95 : - // InternalRDL.g:1:578: T__104 + case 93 : + // InternalRDL.g:1:566: T__104 { mT__104(); } break; - case 96 : - // InternalRDL.g:1:585: T__105 + case 94 : + // InternalRDL.g:1:573: T__105 { mT__105(); } break; - case 97 : - // InternalRDL.g:1:592: T__106 + case 95 : + // InternalRDL.g:1:580: T__106 { mT__106(); } break; - case 98 : - // InternalRDL.g:1:599: T__107 + case 96 : + // InternalRDL.g:1:587: T__107 { mT__107(); } break; - case 99 : - // InternalRDL.g:1:606: T__108 + case 97 : + // InternalRDL.g:1:594: T__108 { mT__108(); } break; - case 100 : - // InternalRDL.g:1:613: T__109 + case 98 : + // InternalRDL.g:1:601: T__109 { mT__109(); } break; - case 101 : - // InternalRDL.g:1:620: T__110 + case 99 : + // InternalRDL.g:1:608: T__110 { mT__110(); } break; - case 102 : - // InternalRDL.g:1:627: T__111 + case 100 : + // InternalRDL.g:1:615: T__111 { mT__111(); } break; - case 103 : - // InternalRDL.g:1:634: T__112 + case 101 : + // InternalRDL.g:1:622: T__112 { mT__112(); } break; - case 104 : - // InternalRDL.g:1:641: T__113 + case 102 : + // InternalRDL.g:1:629: T__113 { mT__113(); } break; - case 105 : - // InternalRDL.g:1:648: T__114 + case 103 : + // InternalRDL.g:1:636: T__114 { mT__114(); } break; - case 106 : - // InternalRDL.g:1:655: T__115 + case 104 : + // InternalRDL.g:1:643: T__115 { mT__115(); } break; - case 107 : - // InternalRDL.g:1:662: T__116 + case 105 : + // InternalRDL.g:1:650: T__116 { mT__116(); } break; - case 108 : - // InternalRDL.g:1:669: T__117 + case 106 : + // InternalRDL.g:1:657: T__117 { mT__117(); } break; - case 109 : - // InternalRDL.g:1:676: T__118 + case 107 : + // InternalRDL.g:1:664: T__118 { mT__118(); } break; - case 110 : - // InternalRDL.g:1:683: T__119 + case 108 : + // InternalRDL.g:1:671: T__119 { mT__119(); } break; - case 111 : - // InternalRDL.g:1:690: T__120 + case 109 : + // InternalRDL.g:1:678: T__120 { mT__120(); } break; - case 112 : - // InternalRDL.g:1:697: T__121 + case 110 : + // InternalRDL.g:1:685: T__121 { mT__121(); } break; - case 113 : - // InternalRDL.g:1:704: T__122 + case 111 : + // InternalRDL.g:1:692: T__122 { mT__122(); } break; - case 114 : - // InternalRDL.g:1:711: T__123 + case 112 : + // InternalRDL.g:1:699: T__123 { mT__123(); } break; - case 115 : - // InternalRDL.g:1:718: T__124 + case 113 : + // InternalRDL.g:1:706: T__124 { mT__124(); } break; - case 116 : - // InternalRDL.g:1:725: T__125 + case 114 : + // InternalRDL.g:1:713: T__125 { mT__125(); } break; - case 117 : - // InternalRDL.g:1:732: T__126 + case 115 : + // InternalRDL.g:1:720: T__126 { mT__126(); } break; - case 118 : - // InternalRDL.g:1:739: T__127 + case 116 : + // InternalRDL.g:1:727: T__127 { mT__127(); } break; - case 119 : - // InternalRDL.g:1:746: T__128 + case 117 : + // InternalRDL.g:1:734: T__128 { mT__128(); } break; - case 120 : - // InternalRDL.g:1:753: T__129 + case 118 : + // InternalRDL.g:1:741: T__129 { mT__129(); } break; - case 121 : - // InternalRDL.g:1:760: T__130 + case 119 : + // InternalRDL.g:1:748: T__130 { mT__130(); } break; - case 122 : - // InternalRDL.g:1:767: T__131 + case 120 : + // InternalRDL.g:1:755: T__131 { mT__131(); } break; - case 123 : - // InternalRDL.g:1:774: T__132 + case 121 : + // InternalRDL.g:1:762: T__132 { mT__132(); + } + break; + case 122 : + // InternalRDL.g:1:769: T__133 + { + mT__133(); + + } + break; + case 123 : + // InternalRDL.g:1:776: T__134 + { + mT__134(); + } break; case 124 : - // InternalRDL.g:1:781: RULE_ID + // InternalRDL.g:1:783: RULE_ID { mRULE_ID(); } break; case 125 : - // InternalRDL.g:1:789: RULE_WS + // InternalRDL.g:1:791: RULE_WS { mRULE_WS(); } break; case 126 : - // InternalRDL.g:1:797: RULE_ML_COMMENT + // InternalRDL.g:1:799: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; case 127 : - // InternalRDL.g:1:813: RULE_SL_COMMENT + // InternalRDL.g:1:815: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; case 128 : - // InternalRDL.g:1:829: RULE_NUM + // InternalRDL.g:1:831: RULE_ESCAPE_JSP + { + mRULE_ESCAPE_JSP(); + + } + break; + case 129 : + // InternalRDL.g:1:847: RULE_ESCAPE_ORDL + { + mRULE_ESCAPE_ORDL(); + + } + break; + case 130 : + // InternalRDL.g:1:864: RULE_NUM { mRULE_NUM(); } break; - case 129 : - // InternalRDL.g:1:838: RULE_STR + case 131 : + // InternalRDL.g:1:873: RULE_STR { mRULE_STR(); @@ -4529,100 +4536,100 @@ public class InternalRDLLexer extends Lexer { } - protected DFA21 dfa21 = new DFA21(this); - protected DFA23 dfa23 = new DFA23(this); - static final String DFA21_eotS = - "\1\uffff\2\5\7\uffff"; - static final String DFA21_eofS = + protected DFA20 dfa20 = new DFA20(this); + protected DFA22 dfa22 = new DFA22(this); + static final String DFA20_eotS = + "\1\uffff\2\4\7\uffff"; + static final String DFA20_eofS = "\12\uffff"; - static final String DFA21_minS = - "\1\60\2\47\1\uffff\1\142\5\uffff"; - static final String DFA21_maxS = - "\1\71\1\170\1\71\1\uffff\1\157\5\uffff"; - static final String DFA21_acceptS = - "\3\uffff\1\5\1\uffff\1\6\1\4\1\3\1\2\1\1"; - static final String DFA21_specialS = + static final String DFA20_minS = + "\1\60\2\47\2\uffff\1\142\4\uffff"; + static final String DFA20_maxS = + "\1\71\1\170\1\71\2\uffff\1\157\4\uffff"; + static final String DFA20_acceptS = + "\3\uffff\1\5\1\6\1\uffff\1\4\1\3\1\2\1\1"; + static final String DFA20_specialS = "\12\uffff}>"; - static final String[] DFA21_transitionS = { + static final String[] DFA20_transitionS = { "\1\1\11\2", - "\1\4\10\uffff\12\2\76\uffff\1\3", - "\1\4\10\uffff\12\2", + "\1\5\10\uffff\12\2\76\uffff\1\3", + "\1\5\10\uffff\12\2", + "", "", "\1\11\1\uffff\1\6\3\uffff\1\7\6\uffff\1\10", "", "", "", - "", "" }; - static final short[] DFA21_eot = DFA.unpackEncodedString(DFA21_eotS); - static final short[] DFA21_eof = DFA.unpackEncodedString(DFA21_eofS); - static final char[] DFA21_min = DFA.unpackEncodedStringToUnsignedChars(DFA21_minS); - static final char[] DFA21_max = DFA.unpackEncodedStringToUnsignedChars(DFA21_maxS); - static final short[] DFA21_accept = DFA.unpackEncodedString(DFA21_acceptS); - static final short[] DFA21_special = DFA.unpackEncodedString(DFA21_specialS); - static final short[][] DFA21_transition; + static final short[] DFA20_eot = DFA.unpackEncodedString(DFA20_eotS); + static final short[] DFA20_eof = DFA.unpackEncodedString(DFA20_eofS); + static final char[] DFA20_min = DFA.unpackEncodedStringToUnsignedChars(DFA20_minS); + static final char[] DFA20_max = DFA.unpackEncodedStringToUnsignedChars(DFA20_maxS); + static final short[] DFA20_accept = DFA.unpackEncodedString(DFA20_acceptS); + static final short[] DFA20_special = DFA.unpackEncodedString(DFA20_specialS); + static final short[][] DFA20_transition; static { - int numStates = DFA21_transitionS.length; - DFA21_transition = new short[numStates][]; + int numStates = DFA20_transitionS.length; + DFA20_transition = new short[numStates][]; for (int i=0; i"; - static final String[] DFA23_transitionS = { - "\2\45\2\uffff\1\45\22\uffff\1\45\1\uffff\1\51\2\uffff\1\36\2\uffff\1\47\2\uffff\1\35\1\33\1\42\1\43\1\46\12\50\1\41\1\30\1\47\1\31\2\uffff\1\34\24\44\1\24\5\44\1\37\1\44\1\40\1\uffff\1\44\1\25\1\4\1\3\1\15\1\7\1\16\1\6\1\44\1\11\1\12\2\44\1\17\1\20\1\2\1\13\1\23\1\44\1\5\1\1\1\22\1\21\1\44\1\10\1\14\2\44\1\26\1\32\1\27", - "\1\57\6\uffff\1\55\1\53\12\uffff\1\52\2\uffff\1\54\1\uffff\1\56", - "\1\61\3\uffff\1\62\11\uffff\1\63\5\uffff\1\60", - "\1\65\5\uffff\1\64\2\uffff\1\66", - "\1\74\1\67\7\uffff\1\70\1\uffff\1\72\3\uffff\1\71\1\73", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\2\44\1\77\1\44\1\75\15\44\1\76\3\44\1\100\3\44", - "\1\103\7\uffff\1\102\13\uffff\1\104", - "\1\105\11\uffff\1\106", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\110\11\44\1\107\2\44\1\111\10\44", - "\1\114\25\uffff\1\113", - "\1\115", - "\1\116\3\uffff\1\117", - "\1\120", - "\1\123\2\uffff\1\121\1\122", - "\1\125\3\uffff\1\124\5\uffff\1\126", - "\1\131\3\uffff\1\127\11\uffff\1\130", - "\1\133\21\uffff\1\132", - "\1\134", - "\1\135\11\uffff\1\136\6\uffff\1\137", - "\1\141\2\uffff\1\140", - "\1\142", + static final String DFA22_eotS = + "\1\uffff\4\44\1\102\2\44\1\113\14\44\26\uffff\2\44\1\155\4\44\1\163\16\44\1\u0089\1\uffff\6\44\1\u0094\1\u0095\1\uffff\1\u009a\27\44\2\uffff\7\44\1\uffff\5\44\1\uffff\10\44\1\u00cb\6\44\1\u00d6\1\u00d7\4\44\1\uffff\11\44\1\u00e5\2\uffff\4\44\1\uffff\40\44\1\u010c\3\44\1\u0110\2\44\1\u0113\1\u0114\7\44\1\uffff\12\44\2\uffff\1\44\1\u0128\1\44\1\u012a\3\44\1\u012e\1\u0133\4\44\1\uffff\4\44\1\u013f\1\u0140\1\44\1\u0144\1\u0145\11\44\1\u0150\2\44\1\u0153\1\44\1\u0155\1\u0156\2\44\1\u0159\1\u015a\10\44\1\u0163\1\uffff\1\u0164\1\u0165\1\44\1\uffff\2\44\2\uffff\11\44\1\u0172\1\44\1\u0174\1\u0175\5\44\1\u017c\1\uffff\1\44\1\uffff\1\u0180\1\u0181\1\44\1\uffff\4\44\1\uffff\3\44\1\u018a\1\u018b\1\u018c\1\u018d\4\44\2\uffff\3\44\2\uffff\1\44\1\u0196\4\44\1\u019b\3\44\1\uffff\2\44\1\uffff\1\u01a1\2\uffff\2\44\2\uffff\4\44\1\u01a8\1\u01aa\1\u01ac\1\44\3\uffff\1\u01af\1\44\1\u01b1\5\44\1\u01b7\3\44\1\uffff\1\44\2\uffff\6\44\1\uffff\3\44\2\uffff\10\44\4\uffff\1\44\1\u01cf\6\44\1\uffff\4\44\1\uffff\1\44\1\u01db\1\u01dc\2\44\1\uffff\6\44\1\uffff\1\44\1\uffff\1\44\1\uffff\2\44\1\uffff\1\44\1\uffff\1\u01ea\1\44\1\u01ec\2\44\1\uffff\1\u01ef\2\44\1\u01f2\3\44\1\u01f6\3\44\1\u01fb\7\44\1\u0203\3\44\1\uffff\6\44\1\u020d\1\u020e\3\44\2\uffff\6\44\1\u0218\5\44\1\u021e\1\uffff\1\44\1\uffff\1\u0220\1\44\1\uffff\2\44\1\uffff\3\44\1\uffff\1\u0227\1\u0228\1\44\1\u022a\1\uffff\7\44\1\uffff\1\44\1\u0233\1\u0234\1\u0235\1\44\1\u0237\2\44\1\u023a\2\uffff\3\44\1\u023e\4\44\1\u0243\1\uffff\1\44\1\u0245\3\44\1\uffff\1\u0249\1\uffff\1\u024a\1\44\1\u024c\1\44\1\u024e\1\44\2\uffff\1\44\1\uffff\2\44\1\u0253\1\u0254\1\u0255\3\44\3\uffff\1\44\1\uffff\1\u025a\1\u025b\1\uffff\1\u025c\1\44\1\u025e\1\uffff\1\44\1\u0260\1\u0261\1\44\1\uffff\1\u0263\1\uffff\3\44\2\uffff\1\u0267\1\uffff\1\u0268\1\uffff\3\44\1\u026c\3\uffff\3\44\1\u0270\3\uffff\1\44\1\uffff\1\44\2\uffff\1\u0273\1\uffff\1\u0274\1\u0275\1\44\2\uffff\1\u0277\1\u0278\1\u0279\1\uffff\2\44\1\u027c\1\uffff\1\u027d\1\44\3\uffff\1\u027f\3\uffff\1\u0280\1\44\2\uffff\1\u0282\2\uffff\1\u0283\2\uffff"; + static final String DFA22_eofS = + "\u0284\uffff"; + static final String DFA22_minS = + "\1\11\2\141\1\151\1\143\1\60\1\141\1\145\1\60\1\141\1\156\1\162\1\157\1\154\1\156\1\145\1\141\1\156\1\150\1\157\1\116\21\uffff\1\52\4\uffff\1\151\1\147\1\60\1\141\1\156\1\164\1\155\1\60\1\147\1\156\1\157\1\147\1\151\1\144\1\151\1\142\1\144\1\171\1\143\1\146\1\145\1\154\1\60\1\uffff\1\145\2\154\1\143\1\156\1\143\2\60\1\uffff\1\60\1\154\1\143\2\145\1\162\1\155\1\165\1\157\1\162\1\141\2\164\1\142\1\166\1\142\1\163\1\144\1\162\1\165\1\160\1\145\1\163\1\104\2\uffff\1\151\1\143\1\156\1\147\1\145\1\157\1\143\1\uffff\1\162\1\143\1\165\1\142\1\145\1\uffff\1\164\1\145\1\163\1\154\1\150\1\145\1\144\1\162\1\60\1\141\1\151\1\145\1\156\1\151\1\145\2\60\1\145\1\164\1\144\1\162\1\uffff\1\154\1\163\1\154\1\143\1\162\1\141\1\164\1\154\1\145\1\60\2\uffff\1\145\1\154\1\156\1\141\1\uffff\1\164\1\145\1\162\1\144\1\162\1\145\1\156\1\160\1\151\1\143\1\145\1\157\1\142\1\155\1\145\1\164\1\60\1\145\1\60\1\153\4\145\1\143\1\160\1\145\1\105\1\156\1\153\1\141\1\154\1\60\1\144\1\143\1\145\1\60\1\162\1\145\2\60\1\144\1\164\2\145\1\156\1\147\1\145\1\uffff\1\156\1\163\1\164\1\144\1\143\1\166\1\163\2\151\1\154\2\uffff\1\164\1\60\1\163\1\60\1\144\1\145\1\141\2\60\1\165\1\143\1\162\1\164\1\uffff\1\164\1\162\1\141\1\163\2\60\1\162\2\60\1\146\1\144\1\164\1\141\1\146\1\153\1\170\1\144\1\154\1\60\1\162\1\154\1\60\1\154\2\60\1\162\1\163\2\60\2\145\1\144\1\106\1\147\1\171\1\154\1\145\1\60\1\uffff\2\60\1\144\1\uffff\1\141\1\162\2\uffff\1\147\1\151\1\141\2\144\1\145\1\141\1\163\1\155\1\60\1\145\2\60\1\145\1\163\1\154\1\144\1\151\1\60\1\uffff\1\145\1\uffff\2\60\1\154\1\uffff\1\151\2\141\1\150\1\uffff\1\154\1\157\1\145\4\60\1\142\1\153\1\141\1\156\2\uffff\1\156\1\151\1\141\2\uffff\1\154\1\60\1\145\1\143\1\156\1\137\1\60\1\164\2\145\1\uffff\1\156\1\145\1\uffff\1\60\2\uffff\1\146\1\150\2\uffff\1\144\1\162\1\147\1\111\3\60\1\160\3\uffff\1\60\1\164\1\60\1\145\1\143\1\156\1\147\1\151\1\60\1\160\1\163\1\145\1\uffff\1\162\2\uffff\1\150\1\167\1\145\1\164\1\147\1\151\1\uffff\1\164\1\162\1\151\2\uffff\1\151\1\144\1\154\1\164\1\162\1\164\1\155\1\163\4\uffff\1\154\1\60\1\163\2\141\1\144\1\154\1\157\1\uffff\1\162\1\164\1\145\1\162\1\uffff\1\142\2\60\1\141\1\145\1\uffff\1\154\1\157\1\145\1\164\1\145\1\116\1\uffff\1\151\1\uffff\1\151\1\uffff\1\165\1\170\1\uffff\1\145\1\uffff\1\60\1\153\1\60\1\145\1\141\1\uffff\1\60\1\151\1\156\1\60\1\151\1\157\1\151\1\60\1\150\1\156\1\147\1\60\1\145\1\144\1\147\1\164\2\165\1\145\1\60\1\160\1\164\1\145\1\uffff\1\153\1\142\1\154\1\164\1\165\1\167\2\60\1\156\1\145\1\165\2\uffff\1\154\1\156\1\157\1\154\1\156\1\171\1\60\1\105\1\164\1\144\1\154\1\164\1\60\1\uffff\1\171\1\uffff\1\60\1\156\1\uffff\1\156\1\164\1\uffff\1\147\1\167\1\144\1\uffff\2\60\1\156\1\60\1\uffff\1\163\1\164\1\156\1\150\1\145\1\162\1\163\1\uffff\1\141\3\60\1\154\1\60\1\150\1\145\1\60\2\uffff\1\164\2\163\1\60\1\144\1\167\1\144\1\143\1\60\1\uffff\1\104\1\60\1\164\1\163\1\142\1\uffff\1\60\1\uffff\1\60\1\147\1\60\1\150\1\60\1\164\2\uffff\1\141\1\uffff\1\145\1\150\3\60\1\141\1\150\1\162\3\uffff\1\145\1\uffff\2\60\1\uffff\1\60\1\145\1\60\1\uffff\1\151\2\60\1\145\1\uffff\1\60\1\uffff\1\150\1\145\1\165\2\uffff\1\60\1\uffff\1\60\1\uffff\1\150\1\154\1\164\1\60\3\uffff\1\164\1\157\1\145\1\60\3\uffff\1\164\1\uffff\1\141\2\uffff\1\60\1\uffff\2\60\1\163\2\uffff\3\60\1\uffff\1\145\1\154\1\60\1\uffff\1\60\1\156\3\uffff\1\60\3\uffff\1\60\1\144\2\uffff\1\60\2\uffff\1\60\2\uffff"; + static final String DFA22_maxS = + "\1\175\1\171\1\165\1\162\1\163\1\172\1\165\1\157\1\172\1\167\1\156\1\166\1\157\1\160\1\170\2\163\1\156\1\171\1\162\1\116\21\uffff\1\57\4\uffff\1\162\1\156\1\172\1\141\1\156\1\164\1\155\1\172\1\170\1\156\1\164\1\147\1\151\1\144\1\154\1\142\1\144\1\171\1\164\1\163\1\166\1\154\1\172\1\uffff\1\145\2\154\1\163\1\156\1\163\2\172\1\uffff\1\172\1\154\1\164\2\145\1\162\2\165\1\157\1\162\1\165\2\164\1\142\1\166\1\142\1\163\1\144\1\162\1\165\1\160\1\157\1\163\1\104\2\uffff\1\151\1\143\1\156\1\147\1\145\1\157\1\143\1\uffff\1\162\1\143\1\165\1\142\1\145\1\uffff\1\164\1\145\1\163\1\154\1\150\1\145\1\144\1\162\1\172\1\147\1\151\1\145\1\156\1\151\1\145\2\172\1\145\1\164\1\144\1\162\1\uffff\1\154\1\163\1\154\1\143\1\162\1\141\1\164\1\154\1\145\1\172\2\uffff\1\145\1\154\1\156\1\141\1\uffff\1\164\2\162\1\144\1\162\1\145\1\156\1\160\1\151\1\143\1\145\1\157\1\142\1\155\1\145\1\164\1\60\1\145\1\60\1\153\4\145\1\143\1\160\1\145\1\105\1\156\1\153\1\141\1\154\1\172\1\144\1\143\1\145\1\172\1\162\1\145\2\172\1\144\1\164\2\145\1\156\1\147\1\155\1\uffff\1\156\1\163\1\164\1\144\1\143\1\166\1\163\2\151\1\154\2\uffff\1\164\1\172\1\163\1\172\1\144\1\145\1\141\2\172\1\165\1\164\1\162\1\164\1\uffff\1\164\1\162\1\141\1\163\2\172\1\162\2\172\1\146\1\144\1\164\1\157\1\146\1\153\1\170\1\144\1\154\1\172\1\162\1\154\1\172\1\154\2\172\1\162\1\163\2\172\2\145\1\144\1\106\1\147\1\171\1\154\1\145\1\172\1\uffff\2\172\1\144\1\uffff\1\141\1\162\2\uffff\1\147\1\151\1\141\2\144\1\145\1\141\1\163\1\155\1\172\1\145\2\172\1\145\1\163\1\154\1\144\1\151\1\172\1\uffff\1\145\1\uffff\2\172\1\154\1\uffff\1\151\2\141\1\150\1\uffff\1\154\1\157\1\145\4\172\1\142\1\153\1\141\1\156\2\uffff\1\156\1\151\1\141\2\uffff\1\154\1\172\1\145\1\143\1\156\1\137\1\172\1\164\2\145\1\uffff\1\156\1\145\1\uffff\1\172\2\uffff\1\146\1\150\2\uffff\1\144\1\162\1\147\1\111\3\172\1\160\3\uffff\1\172\1\164\1\172\1\145\1\143\1\156\1\147\1\151\1\172\1\160\1\163\1\145\1\uffff\1\162\2\uffff\1\154\1\167\1\145\1\164\1\147\1\151\1\uffff\1\164\1\162\1\151\2\uffff\1\151\1\144\1\154\1\164\1\162\1\164\1\155\1\163\4\uffff\1\154\1\172\1\163\2\141\1\144\1\154\1\157\1\uffff\1\162\1\164\1\145\1\162\1\uffff\1\142\2\172\1\141\1\145\1\uffff\1\154\1\157\1\145\1\164\1\145\1\116\1\uffff\1\151\1\uffff\1\151\1\uffff\1\165\1\170\1\uffff\1\145\1\uffff\1\172\1\153\1\172\1\145\1\141\1\uffff\1\172\1\151\1\156\1\172\1\151\1\157\1\151\1\172\1\150\1\156\1\147\1\172\1\145\1\144\1\147\1\164\2\165\1\145\1\172\1\160\1\164\1\145\1\uffff\1\153\1\142\1\154\1\164\1\165\1\167\2\172\1\156\1\145\1\165\2\uffff\1\154\1\156\1\157\1\154\1\156\1\171\1\172\1\105\1\164\1\144\1\154\1\164\1\172\1\uffff\1\171\1\uffff\1\172\1\156\1\uffff\1\156\1\164\1\uffff\1\147\1\167\1\144\1\uffff\2\172\1\156\1\172\1\uffff\1\163\1\164\1\156\1\150\1\145\1\162\1\163\1\uffff\1\141\3\172\1\154\1\172\1\150\1\145\1\172\2\uffff\1\164\2\163\1\172\1\144\1\167\1\144\1\143\1\172\1\uffff\1\104\1\172\1\164\1\163\1\142\1\uffff\1\172\1\uffff\1\172\1\147\1\172\1\150\1\172\1\164\2\uffff\1\141\1\uffff\1\145\1\150\3\172\1\141\1\150\1\162\3\uffff\1\145\1\uffff\2\172\1\uffff\1\172\1\145\1\172\1\uffff\1\151\2\172\1\145\1\uffff\1\172\1\uffff\1\150\1\145\1\165\2\uffff\1\172\1\uffff\1\172\1\uffff\1\150\1\154\1\164\1\172\3\uffff\1\164\1\157\1\145\1\172\3\uffff\1\164\1\uffff\1\141\2\uffff\1\172\1\uffff\2\172\1\163\2\uffff\3\172\1\uffff\1\145\1\154\1\172\1\uffff\1\172\1\156\3\uffff\1\172\3\uffff\1\172\1\144\2\uffff\1\172\2\uffff\1\172\2\uffff"; + static final String DFA22_acceptS = + "\25\uffff\1\146\1\150\1\151\1\152\1\154\1\157\1\161\1\162\1\163\1\164\1\165\1\166\1\167\1\170\1\171\1\174\1\175\1\uffff\1\u0080\1\u0081\1\u0082\1\u0083\27\uffff\1\133\10\uffff\1\134\30\uffff\1\176\1\177\7\uffff\1\107\5\uffff\1\135\25\uffff\1\131\12\uffff\1\22\1\132\4\uffff\1\110\60\uffff\1\12\12\uffff\1\5\1\10\15\uffff\1\23\46\uffff\1\24\3\uffff\1\55\2\uffff\1\13\1\125\23\uffff\1\16\1\uffff\1\17\3\uffff\1\14\4\uffff\1\66\13\uffff\1\124\1\34\3\uffff\1\65\1\36\12\uffff\1\172\2\uffff\1\54\1\uffff\1\53\1\116\2\uffff\1\127\1\153\10\uffff\1\25\1\30\1\31\14\uffff\1\160\1\uffff\1\35\1\56\6\uffff\1\44\3\uffff\1\7\1\130\10\uffff\1\20\1\21\1\26\1\27\10\uffff\1\37\4\uffff\1\115\5\uffff\1\144\6\uffff\1\1\1\uffff\1\32\1\uffff\1\11\2\uffff\1\52\1\uffff\1\2\5\uffff\1\51\27\uffff\1\121\13\uffff\1\113\1\117\15\uffff\1\142\1\uffff\1\3\2\uffff\1\4\2\uffff\1\15\3\uffff\1\6\4\uffff\1\47\7\uffff\1\155\11\uffff\1\40\1\136\11\uffff\1\141\5\uffff\1\73\1\uffff\1\143\6\uffff\1\103\1\137\1\uffff\1\50\10\uffff\1\100\1\120\1\122\1\uffff\1\101\2\uffff\1\41\3\uffff\1\173\4\uffff\1\147\1\uffff\1\33\3\uffff\1\145\1\46\1\uffff\1\102\1\uffff\1\62\4\uffff\1\140\1\70\1\72\4\uffff\1\67\1\71\1\156\1\uffff\1\43\1\uffff\1\64\1\75\1\uffff\1\126\3\uffff\1\111\1\61\3\uffff\1\104\3\uffff\1\123\2\uffff\1\112\1\105\1\63\1\uffff\1\106\1\114\1\60\2\uffff\1\77\1\57\1\uffff\1\42\1\74\1\uffff\1\45\1\76"; + static final String DFA22_specialS = + "\u0284\uffff}>"; + static final String[] DFA22_transitionS = { + "\2\45\2\uffff\1\45\22\uffff\1\45\1\uffff\1\52\2\uffff\1\36\2\uffff\1\50\2\uffff\1\35\1\33\1\42\1\43\1\46\12\51\1\41\1\30\1\47\1\31\2\uffff\1\34\24\44\1\24\5\44\1\37\1\44\1\40\1\uffff\1\44\1\25\1\4\1\3\1\15\1\7\1\16\1\6\1\44\1\11\1\12\2\44\1\17\1\20\1\2\1\13\1\23\1\44\1\5\1\1\1\22\1\21\1\44\1\10\1\14\2\44\1\26\1\32\1\27", + "\1\60\6\uffff\1\56\1\54\12\uffff\1\53\2\uffff\1\55\1\uffff\1\57", + "\1\62\3\uffff\1\63\11\uffff\1\64\5\uffff\1\61", + "\1\66\5\uffff\1\65\2\uffff\1\67", + "\1\75\1\70\7\uffff\1\71\1\uffff\1\73\3\uffff\1\72\1\74", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\2\44\1\100\1\44\1\76\15\44\1\77\3\44\1\101\3\44", + "\1\104\7\uffff\1\103\13\uffff\1\105", + "\1\106\11\uffff\1\107", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\111\11\44\1\110\2\44\1\112\10\44", + "\1\115\25\uffff\1\114", + "\1\116", + "\1\117\3\uffff\1\120", + "\1\121", + "\1\124\2\uffff\1\122\1\123", + "\1\126\3\uffff\1\125\5\uffff\1\127", + "\1\132\3\uffff\1\130\11\uffff\1\131", + "\1\134\21\uffff\1\133", + "\1\135", + "\1\136\11\uffff\1\137\6\uffff\1\140", + "\1\142\2\uffff\1\141", + "\1\143", "", "", "", @@ -4640,56 +4647,55 @@ public class InternalRDLLexer extends Lexer { "", "", "", - "\1\47\4\uffff\1\143", + "\1\144\4\uffff\1\145", "", "", "", - "\1\145\10\uffff\1\144", - "\1\146\6\uffff\1\147", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\152\13\44\1\151\11\44\1\150\3\44", - "\1\154", - "\1\155", + "", + "\1\147\10\uffff\1\146", + "\1\150\6\uffff\1\151", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\154\13\44\1\153\11\44\1\152\3\44", "\1\156", "\1\157", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\14\44\1\160\15\44", - "\1\163\20\uffff\1\162", - "\1\164", - "\1\165\4\uffff\1\166", - "\1\167", - "\1\170", + "\1\160", + "\1\161", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\14\44\1\162\15\44", + "\1\165\20\uffff\1\164", + "\1\166", + "\1\167\4\uffff\1\170", "\1\171", - "\1\173\2\uffff\1\172", - "\1\174", - "\1\175", + "\1\172", + "\1\173", + "\1\175\2\uffff\1\174", "\1\176", - "\1\u0080\20\uffff\1\177", - "\1\u0082\1\u0081\13\uffff\1\u0083", - "\1\u0084\20\uffff\1\u0085", - "\1\u0086", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", + "\1\177", + "\1\u0080", + "\1\u0082\20\uffff\1\u0081", + "\1\u0084\1\u0083\13\uffff\1\u0085", + "\1\u0086\20\uffff\1\u0087", "\1\u0088", - "\1\u0089", - "\1\u008a", - "\1\u008c\2\uffff\1\u008d\14\uffff\1\u008b", - "\1\u008e", - "\1\u008f\17\uffff\1\u0090", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\13\44\1\u0091\16\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\2\44\1\u0095\1\44\1\u0096\7\44\1\u0097\5\44\1\u0094\7\44", - "\1\u0099", - "\1\u009b\20\uffff\1\u009a", - "\1\u009c", - "\1\u009d", + "\1\u008a", + "\1\u008b", + "\1\u008c", + "\1\u008e\2\uffff\1\u008f\14\uffff\1\u008d", + "\1\u0090", + "\1\u0091\17\uffff\1\u0092", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\13\44\1\u0093\16\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\2\44\1\u0097\1\44\1\u0098\7\44\1\u0099\5\44\1\u0096\7\44", + "\1\u009b", + "\1\u009d\20\uffff\1\u009c", "\1\u009e", - "\1\u00a0\7\uffff\1\u009f", - "\1\u00a1", - "\1\u00a2", + "\1\u009f", + "\1\u00a0", + "\1\u00a2\7\uffff\1\u00a1", "\1\u00a3", - "\1\u00a5\1\uffff\1\u00a4\21\uffff\1\u00a6", - "\1\u00a7", - "\1\u00a8", + "\1\u00a4", + "\1\u00a5", + "\1\u00a7\1\uffff\1\u00a6\21\uffff\1\u00a8", "\1\u00a9", "\1\u00aa", "\1\u00ab", @@ -4698,48 +4704,49 @@ public class InternalRDLLexer extends Lexer { "\1\u00ae", "\1\u00af", "\1\u00b0", - "\1\u00b1\11\uffff\1\u00b2", - "\1\u00b3", - "\1\u00b4", - "", + "\1\u00b1", + "\1\u00b2", + "\1\u00b3\11\uffff\1\u00b4", "\1\u00b5", "\1\u00b6", + "", + "", "\1\u00b7", "\1\u00b8", "\1\u00b9", "\1\u00ba", "\1\u00bb", - "", "\1\u00bc", "\1\u00bd", + "", "\1\u00be", "\1\u00bf", "\1\u00c0", - "", "\1\u00c1", "\1\u00c2", + "", "\1\u00c3", "\1\u00c4", "\1\u00c5", "\1\u00c6", "\1\u00c7", "\1\u00c8", + "\1\u00c9", + "\1\u00ca", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u00cb\5\uffff\1\u00ca", - "\1\u00cc", - "\1\u00cd", + "\1\u00cd\5\uffff\1\u00cc", "\1\u00ce", "\1\u00cf", "\1\u00d0", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\u00d3\4\44\1\u00d1\20\44\1\u00d2\3\44", + "\1\u00d1", + "\1\u00d2", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\u00d5\4\44\1\u00d3\20\44\1\u00d4\3\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u00d6", - "\1\u00d7", "\1\u00d8", "\1\u00d9", - "", "\1\u00da", "\1\u00db", + "", "\1\u00dc", "\1\u00dd", "\1\u00de", @@ -4747,18 +4754,18 @@ public class InternalRDLLexer extends Lexer { "\1\u00e0", "\1\u00e1", "\1\u00e2", + "\1\u00e3", + "\1\u00e4", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "", - "\1\u00e4", - "\1\u00e5", "\1\u00e6", "\1\u00e7", - "", "\1\u00e8", - "\1\u00ea\14\uffff\1\u00e9", - "\1\u00eb", - "\1\u00ec", + "\1\u00e9", + "", + "\1\u00ea", + "\1\u00ec\14\uffff\1\u00eb", "\1\u00ed", "\1\u00ee", "\1\u00ef", @@ -4787,25 +4794,25 @@ public class InternalRDLLexer extends Lexer { "\1\u0106", "\1\u0107", "\1\u0108", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\13\44\1\u0109\16\44", - "\1\u010b", - "\1\u010c", + "\1\u0109", + "\1\u010a", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\13\44\1\u010b\16\44", "\1\u010d", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u010e", "\1\u010f", - "\1\u0110", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0111", + "\1\u0112", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0113", - "\1\u0114", "\1\u0115", "\1\u0116", "\1\u0117", "\1\u0118", - "\1\u011a\7\uffff\1\u0119", + "\1\u0119", + "\1\u011a", + "\1\u011c\7\uffff\1\u011b", "", - "\1\u011b", - "\1\u011c", "\1\u011d", "\1\u011e", "\1\u011f", @@ -4814,71 +4821,71 @@ public class InternalRDLLexer extends Lexer { "\1\u0122", "\1\u0123", "\1\u0124", - "", - "", "\1\u0125", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0126", + "", + "", "\1\u0127", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0129", - "\1\u012a", - "\1\u012b", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\22\44\1\u012f\1\u0130\1\44\1\u012e\1\u012d\3\44", - "\1\u0132", - "\1\u0133\20\uffff\1\u0134", - "\1\u0135", - "\1\u0136", - "", + "\1\u012b", + "\1\u012c", + "\1\u012d", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\22\44\1\u0131\1\u0132\1\44\1\u0130\1\u012f\3\44", + "\1\u0134", + "\1\u0135\20\uffff\1\u0136", "\1\u0137", "\1\u0138", + "", "\1\u0139", "\1\u013a", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\u013c\7\44\1\u013b\15\44", + "\1\u013b", + "\1\u013c", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\u013e\7\44\1\u013d\15\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u013f", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\25\44\1\u0141\1\u0140\3\44", + "\1\u0141", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\25\44\1\u0143\1\u0142\3\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0144", - "\1\u0145", "\1\u0146", - "\1\u0147\15\uffff\1\u0148", - "\1\u0149", - "\1\u014a", + "\1\u0147", + "\1\u0148", + "\1\u0149\15\uffff\1\u014a", "\1\u014b", "\1\u014c", "\1\u014d", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u014e", "\1\u014f", - "\1\u0150", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0151", "\1\u0152", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0155", - "\1\u0156", + "\1\u0154", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0157", + "\1\u0158", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0159", - "\1\u015a", "\1\u015b", "\1\u015c", "\1\u015d", "\1\u015e", "\1\u015f", "\1\u0160", + "\1\u0161", + "\1\u0162", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0164", - "", - "\1\u0165", "\1\u0166", "", - "", "\1\u0167", "\1\u0168", + "", + "", "\1\u0169", "\1\u016a", "\1\u016b", @@ -4886,347 +4893,349 @@ public class InternalRDLLexer extends Lexer { "\1\u016d", "\1\u016e", "\1\u016f", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0170", "\1\u0171", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0173", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0174", - "\1\u0175", "\1\u0176", "\1\u0177", "\1\u0178", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\22\44\1\u0179\7\44", + "\1\u0179", + "\1\u017a", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\22\44\1\u017b\7\44", "", - "\1\u017b", + "\1\u017d", "", - "\12\44\7\uffff\32\44\4\uffff\1\u017c\1\uffff\26\44\1\u017d\3\44", + "\12\44\7\uffff\32\44\4\uffff\1\u017e\1\uffff\26\44\1\u017f\3\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0180", - "", - "\1\u0181", "\1\u0182", + "", "\1\u0183", "\1\u0184", - "", "\1\u0185", "\1\u0186", + "", "\1\u0187", + "\1\u0188", + "\1\u0189", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u018c", - "\1\u018d", "\1\u018e", "\1\u018f", - "", - "", "\1\u0190", "\1\u0191", + "", + "", "\1\u0192", - "", - "", "\1\u0193", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0194", + "", + "", "\1\u0195", - "\1\u0196", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0197", "\1\u0198", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0199", "\1\u019a", - "\1\u019b", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u019c", - "", "\1\u019d", "\1\u019e", "", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", - "", + "\1\u019f", "\1\u01a0", - "\1\u01a1", + "", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "", "\1\u01a2", "\1\u01a3", + "", + "", "\1\u01a4", "\1\u01a5", + "\1\u01a6", + "\1\u01a7", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\44\1\u01a7\30\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\26\44\1\u01a9\3\44", - "\1\u01ab", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\44\1\u01a9\30\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\26\44\1\u01ab\3\44", + "\1\u01ad", "", "", "", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\u01ac\25\44", - "\1\u01ae", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\u01ae\25\44", "\1\u01b0", - "\1\u01b1", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01b2", "\1\u01b3", "\1\u01b4", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01b5", "\1\u01b6", - "\1\u01b7", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01b8", - "", "\1\u01b9", + "\1\u01ba", + "", + "\1\u01bb", "", "", - "\1\u01ba\3\uffff\1\u01bb", - "\1\u01bc", - "\1\u01bd", + "\1\u01bc\3\uffff\1\u01bd", "\1\u01be", "\1\u01bf", "\1\u01c0", - "", "\1\u01c1", "\1\u01c2", + "", "\1\u01c3", - "", - "", "\1\u01c4", "\1\u01c5", + "", + "", "\1\u01c6", "\1\u01c7", "\1\u01c8", "\1\u01c9", "\1\u01ca", "\1\u01cb", - "", - "", - "", - "", "\1\u01cc", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01cd", + "", + "", + "", + "", "\1\u01ce", - "\1\u01cf", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01d0", "\1\u01d1", "\1\u01d2", "\1\u01d3", - "", "\1\u01d4", "\1\u01d5", + "", "\1\u01d6", "\1\u01d7", - "", "\1\u01d8", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u01db", - "\1\u01dc", + "\1\u01d9", "", + "\1\u01da", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01dd", "\1\u01de", + "", "\1\u01df", "\1\u01e0", "\1\u01e1", "\1\u01e2", - "", "\1\u01e3", - "", "\1\u01e4", "", "\1\u01e5", + "", "\1\u01e6", "", "\1\u01e7", + "\1\u01e8", "", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01e9", + "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01eb", - "\1\u01ec", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01ed", + "\1\u01ee", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u01ee", - "\1\u01ef", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01f0", "\1\u01f1", - "\1\u01f2", - "\1\u01f3", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01f3", + "\1\u01f4", "\1\u01f5", - "\1\u01f6", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01f7", - "\12\44\7\uffff\27\44\1\u01f8\2\44\4\uffff\1\44\1\uffff\32\44", - "\1\u01fa", - "\1\u01fb", + "\1\u01f8", + "\1\u01f9", + "\12\44\7\uffff\27\44\1\u01fa\2\44\4\uffff\1\44\1\uffff\32\44", "\1\u01fc", "\1\u01fd", "\1\u01fe", "\1\u01ff", "\1\u0200", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0201", "\1\u0202", - "\1\u0203", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0204", - "", "\1\u0205", "\1\u0206", + "", "\1\u0207", "\1\u0208", "\1\u0209", "\1\u020a", + "\1\u020b", + "\1\u020c", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u020d", - "\1\u020e", "\1\u020f", - "", - "", "\1\u0210", "\1\u0211", + "", + "", "\1\u0212", "\1\u0213", "\1\u0214", "\1\u0215", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0216", "\1\u0217", - "\1\u0218", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0219", "\1\u021a", "\1\u021b", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", + "\1\u021c", "\1\u021d", - "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", "\1\u021f", "", - "\1\u0220", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0221", "", "\1\u0222", "\1\u0223", + "", "\1\u0224", + "\1\u0225", + "\1\u0226", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0227", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", "\1\u0229", - "\1\u022a", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", "\1\u022b", "\1\u022c", "\1\u022d", "\1\u022e", "\1\u022f", - "", "\1\u0230", + "\1\u0231", + "", + "\1\u0232", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0234", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0236", - "\1\u0237", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", - "", + "\1\u0238", "\1\u0239", - "\1\u023a", - "\1\u023b", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", + "", + "\1\u023b", + "\1\u023c", "\1\u023d", - "\1\u023e", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u023f", "\1\u0240", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", + "\1\u0241", "\1\u0242", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", "\1\u0244", - "\1\u0245", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0246", + "\1\u0247", + "\1\u0248", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0249", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u024b", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u024d", - "", - "", - "\1\u024e", - "", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u024f", + "", + "", "\1\u0250", + "", + "\1\u0251", + "\1\u0252", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0254", - "\1\u0255", "\1\u0256", - "", - "", - "", "\1\u0257", + "\1\u0258", + "", + "", + "", + "\1\u0259", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u025b", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", "\1\u025d", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0260", "", + "\1\u025f", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", "\1\u0262", - "\1\u0263", + "", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", "\1\u0264", + "\1\u0265", + "\1\u0266", "", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", - "\1\u0267", - "\1\u0268", "\1\u0269", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", - "", - "", + "\1\u026a", "\1\u026b", - "\1\u026c", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", + "", + "", "\1\u026d", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", - "", - "", + "\1\u026e", "\1\u026f", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", - "\1\u0270", + "", + "", + "\1\u0271", + "", + "\1\u0272", "", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0274", + "\1\u0276", "", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", - "\1\u0278", - "\1\u0279", + "\1\u027a", + "\1\u027b", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u027c", + "\1\u027e", "", "", "", @@ -5235,7 +5244,7 @@ public class InternalRDLLexer extends Lexer { "", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u027f", + "\1\u0281", "", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", @@ -5246,37 +5255,37 @@ public class InternalRDLLexer extends Lexer { "" }; - static final short[] DFA23_eot = DFA.unpackEncodedString(DFA23_eotS); - static final short[] DFA23_eof = DFA.unpackEncodedString(DFA23_eofS); - static final char[] DFA23_min = DFA.unpackEncodedStringToUnsignedChars(DFA23_minS); - static final char[] DFA23_max = DFA.unpackEncodedStringToUnsignedChars(DFA23_maxS); - static final short[] DFA23_accept = DFA.unpackEncodedString(DFA23_acceptS); - static final short[] DFA23_special = DFA.unpackEncodedString(DFA23_specialS); - static final short[][] DFA23_transition; + static final short[] DFA22_eot = DFA.unpackEncodedString(DFA22_eotS); + static final short[] DFA22_eof = DFA.unpackEncodedString(DFA22_eofS); + static final char[] DFA22_min = DFA.unpackEncodedStringToUnsignedChars(DFA22_minS); + static final char[] DFA22_max = DFA.unpackEncodedStringToUnsignedChars(DFA22_maxS); + static final short[] DFA22_accept = DFA.unpackEncodedString(DFA22_acceptS); + static final short[] DFA22_special = DFA.unpackEncodedString(DFA22_specialS); + static final short[][] DFA22_transition; static { - int numStates = DFA23_transitionS.length; - DFA23_transition = new short[numStates][]; + int numStates = DFA22_transitionS.length; + DFA22_transition = new short[numStates][]; for (int i=0; i", "", "", "", "RULE_STR", "RULE_ID", "RULE_NUM", "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "'string'", "'number'", "'boolean'", "'addrmap'", "'reg'", "'regfile'", "'field'", "'ref'", "'signal'", "'all'", "'name'", "'desc'", "'arbiter'", "'rset'", "'rclr'", "'woclr'", "'woset'", "'we'", "'wel'", "'swwe'", "'swwel'", "'hwset'", "'hwclr'", "'swmod'", "'swacc'", "'sticky'", "'stickybit'", "'intr'", "'anded'", "'ored'", "'xored'", "'counter'", "'overflow'", "'sharedextbus'", "'errextbus'", "'reset'", "'littleendian'", "'bigendian'", "'rsvdset'", "'rsvdsetX'", "'bridge'", "'shared'", "'msb0'", "'lsb0'", "'sync'", "'async'", "'cpuif_reset'", "'field_reset'", "'activehigh'", "'activelow'", "'singlepulse'", "'underflow'", "'incr'", "'decr'", "'incrwidth'", "'decrwidth'", "'incrvalue'", "'decrvalue'", "'saturate'", "'decrsaturate'", "'threshold'", "'decrthreshold'", "'dontcompare'", "'donttest'", "'internal'", "'alignment'", "'regwidth'", "'fieldwidth'", "'signalwidth'", "'accesswidth'", "'sw'", "'hw'", "'addressing'", "'precedence'", "'encode'", "'resetsignal'", "'clock'", "'mask'", "'enable'", "'hwenable'", "'hwmask'", "'haltmask'", "'haltenable'", "'halt'", "'next'", "'UNDEFINED'", "'true'", "'false'", "'rw'", "'wr'", "'r'", "'w'", "'na'", "'compact'", "'regalign'", "'fullalign'", "'posedge'", "'negedge'", "'bothedge'", "'level'", "'nonsticky'", "'`include'", "'property'", "'{'", "'}'", "';'", "'type'", "'='", "'default'", "'component'", "'|'", "'alias'", "','", "'@'", "'+='", "'%='", "'['", "']'", "':'", "'->'", "'.'", "'enum'", "'external'" + "", "", "", "", "RULE_STR", "RULE_ID", "RULE_NUM", "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ESCAPE_JSP", "RULE_ESCAPE_ORDL", "'string'", "'number'", "'boolean'", "'addrmap'", "'reg'", "'regfile'", "'field'", "'ref'", "'signal'", "'all'", "'name'", "'desc'", "'arbiter'", "'rset'", "'rclr'", "'woclr'", "'woset'", "'we'", "'wel'", "'swwe'", "'swwel'", "'hwset'", "'hwclr'", "'swmod'", "'swacc'", "'sticky'", "'stickybit'", "'intr'", "'anded'", "'ored'", "'xored'", "'counter'", "'overflow'", "'sharedextbus'", "'errextbus'", "'reset'", "'littleendian'", "'bigendian'", "'rsvdset'", "'rsvdsetX'", "'bridge'", "'shared'", "'msb0'", "'lsb0'", "'sync'", "'async'", "'cpuif_reset'", "'field_reset'", "'activehigh'", "'activelow'", "'singlepulse'", "'underflow'", "'incr'", "'decr'", "'incrwidth'", "'decrwidth'", "'incrvalue'", "'decrvalue'", "'saturate'", "'decrsaturate'", "'threshold'", "'decrthreshold'", "'dontcompare'", "'donttest'", "'internal'", "'alignment'", "'regwidth'", "'fieldwidth'", "'signalwidth'", "'accesswidth'", "'sw'", "'hw'", "'addressing'", "'precedence'", "'encode'", "'resetsignal'", "'clock'", "'mask'", "'enable'", "'hwenable'", "'hwmask'", "'haltmask'", "'haltenable'", "'halt'", "'next'", "'UNDEFINED'", "'true'", "'false'", "'rw'", "'wr'", "'r'", "'w'", "'na'", "'compact'", "'regalign'", "'fullalign'", "'posedge'", "'negedge'", "'bothedge'", "'level'", "'nonsticky'", "'`include'", "'property'", "'{'", "'}'", "';'", "'type'", "'='", "'default'", "'component'", "'|'", "'alias'", "','", "'@'", "'+='", "'%='", "'['", "']'", "':'", "'->'", "'.'", "'enum'", "'external'" }; public static final int T__50=50; public static final int T__59=59; @@ -34,9 +34,11 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { public static final int T__52=52; public static final int T__53=53; public static final int T__54=54; + public static final int T__133=133; 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=5; public static final int T__131=131; public static final int T__130=130; @@ -88,7 +90,6 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { public static final int T__16=16; public static final int T__17=17; public static final int T__18=18; - public static final int T__11=11; public static final int T__99=99; public static final int RULE_NUM=6; public static final int T__12=12; @@ -97,8 +98,8 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { public static final int T__95=95; public static final int T__96=96; public static final int T__97=97; - public static final int T__10=10; public static final int T__98=98; + public static final int RULE_ESCAPE_ORDL=11; public static final int T__26=26; public static final int T__27=27; public static final int T__28=28; @@ -136,6 +137,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { public static final int T__111=111; public static final int T__81=81; public static final int T__110=110; + public static final int RULE_ESCAPE_JSP=10; public static final int T__82=82; public static final int T__113=113; public static final int T__83=83; @@ -240,7 +242,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt1=2; int LA1_0 = input.LA(1); - if ( (LA1_0==RULE_ID||(LA1_0>=13 && LA1_0<=16)||LA1_0==18||(LA1_0>=20 && LA1_0<=95)||(LA1_0>=106 && LA1_0<=112)||LA1_0==118||LA1_0==121||(LA1_0>=131 && LA1_0<=132)) ) { + if ( (LA1_0==RULE_ID||(LA1_0>=15 && LA1_0<=18)||LA1_0==20||(LA1_0>=22 && LA1_0<=97)||(LA1_0>=108 && LA1_0<=114)||LA1_0==120||LA1_0==123||(LA1_0>=133 && LA1_0<=134)) ) { alt1=1; } @@ -2425,39 +2427,39 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:777:1: ( ( ( rule__Root__IncludesAssignment_0 ) ) | ( ( rule__Root__ComponentDefinitionsAssignment_1 ) ) | ( ( rule__Root__EnumDefinitionsAssignment_2 ) ) | ( ( rule__Root__NamedInstantiationsAssignment_3 ) ) | ( ( rule__Root__PropertyAssignmentsAssignment_4 ) ) | ( ( rule__Root__PropertyDefinitionsAssignment_5 ) ) ) int alt2=6; switch ( input.LA(1) ) { - case 111: + case 113: { alt2=1; } break; - case 13: - case 14: case 15: case 16: + case 17: case 18: + case 20: { alt2=2; } break; - case 131: + case 133: { alt2=3; } break; - case 121: - case 132: + case 123: + case 134: { alt2=4; } break; - case 74: + case 76: { int LA2_5 = input.LA(2); - if ( (LA2_5==115||LA2_5==117) ) { + if ( (LA2_5==117||LA2_5==119) ) { alt2=5; } - else if ( (LA2_5==RULE_ID||LA2_5==121) ) { + else if ( (LA2_5==RULE_ID||LA2_5==123) ) { alt2=4; } else { @@ -2472,7 +2474,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { { int LA2_6 = input.LA(2); - if ( (LA2_6==115||LA2_6==117||(LA2_6>=129 && LA2_6<=130)) ) { + if ( (LA2_6==117||LA2_6==119||(LA2_6>=131 && LA2_6<=132)) ) { alt2=5; } else if ( (LA2_6==RULE_ID) ) { @@ -2486,8 +2488,6 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { } } break; - case 20: - case 21: case 22: case 23: case 24: @@ -2540,8 +2540,8 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { case 71: case 72: case 73: + case 74: case 75: - case 76: case 77: case 78: case 79: @@ -2561,17 +2561,19 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { case 93: case 94: case 95: - case 106: - case 107: + case 96: + case 97: case 108: case 109: case 110: - case 118: + case 111: + case 112: + case 120: { alt2=5; } break; - case 112: + case 114: { alt2=6; } @@ -2761,17 +2763,17 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:822:1: ( ( ( rule__PropertyDefinition__Group_3_0__0 ) ) | ( ( rule__PropertyDefinition__Group_3_1__0 ) ) | ( ( rule__PropertyDefinition__Group_3_2__0 ) ) ) int alt3=3; switch ( input.LA(1) ) { - case 116: + case 118: { alt3=1; } break; - case 119: + case 121: { alt3=2; } break; - case 118: + case 120: { alt3=3; } @@ -2887,10 +2889,10 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt4=2; int LA4_0 = input.LA(1); - if ( (LA4_0==119) ) { + if ( (LA4_0==121) ) { alt4=1; } - else if ( (LA4_0==118) ) { + else if ( (LA4_0==120) ) { alt4=2; } else { @@ -2978,10 +2980,10 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt5=2; int LA5_0 = input.LA(1); - if ( (LA5_0==116) ) { + if ( (LA5_0==118) ) { alt5=1; } - else if ( (LA5_0==118) ) { + else if ( (LA5_0==120) ) { alt5=2; } else { @@ -3069,10 +3071,10 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt6=2; int LA6_0 = input.LA(1); - if ( (LA6_0==116) ) { + if ( (LA6_0==118) ) { alt6=1; } - else if ( (LA6_0==119) ) { + else if ( (LA6_0==121) ) { alt6=2; } else { @@ -3169,12 +3171,12 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { alt7=2; } break; - case 96: + case 98: { alt7=3; } break; - case 97: + case 99: { alt7=4; } @@ -3314,29 +3316,29 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:945:1: ( ( ( rule__ComponentDefinition__ComponentDefinitionsAssignment_3_0 ) ) | ( ( rule__ComponentDefinition__NamedInstantiationsAssignment_3_1 ) ) | ( ( rule__ComponentDefinition__PropertyAssignmentsAssignment_3_2 ) ) | ( ( rule__ComponentDefinition__EnumDefinitionsAssignment_3_3 ) ) ) int alt8=4; switch ( input.LA(1) ) { - case 13: - case 14: case 15: case 16: + case 17: case 18: + case 20: { alt8=1; } break; - case 121: - case 132: + case 123: + case 134: { alt8=2; } break; - case 74: + case 76: { int LA8_3 = input.LA(2); - if ( (LA8_3==RULE_ID||LA8_3==121) ) { + if ( (LA8_3==RULE_ID||LA8_3==123) ) { alt8=2; } - else if ( (LA8_3==115||LA8_3==117) ) { + else if ( (LA8_3==117||LA8_3==119) ) { alt8=3; } else { @@ -3351,7 +3353,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { { int LA8_4 = input.LA(2); - if ( (LA8_4==115||LA8_4==117||(LA8_4>=129 && LA8_4<=130)) ) { + if ( (LA8_4==117||LA8_4==119||(LA8_4>=131 && LA8_4<=132)) ) { alt8=3; } else if ( (LA8_4==RULE_ID) ) { @@ -3365,8 +3367,6 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { } } break; - case 20: - case 21: case 22: case 23: case 24: @@ -3419,8 +3419,8 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { case 71: case 72: case 73: + case 74: case 75: - case 76: case 77: case 78: case 79: @@ -3440,17 +3440,19 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { case 93: case 94: case 95: - case 106: - case 107: + case 96: + case 97: case 108: case 109: case 110: - case 118: + case 111: + case 112: + case 120: { alt8=3; } break; - case 131: + case 133: { alt8=4; } @@ -3594,10 +3596,10 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { if ( (LA9_0==RULE_NUM) ) { int LA9_1 = input.LA(2); - if ( (LA9_1==127) ) { + if ( (LA9_1==129) ) { alt9=2; } - else if ( (LA9_1==128) ) { + else if ( (LA9_1==130) ) { alt9=1; } else { @@ -3691,13 +3693,11 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:999:1: ( ( ruleDefaultProperyAssignment ) | ( ruleExplicitPropertyAssignment ) | ( rulePostPropertyAssignment ) ) int alt10=3; switch ( input.LA(1) ) { - case 118: + case 120: { alt10=1; } break; - case 20: - case 21: case 22: case 23: case 24: @@ -3772,11 +3772,13 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { case 93: case 94: case 95: - case 106: - case 107: + case 96: + case 97: case 108: case 109: case 110: + case 111: + case 112: { alt10=2; } @@ -3879,10 +3881,10 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt11=2; int LA11_0 = input.LA(1); - if ( (LA11_0==95||(LA11_0>=106 && LA11_0<=110)) ) { + if ( (LA11_0==97||(LA11_0>=108 && LA11_0<=112)) ) { alt11=1; } - else if ( ((LA11_0>=20 && LA11_0<=94)) ) { + else if ( ((LA11_0>=22 && LA11_0<=96)) ) { alt11=2; } else { @@ -3973,10 +3975,10 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { if ( (LA12_0==RULE_ID) ) { int LA12_1 = input.LA(2); - if ( (LA12_1==115||LA12_1==117) ) { + if ( (LA12_1==117||LA12_1==119) ) { alt12=2; } - else if ( ((LA12_1>=129 && LA12_1<=130)) ) { + else if ( ((LA12_1>=131 && LA12_1<=132)) ) { alt12=1; } else { @@ -4071,7 +4073,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt13=2; int LA13_0 = input.LA(1); - if ( ((LA13_0>=20 && LA13_0<=94)) ) { + if ( ((LA13_0>=22 && LA13_0<=96)) ) { alt13=1; } else if ( (LA13_0==RULE_ID) ) { @@ -4162,7 +4164,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt14=2; int LA14_0 = input.LA(1); - if ( ((LA14_0>=20 && LA14_0<=94)) ) { + if ( ((LA14_0>=22 && LA14_0<=96)) ) { alt14=1; } else if ( (LA14_0==RULE_ID) ) { @@ -4254,10 +4256,8 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { switch ( input.LA(1) ) { case RULE_STR: case RULE_NUM: - case 80: - case 81: - case 95: - case 96: + case 82: + case 83: case 97: case 98: case 99: @@ -4267,6 +4267,8 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { case 103: case 104: case 105: + case 106: + case 107: { alt15=1; } @@ -4275,10 +4277,10 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { { int LA15_2 = input.LA(2); - if ( (LA15_2==131) ) { + if ( (LA15_2==133) ) { alt15=3; } - else if ( (LA15_2==EOF||LA15_2==115||(LA15_2>=129 && LA15_2<=130)) ) { + else if ( (LA15_2==EOF||LA15_2==117||(LA15_2>=131 && LA15_2<=132)) ) { alt15=2; } else { @@ -4289,7 +4291,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { } } break; - case 113: + case 115: { alt15=4; } @@ -4520,10 +4522,8 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1164:1: ( ( ( rule__PropertyRvalueConstant__ValAssignment_0 ) ) | ( ( rule__PropertyRvalueConstant__NumAssignment_1 ) ) | ( ( rule__PropertyRvalueConstant__StrAssignment_2 ) ) ) int alt17=3; switch ( input.LA(1) ) { - case 80: - case 81: - case 95: - case 96: + case 82: + case 83: case 97: case 98: case 99: @@ -4533,6 +4533,8 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { case 103: case 104: case 105: + case 106: + case 107: { alt17=1; } @@ -4658,10 +4660,10 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt18=2; int LA18_0 = input.LA(1); - if ( (LA18_0==20) ) { + if ( (LA18_0==22) ) { alt18=1; } - else if ( (LA18_0==21) ) { + else if ( (LA18_0==23) ) { alt18=2; } else { @@ -4748,42 +4750,42 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1212:1: ( ( ( 'string' ) ) | ( ( 'number' ) ) | ( ( 'boolean' ) ) | ( ( 'addrmap' ) ) | ( ( 'reg' ) ) | ( ( 'regfile' ) ) | ( ( 'field' ) ) | ( ( 'ref' ) ) ) int alt19=8; switch ( input.LA(1) ) { - case 10: + case 12: { alt19=1; } break; - case 11: + case 13: { alt19=2; } break; - case 12: + case 14: { alt19=3; } break; - case 13: + case 15: { alt19=4; } break; - case 14: + case 16: { alt19=5; } break; - case 15: + case 17: { alt19=6; } break; - case 16: + case 18: { alt19=7; } break; - case 17: + case 19: { alt19=8; } @@ -4806,7 +4808,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1215:3: ( 'string' ) // InternalRDL.g:1215:4: 'string' { - match(input,10,FOLLOW_2); + match(input,12,FOLLOW_2); } @@ -4827,7 +4829,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1221:3: ( 'number' ) // InternalRDL.g:1221:4: 'number' { - match(input,11,FOLLOW_2); + match(input,13,FOLLOW_2); } @@ -4848,7 +4850,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1227:3: ( 'boolean' ) // InternalRDL.g:1227:4: 'boolean' { - match(input,12,FOLLOW_2); + match(input,14,FOLLOW_2); } @@ -4869,7 +4871,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1233:3: ( 'addrmap' ) // InternalRDL.g:1233:4: 'addrmap' { - match(input,13,FOLLOW_2); + match(input,15,FOLLOW_2); } @@ -4890,7 +4892,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1239:3: ( 'reg' ) // InternalRDL.g:1239:4: 'reg' { - match(input,14,FOLLOW_2); + match(input,16,FOLLOW_2); } @@ -4911,7 +4913,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1245:3: ( 'regfile' ) // InternalRDL.g:1245:4: 'regfile' { - match(input,15,FOLLOW_2); + match(input,17,FOLLOW_2); } @@ -4932,7 +4934,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1251:3: ( 'field' ) // InternalRDL.g:1251:4: 'field' { - match(input,16,FOLLOW_2); + match(input,18,FOLLOW_2); } @@ -4953,7 +4955,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1257:3: ( 'ref' ) // InternalRDL.g:1257:4: 'ref' { - match(input,17,FOLLOW_2); + match(input,19,FOLLOW_2); } @@ -4991,32 +4993,32 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1269:1: ( ( ( 'signal' ) ) | ( ( 'addrmap' ) ) | ( ( 'reg' ) ) | ( ( 'regfile' ) ) | ( ( 'field' ) ) | ( ( 'all' ) ) ) int alt20=6; switch ( input.LA(1) ) { - case 18: + case 20: { alt20=1; } break; - case 13: + case 15: { alt20=2; } break; - case 14: + case 16: { alt20=3; } break; - case 15: + case 17: { alt20=4; } break; - case 16: + case 18: { alt20=5; } break; - case 19: + case 21: { alt20=6; } @@ -5039,7 +5041,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1272:3: ( 'signal' ) // InternalRDL.g:1272:4: 'signal' { - match(input,18,FOLLOW_2); + match(input,20,FOLLOW_2); } @@ -5060,7 +5062,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1278:3: ( 'addrmap' ) // InternalRDL.g:1278:4: 'addrmap' { - match(input,13,FOLLOW_2); + match(input,15,FOLLOW_2); } @@ -5081,7 +5083,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1284:3: ( 'reg' ) // InternalRDL.g:1284:4: 'reg' { - match(input,14,FOLLOW_2); + match(input,16,FOLLOW_2); } @@ -5102,7 +5104,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1290:3: ( 'regfile' ) // InternalRDL.g:1290:4: 'regfile' { - match(input,15,FOLLOW_2); + match(input,17,FOLLOW_2); } @@ -5123,7 +5125,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1296:3: ( 'field' ) // InternalRDL.g:1296:4: 'field' { - match(input,16,FOLLOW_2); + match(input,18,FOLLOW_2); } @@ -5144,7 +5146,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1302:3: ( 'all' ) // InternalRDL.g:1302:4: 'all' { - match(input,19,FOLLOW_2); + match(input,21,FOLLOW_2); } @@ -5182,27 +5184,27 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1314:1: ( ( ( 'signal' ) ) | ( ( 'addrmap' ) ) | ( ( 'regfile' ) ) | ( ( 'reg' ) ) | ( ( 'field' ) ) ) int alt21=5; switch ( input.LA(1) ) { - case 18: + case 20: { alt21=1; } break; - case 13: + case 15: { alt21=2; } break; - case 15: + case 17: { alt21=3; } break; - case 14: + case 16: { alt21=4; } break; - case 16: + case 18: { alt21=5; } @@ -5225,7 +5227,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1317:3: ( 'signal' ) // InternalRDL.g:1317:4: 'signal' { - match(input,18,FOLLOW_2); + match(input,20,FOLLOW_2); } @@ -5246,7 +5248,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1323:3: ( 'addrmap' ) // InternalRDL.g:1323:4: 'addrmap' { - match(input,13,FOLLOW_2); + match(input,15,FOLLOW_2); } @@ -5267,7 +5269,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1329:3: ( 'regfile' ) // InternalRDL.g:1329:4: 'regfile' { - match(input,15,FOLLOW_2); + match(input,17,FOLLOW_2); } @@ -5288,7 +5290,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1335:3: ( 'reg' ) // InternalRDL.g:1335:4: 'reg' { - match(input,14,FOLLOW_2); + match(input,16,FOLLOW_2); } @@ -5309,7 +5311,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1341:3: ( 'field' ) // InternalRDL.g:1341:4: 'field' { - match(input,16,FOLLOW_2); + match(input,18,FOLLOW_2); } @@ -5347,377 +5349,377 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1353:1: ( ( ( 'name' ) ) | ( ( 'desc' ) ) | ( ( 'arbiter' ) ) | ( ( 'rset' ) ) | ( ( 'rclr' ) ) | ( ( 'woclr' ) ) | ( ( 'woset' ) ) | ( ( 'we' ) ) | ( ( 'wel' ) ) | ( ( 'swwe' ) ) | ( ( 'swwel' ) ) | ( ( 'hwset' ) ) | ( ( 'hwclr' ) ) | ( ( 'swmod' ) ) | ( ( 'swacc' ) ) | ( ( 'sticky' ) ) | ( ( 'stickybit' ) ) | ( ( 'intr' ) ) | ( ( 'anded' ) ) | ( ( 'ored' ) ) | ( ( 'xored' ) ) | ( ( 'counter' ) ) | ( ( 'overflow' ) ) | ( ( 'sharedextbus' ) ) | ( ( 'errextbus' ) ) | ( ( 'reset' ) ) | ( ( 'littleendian' ) ) | ( ( 'bigendian' ) ) | ( ( 'rsvdset' ) ) | ( ( 'rsvdsetX' ) ) | ( ( 'bridge' ) ) | ( ( 'shared' ) ) | ( ( 'msb0' ) ) | ( ( 'lsb0' ) ) | ( ( 'sync' ) ) | ( ( 'async' ) ) | ( ( 'cpuif_reset' ) ) | ( ( 'field_reset' ) ) | ( ( 'activehigh' ) ) | ( ( 'activelow' ) ) | ( ( 'singlepulse' ) ) | ( ( 'underflow' ) ) | ( ( 'incr' ) ) | ( ( 'decr' ) ) | ( ( 'incrwidth' ) ) | ( ( 'decrwidth' ) ) | ( ( 'incrvalue' ) ) | ( ( 'decrvalue' ) ) | ( ( 'saturate' ) ) | ( ( 'decrsaturate' ) ) | ( ( 'threshold' ) ) | ( ( 'decrthreshold' ) ) | ( ( 'dontcompare' ) ) | ( ( 'donttest' ) ) | ( ( 'internal' ) ) | ( ( 'alignment' ) ) | ( ( 'regwidth' ) ) | ( ( 'fieldwidth' ) ) | ( ( 'signalwidth' ) ) | ( ( 'accesswidth' ) ) | ( ( 'sw' ) ) | ( ( 'hw' ) ) | ( ( 'addressing' ) ) | ( ( 'precedence' ) ) | ( ( 'encode' ) ) | ( ( 'resetsignal' ) ) | ( ( 'clock' ) ) | ( ( 'mask' ) ) | ( ( 'enable' ) ) | ( ( 'hwenable' ) ) | ( ( 'hwmask' ) ) | ( ( 'haltmask' ) ) | ( ( 'haltenable' ) ) | ( ( 'halt' ) ) | ( ( 'next' ) ) ) int alt22=75; switch ( input.LA(1) ) { - case 20: + case 22: { alt22=1; } break; - case 21: + case 23: { alt22=2; } break; - case 22: + case 24: { alt22=3; } break; - case 23: + case 25: { alt22=4; } break; - case 24: + case 26: { alt22=5; } break; - case 25: + case 27: { alt22=6; } break; - case 26: + case 28: { alt22=7; } break; - case 27: + case 29: { alt22=8; } break; - case 28: + case 30: { alt22=9; } break; - case 29: + case 31: { alt22=10; } break; - case 30: + case 32: { alt22=11; } break; - case 31: + case 33: { alt22=12; } break; - case 32: + case 34: { alt22=13; } break; - case 33: + case 35: { alt22=14; } break; - case 34: + case 36: { alt22=15; } break; - case 35: + case 37: { alt22=16; } break; - case 36: + case 38: { alt22=17; } break; - case 37: + case 39: { alt22=18; } break; - case 38: + case 40: { alt22=19; } break; - case 39: + case 41: { alt22=20; } break; - case 40: + case 42: { alt22=21; } break; - case 41: + case 43: { alt22=22; } break; - case 42: + case 44: { alt22=23; } break; - case 43: + case 45: { alt22=24; } break; - case 44: + case 46: { alt22=25; } break; - case 45: + case 47: { alt22=26; } break; - case 46: + case 48: { alt22=27; } break; - case 47: + case 49: { alt22=28; } break; - case 48: + case 50: { alt22=29; } break; - case 49: + case 51: { alt22=30; } break; - case 50: + case 52: { alt22=31; } break; - case 51: + case 53: { alt22=32; } break; - case 52: + case 54: { alt22=33; } break; - case 53: + case 55: { alt22=34; } break; - case 54: + case 56: { alt22=35; } break; - case 55: + case 57: { alt22=36; } break; - case 56: + case 58: { alt22=37; } break; - case 57: + case 59: { alt22=38; } break; - case 58: + case 60: { alt22=39; } break; - case 59: + case 61: { alt22=40; } break; - case 60: + case 62: { alt22=41; } break; - case 61: + case 63: { alt22=42; } break; - case 62: + case 64: { alt22=43; } break; - case 63: + case 65: { alt22=44; } break; - case 64: + case 66: { alt22=45; } break; - case 65: + case 67: { alt22=46; } break; - case 66: + case 68: { alt22=47; } break; - case 67: + case 69: { alt22=48; } break; - case 68: + case 70: { alt22=49; } break; - case 69: + case 71: { alt22=50; } break; - case 70: + case 72: { alt22=51; } break; - case 71: + case 73: { alt22=52; } break; - case 72: + case 74: { alt22=53; } break; - case 73: + case 75: { alt22=54; } break; - case 74: + case 76: { alt22=55; } break; - case 75: + case 77: { alt22=56; } break; - case 76: + case 78: { alt22=57; } break; - case 77: + case 79: { alt22=58; } break; - case 78: + case 80: { alt22=59; } break; - case 79: + case 81: { alt22=60; } break; - case 80: + case 82: { alt22=61; } break; - case 81: + case 83: { alt22=62; } break; - case 82: + case 84: { alt22=63; } break; - case 83: + case 85: { alt22=64; } break; - case 84: + case 86: { alt22=65; } break; - case 85: + case 87: { alt22=66; } break; - case 86: + case 88: { alt22=67; } break; - case 87: + case 89: { alt22=68; } break; - case 88: + case 90: { alt22=69; } break; - case 89: + case 91: { alt22=70; } break; - case 90: + case 92: { alt22=71; } break; - case 91: + case 93: { alt22=72; } break; - case 92: + case 94: { alt22=73; } break; - case 93: + case 95: { alt22=74; } break; - case 94: + case 96: { alt22=75; } @@ -5740,7 +5742,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1356:3: ( 'name' ) // InternalRDL.g:1356:4: 'name' { - match(input,20,FOLLOW_2); + match(input,22,FOLLOW_2); } @@ -5761,7 +5763,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1362:3: ( 'desc' ) // InternalRDL.g:1362:4: 'desc' { - match(input,21,FOLLOW_2); + match(input,23,FOLLOW_2); } @@ -5782,7 +5784,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1368:3: ( 'arbiter' ) // InternalRDL.g:1368:4: 'arbiter' { - match(input,22,FOLLOW_2); + match(input,24,FOLLOW_2); } @@ -5803,7 +5805,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1374:3: ( 'rset' ) // InternalRDL.g:1374:4: 'rset' { - match(input,23,FOLLOW_2); + match(input,25,FOLLOW_2); } @@ -5824,7 +5826,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1380:3: ( 'rclr' ) // InternalRDL.g:1380:4: 'rclr' { - match(input,24,FOLLOW_2); + match(input,26,FOLLOW_2); } @@ -5845,7 +5847,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1386:3: ( 'woclr' ) // InternalRDL.g:1386:4: 'woclr' { - match(input,25,FOLLOW_2); + match(input,27,FOLLOW_2); } @@ -5866,7 +5868,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1392:3: ( 'woset' ) // InternalRDL.g:1392:4: 'woset' { - match(input,26,FOLLOW_2); + match(input,28,FOLLOW_2); } @@ -5887,7 +5889,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1398:3: ( 'we' ) // InternalRDL.g:1398:4: 'we' { - match(input,27,FOLLOW_2); + match(input,29,FOLLOW_2); } @@ -5908,7 +5910,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1404:3: ( 'wel' ) // InternalRDL.g:1404:4: 'wel' { - match(input,28,FOLLOW_2); + match(input,30,FOLLOW_2); } @@ -5929,7 +5931,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1410:3: ( 'swwe' ) // InternalRDL.g:1410:4: 'swwe' { - match(input,29,FOLLOW_2); + match(input,31,FOLLOW_2); } @@ -5950,7 +5952,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1416:3: ( 'swwel' ) // InternalRDL.g:1416:4: 'swwel' { - match(input,30,FOLLOW_2); + match(input,32,FOLLOW_2); } @@ -5971,7 +5973,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1422:3: ( 'hwset' ) // InternalRDL.g:1422:4: 'hwset' { - match(input,31,FOLLOW_2); + match(input,33,FOLLOW_2); } @@ -5992,7 +5994,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1428:3: ( 'hwclr' ) // InternalRDL.g:1428:4: 'hwclr' { - match(input,32,FOLLOW_2); + match(input,34,FOLLOW_2); } @@ -6013,7 +6015,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1434:3: ( 'swmod' ) // InternalRDL.g:1434:4: 'swmod' { - match(input,33,FOLLOW_2); + match(input,35,FOLLOW_2); } @@ -6034,7 +6036,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1440:3: ( 'swacc' ) // InternalRDL.g:1440:4: 'swacc' { - match(input,34,FOLLOW_2); + match(input,36,FOLLOW_2); } @@ -6055,7 +6057,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1446:3: ( 'sticky' ) // InternalRDL.g:1446:4: 'sticky' { - match(input,35,FOLLOW_2); + match(input,37,FOLLOW_2); } @@ -6076,7 +6078,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1452:3: ( 'stickybit' ) // InternalRDL.g:1452:4: 'stickybit' { - match(input,36,FOLLOW_2); + match(input,38,FOLLOW_2); } @@ -6097,7 +6099,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1458:3: ( 'intr' ) // InternalRDL.g:1458:4: 'intr' { - match(input,37,FOLLOW_2); + match(input,39,FOLLOW_2); } @@ -6118,7 +6120,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1464:3: ( 'anded' ) // InternalRDL.g:1464:4: 'anded' { - match(input,38,FOLLOW_2); + match(input,40,FOLLOW_2); } @@ -6139,7 +6141,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1470:3: ( 'ored' ) // InternalRDL.g:1470:4: 'ored' { - match(input,39,FOLLOW_2); + match(input,41,FOLLOW_2); } @@ -6160,7 +6162,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1476:3: ( 'xored' ) // InternalRDL.g:1476:4: 'xored' { - match(input,40,FOLLOW_2); + match(input,42,FOLLOW_2); } @@ -6181,7 +6183,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1482:3: ( 'counter' ) // InternalRDL.g:1482:4: 'counter' { - match(input,41,FOLLOW_2); + match(input,43,FOLLOW_2); } @@ -6202,7 +6204,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1488:3: ( 'overflow' ) // InternalRDL.g:1488:4: 'overflow' { - match(input,42,FOLLOW_2); + match(input,44,FOLLOW_2); } @@ -6223,7 +6225,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1494:3: ( 'sharedextbus' ) // InternalRDL.g:1494:4: 'sharedextbus' { - match(input,43,FOLLOW_2); + match(input,45,FOLLOW_2); } @@ -6244,7 +6246,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1500:3: ( 'errextbus' ) // InternalRDL.g:1500:4: 'errextbus' { - match(input,44,FOLLOW_2); + match(input,46,FOLLOW_2); } @@ -6265,7 +6267,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1506:3: ( 'reset' ) // InternalRDL.g:1506:4: 'reset' { - match(input,45,FOLLOW_2); + match(input,47,FOLLOW_2); } @@ -6286,7 +6288,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1512:3: ( 'littleendian' ) // InternalRDL.g:1512:4: 'littleendian' { - match(input,46,FOLLOW_2); + match(input,48,FOLLOW_2); } @@ -6307,7 +6309,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1518:3: ( 'bigendian' ) // InternalRDL.g:1518:4: 'bigendian' { - match(input,47,FOLLOW_2); + match(input,49,FOLLOW_2); } @@ -6328,7 +6330,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1524:3: ( 'rsvdset' ) // InternalRDL.g:1524:4: 'rsvdset' { - match(input,48,FOLLOW_2); + match(input,50,FOLLOW_2); } @@ -6349,7 +6351,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1530:3: ( 'rsvdsetX' ) // InternalRDL.g:1530:4: 'rsvdsetX' { - match(input,49,FOLLOW_2); + match(input,51,FOLLOW_2); } @@ -6370,7 +6372,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1536:3: ( 'bridge' ) // InternalRDL.g:1536:4: 'bridge' { - match(input,50,FOLLOW_2); + match(input,52,FOLLOW_2); } @@ -6391,7 +6393,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1542:3: ( 'shared' ) // InternalRDL.g:1542:4: 'shared' { - match(input,51,FOLLOW_2); + match(input,53,FOLLOW_2); } @@ -6412,7 +6414,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1548:3: ( 'msb0' ) // InternalRDL.g:1548:4: 'msb0' { - match(input,52,FOLLOW_2); + match(input,54,FOLLOW_2); } @@ -6433,7 +6435,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1554:3: ( 'lsb0' ) // InternalRDL.g:1554:4: 'lsb0' { - match(input,53,FOLLOW_2); + match(input,55,FOLLOW_2); } @@ -6454,7 +6456,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1560:3: ( 'sync' ) // InternalRDL.g:1560:4: 'sync' { - match(input,54,FOLLOW_2); + match(input,56,FOLLOW_2); } @@ -6475,7 +6477,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1566:3: ( 'async' ) // InternalRDL.g:1566:4: 'async' { - match(input,55,FOLLOW_2); + match(input,57,FOLLOW_2); } @@ -6496,7 +6498,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1572:3: ( 'cpuif_reset' ) // InternalRDL.g:1572:4: 'cpuif_reset' { - match(input,56,FOLLOW_2); + match(input,58,FOLLOW_2); } @@ -6517,7 +6519,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1578:3: ( 'field_reset' ) // InternalRDL.g:1578:4: 'field_reset' { - match(input,57,FOLLOW_2); + match(input,59,FOLLOW_2); } @@ -6538,7 +6540,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1584:3: ( 'activehigh' ) // InternalRDL.g:1584:4: 'activehigh' { - match(input,58,FOLLOW_2); + match(input,60,FOLLOW_2); } @@ -6559,7 +6561,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1590:3: ( 'activelow' ) // InternalRDL.g:1590:4: 'activelow' { - match(input,59,FOLLOW_2); + match(input,61,FOLLOW_2); } @@ -6580,7 +6582,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1596:3: ( 'singlepulse' ) // InternalRDL.g:1596:4: 'singlepulse' { - match(input,60,FOLLOW_2); + match(input,62,FOLLOW_2); } @@ -6601,7 +6603,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1602:3: ( 'underflow' ) // InternalRDL.g:1602:4: 'underflow' { - match(input,61,FOLLOW_2); + match(input,63,FOLLOW_2); } @@ -6622,7 +6624,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1608:3: ( 'incr' ) // InternalRDL.g:1608:4: 'incr' { - match(input,62,FOLLOW_2); + match(input,64,FOLLOW_2); } @@ -6643,7 +6645,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1614:3: ( 'decr' ) // InternalRDL.g:1614:4: 'decr' { - match(input,63,FOLLOW_2); + match(input,65,FOLLOW_2); } @@ -6664,7 +6666,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1620:3: ( 'incrwidth' ) // InternalRDL.g:1620:4: 'incrwidth' { - match(input,64,FOLLOW_2); + match(input,66,FOLLOW_2); } @@ -6685,7 +6687,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1626:3: ( 'decrwidth' ) // InternalRDL.g:1626:4: 'decrwidth' { - match(input,65,FOLLOW_2); + match(input,67,FOLLOW_2); } @@ -6706,7 +6708,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1632:3: ( 'incrvalue' ) // InternalRDL.g:1632:4: 'incrvalue' { - match(input,66,FOLLOW_2); + match(input,68,FOLLOW_2); } @@ -6727,7 +6729,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1638:3: ( 'decrvalue' ) // InternalRDL.g:1638:4: 'decrvalue' { - match(input,67,FOLLOW_2); + match(input,69,FOLLOW_2); } @@ -6748,7 +6750,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1644:3: ( 'saturate' ) // InternalRDL.g:1644:4: 'saturate' { - match(input,68,FOLLOW_2); + match(input,70,FOLLOW_2); } @@ -6769,7 +6771,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1650:3: ( 'decrsaturate' ) // InternalRDL.g:1650:4: 'decrsaturate' { - match(input,69,FOLLOW_2); + match(input,71,FOLLOW_2); } @@ -6790,7 +6792,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1656:3: ( 'threshold' ) // InternalRDL.g:1656:4: 'threshold' { - match(input,70,FOLLOW_2); + match(input,72,FOLLOW_2); } @@ -6811,7 +6813,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1662:3: ( 'decrthreshold' ) // InternalRDL.g:1662:4: 'decrthreshold' { - match(input,71,FOLLOW_2); + match(input,73,FOLLOW_2); } @@ -6832,7 +6834,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1668:3: ( 'dontcompare' ) // InternalRDL.g:1668:4: 'dontcompare' { - match(input,72,FOLLOW_2); + match(input,74,FOLLOW_2); } @@ -6853,7 +6855,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1674:3: ( 'donttest' ) // InternalRDL.g:1674:4: 'donttest' { - match(input,73,FOLLOW_2); + match(input,75,FOLLOW_2); } @@ -6874,7 +6876,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1680:3: ( 'internal' ) // InternalRDL.g:1680:4: 'internal' { - match(input,74,FOLLOW_2); + match(input,76,FOLLOW_2); } @@ -6895,7 +6897,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1686:3: ( 'alignment' ) // InternalRDL.g:1686:4: 'alignment' { - match(input,75,FOLLOW_2); + match(input,77,FOLLOW_2); } @@ -6916,7 +6918,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1692:3: ( 'regwidth' ) // InternalRDL.g:1692:4: 'regwidth' { - match(input,76,FOLLOW_2); + match(input,78,FOLLOW_2); } @@ -6937,7 +6939,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1698:3: ( 'fieldwidth' ) // InternalRDL.g:1698:4: 'fieldwidth' { - match(input,77,FOLLOW_2); + match(input,79,FOLLOW_2); } @@ -6958,7 +6960,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1704:3: ( 'signalwidth' ) // InternalRDL.g:1704:4: 'signalwidth' { - match(input,78,FOLLOW_2); + match(input,80,FOLLOW_2); } @@ -6979,7 +6981,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1710:3: ( 'accesswidth' ) // InternalRDL.g:1710:4: 'accesswidth' { - match(input,79,FOLLOW_2); + match(input,81,FOLLOW_2); } @@ -7000,7 +7002,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1716:3: ( 'sw' ) // InternalRDL.g:1716:4: 'sw' { - match(input,80,FOLLOW_2); + match(input,82,FOLLOW_2); } @@ -7021,7 +7023,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1722:3: ( 'hw' ) // InternalRDL.g:1722:4: 'hw' { - match(input,81,FOLLOW_2); + match(input,83,FOLLOW_2); } @@ -7042,7 +7044,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1728:3: ( 'addressing' ) // InternalRDL.g:1728:4: 'addressing' { - match(input,82,FOLLOW_2); + match(input,84,FOLLOW_2); } @@ -7063,7 +7065,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1734:3: ( 'precedence' ) // InternalRDL.g:1734:4: 'precedence' { - match(input,83,FOLLOW_2); + match(input,85,FOLLOW_2); } @@ -7084,7 +7086,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1740:3: ( 'encode' ) // InternalRDL.g:1740:4: 'encode' { - match(input,84,FOLLOW_2); + match(input,86,FOLLOW_2); } @@ -7105,7 +7107,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1746:3: ( 'resetsignal' ) // InternalRDL.g:1746:4: 'resetsignal' { - match(input,85,FOLLOW_2); + match(input,87,FOLLOW_2); } @@ -7126,7 +7128,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1752:3: ( 'clock' ) // InternalRDL.g:1752:4: 'clock' { - match(input,86,FOLLOW_2); + match(input,88,FOLLOW_2); } @@ -7147,7 +7149,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1758:3: ( 'mask' ) // InternalRDL.g:1758:4: 'mask' { - match(input,87,FOLLOW_2); + match(input,89,FOLLOW_2); } @@ -7168,7 +7170,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1764:3: ( 'enable' ) // InternalRDL.g:1764:4: 'enable' { - match(input,88,FOLLOW_2); + match(input,90,FOLLOW_2); } @@ -7189,7 +7191,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1770:3: ( 'hwenable' ) // InternalRDL.g:1770:4: 'hwenable' { - match(input,89,FOLLOW_2); + match(input,91,FOLLOW_2); } @@ -7210,7 +7212,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1776:3: ( 'hwmask' ) // InternalRDL.g:1776:4: 'hwmask' { - match(input,90,FOLLOW_2); + match(input,92,FOLLOW_2); } @@ -7231,7 +7233,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1782:3: ( 'haltmask' ) // InternalRDL.g:1782:4: 'haltmask' { - match(input,91,FOLLOW_2); + match(input,93,FOLLOW_2); } @@ -7252,7 +7254,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1788:3: ( 'haltenable' ) // InternalRDL.g:1788:4: 'haltenable' { - match(input,92,FOLLOW_2); + match(input,94,FOLLOW_2); } @@ -7273,7 +7275,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1794:3: ( 'halt' ) // InternalRDL.g:1794:4: 'halt' { - match(input,93,FOLLOW_2); + match(input,95,FOLLOW_2); } @@ -7294,7 +7296,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1800:3: ( 'next' ) // InternalRDL.g:1800:4: 'next' { - match(input,94,FOLLOW_2); + match(input,96,FOLLOW_2); } @@ -7332,67 +7334,67 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1812:1: ( ( ( 'UNDEFINED' ) ) | ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'rw' ) ) | ( ( 'wr' ) ) | ( ( 'r' ) ) | ( ( 'w' ) ) | ( ( 'na' ) ) | ( ( 'compact' ) ) | ( ( 'regalign' ) ) | ( ( 'fullalign' ) ) | ( ( 'hw' ) ) | ( ( 'sw' ) ) ) int alt23=13; switch ( input.LA(1) ) { - case 95: + case 97: { alt23=1; } break; - case 96: + case 98: { alt23=2; } break; - case 97: + case 99: { alt23=3; } break; - case 98: + case 100: { alt23=4; } break; - case 99: + case 101: { alt23=5; } break; - case 100: + case 102: { alt23=6; } break; - case 101: + case 103: { alt23=7; } break; - case 102: + case 104: { alt23=8; } break; - case 103: + case 105: { alt23=9; } break; - case 104: + case 106: { alt23=10; } break; - case 105: + case 107: { alt23=11; } break; - case 81: + case 83: { alt23=12; } break; - case 80: + case 82: { alt23=13; } @@ -7415,7 +7417,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1815:3: ( 'UNDEFINED' ) // InternalRDL.g:1815:4: 'UNDEFINED' { - match(input,95,FOLLOW_2); + match(input,97,FOLLOW_2); } @@ -7436,7 +7438,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1821:3: ( 'true' ) // InternalRDL.g:1821:4: 'true' { - match(input,96,FOLLOW_2); + match(input,98,FOLLOW_2); } @@ -7457,7 +7459,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1827:3: ( 'false' ) // InternalRDL.g:1827:4: 'false' { - match(input,97,FOLLOW_2); + match(input,99,FOLLOW_2); } @@ -7478,7 +7480,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1833:3: ( 'rw' ) // InternalRDL.g:1833:4: 'rw' { - match(input,98,FOLLOW_2); + match(input,100,FOLLOW_2); } @@ -7499,7 +7501,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1839:3: ( 'wr' ) // InternalRDL.g:1839:4: 'wr' { - match(input,99,FOLLOW_2); + match(input,101,FOLLOW_2); } @@ -7520,7 +7522,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1845:3: ( 'r' ) // InternalRDL.g:1845:4: 'r' { - match(input,100,FOLLOW_2); + match(input,102,FOLLOW_2); } @@ -7541,7 +7543,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1851:3: ( 'w' ) // InternalRDL.g:1851:4: 'w' { - match(input,101,FOLLOW_2); + match(input,103,FOLLOW_2); } @@ -7562,7 +7564,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1857:3: ( 'na' ) // InternalRDL.g:1857:4: 'na' { - match(input,102,FOLLOW_2); + match(input,104,FOLLOW_2); } @@ -7583,7 +7585,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1863:3: ( 'compact' ) // InternalRDL.g:1863:4: 'compact' { - match(input,103,FOLLOW_2); + match(input,105,FOLLOW_2); } @@ -7604,7 +7606,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1869:3: ( 'regalign' ) // InternalRDL.g:1869:4: 'regalign' { - match(input,104,FOLLOW_2); + match(input,106,FOLLOW_2); } @@ -7625,7 +7627,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1875:3: ( 'fullalign' ) // InternalRDL.g:1875:4: 'fullalign' { - match(input,105,FOLLOW_2); + match(input,107,FOLLOW_2); } @@ -7646,7 +7648,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1881:3: ( 'hw' ) // InternalRDL.g:1881:4: 'hw' { - match(input,81,FOLLOW_2); + match(input,83,FOLLOW_2); } @@ -7667,7 +7669,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1887:3: ( 'sw' ) // InternalRDL.g:1887:4: 'sw' { - match(input,80,FOLLOW_2); + match(input,82,FOLLOW_2); } @@ -7705,32 +7707,32 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1899:1: ( ( ( 'UNDEFINED' ) ) | ( ( 'posedge' ) ) | ( ( 'negedge' ) ) | ( ( 'bothedge' ) ) | ( ( 'level' ) ) | ( ( 'nonsticky' ) ) ) int alt24=6; switch ( input.LA(1) ) { - case 95: + case 97: { alt24=1; } break; - case 106: + case 108: { alt24=2; } break; - case 107: + case 109: { alt24=3; } break; - case 108: + case 110: { alt24=4; } break; - case 109: + case 111: { alt24=5; } break; - case 110: + case 112: { alt24=6; } @@ -7753,7 +7755,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1902:3: ( 'UNDEFINED' ) // InternalRDL.g:1902:4: 'UNDEFINED' { - match(input,95,FOLLOW_2); + match(input,97,FOLLOW_2); } @@ -7774,7 +7776,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1908:3: ( 'posedge' ) // InternalRDL.g:1908:4: 'posedge' { - match(input,106,FOLLOW_2); + match(input,108,FOLLOW_2); } @@ -7795,7 +7797,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1914:3: ( 'negedge' ) // InternalRDL.g:1914:4: 'negedge' { - match(input,107,FOLLOW_2); + match(input,109,FOLLOW_2); } @@ -7816,7 +7818,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1920:3: ( 'bothedge' ) // InternalRDL.g:1920:4: 'bothedge' { - match(input,108,FOLLOW_2); + match(input,110,FOLLOW_2); } @@ -7837,7 +7839,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1926:3: ( 'level' ) // InternalRDL.g:1926:4: 'level' { - match(input,109,FOLLOW_2); + match(input,111,FOLLOW_2); } @@ -7858,7 +7860,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1932:3: ( 'nonsticky' ) // InternalRDL.g:1932:4: 'nonsticky' { - match(input,110,FOLLOW_2); + match(input,112,FOLLOW_2); } @@ -7938,7 +7940,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:1958:2: '`include' { before(grammarAccess.getIncludeAccess().getIncludeKeyword_0()); - match(input,111,FOLLOW_2); + match(input,113,FOLLOW_2); after(grammarAccess.getIncludeAccess().getIncludeKeyword_0()); } @@ -8093,7 +8095,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2012:2: 'property' { before(grammarAccess.getPropertyDefinitionAccess().getPropertyKeyword_0()); - match(input,112,FOLLOW_2); + match(input,114,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getPropertyKeyword_0()); } @@ -8253,7 +8255,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2066:2: '{' { before(grammarAccess.getPropertyDefinitionAccess().getLeftCurlyBracketKeyword_2()); - match(input,113,FOLLOW_2); + match(input,115,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getLeftCurlyBracketKeyword_2()); } @@ -8413,7 +8415,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2120:2: '}' { before(grammarAccess.getPropertyDefinitionAccess().getRightCurlyBracketKeyword_4()); - match(input,114,FOLLOW_2); + match(input,116,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getRightCurlyBracketKeyword_4()); } @@ -8483,7 +8485,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2146:2: ';' { before(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_5()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_5()); } @@ -8558,7 +8560,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2174:2: 'type' { before(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_0_0()); - match(input,116,FOLLOW_2); + match(input,118,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_0_0()); } @@ -8633,7 +8635,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2201:2: '=' { before(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_0_1()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_0_1()); } @@ -8793,7 +8795,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2255:2: ';' { before(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_0_3()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_0_3()); } @@ -9032,7 +9034,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt25=2; int LA25_0 = input.LA(1); - if ( (LA25_0==118) ) { + if ( (LA25_0==120) ) { alt25=1; } switch (alt25) { @@ -9454,7 +9456,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2471:2: 'type' { before(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_1_1_0_0()); - match(input,116,FOLLOW_2); + match(input,118,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_1_1_0_0()); } @@ -9529,7 +9531,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2498:2: '=' { before(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_1_1_0_1()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_1_1_0_1()); } @@ -9689,7 +9691,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2552:2: ';' { before(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_1_1_0_3()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_1_1_0_3()); } @@ -9763,7 +9765,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt26=2; int LA26_0 = input.LA(1); - if ( (LA26_0==118) ) { + if ( (LA26_0==120) ) { alt26=1; } switch (alt26) { @@ -9940,7 +9942,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2633:2: 'type' { before(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_1_1_1_1()); - match(input,116,FOLLOW_2); + match(input,118,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_1_1_1_1()); } @@ -10015,7 +10017,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2660:2: '=' { before(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_1_1_1_2()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_1_1_1_2()); } @@ -10170,7 +10172,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2713:2: ';' { before(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_1_1_1_4()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_1_1_1_4()); } @@ -10410,7 +10412,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2795:2: 'type' { before(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_2_1_0_0()); - match(input,116,FOLLOW_2); + match(input,118,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_2_1_0_0()); } @@ -10485,7 +10487,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2822:2: '=' { before(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_2_1_0_1()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_2_1_0_1()); } @@ -10645,7 +10647,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2876:2: ';' { before(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_2_1_0_3()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_2_1_0_3()); } @@ -10885,7 +10887,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2957:2: 'type' { before(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_2_1_1_1()); - match(input,116,FOLLOW_2); + match(input,118,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_2_1_1_1()); } @@ -10960,7 +10962,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:2984:2: '=' { before(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_2_1_1_2()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_2_1_1_2()); } @@ -11115,7 +11117,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3037:2: ';' { before(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_2_1_1_4()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_2_1_1_4()); } @@ -11190,7 +11192,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3065:2: 'default' { before(grammarAccess.getPropertyDefaultAccess().getDefaultKeyword_0()); - match(input,118,FOLLOW_2); + match(input,120,FOLLOW_2); after(grammarAccess.getPropertyDefaultAccess().getDefaultKeyword_0()); } @@ -11265,7 +11267,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3092:2: '=' { before(grammarAccess.getPropertyDefaultAccess().getEqualsSignKeyword_1()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getPropertyDefaultAccess().getEqualsSignKeyword_1()); } @@ -11420,7 +11422,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3145:2: ';' { before(grammarAccess.getPropertyDefaultAccess().getSemicolonKeyword_3()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getPropertyDefaultAccess().getSemicolonKeyword_3()); } @@ -11495,7 +11497,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3173:2: 'component' { before(grammarAccess.getPropertyUsageAccess().getComponentKeyword_0()); - match(input,119,FOLLOW_2); + match(input,121,FOLLOW_2); after(grammarAccess.getPropertyUsageAccess().getComponentKeyword_0()); } @@ -11570,7 +11572,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3200:2: '=' { before(grammarAccess.getPropertyUsageAccess().getEqualsSignKeyword_1()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getPropertyUsageAccess().getEqualsSignKeyword_1()); } @@ -11736,7 +11738,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt27=2; int LA27_0 = input.LA(1); - if ( (LA27_0==120) ) { + if ( (LA27_0==122) ) { alt27=1; } @@ -11828,7 +11830,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3280:2: ';' { before(grammarAccess.getPropertyUsageAccess().getSemicolonKeyword_4()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getPropertyUsageAccess().getSemicolonKeyword_4()); } @@ -11903,7 +11905,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3308:2: '|' { before(grammarAccess.getPropertyUsageAccess().getVerticalLineKeyword_3_0()); - match(input,120,FOLLOW_2); + match(input,122,FOLLOW_2); after(grammarAccess.getPropertyUsageAccess().getVerticalLineKeyword_3_0()); } @@ -12239,7 +12241,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3416:2: '{' { before(grammarAccess.getComponentDefinitionAccess().getLeftCurlyBracketKeyword_2()); - match(input,113,FOLLOW_2); + match(input,115,FOLLOW_2); after(grammarAccess.getComponentDefinitionAccess().getLeftCurlyBracketKeyword_2()); } @@ -12320,7 +12322,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt29=2; int LA29_0 = input.LA(1); - if ( (LA29_0==RULE_ID||(LA29_0>=13 && LA29_0<=16)||LA29_0==18||(LA29_0>=20 && LA29_0<=95)||(LA29_0>=106 && LA29_0<=110)||LA29_0==118||LA29_0==121||(LA29_0>=131 && LA29_0<=132)) ) { + if ( (LA29_0==RULE_ID||(LA29_0>=15 && LA29_0<=18)||LA29_0==20||(LA29_0>=22 && LA29_0<=97)||(LA29_0>=108 && LA29_0<=112)||LA29_0==120||LA29_0==123||(LA29_0>=133 && LA29_0<=134)) ) { alt29=1; } @@ -12417,7 +12419,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3470:2: '}' { before(grammarAccess.getComponentDefinitionAccess().getRightCurlyBracketKeyword_4()); - match(input,114,FOLLOW_2); + match(input,116,FOLLOW_2); after(grammarAccess.getComponentDefinitionAccess().getRightCurlyBracketKeyword_4()); } @@ -12496,7 +12498,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt30=2; int LA30_0 = input.LA(1); - if ( (LA30_0==RULE_ID||LA30_0==132) ) { + if ( (LA30_0==RULE_ID||LA30_0==134) ) { alt30=1; } switch (alt30) { @@ -12583,7 +12585,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3523:2: ';' { before(grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_6()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_6()); } @@ -12662,7 +12664,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt31=2; int LA31_0 = input.LA(1); - if ( (LA31_0==132) ) { + if ( (LA31_0==134) ) { alt31=1; } switch (alt31) { @@ -12758,7 +12760,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt32=2; int LA32_0 = input.LA(1); - if ( (LA32_0==74) ) { + if ( (LA32_0==76) ) { alt32=1; } switch (alt32) { @@ -12854,7 +12856,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt33=2; int LA33_0 = input.LA(1); - if ( (LA33_0==121) ) { + if ( (LA33_0==123) ) { alt33=1; } switch (alt33) { @@ -13122,7 +13124,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt34=2; int LA34_0 = input.LA(1); - if ( (LA34_0==122) ) { + if ( (LA34_0==124) ) { alt34=1; } @@ -13214,7 +13216,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3712:2: ';' { before(grammarAccess.getNamedInstantiationAccess().getSemicolonKeyword_6()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getNamedInstantiationAccess().getSemicolonKeyword_6()); } @@ -13289,7 +13291,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3740:2: 'alias' { before(grammarAccess.getNamedInstantiationAccess().getAliasKeyword_2_0()); - match(input,121,FOLLOW_2); + match(input,123,FOLLOW_2); after(grammarAccess.getNamedInstantiationAccess().getAliasKeyword_2_0()); } @@ -13444,7 +13446,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3794:2: ',' { before(grammarAccess.getNamedInstantiationAccess().getCommaKeyword_5_0()); - match(input,122,FOLLOW_2); + match(input,124,FOLLOW_2); after(grammarAccess.getNamedInstantiationAccess().getCommaKeyword_5_0()); } @@ -13603,7 +13605,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt35=2; int LA35_0 = input.LA(1); - if ( (LA35_0==132) ) { + if ( (LA35_0==134) ) { alt35=1; } switch (alt35) { @@ -13781,7 +13783,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt36=2; int LA36_0 = input.LA(1); - if ( (LA36_0==122) ) { + if ( (LA36_0==124) ) { alt36=1; } @@ -13878,7 +13880,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:3929:2: ',' { before(grammarAccess.getImmediateInstantiationAccess().getCommaKeyword_2_0()); - match(input,122,FOLLOW_2); + match(input,124,FOLLOW_2); after(grammarAccess.getImmediateInstantiationAccess().getCommaKeyword_2_0()); } @@ -14122,7 +14124,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt37=2; int LA37_0 = input.LA(1); - if ( (LA37_0==126) ) { + if ( (LA37_0==128) ) { alt37=1; } switch (alt37) { @@ -14218,7 +14220,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt38=2; int LA38_0 = input.LA(1); - if ( (LA38_0==117) ) { + if ( (LA38_0==119) ) { alt38=1; } switch (alt38) { @@ -14314,7 +14316,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt39=2; int LA39_0 = input.LA(1); - if ( (LA39_0==123) ) { + if ( (LA39_0==125) ) { alt39=1; } switch (alt39) { @@ -14410,7 +14412,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt40=2; int LA40_0 = input.LA(1); - if ( (LA40_0==124) ) { + if ( (LA40_0==126) ) { alt40=1; } switch (alt40) { @@ -14501,7 +14503,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt41=2; int LA41_0 = input.LA(1); - if ( (LA41_0==125) ) { + if ( (LA41_0==127) ) { alt41=1; } switch (alt41) { @@ -14593,7 +14595,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4145:2: '=' { before(grammarAccess.getComponentInstanceAccess().getEqualsSignKeyword_2_0()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getComponentInstanceAccess().getEqualsSignKeyword_2_0()); } @@ -14748,7 +14750,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4199:2: '@' { before(grammarAccess.getComponentInstanceAccess().getCommercialAtKeyword_3_0()); - match(input,123,FOLLOW_2); + match(input,125,FOLLOW_2); after(grammarAccess.getComponentInstanceAccess().getCommercialAtKeyword_3_0()); } @@ -14903,7 +14905,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4253:2: '+=' { before(grammarAccess.getComponentInstanceAccess().getPlusSignEqualsSignKeyword_4_0()); - match(input,124,FOLLOW_2); + match(input,126,FOLLOW_2); after(grammarAccess.getComponentInstanceAccess().getPlusSignEqualsSignKeyword_4_0()); } @@ -15058,7 +15060,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4307:2: '%=' { before(grammarAccess.getComponentInstanceAccess().getPercentSignEqualsSignKeyword_5_0()); - match(input,125,FOLLOW_2); + match(input,127,FOLLOW_2); after(grammarAccess.getComponentInstanceAccess().getPercentSignEqualsSignKeyword_5_0()); } @@ -15213,7 +15215,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4361:2: '[' { before(grammarAccess.getRangeAccess().getLeftSquareBracketKeyword_0()); - match(input,126,FOLLOW_2); + match(input,128,FOLLOW_2); after(grammarAccess.getRangeAccess().getLeftSquareBracketKeyword_0()); } @@ -15368,7 +15370,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4414:2: ']' { before(grammarAccess.getRangeAccess().getRightSquareBracketKeyword_2()); - match(input,127,FOLLOW_2); + match(input,129,FOLLOW_2); after(grammarAccess.getRangeAccess().getRightSquareBracketKeyword_2()); } @@ -15528,7 +15530,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4469:2: ':' { before(grammarAccess.getRangeAccess().getColonKeyword_1_0_1()); - match(input,128,FOLLOW_2); + match(input,130,FOLLOW_2); after(grammarAccess.getRangeAccess().getColonKeyword_1_0_1()); } @@ -15683,7 +15685,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4523:2: 'default' { before(grammarAccess.getDefaultProperyAssignmentAccess().getDefaultKeyword_0()); - match(input,118,FOLLOW_2); + match(input,120,FOLLOW_2); after(grammarAccess.getDefaultProperyAssignmentAccess().getDefaultKeyword_0()); } @@ -15997,7 +15999,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4630:2: ';' { before(grammarAccess.getExplicitPropertyAssignmentAccess().getSemicolonKeyword_0_2()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getExplicitPropertyAssignmentAccess().getSemicolonKeyword_0_2()); } @@ -16161,7 +16163,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt42=2; int LA42_0 = input.LA(1); - if ( (LA42_0==117) ) { + if ( (LA42_0==119) ) { alt42=1; } switch (alt42) { @@ -16248,7 +16250,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4711:2: ';' { before(grammarAccess.getExplicitPropertyAssignmentAccess().getSemicolonKeyword_1_2()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getExplicitPropertyAssignmentAccess().getSemicolonKeyword_1_2()); } @@ -16323,7 +16325,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4739:2: '=' { before(grammarAccess.getExplicitPropertyAssignmentAccess().getEqualsSignKeyword_1_1_0()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getExplicitPropertyAssignmentAccess().getEqualsSignKeyword_1_1_0()); } @@ -16567,7 +16569,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt43=2; int LA43_0 = input.LA(1); - if ( (LA43_0==117) ) { + if ( (LA43_0==119) ) { alt43=1; } switch (alt43) { @@ -16654,7 +16656,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4846:2: ';' { before(grammarAccess.getPostPropertyAssignmentAccess().getSemicolonKeyword_2()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getPostPropertyAssignmentAccess().getSemicolonKeyword_2()); } @@ -16814,7 +16816,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4901:2: '->' { before(grammarAccess.getPostPropertyAssignmentAccess().getHyphenMinusGreaterThanSignKeyword_0_0_1()); - match(input,129,FOLLOW_2); + match(input,131,FOLLOW_2); after(grammarAccess.getPostPropertyAssignmentAccess().getHyphenMinusGreaterThanSignKeyword_0_0_1()); } @@ -16969,7 +16971,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:4955:2: '=' { before(grammarAccess.getPostPropertyAssignmentAccess().getEqualsSignKeyword_1_0()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getPostPropertyAssignmentAccess().getEqualsSignKeyword_1_0()); } @@ -17208,7 +17210,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt44=2; int LA44_0 = input.LA(1); - if ( (LA44_0==129) ) { + if ( (LA44_0==131) ) { alt44=1; } switch (alt44) { @@ -17300,7 +17302,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5063:2: '->' { before(grammarAccess.getInstancePropertyRefAccess().getHyphenMinusGreaterThanSignKeyword_1_0()); - match(input,129,FOLLOW_2); + match(input,131,FOLLOW_2); after(grammarAccess.getInstancePropertyRefAccess().getHyphenMinusGreaterThanSignKeyword_1_0()); } @@ -17539,7 +17541,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt45=2; int LA45_0 = input.LA(1); - if ( (LA45_0==130) ) { + if ( (LA45_0==132) ) { alt45=1; } switch (alt45) { @@ -17631,7 +17633,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5171:2: '.' { before(grammarAccess.getInstanceRefAccess().getFullStopKeyword_1_0()); - match(input,130,FOLLOW_2); + match(input,132,FOLLOW_2); after(grammarAccess.getInstanceRefAccess().getFullStopKeyword_1_0()); } @@ -17870,7 +17872,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt46=2; int LA46_0 = input.LA(1); - if ( (LA46_0==130) ) { + if ( (LA46_0==132) ) { alt46=1; } switch (alt46) { @@ -17962,7 +17964,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5279:2: '.' { before(grammarAccess.getHierInstanceRefAccess().getFullStopKeyword_1_0()); - match(input,130,FOLLOW_2); + match(input,132,FOLLOW_2); after(grammarAccess.getHierInstanceRefAccess().getFullStopKeyword_1_0()); } @@ -18202,7 +18204,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5360:2: 'enum' { before(grammarAccess.getPropertyAssignmentRhsAccess().getEnumKeyword_2_1()); - match(input,131,FOLLOW_2); + match(input,133,FOLLOW_2); after(grammarAccess.getPropertyAssignmentRhsAccess().getEnumKeyword_2_1()); } @@ -18357,7 +18359,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5414:2: '{' { before(grammarAccess.getConcatAccess().getLeftCurlyBracketKeyword_0()); - match(input,113,FOLLOW_2); + match(input,115,FOLLOW_2); after(grammarAccess.getConcatAccess().getLeftCurlyBracketKeyword_0()); } @@ -18523,7 +18525,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt47=2; int LA47_0 = input.LA(1); - if ( (LA47_0==122) ) { + if ( (LA47_0==124) ) { alt47=1; } @@ -18615,7 +18617,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5494:2: '}' { before(grammarAccess.getConcatAccess().getRightCurlyBracketKeyword_3()); - match(input,114,FOLLOW_2); + match(input,116,FOLLOW_2); after(grammarAccess.getConcatAccess().getRightCurlyBracketKeyword_3()); } @@ -18690,7 +18692,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5522:2: ',' { before(grammarAccess.getConcatAccess().getCommaKeyword_2_0()); - match(input,122,FOLLOW_2); + match(input,124,FOLLOW_2); after(grammarAccess.getConcatAccess().getCommaKeyword_2_0()); } @@ -18845,7 +18847,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5576:2: 'enum' { before(grammarAccess.getEnumDefinitionAccess().getEnumKeyword_0()); - match(input,131,FOLLOW_2); + match(input,133,FOLLOW_2); after(grammarAccess.getEnumDefinitionAccess().getEnumKeyword_0()); } @@ -19085,7 +19087,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5656:2: ';' { before(grammarAccess.getEnumDefinitionAccess().getSemicolonKeyword_3()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getEnumDefinitionAccess().getSemicolonKeyword_3()); } @@ -19160,7 +19162,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5684:2: '{' { before(grammarAccess.getEnumBodyAccess().getLeftCurlyBracketKeyword_0()); - match(input,113,FOLLOW_2); + match(input,115,FOLLOW_2); after(grammarAccess.getEnumBodyAccess().getLeftCurlyBracketKeyword_0()); } @@ -19408,7 +19410,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5764:2: '}' { before(grammarAccess.getEnumBodyAccess().getRightCurlyBracketKeyword_3()); - match(input,114,FOLLOW_2); + match(input,116,FOLLOW_2); after(grammarAccess.getEnumBodyAccess().getRightCurlyBracketKeyword_3()); } @@ -19568,7 +19570,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5819:2: '=' { before(grammarAccess.getEnumEntryAccess().getEqualsSignKeyword_1()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getEnumEntryAccess().getEqualsSignKeyword_1()); } @@ -19732,7 +19734,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt49=2; int LA49_0 = input.LA(1); - if ( (LA49_0==113) ) { + if ( (LA49_0==115) ) { alt49=1; } switch (alt49) { @@ -19819,7 +19821,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5899:2: ';' { before(grammarAccess.getEnumEntryAccess().getSemicolonKeyword_4()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getEnumEntryAccess().getSemicolonKeyword_4()); } @@ -19894,7 +19896,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5927:2: '{' { before(grammarAccess.getEnumEntryAccess().getLeftCurlyBracketKeyword_3_0()); - match(input,113,FOLLOW_2); + match(input,115,FOLLOW_2); after(grammarAccess.getEnumEntryAccess().getLeftCurlyBracketKeyword_3_0()); } @@ -19975,7 +19977,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { int alt50=2; int LA50_0 = input.LA(1); - if ( ((LA50_0>=20 && LA50_0<=21)) ) { + if ( ((LA50_0>=22 && LA50_0<=23)) ) { alt50=1; } @@ -20067,7 +20069,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:5980:2: '}' { before(grammarAccess.getEnumEntryAccess().getRightCurlyBracketKeyword_3_2()); - match(input,114,FOLLOW_2); + match(input,116,FOLLOW_2); after(grammarAccess.getEnumEntryAccess().getRightCurlyBracketKeyword_3_2()); } @@ -20222,7 +20224,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:6034:2: ';' { before(grammarAccess.getEnumPropertyAccess().getSemicolonKeyword_1()); - match(input,115,FOLLOW_2); + match(input,117,FOLLOW_2); after(grammarAccess.getEnumPropertyAccess().getSemicolonKeyword_1()); } @@ -20382,7 +20384,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:6089:2: '=' { before(grammarAccess.getEnumPropertyAccess().getEqualsSignKeyword_0_0_1()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getEnumPropertyAccess().getEqualsSignKeyword_0_0_1()); } @@ -20622,7 +20624,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:6170:2: '=' { before(grammarAccess.getEnumPropertyAccess().getEqualsSignKeyword_0_1_1()); - match(input,117,FOLLOW_2); + match(input,119,FOLLOW_2); after(grammarAccess.getEnumPropertyAccess().getEqualsSignKeyword_0_1_1()); } @@ -21752,7 +21754,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:6589:4: 'true' { before(grammarAccess.getPropertyDefaultAccess().getStringTrueKeyword_2_2_0()); - match(input,96,FOLLOW_2); + match(input,98,FOLLOW_2); after(grammarAccess.getPropertyDefaultAccess().getStringTrueKeyword_2_2_0()); } @@ -21797,7 +21799,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:6608:4: 'false' { before(grammarAccess.getPropertyDefaultAccess().getStringFalseKeyword_2_3_0()); - match(input,97,FOLLOW_2); + match(input,99,FOLLOW_2); after(grammarAccess.getPropertyDefaultAccess().getStringFalseKeyword_2_3_0()); } @@ -22207,7 +22209,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:6762:4: 'external' { before(grammarAccess.getNamedInstantiationAccess().getExternalExternalKeyword_0_0()); - match(input,132,FOLLOW_2); + match(input,134,FOLLOW_2); after(grammarAccess.getNamedInstantiationAccess().getExternalExternalKeyword_0_0()); } @@ -22252,7 +22254,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:6781:4: 'internal' { before(grammarAccess.getNamedInstantiationAccess().getInternalInternalKeyword_1_0()); - match(input,74,FOLLOW_2); + match(input,76,FOLLOW_2); after(grammarAccess.getNamedInstantiationAccess().getInternalInternalKeyword_1_0()); } @@ -22461,7 +22463,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:6864:4: 'external' { before(grammarAccess.getImmediateInstantiationAccess().getExternalExternalKeyword_0_0()); - match(input,132,FOLLOW_2); + match(input,134,FOLLOW_2); after(grammarAccess.getImmediateInstantiationAccess().getExternalExternalKeyword_0_0()); } @@ -24319,7 +24321,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:7582:4: 'name' { before(grammarAccess.getEnumPropertyAccess().getNameNameKeyword_0_0_0_0()); - match(input,20,FOLLOW_2); + match(input,22,FOLLOW_2); after(grammarAccess.getEnumPropertyAccess().getNameNameKeyword_0_0_0_0()); } @@ -24401,7 +24403,7 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { // InternalRDL.g:7616:4: 'desc' { before(grammarAccess.getEnumPropertyAccess().getNameDescKeyword_0_1_0_0()); - match(input,21,FOLLOW_2); + match(input,23,FOLLOW_2); after(grammarAccess.getEnumPropertyAccess().getNameDescKeyword_0_1_0_0()); } @@ -24471,48 +24473,48 @@ public class InternalRDLParser extends AbstractInternalContentAssistParser { public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_3 = new BitSet(new long[]{0xFFFFFFFFFFF5E022L,0x0241FC00FFFFFFFFL,0x0000000000000018L}); + public static final BitSet FOLLOW_3 = new BitSet(new long[]{0xFFFFFFFFFFD78022L,0x0907F003FFFFFFFFL,0x0000000000000060L}); public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L}); public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000000L,0x0002000000000000L}); - public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000000000L,0x00D0000000000000L}); - public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L}); - public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L}); - public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L}); - public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x000000000003FC00L}); - public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L}); - public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L}); - public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000000L,0x0090000000000000L}); - public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000000050L,0x0000000300000000L}); - public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x00000000000DE000L}); - public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000000L,0x0108000000000000L}); - public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000002L,0x0100000000000000L}); - public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000000020L,0x0002000000000000L}); - public static final BitSet FOLLOW_20 = new BitSet(new long[]{0xFFFFFFFFFFF5E020L,0x02447C00FFFFFFFFL,0x0000000000000018L}); - public static final BitSet FOLLOW_21 = new BitSet(new long[]{0xFFFFFFFFFFF5E022L,0x02407C00FFFFFFFFL,0x0000000000000018L}); - public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000000020L,0x0008000000000000L,0x0000000000000010L}); - public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000000020L,0x0200000000000400L,0x0000000000000010L}); - public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000000020L,0x0000000000000000L,0x0000000000000010L}); - public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000000L,0x0408000000000000L}); - public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000000002L,0x0400000000000000L}); - public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000000L,0x0400000000000000L}); - public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000000000L,0x7820000000000000L}); + public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L}); + public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000000000L,0x0340000000000000L}); + public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L}); + public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L}); + public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L}); + public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x00000000000FF000L}); + public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000000L,0x0200000000000000L}); + public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000000L,0x0040000000000000L}); + public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000000L,0x0240000000000000L}); + public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000000050L,0x0000000C00000000L}); + public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000378000L}); + public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000000L,0x0420000000000000L}); + public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000002L,0x0400000000000000L}); + public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000000020L,0x0008000000000000L}); + public static final BitSet FOLLOW_20 = new BitSet(new long[]{0xFFFFFFFFFFD78020L,0x0911F003FFFFFFFFL,0x0000000000000060L}); + public static final BitSet FOLLOW_21 = new BitSet(new long[]{0xFFFFFFFFFFD78022L,0x0901F003FFFFFFFFL,0x0000000000000060L}); + public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000000020L,0x0020000000000000L,0x0000000000000040L}); + public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000000020L,0x0800000000001000L,0x0000000000000040L}); + public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000000020L,0x0000000000000000L,0x0000000000000040L}); + public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000000000L,0x1020000000000000L}); + public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000000002L,0x1000000000000000L}); + public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000000000L,0x1000000000000000L}); + public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000000000L,0xE080000000000000L,0x0000000000000001L}); public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000000000L,0x8000000000000000L}); - public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000001L}); - public static final BitSet FOLLOW_32 = new BitSet(new long[]{0xFFFFFFFFFFF00000L,0x00007C00FFFFFFFFL}); - public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000000L,0x0028000000000000L}); - public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000070L,0x000203FF80030000L}); - public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000002L}); - public static final BitSet FOLLOW_36 = new BitSet(new long[]{0xFFFFFFFFFFF00020L,0x00007C00FFFFFFFFL}); - public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000004L}); - public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000008L}); + public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000002L}); + public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000004L}); + public static final BitSet FOLLOW_32 = new BitSet(new long[]{0xFFFFFFFFFFC00000L,0x0001F003FFFFFFFFL}); + public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000000L,0x00A0000000000000L}); + public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000070L,0x00080FFE000C0000L}); + public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000008L}); + public static final BitSet FOLLOW_36 = new BitSet(new long[]{0xFFFFFFFFFFC00020L,0x0001F003FFFFFFFFL}); + public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000010L}); + public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000000L,0x0000000000000020L}); public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000060L}); - public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x0404000000000000L}); - public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000020L,0x0004000000000000L}); + public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000000000L,0x1010000000000000L}); + public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000020L,0x0010000000000000L}); public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000000022L}); - public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x000A000000000000L}); - public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000300000L,0x0004000000000000L}); - public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000300002L}); + public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000000L,0x0028000000000000L}); + public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000000C00000L,0x0010000000000000L}); + public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000C00002L}); } \ No newline at end of file diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java index 62984da..97b794f 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java @@ -346,6 +346,12 @@ public abstract class AbstractRDLProposalProvider extends AbstractJavaBasedConte public void complete_SL_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } + public void complete_ESCAPE_JSP(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + // subclasses may override + } + public void complete_ESCAPE_ORDL(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + // subclasses may override + } public void complete_NUM(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLParser.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLParser.java index cd6ee1a..b15ee91 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLParser.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLParser.java @@ -16,7 +16,7 @@ public class RDLParser extends AbstractAntlrParser { @Override protected void setInitialHiddenTokens(XtextTokenStream tokenStream) { - tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT"); + tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ESCAPE_JSP", "RULE_ESCAPE_ORDL"); } diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.g b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.g index cfa6149..5c23436 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.g +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.g @@ -3576,10 +3576,14 @@ RULE_ID : '\\'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_WS : (' '|'\t'|'\r'|'\n')+; -RULE_ML_COMMENT : ('/*' ( options {greedy=false;} : . )*'*/'|'<%' ( options {greedy=false;} : . )*'%>'|'(' ( options {greedy=false;} : . )*')'); +RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/'; RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; +RULE_ESCAPE_JSP : '<%' ( options {greedy=false;} : . )*'%>'; + +RULE_ESCAPE_ORDL : '(' ( options {greedy=false;} : . )*')'; + RULE_NUM : (('0'..'9')+ '\'b' ('0'|'1'|'_')+|('0'..'9')+ '\'o' ('0'..'7'|'_')+|('0'..'9')+ '\'h' ('0'..'9'|'a'..'f'|'A'..'F'|'_')+|('0'..'9')+ '\'d' ('0'..'9'|'_')+|'0x' ('0'..'9'|'a'..'f'|'A'..'F')+|('0'..'9')+); RULE_STR : '"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'; diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.tokens b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.tokens index 585e1dd..ba0d5ba 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.tokens +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.tokens @@ -1,126 +1,128 @@ -'%='=28 -'+='=27 -','=25 -'->'=32 -'.'=33 -':'=30 -';'=15 -'='=14 -'@'=26 -'UNDEFINED'=119 -'['=29 -']'=31 -'`include'=10 -'accesswidth'=103 -'activehigh'=83 -'activelow'=84 -'addressing'=106 -'addrmap'=40 -'alias'=24 -'alignment'=99 -'all'=46 -'anded'=63 -'arbiter'=47 -'async'=80 -'bigendian'=72 -'boolean'=39 -'bothedge'=130 -'bridge'=75 -'clock'=110 -'compact'=125 -'component'=20 -'counter'=66 -'cpuif_reset'=81 -'decr'=88 -'decrsaturate'=94 -'decrthreshold'=96 -'decrvalue'=92 -'decrwidth'=90 -'default'=17 -'desc'=36 -'dontcompare'=97 -'donttest'=98 -'enable'=112 -'encode'=108 -'enum'=34 -'errextbus'=69 -'external'=22 -'false'=19 -'field'=43 -'field_reset'=82 -'fieldwidth'=101 -'fullalign'=127 -'halt'=117 -'haltenable'=116 -'haltmask'=115 -'hw'=105 -'hwclr'=57 -'hwenable'=113 -'hwmask'=114 -'hwset'=56 -'incr'=87 -'incrvalue'=91 -'incrwidth'=89 -'internal'=23 -'intr'=62 -'level'=131 -'littleendian'=71 -'lsb0'=78 -'mask'=111 -'msb0'=77 -'na'=124 -'name'=35 -'negedge'=129 -'next'=118 -'nonsticky'=132 -'number'=38 -'ored'=64 -'overflow'=67 -'posedge'=128 -'precedence'=107 -'property'=11 -'r'=122 -'rclr'=49 -'ref'=44 -'reg'=41 -'regalign'=126 -'regfile'=42 -'regwidth'=100 -'reset'=70 -'resetsignal'=109 -'rset'=48 -'rsvdset'=73 -'rsvdsetX'=74 -'rw'=120 -'saturate'=93 -'shared'=76 -'sharedextbus'=68 -'signal'=45 -'signalwidth'=102 -'singlepulse'=85 -'sticky'=60 -'stickybit'=61 -'string'=37 -'sw'=104 -'swacc'=59 -'swmod'=58 -'swwe'=54 -'swwel'=55 -'sync'=79 -'threshold'=95 -'true'=18 -'type'=13 -'underflow'=86 -'w'=123 -'we'=52 -'wel'=53 -'woclr'=50 -'woset'=51 -'wr'=121 -'xored'=65 -'{'=12 -'|'=21 -'}'=16 +'%='=30 +'+='=29 +','=27 +'->'=34 +'.'=35 +':'=32 +';'=17 +'='=16 +'@'=28 +'UNDEFINED'=121 +'['=31 +']'=33 +'`include'=12 +'accesswidth'=105 +'activehigh'=85 +'activelow'=86 +'addressing'=108 +'addrmap'=42 +'alias'=26 +'alignment'=101 +'all'=48 +'anded'=65 +'arbiter'=49 +'async'=82 +'bigendian'=74 +'boolean'=41 +'bothedge'=132 +'bridge'=77 +'clock'=112 +'compact'=127 +'component'=22 +'counter'=68 +'cpuif_reset'=83 +'decr'=90 +'decrsaturate'=96 +'decrthreshold'=98 +'decrvalue'=94 +'decrwidth'=92 +'default'=19 +'desc'=38 +'dontcompare'=99 +'donttest'=100 +'enable'=114 +'encode'=110 +'enum'=36 +'errextbus'=71 +'external'=24 +'false'=21 +'field'=45 +'field_reset'=84 +'fieldwidth'=103 +'fullalign'=129 +'halt'=119 +'haltenable'=118 +'haltmask'=117 +'hw'=107 +'hwclr'=59 +'hwenable'=115 +'hwmask'=116 +'hwset'=58 +'incr'=89 +'incrvalue'=93 +'incrwidth'=91 +'internal'=25 +'intr'=64 +'level'=133 +'littleendian'=73 +'lsb0'=80 +'mask'=113 +'msb0'=79 +'na'=126 +'name'=37 +'negedge'=131 +'next'=120 +'nonsticky'=134 +'number'=40 +'ored'=66 +'overflow'=69 +'posedge'=130 +'precedence'=109 +'property'=13 +'r'=124 +'rclr'=51 +'ref'=46 +'reg'=43 +'regalign'=128 +'regfile'=44 +'regwidth'=102 +'reset'=72 +'resetsignal'=111 +'rset'=50 +'rsvdset'=75 +'rsvdsetX'=76 +'rw'=122 +'saturate'=95 +'shared'=78 +'sharedextbus'=70 +'signal'=47 +'signalwidth'=104 +'singlepulse'=87 +'sticky'=62 +'stickybit'=63 +'string'=39 +'sw'=106 +'swacc'=61 +'swmod'=60 +'swwe'=56 +'swwel'=57 +'sync'=81 +'threshold'=97 +'true'=20 +'type'=15 +'underflow'=88 +'w'=125 +'we'=54 +'wel'=55 +'woclr'=52 +'woset'=53 +'wr'=123 +'xored'=67 +'{'=14 +'|'=23 +'}'=18 +RULE_ESCAPE_JSP=10 +RULE_ESCAPE_ORDL=11 RULE_ID=5 RULE_ML_COMMENT=8 RULE_NUM=6 @@ -137,7 +139,6 @@ T__106=106 T__107=107 T__108=108 T__109=109 -T__10=10 T__110=110 T__111=111 T__112=112 @@ -148,7 +149,6 @@ T__116=116 T__117=117 T__118=118 T__119=119 -T__11=11 T__120=120 T__121=121 T__122=122 @@ -163,6 +163,8 @@ T__12=12 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/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDLLexer.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDLLexer.java index 74a2fa2..a79e115 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDLLexer.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDLLexer.java @@ -22,9 +22,11 @@ public class InternalRDLLexer extends Lexer { public static final int T__52=52; public static final int T__53=53; public static final int T__54=54; + public static final int T__133=133; 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=5; public static final int T__131=131; public static final int T__130=130; @@ -76,7 +78,6 @@ public class InternalRDLLexer extends Lexer { public static final int T__16=16; public static final int T__17=17; public static final int T__18=18; - public static final int T__11=11; public static final int T__99=99; public static final int RULE_NUM=6; public static final int T__12=12; @@ -85,8 +86,8 @@ public class InternalRDLLexer extends Lexer { public static final int T__95=95; public static final int T__96=96; public static final int T__97=97; - public static final int T__10=10; public static final int T__98=98; + public static final int RULE_ESCAPE_ORDL=11; public static final int T__26=26; public static final int T__27=27; public static final int T__28=28; @@ -124,6 +125,7 @@ public class InternalRDLLexer extends Lexer { public static final int T__111=111; public static final int T__81=81; public static final int T__110=110; + public static final int RULE_ESCAPE_JSP=10; public static final int T__82=82; public static final int T__113=113; public static final int T__83=83; @@ -156,10 +158,10 @@ public class InternalRDLLexer extends Lexer { } public String getGrammarFileName() { return "InternalRDL.g"; } - // $ANTLR start "T__10" - public final void mT__10() throws RecognitionException { + // $ANTLR start "T__12" + public final void mT__12() throws RecognitionException { try { - int _type = T__10; + int _type = T__12; int _channel = DEFAULT_TOKEN_CHANNEL; // InternalRDL.g:11:7: ( '`include' ) // InternalRDL.g:11:9: '`include' @@ -167,47 +169,6 @@ public class InternalRDLLexer extends Lexer { match("`include"); - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "T__10" - - // $ANTLR start "T__11" - public final void mT__11() throws RecognitionException { - try { - int _type = T__11; - int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:12:7: ( 'property' ) - // InternalRDL.g:12:9: 'property' - { - match("property"); - - - } - - state.type = _type; - state.channel = _channel; - } - finally { - } - } - // $ANTLR end "T__11" - - // $ANTLR start "T__12" - public final void mT__12() throws RecognitionException { - try { - int _type = T__12; - int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:13:7: ( '{' ) - // InternalRDL.g:13:9: '{' - { - match('{'); - } state.type = _type; @@ -223,10 +184,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__13; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:14:7: ( 'type' ) - // InternalRDL.g:14:9: 'type' + // InternalRDL.g:12:7: ( 'property' ) + // InternalRDL.g:12:9: 'property' { - match("type"); + match("property"); } @@ -244,10 +205,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__14; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:15:7: ( '=' ) - // InternalRDL.g:15:9: '=' + // InternalRDL.g:13:7: ( '{' ) + // InternalRDL.g:13:9: '{' { - match('='); + match('{'); } @@ -264,10 +225,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__15; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:16:7: ( ';' ) - // InternalRDL.g:16:9: ';' + // InternalRDL.g:14:7: ( 'type' ) + // InternalRDL.g:14:9: 'type' { - match(';'); + match("type"); + } @@ -284,10 +246,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__16; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:17:7: ( '}' ) - // InternalRDL.g:17:9: '}' + // InternalRDL.g:15:7: ( '=' ) + // InternalRDL.g:15:9: '=' { - match('}'); + match('='); } @@ -304,11 +266,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__17; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:18:7: ( 'default' ) - // InternalRDL.g:18:9: 'default' + // InternalRDL.g:16:7: ( ';' ) + // InternalRDL.g:16:9: ';' { - match("default"); - + match(';'); } @@ -325,11 +286,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__18; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:19:7: ( 'true' ) - // InternalRDL.g:19:9: 'true' + // InternalRDL.g:17:7: ( '}' ) + // InternalRDL.g:17:9: '}' { - match("true"); - + match('}'); } @@ -346,10 +306,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__19; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:20:7: ( 'false' ) - // InternalRDL.g:20:9: 'false' + // InternalRDL.g:18:7: ( 'default' ) + // InternalRDL.g:18:9: 'default' { - match("false"); + match("default"); } @@ -367,10 +327,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__20; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:21:7: ( 'component' ) - // InternalRDL.g:21:9: 'component' + // InternalRDL.g:19:7: ( 'true' ) + // InternalRDL.g:19:9: 'true' { - match("component"); + match("true"); } @@ -388,10 +348,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__21; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:22:7: ( '|' ) - // InternalRDL.g:22:9: '|' + // InternalRDL.g:20:7: ( 'false' ) + // InternalRDL.g:20:9: 'false' { - match('|'); + match("false"); + } @@ -408,10 +369,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__22; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:23:7: ( 'external' ) - // InternalRDL.g:23:9: 'external' + // InternalRDL.g:21:7: ( 'component' ) + // InternalRDL.g:21:9: 'component' { - match("external"); + match("component"); } @@ -429,11 +390,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__23; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:24:7: ( 'internal' ) - // InternalRDL.g:24:9: 'internal' + // InternalRDL.g:22:7: ( '|' ) + // InternalRDL.g:22:9: '|' { - match("internal"); - + match('|'); } @@ -450,10 +410,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__24; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:25:7: ( 'alias' ) - // InternalRDL.g:25:9: 'alias' + // InternalRDL.g:23:7: ( 'external' ) + // InternalRDL.g:23:9: 'external' { - match("alias"); + match("external"); } @@ -471,10 +431,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__25; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:26:7: ( ',' ) - // InternalRDL.g:26:9: ',' + // InternalRDL.g:24:7: ( 'internal' ) + // InternalRDL.g:24:9: 'internal' { - match(','); + match("internal"); + } @@ -491,10 +452,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__26; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:27:7: ( '@' ) - // InternalRDL.g:27:9: '@' + // InternalRDL.g:25:7: ( 'alias' ) + // InternalRDL.g:25:9: 'alias' { - match('@'); + match("alias"); + } @@ -511,11 +473,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__27; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:28:7: ( '+=' ) - // InternalRDL.g:28:9: '+=' + // InternalRDL.g:26:7: ( ',' ) + // InternalRDL.g:26:9: ',' { - match("+="); - + match(','); } @@ -532,11 +493,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__28; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:29:7: ( '%=' ) - // InternalRDL.g:29:9: '%=' + // InternalRDL.g:27:7: ( '@' ) + // InternalRDL.g:27:9: '@' { - match("%="); - + match('@'); } @@ -553,10 +513,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__29; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:30:7: ( '[' ) - // InternalRDL.g:30:9: '[' + // InternalRDL.g:28:7: ( '+=' ) + // InternalRDL.g:28:9: '+=' { - match('['); + match("+="); + } @@ -573,10 +534,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__30; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:31:7: ( ':' ) - // InternalRDL.g:31:9: ':' + // InternalRDL.g:29:7: ( '%=' ) + // InternalRDL.g:29:9: '%=' { - match(':'); + match("%="); + } @@ -593,10 +555,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__31; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:32:7: ( ']' ) - // InternalRDL.g:32:9: ']' + // InternalRDL.g:30:7: ( '[' ) + // InternalRDL.g:30:9: '[' { - match(']'); + match('['); } @@ -613,11 +575,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__32; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:33:7: ( '->' ) - // InternalRDL.g:33:9: '->' + // InternalRDL.g:31:7: ( ':' ) + // InternalRDL.g:31:9: ':' { - match("->"); - + match(':'); } @@ -634,10 +595,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__33; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:34:7: ( '.' ) - // InternalRDL.g:34:9: '.' + // InternalRDL.g:32:7: ( ']' ) + // InternalRDL.g:32:9: ']' { - match('.'); + match(']'); } @@ -654,10 +615,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__34; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:35:7: ( 'enum' ) - // InternalRDL.g:35:9: 'enum' + // InternalRDL.g:33:7: ( '->' ) + // InternalRDL.g:33:9: '->' { - match("enum"); + match("->"); } @@ -675,11 +636,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__35; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:36:7: ( 'name' ) - // InternalRDL.g:36:9: 'name' + // InternalRDL.g:34:7: ( '.' ) + // InternalRDL.g:34:9: '.' { - match("name"); - + match('.'); } @@ -696,10 +656,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__36; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:37:7: ( 'desc' ) - // InternalRDL.g:37:9: 'desc' + // InternalRDL.g:35:7: ( 'enum' ) + // InternalRDL.g:35:9: 'enum' { - match("desc"); + match("enum"); } @@ -717,10 +677,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__37; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:38:7: ( 'string' ) - // InternalRDL.g:38:9: 'string' + // InternalRDL.g:36:7: ( 'name' ) + // InternalRDL.g:36:9: 'name' { - match("string"); + match("name"); } @@ -738,10 +698,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__38; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:39:7: ( 'number' ) - // InternalRDL.g:39:9: 'number' + // InternalRDL.g:37:7: ( 'desc' ) + // InternalRDL.g:37:9: 'desc' { - match("number"); + match("desc"); } @@ -759,10 +719,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__39; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:40:7: ( 'boolean' ) - // InternalRDL.g:40:9: 'boolean' + // InternalRDL.g:38:7: ( 'string' ) + // InternalRDL.g:38:9: 'string' { - match("boolean"); + match("string"); } @@ -780,10 +740,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__40; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:41:7: ( 'addrmap' ) - // InternalRDL.g:41:9: 'addrmap' + // InternalRDL.g:39:7: ( 'number' ) + // InternalRDL.g:39:9: 'number' { - match("addrmap"); + match("number"); } @@ -801,10 +761,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__41; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:42:7: ( 'reg' ) - // InternalRDL.g:42:9: 'reg' + // InternalRDL.g:40:7: ( 'boolean' ) + // InternalRDL.g:40:9: 'boolean' { - match("reg"); + match("boolean"); } @@ -822,10 +782,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__42; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:43:7: ( 'regfile' ) - // InternalRDL.g:43:9: 'regfile' + // InternalRDL.g:41:7: ( 'addrmap' ) + // InternalRDL.g:41:9: 'addrmap' { - match("regfile"); + match("addrmap"); } @@ -843,10 +803,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__43; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:44:7: ( 'field' ) - // InternalRDL.g:44:9: 'field' + // InternalRDL.g:42:7: ( 'reg' ) + // InternalRDL.g:42:9: 'reg' { - match("field"); + match("reg"); } @@ -864,10 +824,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__44; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:45:7: ( 'ref' ) - // InternalRDL.g:45:9: 'ref' + // InternalRDL.g:43:7: ( 'regfile' ) + // InternalRDL.g:43:9: 'regfile' { - match("ref"); + match("regfile"); } @@ -885,10 +845,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__45; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:46:7: ( 'signal' ) - // InternalRDL.g:46:9: 'signal' + // InternalRDL.g:44:7: ( 'field' ) + // InternalRDL.g:44:9: 'field' { - match("signal"); + match("field"); } @@ -906,10 +866,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__46; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:47:7: ( 'all' ) - // InternalRDL.g:47:9: 'all' + // InternalRDL.g:45:7: ( 'ref' ) + // InternalRDL.g:45:9: 'ref' { - match("all"); + match("ref"); } @@ -927,10 +887,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__47; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:48:7: ( 'arbiter' ) - // InternalRDL.g:48:9: 'arbiter' + // InternalRDL.g:46:7: ( 'signal' ) + // InternalRDL.g:46:9: 'signal' { - match("arbiter"); + match("signal"); } @@ -948,10 +908,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__48; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:49:7: ( 'rset' ) - // InternalRDL.g:49:9: 'rset' + // InternalRDL.g:47:7: ( 'all' ) + // InternalRDL.g:47:9: 'all' { - match("rset"); + match("all"); } @@ -969,10 +929,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__49; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:50:7: ( 'rclr' ) - // InternalRDL.g:50:9: 'rclr' + // InternalRDL.g:48:7: ( 'arbiter' ) + // InternalRDL.g:48:9: 'arbiter' { - match("rclr"); + match("arbiter"); } @@ -990,10 +950,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__50; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:51:7: ( 'woclr' ) - // InternalRDL.g:51:9: 'woclr' + // InternalRDL.g:49:7: ( 'rset' ) + // InternalRDL.g:49:9: 'rset' { - match("woclr"); + match("rset"); } @@ -1011,10 +971,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__51; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:52:7: ( 'woset' ) - // InternalRDL.g:52:9: 'woset' + // InternalRDL.g:50:7: ( 'rclr' ) + // InternalRDL.g:50:9: 'rclr' { - match("woset"); + match("rclr"); } @@ -1032,10 +992,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__52; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:53:7: ( 'we' ) - // InternalRDL.g:53:9: 'we' + // InternalRDL.g:51:7: ( 'woclr' ) + // InternalRDL.g:51:9: 'woclr' { - match("we"); + match("woclr"); } @@ -1053,10 +1013,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__53; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:54:7: ( 'wel' ) - // InternalRDL.g:54:9: 'wel' + // InternalRDL.g:52:7: ( 'woset' ) + // InternalRDL.g:52:9: 'woset' { - match("wel"); + match("woset"); } @@ -1074,10 +1034,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__54; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:55:7: ( 'swwe' ) - // InternalRDL.g:55:9: 'swwe' + // InternalRDL.g:53:7: ( 'we' ) + // InternalRDL.g:53:9: 'we' { - match("swwe"); + match("we"); } @@ -1095,10 +1055,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__55; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:56:7: ( 'swwel' ) - // InternalRDL.g:56:9: 'swwel' + // InternalRDL.g:54:7: ( 'wel' ) + // InternalRDL.g:54:9: 'wel' { - match("swwel"); + match("wel"); } @@ -1116,10 +1076,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__56; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:57:7: ( 'hwset' ) - // InternalRDL.g:57:9: 'hwset' + // InternalRDL.g:55:7: ( 'swwe' ) + // InternalRDL.g:55:9: 'swwe' { - match("hwset"); + match("swwe"); } @@ -1137,10 +1097,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__57; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:58:7: ( 'hwclr' ) - // InternalRDL.g:58:9: 'hwclr' + // InternalRDL.g:56:7: ( 'swwel' ) + // InternalRDL.g:56:9: 'swwel' { - match("hwclr"); + match("swwel"); } @@ -1158,10 +1118,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__58; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:59:7: ( 'swmod' ) - // InternalRDL.g:59:9: 'swmod' + // InternalRDL.g:57:7: ( 'hwset' ) + // InternalRDL.g:57:9: 'hwset' { - match("swmod"); + match("hwset"); } @@ -1179,10 +1139,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__59; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:60:7: ( 'swacc' ) - // InternalRDL.g:60:9: 'swacc' + // InternalRDL.g:58:7: ( 'hwclr' ) + // InternalRDL.g:58:9: 'hwclr' { - match("swacc"); + match("hwclr"); } @@ -1200,10 +1160,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__60; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:61:7: ( 'sticky' ) - // InternalRDL.g:61:9: 'sticky' + // InternalRDL.g:59:7: ( 'swmod' ) + // InternalRDL.g:59:9: 'swmod' { - match("sticky"); + match("swmod"); } @@ -1221,10 +1181,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__61; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:62:7: ( 'stickybit' ) - // InternalRDL.g:62:9: 'stickybit' + // InternalRDL.g:60:7: ( 'swacc' ) + // InternalRDL.g:60:9: 'swacc' { - match("stickybit"); + match("swacc"); } @@ -1242,10 +1202,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__62; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:63:7: ( 'intr' ) - // InternalRDL.g:63:9: 'intr' + // InternalRDL.g:61:7: ( 'sticky' ) + // InternalRDL.g:61:9: 'sticky' { - match("intr"); + match("sticky"); } @@ -1263,10 +1223,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__63; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:64:7: ( 'anded' ) - // InternalRDL.g:64:9: 'anded' + // InternalRDL.g:62:7: ( 'stickybit' ) + // InternalRDL.g:62:9: 'stickybit' { - match("anded"); + match("stickybit"); } @@ -1284,10 +1244,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__64; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:65:7: ( 'ored' ) - // InternalRDL.g:65:9: 'ored' + // InternalRDL.g:63:7: ( 'intr' ) + // InternalRDL.g:63:9: 'intr' { - match("ored"); + match("intr"); } @@ -1305,10 +1265,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__65; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:66:7: ( 'xored' ) - // InternalRDL.g:66:9: 'xored' + // InternalRDL.g:64:7: ( 'anded' ) + // InternalRDL.g:64:9: 'anded' { - match("xored"); + match("anded"); } @@ -1326,10 +1286,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__66; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:67:7: ( 'counter' ) - // InternalRDL.g:67:9: 'counter' + // InternalRDL.g:65:7: ( 'ored' ) + // InternalRDL.g:65:9: 'ored' { - match("counter"); + match("ored"); } @@ -1347,10 +1307,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__67; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:68:7: ( 'overflow' ) - // InternalRDL.g:68:9: 'overflow' + // InternalRDL.g:66:7: ( 'xored' ) + // InternalRDL.g:66:9: 'xored' { - match("overflow"); + match("xored"); } @@ -1368,10 +1328,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__68; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:69:7: ( 'sharedextbus' ) - // InternalRDL.g:69:9: 'sharedextbus' + // InternalRDL.g:67:7: ( 'counter' ) + // InternalRDL.g:67:9: 'counter' { - match("sharedextbus"); + match("counter"); } @@ -1389,10 +1349,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__69; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:70:7: ( 'errextbus' ) - // InternalRDL.g:70:9: 'errextbus' + // InternalRDL.g:68:7: ( 'overflow' ) + // InternalRDL.g:68:9: 'overflow' { - match("errextbus"); + match("overflow"); } @@ -1410,10 +1370,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__70; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:71:7: ( 'reset' ) - // InternalRDL.g:71:9: 'reset' + // InternalRDL.g:69:7: ( 'sharedextbus' ) + // InternalRDL.g:69:9: 'sharedextbus' { - match("reset"); + match("sharedextbus"); } @@ -1431,10 +1391,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__71; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:72:7: ( 'littleendian' ) - // InternalRDL.g:72:9: 'littleendian' + // InternalRDL.g:70:7: ( 'errextbus' ) + // InternalRDL.g:70:9: 'errextbus' { - match("littleendian"); + match("errextbus"); } @@ -1452,10 +1412,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__72; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:73:7: ( 'bigendian' ) - // InternalRDL.g:73:9: 'bigendian' + // InternalRDL.g:71:7: ( 'reset' ) + // InternalRDL.g:71:9: 'reset' { - match("bigendian"); + match("reset"); } @@ -1473,10 +1433,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__73; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:74:7: ( 'rsvdset' ) - // InternalRDL.g:74:9: 'rsvdset' + // InternalRDL.g:72:7: ( 'littleendian' ) + // InternalRDL.g:72:9: 'littleendian' { - match("rsvdset"); + match("littleendian"); } @@ -1494,10 +1454,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__74; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:75:7: ( 'rsvdsetX' ) - // InternalRDL.g:75:9: 'rsvdsetX' + // InternalRDL.g:73:7: ( 'bigendian' ) + // InternalRDL.g:73:9: 'bigendian' { - match("rsvdsetX"); + match("bigendian"); } @@ -1515,10 +1475,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__75; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:76:7: ( 'bridge' ) - // InternalRDL.g:76:9: 'bridge' + // InternalRDL.g:74:7: ( 'rsvdset' ) + // InternalRDL.g:74:9: 'rsvdset' { - match("bridge"); + match("rsvdset"); } @@ -1536,10 +1496,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__76; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:77:7: ( 'shared' ) - // InternalRDL.g:77:9: 'shared' + // InternalRDL.g:75:7: ( 'rsvdsetX' ) + // InternalRDL.g:75:9: 'rsvdsetX' { - match("shared"); + match("rsvdsetX"); } @@ -1557,10 +1517,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__77; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:78:7: ( 'msb0' ) - // InternalRDL.g:78:9: 'msb0' + // InternalRDL.g:76:7: ( 'bridge' ) + // InternalRDL.g:76:9: 'bridge' { - match("msb0"); + match("bridge"); } @@ -1578,10 +1538,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__78; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:79:7: ( 'lsb0' ) - // InternalRDL.g:79:9: 'lsb0' + // InternalRDL.g:77:7: ( 'shared' ) + // InternalRDL.g:77:9: 'shared' { - match("lsb0"); + match("shared"); } @@ -1599,10 +1559,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__79; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:80:7: ( 'sync' ) - // InternalRDL.g:80:9: 'sync' + // InternalRDL.g:78:7: ( 'msb0' ) + // InternalRDL.g:78:9: 'msb0' { - match("sync"); + match("msb0"); } @@ -1620,10 +1580,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__80; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:81:7: ( 'async' ) - // InternalRDL.g:81:9: 'async' + // InternalRDL.g:79:7: ( 'lsb0' ) + // InternalRDL.g:79:9: 'lsb0' { - match("async"); + match("lsb0"); } @@ -1641,10 +1601,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__81; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:82:7: ( 'cpuif_reset' ) - // InternalRDL.g:82:9: 'cpuif_reset' + // InternalRDL.g:80:7: ( 'sync' ) + // InternalRDL.g:80:9: 'sync' { - match("cpuif_reset"); + match("sync"); } @@ -1662,10 +1622,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__82; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:83:7: ( 'field_reset' ) - // InternalRDL.g:83:9: 'field_reset' + // InternalRDL.g:81:7: ( 'async' ) + // InternalRDL.g:81:9: 'async' { - match("field_reset"); + match("async"); } @@ -1683,10 +1643,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__83; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:84:7: ( 'activehigh' ) - // InternalRDL.g:84:9: 'activehigh' + // InternalRDL.g:82:7: ( 'cpuif_reset' ) + // InternalRDL.g:82:9: 'cpuif_reset' { - match("activehigh"); + match("cpuif_reset"); } @@ -1704,10 +1664,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__84; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:85:7: ( 'activelow' ) - // InternalRDL.g:85:9: 'activelow' + // InternalRDL.g:83:7: ( 'field_reset' ) + // InternalRDL.g:83:9: 'field_reset' { - match("activelow"); + match("field_reset"); } @@ -1725,10 +1685,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__85; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:86:7: ( 'singlepulse' ) - // InternalRDL.g:86:9: 'singlepulse' + // InternalRDL.g:84:7: ( 'activehigh' ) + // InternalRDL.g:84:9: 'activehigh' { - match("singlepulse"); + match("activehigh"); } @@ -1746,10 +1706,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__86; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:87:7: ( 'underflow' ) - // InternalRDL.g:87:9: 'underflow' + // InternalRDL.g:85:7: ( 'activelow' ) + // InternalRDL.g:85:9: 'activelow' { - match("underflow"); + match("activelow"); } @@ -1767,10 +1727,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__87; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:88:7: ( 'incr' ) - // InternalRDL.g:88:9: 'incr' + // InternalRDL.g:86:7: ( 'singlepulse' ) + // InternalRDL.g:86:9: 'singlepulse' { - match("incr"); + match("singlepulse"); } @@ -1788,10 +1748,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__88; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:89:7: ( 'decr' ) - // InternalRDL.g:89:9: 'decr' + // InternalRDL.g:87:7: ( 'underflow' ) + // InternalRDL.g:87:9: 'underflow' { - match("decr"); + match("underflow"); } @@ -1809,10 +1769,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__89; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:90:7: ( 'incrwidth' ) - // InternalRDL.g:90:9: 'incrwidth' + // InternalRDL.g:88:7: ( 'incr' ) + // InternalRDL.g:88:9: 'incr' { - match("incrwidth"); + match("incr"); } @@ -1830,10 +1790,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__90; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:91:7: ( 'decrwidth' ) - // InternalRDL.g:91:9: 'decrwidth' + // InternalRDL.g:89:7: ( 'decr' ) + // InternalRDL.g:89:9: 'decr' { - match("decrwidth"); + match("decr"); } @@ -1851,10 +1811,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__91; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:92:7: ( 'incrvalue' ) - // InternalRDL.g:92:9: 'incrvalue' + // InternalRDL.g:90:7: ( 'incrwidth' ) + // InternalRDL.g:90:9: 'incrwidth' { - match("incrvalue"); + match("incrwidth"); } @@ -1872,10 +1832,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__92; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:93:7: ( 'decrvalue' ) - // InternalRDL.g:93:9: 'decrvalue' + // InternalRDL.g:91:7: ( 'decrwidth' ) + // InternalRDL.g:91:9: 'decrwidth' { - match("decrvalue"); + match("decrwidth"); } @@ -1893,10 +1853,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__93; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:94:7: ( 'saturate' ) - // InternalRDL.g:94:9: 'saturate' + // InternalRDL.g:92:7: ( 'incrvalue' ) + // InternalRDL.g:92:9: 'incrvalue' { - match("saturate"); + match("incrvalue"); } @@ -1914,10 +1874,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__94; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:95:7: ( 'decrsaturate' ) - // InternalRDL.g:95:9: 'decrsaturate' + // InternalRDL.g:93:7: ( 'decrvalue' ) + // InternalRDL.g:93:9: 'decrvalue' { - match("decrsaturate"); + match("decrvalue"); } @@ -1935,10 +1895,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__95; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:96:7: ( 'threshold' ) - // InternalRDL.g:96:9: 'threshold' + // InternalRDL.g:94:7: ( 'saturate' ) + // InternalRDL.g:94:9: 'saturate' { - match("threshold"); + match("saturate"); } @@ -1956,10 +1916,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__96; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:97:7: ( 'decrthreshold' ) - // InternalRDL.g:97:9: 'decrthreshold' + // InternalRDL.g:95:7: ( 'decrsaturate' ) + // InternalRDL.g:95:9: 'decrsaturate' { - match("decrthreshold"); + match("decrsaturate"); } @@ -1977,10 +1937,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__97; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:98:7: ( 'dontcompare' ) - // InternalRDL.g:98:9: 'dontcompare' + // InternalRDL.g:96:7: ( 'threshold' ) + // InternalRDL.g:96:9: 'threshold' { - match("dontcompare"); + match("threshold"); } @@ -1998,10 +1958,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__98; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:99:7: ( 'donttest' ) - // InternalRDL.g:99:9: 'donttest' + // InternalRDL.g:97:7: ( 'decrthreshold' ) + // InternalRDL.g:97:9: 'decrthreshold' { - match("donttest"); + match("decrthreshold"); } @@ -2019,10 +1979,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__99; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:100:7: ( 'alignment' ) - // InternalRDL.g:100:9: 'alignment' + // InternalRDL.g:98:7: ( 'dontcompare' ) + // InternalRDL.g:98:9: 'dontcompare' { - match("alignment"); + match("dontcompare"); } @@ -2040,10 +2000,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__100; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:101:8: ( 'regwidth' ) - // InternalRDL.g:101:10: 'regwidth' + // InternalRDL.g:99:8: ( 'donttest' ) + // InternalRDL.g:99:10: 'donttest' { - match("regwidth"); + match("donttest"); } @@ -2061,10 +2021,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__101; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:102:8: ( 'fieldwidth' ) - // InternalRDL.g:102:10: 'fieldwidth' + // InternalRDL.g:100:8: ( 'alignment' ) + // InternalRDL.g:100:10: 'alignment' { - match("fieldwidth"); + match("alignment"); } @@ -2082,10 +2042,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__102; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:103:8: ( 'signalwidth' ) - // InternalRDL.g:103:10: 'signalwidth' + // InternalRDL.g:101:8: ( 'regwidth' ) + // InternalRDL.g:101:10: 'regwidth' { - match("signalwidth"); + match("regwidth"); } @@ -2103,10 +2063,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__103; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:104:8: ( 'accesswidth' ) - // InternalRDL.g:104:10: 'accesswidth' + // InternalRDL.g:102:8: ( 'fieldwidth' ) + // InternalRDL.g:102:10: 'fieldwidth' { - match("accesswidth"); + match("fieldwidth"); } @@ -2124,10 +2084,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__104; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:105:8: ( 'sw' ) - // InternalRDL.g:105:10: 'sw' + // InternalRDL.g:103:8: ( 'signalwidth' ) + // InternalRDL.g:103:10: 'signalwidth' { - match("sw"); + match("signalwidth"); } @@ -2145,10 +2105,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__105; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:106:8: ( 'hw' ) - // InternalRDL.g:106:10: 'hw' + // InternalRDL.g:104:8: ( 'accesswidth' ) + // InternalRDL.g:104:10: 'accesswidth' { - match("hw"); + match("accesswidth"); } @@ -2166,10 +2126,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__106; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:107:8: ( 'addressing' ) - // InternalRDL.g:107:10: 'addressing' + // InternalRDL.g:105:8: ( 'sw' ) + // InternalRDL.g:105:10: 'sw' { - match("addressing"); + match("sw"); } @@ -2187,10 +2147,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__107; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:108:8: ( 'precedence' ) - // InternalRDL.g:108:10: 'precedence' + // InternalRDL.g:106:8: ( 'hw' ) + // InternalRDL.g:106:10: 'hw' { - match("precedence"); + match("hw"); } @@ -2208,10 +2168,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__108; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:109:8: ( 'encode' ) - // InternalRDL.g:109:10: 'encode' + // InternalRDL.g:107:8: ( 'addressing' ) + // InternalRDL.g:107:10: 'addressing' { - match("encode"); + match("addressing"); } @@ -2229,10 +2189,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__109; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:110:8: ( 'resetsignal' ) - // InternalRDL.g:110:10: 'resetsignal' + // InternalRDL.g:108:8: ( 'precedence' ) + // InternalRDL.g:108:10: 'precedence' { - match("resetsignal"); + match("precedence"); } @@ -2250,10 +2210,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__110; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:111:8: ( 'clock' ) - // InternalRDL.g:111:10: 'clock' + // InternalRDL.g:109:8: ( 'encode' ) + // InternalRDL.g:109:10: 'encode' { - match("clock"); + match("encode"); } @@ -2271,10 +2231,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__111; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:112:8: ( 'mask' ) - // InternalRDL.g:112:10: 'mask' + // InternalRDL.g:110:8: ( 'resetsignal' ) + // InternalRDL.g:110:10: 'resetsignal' { - match("mask"); + match("resetsignal"); } @@ -2292,10 +2252,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__112; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:113:8: ( 'enable' ) - // InternalRDL.g:113:10: 'enable' + // InternalRDL.g:111:8: ( 'clock' ) + // InternalRDL.g:111:10: 'clock' { - match("enable"); + match("clock"); } @@ -2313,10 +2273,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__113; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:114:8: ( 'hwenable' ) - // InternalRDL.g:114:10: 'hwenable' + // InternalRDL.g:112:8: ( 'mask' ) + // InternalRDL.g:112:10: 'mask' { - match("hwenable"); + match("mask"); } @@ -2334,10 +2294,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__114; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:115:8: ( 'hwmask' ) - // InternalRDL.g:115:10: 'hwmask' + // InternalRDL.g:113:8: ( 'enable' ) + // InternalRDL.g:113:10: 'enable' { - match("hwmask"); + match("enable"); } @@ -2355,10 +2315,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__115; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:116:8: ( 'haltmask' ) - // InternalRDL.g:116:10: 'haltmask' + // InternalRDL.g:114:8: ( 'hwenable' ) + // InternalRDL.g:114:10: 'hwenable' { - match("haltmask"); + match("hwenable"); } @@ -2376,10 +2336,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__116; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:117:8: ( 'haltenable' ) - // InternalRDL.g:117:10: 'haltenable' + // InternalRDL.g:115:8: ( 'hwmask' ) + // InternalRDL.g:115:10: 'hwmask' { - match("haltenable"); + match("hwmask"); } @@ -2397,10 +2357,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__117; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:118:8: ( 'halt' ) - // InternalRDL.g:118:10: 'halt' + // InternalRDL.g:116:8: ( 'haltmask' ) + // InternalRDL.g:116:10: 'haltmask' { - match("halt"); + match("haltmask"); } @@ -2418,10 +2378,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__118; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:119:8: ( 'next' ) - // InternalRDL.g:119:10: 'next' + // InternalRDL.g:117:8: ( 'haltenable' ) + // InternalRDL.g:117:10: 'haltenable' { - match("next"); + match("haltenable"); } @@ -2439,10 +2399,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__119; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:120:8: ( 'UNDEFINED' ) - // InternalRDL.g:120:10: 'UNDEFINED' + // InternalRDL.g:118:8: ( 'halt' ) + // InternalRDL.g:118:10: 'halt' { - match("UNDEFINED"); + match("halt"); } @@ -2460,10 +2420,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__120; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:121:8: ( 'rw' ) - // InternalRDL.g:121:10: 'rw' + // InternalRDL.g:119:8: ( 'next' ) + // InternalRDL.g:119:10: 'next' { - match("rw"); + match("next"); } @@ -2481,10 +2441,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__121; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:122:8: ( 'wr' ) - // InternalRDL.g:122:10: 'wr' + // InternalRDL.g:120:8: ( 'UNDEFINED' ) + // InternalRDL.g:120:10: 'UNDEFINED' { - match("wr"); + match("UNDEFINED"); } @@ -2502,10 +2462,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__122; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:123:8: ( 'r' ) - // InternalRDL.g:123:10: 'r' + // InternalRDL.g:121:8: ( 'rw' ) + // InternalRDL.g:121:10: 'rw' { - match('r'); + match("rw"); + } @@ -2522,10 +2483,11 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__123; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:124:8: ( 'w' ) - // InternalRDL.g:124:10: 'w' + // InternalRDL.g:122:8: ( 'wr' ) + // InternalRDL.g:122:10: 'wr' { - match('w'); + match("wr"); + } @@ -2542,11 +2504,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__124; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:125:8: ( 'na' ) - // InternalRDL.g:125:10: 'na' + // InternalRDL.g:123:8: ( 'r' ) + // InternalRDL.g:123:10: 'r' { - match("na"); - + match('r'); } @@ -2563,11 +2524,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__125; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:126:8: ( 'compact' ) - // InternalRDL.g:126:10: 'compact' + // InternalRDL.g:124:8: ( 'w' ) + // InternalRDL.g:124:10: 'w' { - match("compact"); - + match('w'); } @@ -2584,10 +2544,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__126; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:127:8: ( 'regalign' ) - // InternalRDL.g:127:10: 'regalign' + // InternalRDL.g:125:8: ( 'na' ) + // InternalRDL.g:125:10: 'na' { - match("regalign"); + match("na"); } @@ -2605,10 +2565,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__127; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:128:8: ( 'fullalign' ) - // InternalRDL.g:128:10: 'fullalign' + // InternalRDL.g:126:8: ( 'compact' ) + // InternalRDL.g:126:10: 'compact' { - match("fullalign"); + match("compact"); } @@ -2626,10 +2586,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__128; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:129:8: ( 'posedge' ) - // InternalRDL.g:129:10: 'posedge' + // InternalRDL.g:127:8: ( 'regalign' ) + // InternalRDL.g:127:10: 'regalign' { - match("posedge"); + match("regalign"); } @@ -2647,10 +2607,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__129; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:130:8: ( 'negedge' ) - // InternalRDL.g:130:10: 'negedge' + // InternalRDL.g:128:8: ( 'fullalign' ) + // InternalRDL.g:128:10: 'fullalign' { - match("negedge"); + match("fullalign"); } @@ -2668,10 +2628,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__130; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:131:8: ( 'bothedge' ) - // InternalRDL.g:131:10: 'bothedge' + // InternalRDL.g:129:8: ( 'posedge' ) + // InternalRDL.g:129:10: 'posedge' { - match("bothedge"); + match("posedge"); } @@ -2689,10 +2649,10 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__131; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:132:8: ( 'level' ) - // InternalRDL.g:132:10: 'level' + // InternalRDL.g:130:8: ( 'negedge' ) + // InternalRDL.g:130:10: 'negedge' { - match("level"); + match("negedge"); } @@ -2710,6 +2670,48 @@ public class InternalRDLLexer extends Lexer { try { int _type = T__132; int _channel = DEFAULT_TOKEN_CHANNEL; + // InternalRDL.g:131:8: ( 'bothedge' ) + // InternalRDL.g:131:10: 'bothedge' + { + match("bothedge"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__132" + + // $ANTLR start "T__133" + public final void mT__133() throws RecognitionException { + try { + int _type = T__133; + int _channel = DEFAULT_TOKEN_CHANNEL; + // InternalRDL.g:132:8: ( 'level' ) + // InternalRDL.g:132:10: 'level' + { + match("level"); + + + } + + 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; // InternalRDL.g:133:8: ( 'nonsticky' ) // InternalRDL.g:133:10: 'nonsticky' { @@ -2724,7 +2726,7 @@ public class InternalRDLLexer extends Lexer { finally { } } - // $ANTLR end "T__132" + // $ANTLR end "T__134" // $ANTLR start "RULE_ID" public final void mRULE_ID() throws RecognitionException { @@ -2867,167 +2869,49 @@ public class InternalRDLLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:3579:17: ( ( '/*' ( options {greedy=false; } : . )* '*/' | '<%' ( options {greedy=false; } : . )* '%>' | '(' ( options {greedy=false; } : . )* ')' ) ) - // InternalRDL.g:3579:19: ( '/*' ( options {greedy=false; } : . )* '*/' | '<%' ( options {greedy=false; } : . )* '%>' | '(' ( options {greedy=false; } : . )* ')' ) + // InternalRDL.g:3579:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalRDL.g:3579:19: '/*' ( options {greedy=false; } : . )* '*/' { - // InternalRDL.g:3579:19: ( '/*' ( options {greedy=false; } : . )* '*/' | '<%' ( options {greedy=false; } : . )* '%>' | '(' ( options {greedy=false; } : . )* ')' ) - int alt7=3; - switch ( input.LA(1) ) { - case '/': - { - alt7=1; - } - break; - case '<': - { - alt7=2; - } - break; - case '(': - { - alt7=3; - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("", 7, 0, input); + match("/*"); - throw nvae; - } - - switch (alt7) { - case 1 : - // InternalRDL.g:3579:20: '/*' ( options {greedy=false; } : . )* '*/' - { - match("/*"); - - // InternalRDL.g:3579:25: ( options {greedy=false; } : . )* - loop4: - do { - int alt4=2; - int LA4_0 = input.LA(1); - - if ( (LA4_0=='*') ) { - int LA4_1 = input.LA(2); - - if ( (LA4_1=='/') ) { - alt4=2; - } - else if ( ((LA4_1>='\u0000' && LA4_1<='.')||(LA4_1>='0' && LA4_1<='\uFFFF')) ) { - alt4=1; - } - - - } - else if ( ((LA4_0>='\u0000' && LA4_0<=')')||(LA4_0>='+' && LA4_0<='\uFFFF')) ) { - alt4=1; - } - - - switch (alt4) { - case 1 : - // InternalRDL.g:3579:53: . - { - matchAny(); - - } - break; - - default : - break loop4; - } - } while (true); - - match("*/"); + // InternalRDL.g:3579:24: ( options {greedy=false; } : . )* + loop4: + do { + int alt4=2; + int LA4_0 = input.LA(1); + if ( (LA4_0=='*') ) { + int LA4_1 = input.LA(2); + if ( (LA4_1=='/') ) { + alt4=2; } - break; - case 2 : - // InternalRDL.g:3579:62: '<%' ( options {greedy=false; } : . )* '%>' - { - match("<%"); - - // InternalRDL.g:3579:67: ( options {greedy=false; } : . )* - loop5: - do { - int alt5=2; - int LA5_0 = input.LA(1); - - if ( (LA5_0=='%') ) { - int LA5_1 = input.LA(2); - - if ( (LA5_1=='>') ) { - alt5=2; - } - else if ( ((LA5_1>='\u0000' && LA5_1<='=')||(LA5_1>='?' && LA5_1<='\uFFFF')) ) { - alt5=1; - } - - - } - else if ( ((LA5_0>='\u0000' && LA5_0<='$')||(LA5_0>='&' && LA5_0<='\uFFFF')) ) { - alt5=1; - } - - - switch (alt5) { - case 1 : - // InternalRDL.g:3579:95: . - { - matchAny(); - - } - break; - - default : - break loop5; - } - } while (true); - - match("%>"); - - + else if ( ((LA4_1>='\u0000' && LA4_1<='.')||(LA4_1>='0' && LA4_1<='\uFFFF')) ) { + alt4=1; } - break; - case 3 : - // InternalRDL.g:3579:104: '(' ( options {greedy=false; } : . )* ')' - { - match('('); - // InternalRDL.g:3579:108: ( options {greedy=false; } : . )* - loop6: - do { - int alt6=2; - int LA6_0 = input.LA(1); - - if ( (LA6_0==')') ) { - alt6=2; - } - else if ( ((LA6_0>='\u0000' && LA6_0<='(')||(LA6_0>='*' && LA6_0<='\uFFFF')) ) { - alt6=1; - } - switch (alt6) { - case 1 : - // InternalRDL.g:3579:136: . - { - matchAny(); + } + else if ( ((LA4_0>='\u0000' && LA4_0<=')')||(LA4_0>='+' && LA4_0<='\uFFFF')) ) { + alt4=1; + } - } - break; - default : - break loop6; - } - } while (true); + switch (alt4) { + case 1 : + // InternalRDL.g:3579:52: . + { + matchAny(); - match(')'); + } + break; - } - break; + default : + break loop4; + } + } while (true); - } + match("*/"); } @@ -3051,17 +2935,17 @@ public class InternalRDLLexer extends Lexer { match("//"); // InternalRDL.g:3581:24: (~ ( ( '\\n' | '\\r' ) ) )* - loop8: + loop5: do { - int alt8=2; - int LA8_0 = input.LA(1); + int alt5=2; + int LA5_0 = input.LA(1); - if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) { - alt8=1; + if ( ((LA5_0>='\u0000' && LA5_0<='\t')||(LA5_0>='\u000B' && LA5_0<='\f')||(LA5_0>='\u000E' && LA5_0<='\uFFFF')) ) { + alt5=1; } - switch (alt8) { + switch (alt5) { case 1 : // InternalRDL.g:3581:24: ~ ( ( '\\n' | '\\r' ) ) { @@ -3079,29 +2963,29 @@ public class InternalRDLLexer extends Lexer { break; default : - break loop8; + break loop5; } } while (true); // InternalRDL.g:3581:40: ( ( '\\r' )? '\\n' )? - int alt10=2; - int LA10_0 = input.LA(1); + int alt7=2; + int LA7_0 = input.LA(1); - if ( (LA10_0=='\n'||LA10_0=='\r') ) { - alt10=1; + if ( (LA7_0=='\n'||LA7_0=='\r') ) { + alt7=1; } - switch (alt10) { + switch (alt7) { case 1 : // InternalRDL.g:3581:41: ( '\\r' )? '\\n' { // InternalRDL.g:3581:41: ( '\\r' )? - int alt9=2; - int LA9_0 = input.LA(1); + int alt6=2; + int LA6_0 = input.LA(1); - if ( (LA9_0=='\r') ) { - alt9=1; + if ( (LA6_0=='\r') ) { + alt6=1; } - switch (alt9) { + switch (alt6) { case 1 : // InternalRDL.g:3581:41: '\\r' { @@ -3130,36 +3014,145 @@ public class InternalRDLLexer extends Lexer { } // $ANTLR end "RULE_SL_COMMENT" + // $ANTLR start "RULE_ESCAPE_JSP" + public final void mRULE_ESCAPE_JSP() throws RecognitionException { + try { + int _type = RULE_ESCAPE_JSP; + int _channel = DEFAULT_TOKEN_CHANNEL; + // InternalRDL.g:3583:17: ( '<%' ( options {greedy=false; } : . )* '%>' ) + // InternalRDL.g:3583:19: '<%' ( options {greedy=false; } : . )* '%>' + { + match("<%"); + + // InternalRDL.g:3583:24: ( options {greedy=false; } : . )* + loop8: + do { + int alt8=2; + int LA8_0 = input.LA(1); + + if ( (LA8_0=='%') ) { + int LA8_1 = input.LA(2); + + if ( (LA8_1=='>') ) { + alt8=2; + } + else if ( ((LA8_1>='\u0000' && LA8_1<='=')||(LA8_1>='?' && LA8_1<='\uFFFF')) ) { + alt8=1; + } + + + } + else if ( ((LA8_0>='\u0000' && LA8_0<='$')||(LA8_0>='&' && LA8_0<='\uFFFF')) ) { + alt8=1; + } + + + switch (alt8) { + case 1 : + // InternalRDL.g:3583:52: . + { + matchAny(); + + } + break; + + default : + break loop8; + } + } while (true); + + match("%>"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "RULE_ESCAPE_JSP" + + // $ANTLR start "RULE_ESCAPE_ORDL" + public final void mRULE_ESCAPE_ORDL() throws RecognitionException { + try { + int _type = RULE_ESCAPE_ORDL; + int _channel = DEFAULT_TOKEN_CHANNEL; + // InternalRDL.g:3585:18: ( '(' ( options {greedy=false; } : . )* ')' ) + // InternalRDL.g:3585:20: '(' ( options {greedy=false; } : . )* ')' + { + match('('); + // InternalRDL.g:3585:24: ( options {greedy=false; } : . )* + loop9: + do { + int alt9=2; + int LA9_0 = input.LA(1); + + if ( (LA9_0==')') ) { + alt9=2; + } + else if ( ((LA9_0>='\u0000' && LA9_0<='(')||(LA9_0>='*' && LA9_0<='\uFFFF')) ) { + alt9=1; + } + + + switch (alt9) { + case 1 : + // InternalRDL.g:3585:52: . + { + matchAny(); + + } + break; + + default : + break loop9; + } + } while (true); + + match(')'); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "RULE_ESCAPE_ORDL" + // $ANTLR start "RULE_NUM" public final void mRULE_NUM() throws RecognitionException { try { int _type = RULE_NUM; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:3583:10: ( ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) ) - // InternalRDL.g:3583:12: ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) + // InternalRDL.g:3587:10: ( ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) ) + // InternalRDL.g:3587:12: ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) { - // InternalRDL.g:3583:12: ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) - int alt21=6; - alt21 = dfa21.predict(input); - switch (alt21) { + // InternalRDL.g:3587:12: ( ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ | ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ | ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ | ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ | '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ | ( '0' .. '9' )+ ) + int alt20=6; + alt20 = dfa20.predict(input); + switch (alt20) { case 1 : - // InternalRDL.g:3583:13: ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ + // InternalRDL.g:3587:13: ( '0' .. '9' )+ '\\'b' ( '0' | '1' | '_' )+ { - // InternalRDL.g:3583:13: ( '0' .. '9' )+ - int cnt11=0; - loop11: + // InternalRDL.g:3587:13: ( '0' .. '9' )+ + int cnt10=0; + loop10: do { - int alt11=2; - int LA11_0 = input.LA(1); + int alt10=2; + int LA10_0 = input.LA(1); - if ( ((LA11_0>='0' && LA11_0<='9')) ) { - alt11=1; + if ( ((LA10_0>='0' && LA10_0<='9')) ) { + alt10=1; } - switch (alt11) { + switch (alt10) { case 1 : - // InternalRDL.g:3583:14: '0' .. '9' + // InternalRDL.g:3587:14: '0' .. '9' { matchRange('0','9'); @@ -3167,29 +3160,29 @@ public class InternalRDLLexer extends Lexer { break; default : - if ( cnt11 >= 1 ) break loop11; + if ( cnt10 >= 1 ) break loop10; EarlyExitException eee = - new EarlyExitException(11, input); + new EarlyExitException(10, input); throw eee; } - cnt11++; + cnt10++; } while (true); match("'b"); - // InternalRDL.g:3583:31: ( '0' | '1' | '_' )+ - int cnt12=0; - loop12: + // InternalRDL.g:3587:31: ( '0' | '1' | '_' )+ + int cnt11=0; + loop11: do { - int alt12=2; - int LA12_0 = input.LA(1); + int alt11=2; + int LA11_0 = input.LA(1); - if ( ((LA12_0>='0' && LA12_0<='1')||LA12_0=='_') ) { - alt12=1; + if ( ((LA11_0>='0' && LA11_0<='1')||LA11_0=='_') ) { + alt11=1; } - switch (alt12) { + switch (alt11) { case 1 : // InternalRDL.g: { @@ -3206,6 +3199,42 @@ public class InternalRDLLexer extends Lexer { } break; + default : + if ( cnt11 >= 1 ) break loop11; + EarlyExitException eee = + new EarlyExitException(11, input); + throw eee; + } + cnt11++; + } while (true); + + + } + break; + case 2 : + // InternalRDL.g:3587:46: ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ + { + // InternalRDL.g:3587:46: ( '0' .. '9' )+ + int cnt12=0; + loop12: + do { + int alt12=2; + int LA12_0 = input.LA(1); + + if ( ((LA12_0>='0' && LA12_0<='9')) ) { + alt12=1; + } + + + switch (alt12) { + case 1 : + // InternalRDL.g:3587:47: '0' .. '9' + { + matchRange('0','9'); + + } + break; + default : if ( cnt12 >= 1 ) break loop12; EarlyExitException eee = @@ -3215,57 +3244,21 @@ public class InternalRDLLexer extends Lexer { cnt12++; } while (true); + match("'o"); - } - break; - case 2 : - // InternalRDL.g:3583:46: ( '0' .. '9' )+ '\\'o' ( '0' .. '7' | '_' )+ - { - // InternalRDL.g:3583:46: ( '0' .. '9' )+ + // InternalRDL.g:3587:64: ( '0' .. '7' | '_' )+ int cnt13=0; loop13: do { int alt13=2; int LA13_0 = input.LA(1); - if ( ((LA13_0>='0' && LA13_0<='9')) ) { + if ( ((LA13_0>='0' && LA13_0<='7')||LA13_0=='_') ) { alt13=1; } switch (alt13) { - case 1 : - // InternalRDL.g:3583:47: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt13 >= 1 ) break loop13; - EarlyExitException eee = - new EarlyExitException(13, input); - throw eee; - } - cnt13++; - } while (true); - - match("'o"); - - // InternalRDL.g:3583:64: ( '0' .. '7' | '_' )+ - int cnt14=0; - loop14: - do { - int alt14=2; - int LA14_0 = input.LA(1); - - if ( ((LA14_0>='0' && LA14_0<='7')||LA14_0=='_') ) { - alt14=1; - } - - - switch (alt14) { case 1 : // InternalRDL.g: { @@ -3282,6 +3275,42 @@ public class InternalRDLLexer extends Lexer { } break; + default : + if ( cnt13 >= 1 ) break loop13; + EarlyExitException eee = + new EarlyExitException(13, input); + throw eee; + } + cnt13++; + } while (true); + + + } + break; + case 3 : + // InternalRDL.g:3587:80: ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ + { + // InternalRDL.g:3587:80: ( '0' .. '9' )+ + int cnt14=0; + loop14: + do { + int alt14=2; + int LA14_0 = input.LA(1); + + if ( ((LA14_0>='0' && LA14_0<='9')) ) { + alt14=1; + } + + + switch (alt14) { + case 1 : + // InternalRDL.g:3587:81: '0' .. '9' + { + matchRange('0','9'); + + } + break; + default : if ( cnt14 >= 1 ) break loop14; EarlyExitException eee = @@ -3291,57 +3320,21 @@ public class InternalRDLLexer extends Lexer { cnt14++; } while (true); + match("'h"); - } - break; - case 3 : - // InternalRDL.g:3583:80: ( '0' .. '9' )+ '\\'h' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ - { - // InternalRDL.g:3583:80: ( '0' .. '9' )+ + // InternalRDL.g:3587:98: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ int cnt15=0; loop15: do { int alt15=2; int LA15_0 = input.LA(1); - if ( ((LA15_0>='0' && LA15_0<='9')) ) { + if ( ((LA15_0>='0' && LA15_0<='9')||(LA15_0>='A' && LA15_0<='F')||LA15_0=='_'||(LA15_0>='a' && LA15_0<='f')) ) { alt15=1; } switch (alt15) { - case 1 : - // InternalRDL.g:3583:81: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt15 >= 1 ) break loop15; - EarlyExitException eee = - new EarlyExitException(15, input); - throw eee; - } - cnt15++; - } while (true); - - match("'h"); - - // InternalRDL.g:3583:98: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' )+ - int cnt16=0; - loop16: - do { - int alt16=2; - int LA16_0 = input.LA(1); - - if ( ((LA16_0>='0' && LA16_0<='9')||(LA16_0>='A' && LA16_0<='F')||LA16_0=='_'||(LA16_0>='a' && LA16_0<='f')) ) { - alt16=1; - } - - - switch (alt16) { case 1 : // InternalRDL.g: { @@ -3358,6 +3351,42 @@ public class InternalRDLLexer extends Lexer { } break; + default : + if ( cnt15 >= 1 ) break loop15; + EarlyExitException eee = + new EarlyExitException(15, input); + throw eee; + } + cnt15++; + } while (true); + + + } + break; + case 4 : + // InternalRDL.g:3587:132: ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ + { + // InternalRDL.g:3587:132: ( '0' .. '9' )+ + int cnt16=0; + loop16: + do { + int alt16=2; + int LA16_0 = input.LA(1); + + if ( ((LA16_0>='0' && LA16_0<='9')) ) { + alt16=1; + } + + + switch (alt16) { + case 1 : + // InternalRDL.g:3587:133: '0' .. '9' + { + matchRange('0','9'); + + } + break; + default : if ( cnt16 >= 1 ) break loop16; EarlyExitException eee = @@ -3367,29 +3396,33 @@ public class InternalRDLLexer extends Lexer { cnt16++; } while (true); + match("'d"); - } - break; - case 4 : - // InternalRDL.g:3583:132: ( '0' .. '9' )+ '\\'d' ( '0' .. '9' | '_' )+ - { - // InternalRDL.g:3583:132: ( '0' .. '9' )+ + // InternalRDL.g:3587:150: ( '0' .. '9' | '_' )+ int cnt17=0; loop17: do { int alt17=2; int LA17_0 = input.LA(1); - if ( ((LA17_0>='0' && LA17_0<='9')) ) { + if ( ((LA17_0>='0' && LA17_0<='9')||LA17_0=='_') ) { alt17=1; } switch (alt17) { case 1 : - // InternalRDL.g:3583:133: '0' .. '9' + // InternalRDL.g: { - matchRange('0','9'); + if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) { + input.consume(); + + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} + } break; @@ -3403,16 +3436,22 @@ public class InternalRDLLexer extends Lexer { cnt17++; } while (true); - match("'d"); - // InternalRDL.g:3583:150: ( '0' .. '9' | '_' )+ + } + break; + case 5 : + // InternalRDL.g:3587:166: '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ + { + match("0x"); + + // InternalRDL.g:3587:171: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ int cnt18=0; loop18: do { int alt18=2; int LA18_0 = input.LA(1); - if ( ((LA18_0>='0' && LA18_0<='9')||LA18_0=='_') ) { + if ( ((LA18_0>='0' && LA18_0<='9')||(LA18_0>='A' && LA18_0<='F')||(LA18_0>='a' && LA18_0<='f')) ) { alt18=1; } @@ -3421,7 +3460,7 @@ public class InternalRDLLexer extends Lexer { case 1 : // InternalRDL.g: { - if ( (input.LA(1)>='0' && input.LA(1)<='9')||input.LA(1)=='_' ) { + if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) { input.consume(); } @@ -3446,36 +3485,26 @@ public class InternalRDLLexer extends Lexer { } break; - case 5 : - // InternalRDL.g:3583:166: '0x' ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ + case 6 : + // InternalRDL.g:3587:201: ( '0' .. '9' )+ { - match("0x"); - - // InternalRDL.g:3583:171: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )+ + // InternalRDL.g:3587:201: ( '0' .. '9' )+ int cnt19=0; loop19: do { int alt19=2; int LA19_0 = input.LA(1); - if ( ((LA19_0>='0' && LA19_0<='9')||(LA19_0>='A' && LA19_0<='F')||(LA19_0>='a' && LA19_0<='f')) ) { + if ( ((LA19_0>='0' && LA19_0<='9')) ) { alt19=1; } switch (alt19) { case 1 : - // InternalRDL.g: + // InternalRDL.g:3587:202: '0' .. '9' { - if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) { - input.consume(); - - } - else { - MismatchedSetException mse = new MismatchedSetException(null,input); - recover(mse); - throw mse;} - + matchRange('0','9'); } break; @@ -3490,42 +3519,6 @@ public class InternalRDLLexer extends Lexer { } while (true); - } - break; - case 6 : - // InternalRDL.g:3583:201: ( '0' .. '9' )+ - { - // InternalRDL.g:3583:201: ( '0' .. '9' )+ - int cnt20=0; - loop20: - do { - int alt20=2; - int LA20_0 = input.LA(1); - - if ( ((LA20_0>='0' && LA20_0<='9')) ) { - alt20=1; - } - - - switch (alt20) { - case 1 : - // InternalRDL.g:3583:202: '0' .. '9' - { - matchRange('0','9'); - - } - break; - - default : - if ( cnt20 >= 1 ) break loop20; - EarlyExitException eee = - new EarlyExitException(20, input); - throw eee; - } - cnt20++; - } while (true); - - } break; @@ -3547,27 +3540,27 @@ public class InternalRDLLexer extends Lexer { try { int _type = RULE_STR; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalRDL.g:3585:10: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) - // InternalRDL.g:3585:12: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalRDL.g:3589:10: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) + // InternalRDL.g:3589:12: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalRDL.g:3585:16: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* - loop22: + // InternalRDL.g:3589:16: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* + loop21: do { - int alt22=3; - int LA22_0 = input.LA(1); + int alt21=3; + int LA21_0 = input.LA(1); - if ( (LA22_0=='\\') ) { - alt22=1; + if ( (LA21_0=='\\') ) { + alt21=1; } - else if ( ((LA22_0>='\u0000' && LA22_0<='!')||(LA22_0>='#' && LA22_0<='[')||(LA22_0>=']' && LA22_0<='\uFFFF')) ) { - alt22=2; + else if ( ((LA21_0>='\u0000' && LA21_0<='!')||(LA21_0>='#' && LA21_0<='[')||(LA21_0>=']' && LA21_0<='\uFFFF')) ) { + alt21=2; } - switch (alt22) { + switch (alt21) { case 1 : - // InternalRDL.g:3585:17: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // InternalRDL.g:3589:17: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) { match('\\'); if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) { @@ -3583,7 +3576,7 @@ public class InternalRDLLexer extends Lexer { } break; case 2 : - // InternalRDL.g:3585:62: ~ ( ( '\\\\' | '\"' ) ) + // InternalRDL.g:3589:62: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -3599,7 +3592,7 @@ public class InternalRDLLexer extends Lexer { break; default : - break loop22; + break loop21; } } while (true); @@ -3616,908 +3609,922 @@ public class InternalRDLLexer extends Lexer { // $ANTLR end "RULE_STR" public void mTokens() throws RecognitionException { - // InternalRDL.g:1:8: ( T__10 | T__11 | T__12 | 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 | RULE_ID | RULE_WS | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_NUM | RULE_STR ) - int alt23=129; - alt23 = dfa23.predict(input); - switch (alt23) { + // InternalRDL.g:1:8: ( T__12 | 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_ID | RULE_WS | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_ESCAPE_JSP | RULE_ESCAPE_ORDL | RULE_NUM | RULE_STR ) + int alt22=131; + alt22 = dfa22.predict(input); + switch (alt22) { case 1 : - // InternalRDL.g:1:10: T__10 - { - mT__10(); - - } - break; - case 2 : - // InternalRDL.g:1:16: T__11 - { - mT__11(); - - } - break; - case 3 : - // InternalRDL.g:1:22: T__12 + // InternalRDL.g:1:10: T__12 { mT__12(); } break; - case 4 : - // InternalRDL.g:1:28: T__13 + case 2 : + // InternalRDL.g:1:16: T__13 { mT__13(); } break; - case 5 : - // InternalRDL.g:1:34: T__14 + case 3 : + // InternalRDL.g:1:22: T__14 { mT__14(); } break; - case 6 : - // InternalRDL.g:1:40: T__15 + case 4 : + // InternalRDL.g:1:28: T__15 { mT__15(); } break; - case 7 : - // InternalRDL.g:1:46: T__16 + case 5 : + // InternalRDL.g:1:34: T__16 { mT__16(); } break; - case 8 : - // InternalRDL.g:1:52: T__17 + case 6 : + // InternalRDL.g:1:40: T__17 { mT__17(); } break; - case 9 : - // InternalRDL.g:1:58: T__18 + case 7 : + // InternalRDL.g:1:46: T__18 { mT__18(); } break; - case 10 : - // InternalRDL.g:1:64: T__19 + case 8 : + // InternalRDL.g:1:52: T__19 { mT__19(); } break; - case 11 : - // InternalRDL.g:1:70: T__20 + case 9 : + // InternalRDL.g:1:58: T__20 { mT__20(); } break; - case 12 : - // InternalRDL.g:1:76: T__21 + case 10 : + // InternalRDL.g:1:64: T__21 { mT__21(); } break; - case 13 : - // InternalRDL.g:1:82: T__22 + case 11 : + // InternalRDL.g:1:70: T__22 { mT__22(); } break; - case 14 : - // InternalRDL.g:1:88: T__23 + case 12 : + // InternalRDL.g:1:76: T__23 { mT__23(); } break; - case 15 : - // InternalRDL.g:1:94: T__24 + case 13 : + // InternalRDL.g:1:82: T__24 { mT__24(); } break; - case 16 : - // InternalRDL.g:1:100: T__25 + case 14 : + // InternalRDL.g:1:88: T__25 { mT__25(); } break; - case 17 : - // InternalRDL.g:1:106: T__26 + case 15 : + // InternalRDL.g:1:94: T__26 { mT__26(); } break; - case 18 : - // InternalRDL.g:1:112: T__27 + case 16 : + // InternalRDL.g:1:100: T__27 { mT__27(); } break; - case 19 : - // InternalRDL.g:1:118: T__28 + case 17 : + // InternalRDL.g:1:106: T__28 { mT__28(); } break; - case 20 : - // InternalRDL.g:1:124: T__29 + case 18 : + // InternalRDL.g:1:112: T__29 { mT__29(); } break; - case 21 : - // InternalRDL.g:1:130: T__30 + case 19 : + // InternalRDL.g:1:118: T__30 { mT__30(); } break; - case 22 : - // InternalRDL.g:1:136: T__31 + case 20 : + // InternalRDL.g:1:124: T__31 { mT__31(); } break; - case 23 : - // InternalRDL.g:1:142: T__32 + case 21 : + // InternalRDL.g:1:130: T__32 { mT__32(); } break; - case 24 : - // InternalRDL.g:1:148: T__33 + case 22 : + // InternalRDL.g:1:136: T__33 { mT__33(); } break; - case 25 : - // InternalRDL.g:1:154: T__34 + case 23 : + // InternalRDL.g:1:142: T__34 { mT__34(); } break; - case 26 : - // InternalRDL.g:1:160: T__35 + case 24 : + // InternalRDL.g:1:148: T__35 { mT__35(); } break; - case 27 : - // InternalRDL.g:1:166: T__36 + case 25 : + // InternalRDL.g:1:154: T__36 { mT__36(); } break; - case 28 : - // InternalRDL.g:1:172: T__37 + case 26 : + // InternalRDL.g:1:160: T__37 { mT__37(); } break; - case 29 : - // InternalRDL.g:1:178: T__38 + case 27 : + // InternalRDL.g:1:166: T__38 { mT__38(); } break; - case 30 : - // InternalRDL.g:1:184: T__39 + case 28 : + // InternalRDL.g:1:172: T__39 { mT__39(); } break; - case 31 : - // InternalRDL.g:1:190: T__40 + case 29 : + // InternalRDL.g:1:178: T__40 { mT__40(); } break; - case 32 : - // InternalRDL.g:1:196: T__41 + case 30 : + // InternalRDL.g:1:184: T__41 { mT__41(); } break; - case 33 : - // InternalRDL.g:1:202: T__42 + case 31 : + // InternalRDL.g:1:190: T__42 { mT__42(); } break; - case 34 : - // InternalRDL.g:1:208: T__43 + case 32 : + // InternalRDL.g:1:196: T__43 { mT__43(); } break; - case 35 : - // InternalRDL.g:1:214: T__44 + case 33 : + // InternalRDL.g:1:202: T__44 { mT__44(); } break; - case 36 : - // InternalRDL.g:1:220: T__45 + case 34 : + // InternalRDL.g:1:208: T__45 { mT__45(); } break; - case 37 : - // InternalRDL.g:1:226: T__46 + case 35 : + // InternalRDL.g:1:214: T__46 { mT__46(); } break; - case 38 : - // InternalRDL.g:1:232: T__47 + case 36 : + // InternalRDL.g:1:220: T__47 { mT__47(); } break; - case 39 : - // InternalRDL.g:1:238: T__48 + case 37 : + // InternalRDL.g:1:226: T__48 { mT__48(); } break; - case 40 : - // InternalRDL.g:1:244: T__49 + case 38 : + // InternalRDL.g:1:232: T__49 { mT__49(); } break; - case 41 : - // InternalRDL.g:1:250: T__50 + case 39 : + // InternalRDL.g:1:238: T__50 { mT__50(); } break; - case 42 : - // InternalRDL.g:1:256: T__51 + case 40 : + // InternalRDL.g:1:244: T__51 { mT__51(); } break; - case 43 : - // InternalRDL.g:1:262: T__52 + case 41 : + // InternalRDL.g:1:250: T__52 { mT__52(); } break; - case 44 : - // InternalRDL.g:1:268: T__53 + case 42 : + // InternalRDL.g:1:256: T__53 { mT__53(); } break; - case 45 : - // InternalRDL.g:1:274: T__54 + case 43 : + // InternalRDL.g:1:262: T__54 { mT__54(); } break; - case 46 : - // InternalRDL.g:1:280: T__55 + case 44 : + // InternalRDL.g:1:268: T__55 { mT__55(); } break; - case 47 : - // InternalRDL.g:1:286: T__56 + case 45 : + // InternalRDL.g:1:274: T__56 { mT__56(); } break; - case 48 : - // InternalRDL.g:1:292: T__57 + case 46 : + // InternalRDL.g:1:280: T__57 { mT__57(); } break; - case 49 : - // InternalRDL.g:1:298: T__58 + case 47 : + // InternalRDL.g:1:286: T__58 { mT__58(); } break; - case 50 : - // InternalRDL.g:1:304: T__59 + case 48 : + // InternalRDL.g:1:292: T__59 { mT__59(); } break; - case 51 : - // InternalRDL.g:1:310: T__60 + case 49 : + // InternalRDL.g:1:298: T__60 { mT__60(); } break; - case 52 : - // InternalRDL.g:1:316: T__61 + case 50 : + // InternalRDL.g:1:304: T__61 { mT__61(); } break; - case 53 : - // InternalRDL.g:1:322: T__62 + case 51 : + // InternalRDL.g:1:310: T__62 { mT__62(); } break; - case 54 : - // InternalRDL.g:1:328: T__63 + case 52 : + // InternalRDL.g:1:316: T__63 { mT__63(); } break; - case 55 : - // InternalRDL.g:1:334: T__64 + case 53 : + // InternalRDL.g:1:322: T__64 { mT__64(); } break; - case 56 : - // InternalRDL.g:1:340: T__65 + case 54 : + // InternalRDL.g:1:328: T__65 { mT__65(); } break; - case 57 : - // InternalRDL.g:1:346: T__66 + case 55 : + // InternalRDL.g:1:334: T__66 { mT__66(); } break; - case 58 : - // InternalRDL.g:1:352: T__67 + case 56 : + // InternalRDL.g:1:340: T__67 { mT__67(); } break; - case 59 : - // InternalRDL.g:1:358: T__68 + case 57 : + // InternalRDL.g:1:346: T__68 { mT__68(); } break; - case 60 : - // InternalRDL.g:1:364: T__69 + case 58 : + // InternalRDL.g:1:352: T__69 { mT__69(); } break; - case 61 : - // InternalRDL.g:1:370: T__70 + case 59 : + // InternalRDL.g:1:358: T__70 { mT__70(); } break; - case 62 : - // InternalRDL.g:1:376: T__71 + case 60 : + // InternalRDL.g:1:364: T__71 { mT__71(); } break; - case 63 : - // InternalRDL.g:1:382: T__72 + case 61 : + // InternalRDL.g:1:370: T__72 { mT__72(); } break; - case 64 : - // InternalRDL.g:1:388: T__73 + case 62 : + // InternalRDL.g:1:376: T__73 { mT__73(); } break; - case 65 : - // InternalRDL.g:1:394: T__74 + case 63 : + // InternalRDL.g:1:382: T__74 { mT__74(); } break; - case 66 : - // InternalRDL.g:1:400: T__75 + case 64 : + // InternalRDL.g:1:388: T__75 { mT__75(); } break; - case 67 : - // InternalRDL.g:1:406: T__76 + case 65 : + // InternalRDL.g:1:394: T__76 { mT__76(); } break; - case 68 : - // InternalRDL.g:1:412: T__77 + case 66 : + // InternalRDL.g:1:400: T__77 { mT__77(); } break; - case 69 : - // InternalRDL.g:1:418: T__78 + case 67 : + // InternalRDL.g:1:406: T__78 { mT__78(); } break; - case 70 : - // InternalRDL.g:1:424: T__79 + case 68 : + // InternalRDL.g:1:412: T__79 { mT__79(); } break; - case 71 : - // InternalRDL.g:1:430: T__80 + case 69 : + // InternalRDL.g:1:418: T__80 { mT__80(); } break; - case 72 : - // InternalRDL.g:1:436: T__81 + case 70 : + // InternalRDL.g:1:424: T__81 { mT__81(); } break; - case 73 : - // InternalRDL.g:1:442: T__82 + case 71 : + // InternalRDL.g:1:430: T__82 { mT__82(); } break; - case 74 : - // InternalRDL.g:1:448: T__83 + case 72 : + // InternalRDL.g:1:436: T__83 { mT__83(); } break; - case 75 : - // InternalRDL.g:1:454: T__84 + case 73 : + // InternalRDL.g:1:442: T__84 { mT__84(); } break; - case 76 : - // InternalRDL.g:1:460: T__85 + case 74 : + // InternalRDL.g:1:448: T__85 { mT__85(); } break; - case 77 : - // InternalRDL.g:1:466: T__86 + case 75 : + // InternalRDL.g:1:454: T__86 { mT__86(); } break; - case 78 : - // InternalRDL.g:1:472: T__87 + case 76 : + // InternalRDL.g:1:460: T__87 { mT__87(); } break; - case 79 : - // InternalRDL.g:1:478: T__88 + case 77 : + // InternalRDL.g:1:466: T__88 { mT__88(); } break; - case 80 : - // InternalRDL.g:1:484: T__89 + case 78 : + // InternalRDL.g:1:472: T__89 { mT__89(); } break; - case 81 : - // InternalRDL.g:1:490: T__90 + case 79 : + // InternalRDL.g:1:478: T__90 { mT__90(); } break; - case 82 : - // InternalRDL.g:1:496: T__91 + case 80 : + // InternalRDL.g:1:484: T__91 { mT__91(); } break; - case 83 : - // InternalRDL.g:1:502: T__92 + case 81 : + // InternalRDL.g:1:490: T__92 { mT__92(); } break; - case 84 : - // InternalRDL.g:1:508: T__93 + case 82 : + // InternalRDL.g:1:496: T__93 { mT__93(); } break; - case 85 : - // InternalRDL.g:1:514: T__94 + case 83 : + // InternalRDL.g:1:502: T__94 { mT__94(); } break; - case 86 : - // InternalRDL.g:1:520: T__95 + case 84 : + // InternalRDL.g:1:508: T__95 { mT__95(); } break; - case 87 : - // InternalRDL.g:1:526: T__96 + case 85 : + // InternalRDL.g:1:514: T__96 { mT__96(); } break; - case 88 : - // InternalRDL.g:1:532: T__97 + case 86 : + // InternalRDL.g:1:520: T__97 { mT__97(); } break; - case 89 : - // InternalRDL.g:1:538: T__98 + case 87 : + // InternalRDL.g:1:526: T__98 { mT__98(); } break; - case 90 : - // InternalRDL.g:1:544: T__99 + case 88 : + // InternalRDL.g:1:532: T__99 { mT__99(); } break; - case 91 : - // InternalRDL.g:1:550: T__100 + case 89 : + // InternalRDL.g:1:538: T__100 { mT__100(); } break; - case 92 : - // InternalRDL.g:1:557: T__101 + case 90 : + // InternalRDL.g:1:545: T__101 { mT__101(); } break; - case 93 : - // InternalRDL.g:1:564: T__102 + case 91 : + // InternalRDL.g:1:552: T__102 { mT__102(); } break; - case 94 : - // InternalRDL.g:1:571: T__103 + case 92 : + // InternalRDL.g:1:559: T__103 { mT__103(); } break; - case 95 : - // InternalRDL.g:1:578: T__104 + case 93 : + // InternalRDL.g:1:566: T__104 { mT__104(); } break; - case 96 : - // InternalRDL.g:1:585: T__105 + case 94 : + // InternalRDL.g:1:573: T__105 { mT__105(); } break; - case 97 : - // InternalRDL.g:1:592: T__106 + case 95 : + // InternalRDL.g:1:580: T__106 { mT__106(); } break; - case 98 : - // InternalRDL.g:1:599: T__107 + case 96 : + // InternalRDL.g:1:587: T__107 { mT__107(); } break; - case 99 : - // InternalRDL.g:1:606: T__108 + case 97 : + // InternalRDL.g:1:594: T__108 { mT__108(); } break; - case 100 : - // InternalRDL.g:1:613: T__109 + case 98 : + // InternalRDL.g:1:601: T__109 { mT__109(); } break; - case 101 : - // InternalRDL.g:1:620: T__110 + case 99 : + // InternalRDL.g:1:608: T__110 { mT__110(); } break; - case 102 : - // InternalRDL.g:1:627: T__111 + case 100 : + // InternalRDL.g:1:615: T__111 { mT__111(); } break; - case 103 : - // InternalRDL.g:1:634: T__112 + case 101 : + // InternalRDL.g:1:622: T__112 { mT__112(); } break; - case 104 : - // InternalRDL.g:1:641: T__113 + case 102 : + // InternalRDL.g:1:629: T__113 { mT__113(); } break; - case 105 : - // InternalRDL.g:1:648: T__114 + case 103 : + // InternalRDL.g:1:636: T__114 { mT__114(); } break; - case 106 : - // InternalRDL.g:1:655: T__115 + case 104 : + // InternalRDL.g:1:643: T__115 { mT__115(); } break; - case 107 : - // InternalRDL.g:1:662: T__116 + case 105 : + // InternalRDL.g:1:650: T__116 { mT__116(); } break; - case 108 : - // InternalRDL.g:1:669: T__117 + case 106 : + // InternalRDL.g:1:657: T__117 { mT__117(); } break; - case 109 : - // InternalRDL.g:1:676: T__118 + case 107 : + // InternalRDL.g:1:664: T__118 { mT__118(); } break; - case 110 : - // InternalRDL.g:1:683: T__119 + case 108 : + // InternalRDL.g:1:671: T__119 { mT__119(); } break; - case 111 : - // InternalRDL.g:1:690: T__120 + case 109 : + // InternalRDL.g:1:678: T__120 { mT__120(); } break; - case 112 : - // InternalRDL.g:1:697: T__121 + case 110 : + // InternalRDL.g:1:685: T__121 { mT__121(); } break; - case 113 : - // InternalRDL.g:1:704: T__122 + case 111 : + // InternalRDL.g:1:692: T__122 { mT__122(); } break; - case 114 : - // InternalRDL.g:1:711: T__123 + case 112 : + // InternalRDL.g:1:699: T__123 { mT__123(); } break; - case 115 : - // InternalRDL.g:1:718: T__124 + case 113 : + // InternalRDL.g:1:706: T__124 { mT__124(); } break; - case 116 : - // InternalRDL.g:1:725: T__125 + case 114 : + // InternalRDL.g:1:713: T__125 { mT__125(); } break; - case 117 : - // InternalRDL.g:1:732: T__126 + case 115 : + // InternalRDL.g:1:720: T__126 { mT__126(); } break; - case 118 : - // InternalRDL.g:1:739: T__127 + case 116 : + // InternalRDL.g:1:727: T__127 { mT__127(); } break; - case 119 : - // InternalRDL.g:1:746: T__128 + case 117 : + // InternalRDL.g:1:734: T__128 { mT__128(); } break; - case 120 : - // InternalRDL.g:1:753: T__129 + case 118 : + // InternalRDL.g:1:741: T__129 { mT__129(); } break; - case 121 : - // InternalRDL.g:1:760: T__130 + case 119 : + // InternalRDL.g:1:748: T__130 { mT__130(); } break; - case 122 : - // InternalRDL.g:1:767: T__131 + case 120 : + // InternalRDL.g:1:755: T__131 { mT__131(); } break; - case 123 : - // InternalRDL.g:1:774: T__132 + case 121 : + // InternalRDL.g:1:762: T__132 { mT__132(); + } + break; + case 122 : + // InternalRDL.g:1:769: T__133 + { + mT__133(); + + } + break; + case 123 : + // InternalRDL.g:1:776: T__134 + { + mT__134(); + } break; case 124 : - // InternalRDL.g:1:781: RULE_ID + // InternalRDL.g:1:783: RULE_ID { mRULE_ID(); } break; case 125 : - // InternalRDL.g:1:789: RULE_WS + // InternalRDL.g:1:791: RULE_WS { mRULE_WS(); } break; case 126 : - // InternalRDL.g:1:797: RULE_ML_COMMENT + // InternalRDL.g:1:799: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; case 127 : - // InternalRDL.g:1:813: RULE_SL_COMMENT + // InternalRDL.g:1:815: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; case 128 : - // InternalRDL.g:1:829: RULE_NUM + // InternalRDL.g:1:831: RULE_ESCAPE_JSP + { + mRULE_ESCAPE_JSP(); + + } + break; + case 129 : + // InternalRDL.g:1:847: RULE_ESCAPE_ORDL + { + mRULE_ESCAPE_ORDL(); + + } + break; + case 130 : + // InternalRDL.g:1:864: RULE_NUM { mRULE_NUM(); } break; - case 129 : - // InternalRDL.g:1:838: RULE_STR + case 131 : + // InternalRDL.g:1:873: RULE_STR { mRULE_STR(); @@ -4529,94 +4536,94 @@ public class InternalRDLLexer extends Lexer { } - protected DFA21 dfa21 = new DFA21(this); - protected DFA23 dfa23 = new DFA23(this); - static final String DFA21_eotS = - "\1\uffff\2\5\7\uffff"; - static final String DFA21_eofS = + protected DFA20 dfa20 = new DFA20(this); + protected DFA22 dfa22 = new DFA22(this); + static final String DFA20_eotS = + "\1\uffff\2\4\7\uffff"; + static final String DFA20_eofS = "\12\uffff"; - static final String DFA21_minS = - "\1\60\2\47\1\uffff\1\142\5\uffff"; - static final String DFA21_maxS = - "\1\71\1\170\1\71\1\uffff\1\157\5\uffff"; - static final String DFA21_acceptS = - "\3\uffff\1\5\1\uffff\1\6\1\4\1\3\1\2\1\1"; - static final String DFA21_specialS = + static final String DFA20_minS = + "\1\60\2\47\2\uffff\1\142\4\uffff"; + static final String DFA20_maxS = + "\1\71\1\170\1\71\2\uffff\1\157\4\uffff"; + static final String DFA20_acceptS = + "\3\uffff\1\5\1\6\1\uffff\1\4\1\3\1\2\1\1"; + static final String DFA20_specialS = "\12\uffff}>"; - static final String[] DFA21_transitionS = { + static final String[] DFA20_transitionS = { "\1\1\11\2", - "\1\4\10\uffff\12\2\76\uffff\1\3", - "\1\4\10\uffff\12\2", + "\1\5\10\uffff\12\2\76\uffff\1\3", + "\1\5\10\uffff\12\2", + "", "", "\1\11\1\uffff\1\6\3\uffff\1\7\6\uffff\1\10", "", "", "", - "", "" }; - static final short[] DFA21_eot = DFA.unpackEncodedString(DFA21_eotS); - static final short[] DFA21_eof = DFA.unpackEncodedString(DFA21_eofS); - static final char[] DFA21_min = DFA.unpackEncodedStringToUnsignedChars(DFA21_minS); - static final char[] DFA21_max = DFA.unpackEncodedStringToUnsignedChars(DFA21_maxS); - static final short[] DFA21_accept = DFA.unpackEncodedString(DFA21_acceptS); - static final short[] DFA21_special = DFA.unpackEncodedString(DFA21_specialS); - static final short[][] DFA21_transition; + static final short[] DFA20_eot = DFA.unpackEncodedString(DFA20_eotS); + static final short[] DFA20_eof = DFA.unpackEncodedString(DFA20_eofS); + static final char[] DFA20_min = DFA.unpackEncodedStringToUnsignedChars(DFA20_minS); + static final char[] DFA20_max = DFA.unpackEncodedStringToUnsignedChars(DFA20_maxS); + static final short[] DFA20_accept = DFA.unpackEncodedString(DFA20_acceptS); + static final short[] DFA20_special = DFA.unpackEncodedString(DFA20_specialS); + static final short[][] DFA20_transition; static { - int numStates = DFA21_transitionS.length; - DFA21_transition = new short[numStates][]; + int numStates = DFA20_transitionS.length; + DFA20_transition = new short[numStates][]; for (int i=0; i"; - static final String[] DFA23_transitionS = { - "\2\45\2\uffff\1\45\22\uffff\1\45\1\uffff\1\51\2\uffff\1\22\2\uffff\1\47\2\uffff\1\21\1\17\1\26\1\27\1\46\12\50\1\24\1\6\1\47\1\5\2\uffff\1\20\24\44\1\43\5\44\1\23\1\44\1\25\1\uffff\1\44\1\1\1\16\1\32\1\12\1\10\1\14\1\11\1\44\1\35\1\15\2\44\1\40\1\41\1\30\1\36\1\2\1\44\1\33\1\31\1\4\1\42\1\44\1\34\1\37\2\44\1\3\1\13\1\7", + static final String DFA22_eotS = + "\2\uffff\1\44\1\uffff\1\44\3\uffff\3\44\1\uffff\3\44\11\uffff\3\44\1\123\1\127\7\44\7\uffff\27\44\1\u0087\5\44\1\u0093\11\44\1\u00a1\1\uffff\1\44\1\u00a5\1\u00a6\1\uffff\1\u00ab\13\44\2\uffff\31\44\1\u00d2\7\44\1\uffff\13\44\1\uffff\7\44\1\u00ef\1\u00f0\4\44\1\uffff\2\44\1\u00f7\2\uffff\4\44\1\uffff\16\44\1\u010a\1\u010b\2\44\1\u010e\1\u0113\11\44\1\u011f\4\44\1\u0124\1\u0127\2\44\1\uffff\6\44\1\u0131\1\44\1\u0133\6\44\1\u013b\3\44\1\u013f\10\44\2\uffff\1\44\1\u0149\1\44\1\u014b\2\44\1\uffff\4\44\1\u0154\1\u0155\3\44\1\u0159\1\44\1\u015b\1\u015c\5\44\2\uffff\2\44\1\uffff\4\44\1\uffff\2\44\1\u016a\1\u016d\5\44\1\u0173\1\44\1\uffff\4\44\1\uffff\2\44\1\uffff\1\u017b\4\44\1\u0180\1\u0181\2\44\1\uffff\1\44\1\uffff\6\44\1\u018b\1\uffff\1\u018c\1\u018d\1\44\1\uffff\10\44\1\u0198\1\uffff\1\44\1\uffff\1\u019a\1\u019b\1\u019c\1\u019d\4\44\2\uffff\1\44\1\u01a3\1\44\1\uffff\1\u01a5\2\uffff\15\44\1\uffff\2\44\1\uffff\5\44\1\uffff\1\44\1\u01bb\1\u01bc\4\44\1\uffff\4\44\2\uffff\2\44\1\u01c8\2\44\1\u01cb\1\u01cd\1\u01cf\1\44\3\uffff\1\u01d2\4\44\1\u01d7\4\44\1\uffff\1\44\4\uffff\1\44\1\u01de\3\44\1\uffff\1\44\1\uffff\4\44\1\u01e7\1\44\1\u01e9\12\44\1\u01f4\1\u01f5\2\44\2\uffff\5\44\1\u01fd\1\44\1\u01ff\3\44\1\uffff\1\u0203\1\44\1\uffff\1\44\1\uffff\1\44\1\uffff\2\44\1\uffff\1\44\1\u020a\2\44\1\uffff\1\u020d\3\44\1\u0212\1\44\1\uffff\6\44\1\u021a\1\44\1\uffff\1\44\1\uffff\5\44\1\u0222\4\44\2\uffff\1\44\1\u0228\1\44\1\u022a\3\44\1\uffff\1\44\1\uffff\3\44\1\uffff\5\44\1\u0237\1\uffff\1\u0238\1\44\1\uffff\1\u023a\1\u023b\1\44\1\u023d\1\uffff\1\u023e\1\u023f\1\44\1\u0241\3\44\1\uffff\1\44\1\u0246\1\u0247\1\u0248\3\44\1\uffff\2\44\1\u024e\1\u024f\1\44\1\uffff\1\u0251\1\uffff\1\u0252\1\u0253\1\u0254\2\44\1\u0257\1\44\1\u0259\1\u025a\3\44\2\uffff\1\u025e\2\uffff\1\44\3\uffff\1\44\1\uffff\1\44\1\u0262\1\u0263\1\u0264\3\uffff\4\44\1\u0269\2\uffff\1\44\4\uffff\1\u026b\1\u026c\1\uffff\1\44\2\uffff\3\44\1\uffff\1\44\1\u0272\1\44\3\uffff\2\44\1\u0276\1\u0277\1\uffff\1\u0278\2\uffff\1\u0279\1\u027a\1\u027b\1\44\1\u027d\1\uffff\1\44\1\u027f\1\44\6\uffff\1\u0281\1\uffff\1\u0282\1\uffff\1\u0283\3\uffff"; + static final String DFA22_eofS = + "\u0284\uffff"; + static final String DFA22_minS = + "\1\11\1\uffff\1\157\1\uffff\1\150\3\uffff\1\145\1\141\1\154\1\uffff\2\156\1\143\11\uffff\2\141\1\151\2\60\1\141\1\162\1\157\1\145\1\141\1\156\1\116\2\uffff\1\52\4\uffff\1\145\1\163\1\160\1\165\1\162\1\143\1\156\1\154\1\145\1\154\1\155\1\165\1\157\1\164\1\141\1\162\1\143\1\151\1\144\1\142\1\144\1\171\1\143\1\60\1\155\1\147\1\156\1\151\1\147\1\60\1\141\1\156\1\164\1\157\1\147\1\151\1\146\1\145\1\154\1\60\1\uffff\1\143\2\60\1\uffff\1\60\1\154\2\145\1\162\1\164\1\142\1\166\1\142\1\163\1\144\1\104\2\uffff\1\160\1\143\4\145\1\141\1\143\1\162\1\164\1\163\2\154\1\160\1\156\1\151\1\143\1\145\1\155\1\157\1\142\2\145\1\162\1\141\1\60\1\162\1\151\1\145\1\156\1\151\2\145\1\uffff\1\142\1\164\1\145\1\163\1\151\1\143\1\156\1\147\1\145\1\157\1\143\1\uffff\1\162\1\143\1\165\1\154\1\150\1\145\1\144\2\60\1\145\1\164\1\144\1\162\1\uffff\1\154\1\145\1\60\2\uffff\1\145\1\154\1\156\1\141\1\uffff\1\164\1\144\1\162\1\145\1\164\1\60\1\145\1\60\1\153\1\145\1\105\2\145\1\144\2\60\1\163\1\165\2\60\1\143\1\145\1\144\2\141\1\164\1\146\1\153\1\162\1\60\1\144\1\154\1\170\1\162\2\60\1\163\1\156\1\uffff\1\145\1\164\1\144\1\143\1\166\1\163\1\60\1\145\1\60\1\144\1\164\1\156\1\153\1\141\1\154\1\60\1\144\1\143\1\145\1\60\1\162\2\145\1\156\1\147\2\151\1\154\2\uffff\1\164\1\60\1\163\1\60\1\162\1\164\1\uffff\1\164\1\162\1\141\1\163\2\60\1\146\1\144\1\154\1\60\1\154\2\60\1\162\1\106\1\162\1\144\1\147\2\uffff\1\150\1\154\1\uffff\1\151\2\141\1\150\1\uffff\1\157\1\145\2\60\1\154\1\156\1\143\1\145\1\137\1\60\1\156\1\uffff\2\145\1\164\1\156\1\uffff\1\151\1\141\1\uffff\1\60\1\155\1\141\1\163\1\145\2\60\1\145\1\163\1\uffff\1\162\1\uffff\1\147\1\151\1\147\1\171\1\154\1\145\1\60\1\uffff\2\60\1\144\1\uffff\2\141\2\144\1\145\1\154\1\144\1\151\1\60\1\uffff\1\145\1\uffff\4\60\1\142\1\153\1\141\1\156\2\uffff\1\154\1\60\1\145\1\uffff\1\60\2\uffff\1\146\1\111\1\164\2\145\1\157\1\164\1\144\1\154\1\164\1\162\1\155\1\163\1\uffff\1\162\1\151\1\uffff\1\151\1\145\1\164\2\162\1\uffff\1\141\2\60\1\142\1\141\1\144\1\154\1\uffff\1\145\1\160\1\163\1\162\2\uffff\1\150\1\167\1\60\1\145\1\143\3\60\1\160\3\uffff\1\60\1\164\1\156\1\147\1\151\1\60\1\145\1\164\1\147\1\151\1\uffff\1\164\4\uffff\1\154\1\60\1\163\1\141\1\157\1\uffff\1\145\1\uffff\1\154\1\116\1\171\1\156\1\60\1\154\1\60\1\164\2\165\1\145\1\160\1\164\1\145\1\144\1\147\1\156\2\60\1\145\1\154\2\uffff\1\165\1\154\1\164\1\165\1\156\1\60\1\151\1\60\1\151\1\157\1\151\1\uffff\1\60\1\153\1\uffff\1\151\1\uffff\1\151\1\uffff\1\165\1\170\1\uffff\1\145\1\60\1\145\1\141\1\uffff\1\60\1\150\1\156\1\147\1\60\1\145\1\uffff\1\153\1\142\1\167\1\156\1\157\1\105\1\60\1\143\1\uffff\1\144\1\uffff\1\150\1\145\1\162\1\163\1\141\1\60\1\163\1\164\1\156\1\164\2\uffff\1\163\1\60\1\163\1\60\1\150\1\145\1\164\1\uffff\1\156\1\uffff\1\147\1\167\1\144\1\uffff\1\171\1\164\1\144\1\154\1\164\1\60\1\uffff\1\60\1\156\1\uffff\2\60\1\156\1\60\1\uffff\2\60\1\154\1\60\1\144\1\167\1\104\1\uffff\1\145\3\60\1\141\1\150\1\162\1\uffff\1\145\1\150\2\60\1\145\1\uffff\1\60\1\uffff\3\60\1\147\1\150\1\60\1\164\2\60\1\164\1\163\1\142\2\uffff\1\60\2\uffff\1\141\3\uffff\1\145\1\uffff\1\151\3\60\3\uffff\1\164\1\157\1\145\1\164\1\60\2\uffff\1\164\4\uffff\2\60\1\uffff\1\150\2\uffff\1\150\1\145\1\165\1\uffff\1\154\1\60\1\141\3\uffff\1\145\1\154\2\60\1\uffff\1\60\2\uffff\3\60\1\163\1\60\1\uffff\1\156\1\60\1\144\6\uffff\1\60\1\uffff\1\60\1\uffff\1\60\3\uffff"; + static final String DFA22_maxS = + "\1\175\1\uffff\1\162\1\uffff\1\171\3\uffff\1\157\1\165\1\160\1\uffff\1\170\1\156\1\163\11\uffff\1\165\1\171\1\162\2\172\1\167\1\166\1\157\2\163\1\156\1\116\2\uffff\1\57\4\uffff\1\157\1\163\1\160\1\165\1\162\1\163\1\156\1\154\1\145\1\154\2\165\1\157\1\164\1\165\1\162\1\164\1\154\1\144\1\142\1\144\1\171\1\164\1\172\1\155\1\170\1\156\1\162\1\156\1\172\1\141\1\156\2\164\1\147\1\151\1\163\1\166\1\154\1\172\1\uffff\1\163\2\172\1\uffff\1\172\1\154\2\145\1\162\1\164\1\142\1\166\1\142\1\163\1\144\1\104\2\uffff\1\160\1\143\4\145\1\141\1\143\1\162\1\164\1\163\2\154\1\160\1\156\1\151\1\143\1\145\1\155\1\157\1\142\1\145\2\162\1\147\1\172\1\162\1\151\1\145\1\156\1\151\2\145\1\uffff\1\142\1\164\1\145\1\163\1\151\1\143\1\156\1\147\1\145\1\157\1\143\1\uffff\1\162\1\143\1\165\1\154\1\150\1\145\1\144\2\172\1\145\1\164\1\144\1\162\1\uffff\1\154\1\145\1\172\2\uffff\1\145\1\154\1\156\1\141\1\uffff\1\164\1\144\1\162\1\145\1\164\1\60\1\145\1\60\1\153\1\145\1\105\2\145\1\144\2\172\1\163\1\165\2\172\1\164\1\145\1\144\1\141\1\157\1\164\1\146\1\153\1\162\1\172\1\144\1\154\1\170\1\162\2\172\1\163\1\156\1\uffff\1\155\1\164\1\144\1\143\1\166\1\163\1\172\1\145\1\172\1\144\1\164\1\156\1\153\1\141\1\154\1\172\1\144\1\143\1\145\1\172\1\162\2\145\1\156\1\147\2\151\1\154\2\uffff\1\164\1\172\1\163\1\172\1\162\1\164\1\uffff\1\164\1\162\1\141\1\163\2\172\1\146\1\144\1\154\1\172\1\154\2\172\1\162\1\106\1\162\1\144\1\147\2\uffff\1\150\1\154\1\uffff\1\151\2\141\1\150\1\uffff\1\157\1\145\2\172\1\154\1\156\1\143\1\145\1\137\1\172\1\156\1\uffff\2\145\1\164\1\156\1\uffff\1\151\1\141\1\uffff\1\172\1\155\1\141\1\163\1\145\2\172\1\145\1\163\1\uffff\1\162\1\uffff\1\147\1\151\1\147\1\171\1\154\1\145\1\172\1\uffff\2\172\1\144\1\uffff\2\141\2\144\1\145\1\154\1\144\1\151\1\172\1\uffff\1\145\1\uffff\4\172\1\142\1\153\1\141\1\156\2\uffff\1\154\1\172\1\145\1\uffff\1\172\2\uffff\1\146\1\111\1\164\2\145\1\157\1\164\1\144\1\154\1\164\1\162\1\155\1\163\1\uffff\1\162\1\151\1\uffff\1\151\1\145\1\164\2\162\1\uffff\1\141\2\172\1\142\1\141\1\144\1\154\1\uffff\1\145\1\160\1\163\1\162\2\uffff\1\154\1\167\1\172\1\145\1\143\3\172\1\160\3\uffff\1\172\1\164\1\156\1\147\1\151\1\172\1\145\1\164\1\147\1\151\1\uffff\1\164\4\uffff\1\154\1\172\1\163\1\141\1\157\1\uffff\1\145\1\uffff\1\154\1\116\1\171\1\156\1\172\1\154\1\172\1\164\2\165\1\145\1\160\1\164\1\145\1\144\1\147\1\156\2\172\1\145\1\154\2\uffff\1\165\1\154\1\164\1\165\1\156\1\172\1\151\1\172\1\151\1\157\1\151\1\uffff\1\172\1\153\1\uffff\1\151\1\uffff\1\151\1\uffff\1\165\1\170\1\uffff\1\145\1\172\1\145\1\141\1\uffff\1\172\1\150\1\156\1\147\1\172\1\145\1\uffff\1\153\1\142\1\167\1\156\1\157\1\105\1\172\1\143\1\uffff\1\144\1\uffff\1\150\1\145\1\162\1\163\1\141\1\172\1\163\1\164\1\156\1\164\2\uffff\1\163\1\172\1\163\1\172\1\150\1\145\1\164\1\uffff\1\156\1\uffff\1\147\1\167\1\144\1\uffff\1\171\1\164\1\144\1\154\1\164\1\172\1\uffff\1\172\1\156\1\uffff\2\172\1\156\1\172\1\uffff\2\172\1\154\1\172\1\144\1\167\1\104\1\uffff\1\145\3\172\1\141\1\150\1\162\1\uffff\1\145\1\150\2\172\1\145\1\uffff\1\172\1\uffff\3\172\1\147\1\150\1\172\1\164\2\172\1\164\1\163\1\142\2\uffff\1\172\2\uffff\1\141\3\uffff\1\145\1\uffff\1\151\3\172\3\uffff\1\164\1\157\1\145\1\164\1\172\2\uffff\1\164\4\uffff\2\172\1\uffff\1\150\2\uffff\1\150\1\145\1\165\1\uffff\1\154\1\172\1\141\3\uffff\1\145\1\154\2\172\1\uffff\1\172\2\uffff\3\172\1\163\1\172\1\uffff\1\156\1\172\1\144\6\uffff\1\172\1\uffff\1\172\1\uffff\1\172\3\uffff"; + static final String DFA22_acceptS = + "\1\uffff\1\1\1\uffff\1\3\1\uffff\1\5\1\6\1\7\3\uffff\1\14\3\uffff\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30\14\uffff\1\174\1\175\1\uffff\1\u0080\1\u0081\1\u0082\1\u0083\50\uffff\1\161\3\uffff\1\162\14\uffff\1\176\1\177\41\uffff\1\163\13\uffff\1\137\15\uffff\1\157\3\uffff\1\53\1\160\4\uffff\1\140\46\uffff\1\45\34\uffff\1\40\1\43\6\uffff\1\54\22\uffff\1\4\1\11\2\uffff\1\33\4\uffff\1\117\13\uffff\1\31\4\uffff\1\65\2\uffff\1\116\11\uffff\1\32\1\uffff\1\155\7\uffff\1\55\3\uffff\1\106\11\uffff\1\47\1\uffff\1\50\10\uffff\1\154\1\67\3\uffff\1\105\1\uffff\1\104\1\146\15\uffff\1\12\2\uffff\1\42\5\uffff\1\145\7\uffff\1\17\4\uffff\1\66\1\107\11\uffff\1\56\1\61\1\62\12\uffff\1\75\1\uffff\1\51\1\52\1\57\1\60\5\uffff\1\70\1\uffff\1\172\25\uffff\1\143\1\147\13\uffff\1\35\2\uffff\1\34\1\uffff\1\63\1\uffff\1\44\2\uffff\1\103\4\uffff\1\102\6\uffff\1\151\10\uffff\1\167\1\uffff\1\10\12\uffff\1\164\1\71\7\uffff\1\37\1\uffff\1\46\3\uffff\1\170\6\uffff\1\36\2\uffff\1\41\4\uffff\1\100\7\uffff\1\2\7\uffff\1\131\5\uffff\1\15\1\uffff\1\16\14\uffff\1\124\1\171\1\uffff\1\133\1\165\1\uffff\1\101\1\150\1\152\1\uffff\1\72\4\uffff\1\126\1\121\1\123\5\uffff\1\166\1\13\1\uffff\1\74\1\120\1\122\1\132\2\uffff\1\113\1\uffff\1\173\1\64\3\uffff\1\77\3\uffff\1\115\1\156\1\142\4\uffff\1\134\1\uffff\1\141\1\112\5\uffff\1\153\3\uffff\1\130\1\111\1\110\1\136\1\135\1\114\1\uffff\1\144\1\uffff\1\125\1\uffff\1\73\1\76\1\127"; + static final String DFA22_specialS = + "\u0284\uffff}>"; + static final String[] DFA22_transitionS = { + "\2\45\2\uffff\1\45\22\uffff\1\45\1\uffff\1\52\2\uffff\1\22\2\uffff\1\50\2\uffff\1\21\1\17\1\26\1\27\1\46\12\51\1\24\1\6\1\47\1\5\2\uffff\1\20\24\44\1\43\5\44\1\23\1\44\1\25\1\uffff\1\44\1\1\1\16\1\32\1\12\1\10\1\14\1\11\1\44\1\35\1\15\2\44\1\40\1\41\1\30\1\36\1\2\1\44\1\33\1\31\1\4\1\42\1\44\1\34\1\37\2\44\1\3\1\13\1\7", "", - "\1\53\2\uffff\1\52", + "\1\54\2\uffff\1\53", "", - "\1\56\11\uffff\1\55\6\uffff\1\54", + "\1\57\11\uffff\1\56\6\uffff\1\55", "", "", "", - "\1\57\11\uffff\1\60", - "\1\61\7\uffff\1\62\13\uffff\1\63", - "\1\66\2\uffff\1\64\1\65", + "\1\60\11\uffff\1\61", + "\1\62\7\uffff\1\63\13\uffff\1\64", + "\1\67\2\uffff\1\65\1\66", "", - "\1\70\3\uffff\1\71\5\uffff\1\67", - "\1\72", - "\1\100\1\74\7\uffff\1\73\1\uffff\1\76\3\uffff\1\75\1\77", + "\1\71\3\uffff\1\72\5\uffff\1\70", + "\1\73", + "\1\101\1\75\7\uffff\1\74\1\uffff\1\77\3\uffff\1\76\1\100", "", "", "", @@ -4626,72 +4633,71 @@ public class InternalRDLLexer extends Lexer { "", "", "", - "\1\101\3\uffff\1\103\11\uffff\1\104\5\uffff\1\102", - "\1\112\6\uffff\1\110\1\106\12\uffff\1\105\2\uffff\1\107\1\uffff\1\111", - "\1\114\5\uffff\1\113\2\uffff\1\115", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\2\44\1\120\1\44\1\116\15\44\1\117\3\44\1\121\3\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\124\11\44\1\123\2\44\1\125\10\44", - "\1\130\25\uffff\1\127", - "\1\131\3\uffff\1\132", - "\1\133", - "\1\136\3\uffff\1\134\11\uffff\1\135", - "\1\140\21\uffff\1\137", - "\1\141", + "\1\102\3\uffff\1\104\11\uffff\1\105\5\uffff\1\103", + "\1\113\6\uffff\1\111\1\107\12\uffff\1\106\2\uffff\1\110\1\uffff\1\112", + "\1\115\5\uffff\1\114\2\uffff\1\116", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\2\44\1\121\1\44\1\117\15\44\1\120\3\44\1\122\3\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\125\11\44\1\124\2\44\1\126\10\44", + "\1\131\25\uffff\1\130", + "\1\132\3\uffff\1\133", + "\1\134", + "\1\137\3\uffff\1\135\11\uffff\1\136", + "\1\141\21\uffff\1\140", "\1\142", + "\1\143", "", "", - "\1\47\4\uffff\1\143", + "\1\144\4\uffff\1\145", "", "", "", - "\1\145\11\uffff\1\144", - "\1\146", - "\1\147", + "", + "\1\147\11\uffff\1\146", "\1\150", "\1\151", - "\1\154\2\uffff\1\152\14\uffff\1\153", - "\1\155", - "\1\156", + "\1\152", + "\1\153", + "\1\156\2\uffff\1\154\14\uffff\1\155", "\1\157", "\1\160", - "\1\161\7\uffff\1\162", - "\1\163", - "\1\164", + "\1\161", + "\1\162", + "\1\163\7\uffff\1\164", "\1\165", - "\1\170\1\uffff\1\167\21\uffff\1\166", - "\1\171", - "\1\173\20\uffff\1\172", - "\1\174\2\uffff\1\175", - "\1\176", - "\1\177", + "\1\166", + "\1\167", + "\1\172\1\uffff\1\171\21\uffff\1\170", + "\1\173", + "\1\175\20\uffff\1\174", + "\1\176\2\uffff\1\177", "\1\u0080", "\1\u0081", - "\1\u0083\20\uffff\1\u0082", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\14\44\1\u0084\15\44", - "\1\u0086", - "\1\u0088\20\uffff\1\u0087", - "\1\u0089", - "\1\u008b\10\uffff\1\u008a", - "\1\u008c\6\uffff\1\u008d", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\u0090\13\44\1\u008f\11\44\1\u008e\3\44", - "\1\u0092", - "\1\u0093", + "\1\u0082", + "\1\u0083", + "\1\u0085\20\uffff\1\u0084", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\14\44\1\u0086\15\44", + "\1\u0088", + "\1\u008a\20\uffff\1\u0089", + "\1\u008b", + "\1\u008d\10\uffff\1\u008c", + "\1\u008e\6\uffff\1\u008f", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\u0092\13\44\1\u0091\11\44\1\u0090\3\44", "\1\u0094", - "\1\u0095\4\uffff\1\u0096", - "\1\u0097", - "\1\u0098", - "\1\u009a\1\u0099\13\uffff\1\u009b", - "\1\u009c\20\uffff\1\u009d", - "\1\u009e", + "\1\u0095", + "\1\u0096", + "\1\u0097\4\uffff\1\u0098", + "\1\u0099", + "\1\u009a", + "\1\u009c\1\u009b\13\uffff\1\u009d", + "\1\u009e\20\uffff\1\u009f", + "\1\u00a0", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", - "\1\u00a0\17\uffff\1\u00a1", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\13\44\1\u00a2\16\44", + "\1\u00a2\17\uffff\1\u00a3", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\13\44\1\u00a4\16\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\2\44\1\u00a6\1\44\1\u00a7\7\44\1\u00a8\5\44\1\u00a5\7\44", - "\1\u00aa", - "\1\u00ab", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\2\44\1\u00a8\1\44\1\u00a9\7\44\1\u00aa\5\44\1\u00a7\7\44", "\1\u00ac", "\1\u00ad", "\1\u00ae", @@ -4701,9 +4707,10 @@ public class InternalRDLLexer extends Lexer { "\1\u00b2", "\1\u00b3", "\1\u00b4", - "", "\1\u00b5", "\1\u00b6", + "", + "", "\1\u00b7", "\1\u00b8", "\1\u00b9", @@ -4724,20 +4731,20 @@ public class InternalRDLLexer extends Lexer { "\1\u00c8", "\1\u00c9", "\1\u00ca", - "\1\u00cb\14\uffff\1\u00cc", - "\1\u00cd", - "\1\u00ce\5\uffff\1\u00cf", + "\1\u00cb", + "\1\u00cc", + "\1\u00cd\14\uffff\1\u00ce", + "\1\u00cf", + "\1\u00d0\5\uffff\1\u00d1", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u00d1", - "\1\u00d2", "\1\u00d3", "\1\u00d4", "\1\u00d5", "\1\u00d6", "\1\u00d7", - "", "\1\u00d8", "\1\u00d9", + "", "\1\u00da", "\1\u00db", "\1\u00dc", @@ -4747,33 +4754,33 @@ public class InternalRDLLexer extends Lexer { "\1\u00e0", "\1\u00e1", "\1\u00e2", - "", "\1\u00e3", "\1\u00e4", + "", "\1\u00e5", "\1\u00e6", "\1\u00e7", "\1\u00e8", "\1\u00e9", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\u00ec\4\44\1\u00ea\20\44\1\u00eb\3\44", + "\1\u00ea", + "\1\u00eb", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\u00ee\4\44\1\u00ec\20\44\1\u00ed\3\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u00ef", - "\1\u00f0", "\1\u00f1", "\1\u00f2", - "", "\1\u00f3", "\1\u00f4", + "", + "\1\u00f5", + "\1\u00f6", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "", - "\1\u00f6", - "\1\u00f7", "\1\u00f8", "\1\u00f9", - "", "\1\u00fa", "\1\u00fb", + "", "\1\u00fc", "\1\u00fd", "\1\u00fe", @@ -4786,171 +4793,171 @@ public class InternalRDLLexer extends Lexer { "\1\u0105", "\1\u0106", "\1\u0107", + "\1\u0108", + "\1\u0109", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u010a", - "\1\u010b", + "\1\u010c", + "\1\u010d", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\22\44\1\u010f\1\u0110\1\44\1\u010e\1\u010d\3\44", - "\1\u0112\20\uffff\1\u0113", - "\1\u0114", - "\1\u0115", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\22\44\1\u0111\1\u0112\1\44\1\u0110\1\u010f\3\44", + "\1\u0114\20\uffff\1\u0115", "\1\u0116", - "\1\u0118\15\uffff\1\u0117", - "\1\u0119", - "\1\u011a", + "\1\u0117", + "\1\u0118", + "\1\u011a\15\uffff\1\u0119", "\1\u011b", "\1\u011c", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u011d", "\1\u011e", - "\1\u011f", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0120", "\1\u0121", + "\1\u0122", + "\1\u0123", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\25\44\1\u0124\1\u0123\3\44", - "\1\u0126", - "\1\u0127", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\25\44\1\u0126\1\u0125\3\44", + "\1\u0128", + "\1\u0129", "", - "\1\u0129\7\uffff\1\u0128", - "\1\u012a", - "\1\u012b", + "\1\u012b\7\uffff\1\u012a", "\1\u012c", "\1\u012d", "\1\u012e", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u012f", "\1\u0130", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0132", - "\1\u0133", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0134", "\1\u0135", "\1\u0136", "\1\u0137", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\13\44\1\u0138\16\44", - "\1\u013a", - "\1\u013b", + "\1\u0138", + "\1\u0139", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\13\44\1\u013a\16\44", "\1\u013c", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u013d", "\1\u013e", - "\1\u013f", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0140", "\1\u0141", "\1\u0142", "\1\u0143", "\1\u0144", "\1\u0145", - "", - "", "\1\u0146", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0147", + "", + "", "\1\u0148", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u014a", - "\1\u014b", - "", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u014c", "\1\u014d", + "", "\1\u014e", "\1\u014f", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\u0151\7\44\1\u0150\15\44", + "\1\u0150", + "\1\u0151", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\u0153\7\44\1\u0152\15\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0154", - "\1\u0155", "\1\u0156", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0157", "\1\u0158", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u015a", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u015b", - "\1\u015c", "\1\u015d", "\1\u015e", "\1\u015f", - "", - "", "\1\u0160", "\1\u0161", "", + "", "\1\u0162", "\1\u0163", + "", "\1\u0164", "\1\u0165", - "", "\1\u0166", "\1\u0167", + "", + "\1\u0168", + "\1\u0169", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\u0169\1\uffff\26\44\1\u016a\3\44", - "\1\u016c", - "\1\u016d", + "\12\44\7\uffff\32\44\4\uffff\1\u016b\1\uffff\26\44\1\u016c\3\44", "\1\u016e", "\1\u016f", "\1\u0170", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0171", "\1\u0172", - "", - "\1\u0173", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0174", + "", "\1\u0175", "\1\u0176", - "", "\1\u0177", "\1\u0178", "", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0179", "\1\u017a", - "\1\u017b", + "", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u017c", "\1\u017d", + "\1\u017e", + "\1\u017f", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0180", - "\1\u0181", - "", "\1\u0182", - "", "\1\u0183", + "", "\1\u0184", + "", "\1\u0185", "\1\u0186", "\1\u0187", "\1\u0188", + "\1\u0189", + "\1\u018a", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u018c", - "", - "\1\u018d", "\1\u018e", + "", "\1\u018f", "\1\u0190", "\1\u0191", "\1\u0192", "\1\u0193", "\1\u0194", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\22\44\1\u0195\7\44", + "\1\u0195", + "\1\u0196", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\22\44\1\u0197\7\44", "", - "\1\u0197", + "\1\u0199", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u019c", - "\1\u019d", "\1\u019e", "\1\u019f", - "", - "", "\1\u01a0", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01a1", + "", + "", "\1\u01a2", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01a4", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "", - "\1\u01a4", - "\1\u01a5", "\1\u01a6", "\1\u01a7", "\1\u01a8", @@ -4962,75 +4969,75 @@ public class InternalRDLLexer extends Lexer { "\1\u01ae", "\1\u01af", "\1\u01b0", - "", "\1\u01b1", "\1\u01b2", "", "\1\u01b3", "\1\u01b4", + "", "\1\u01b5", "\1\u01b6", "\1\u01b7", - "", "\1\u01b8", + "\1\u01b9", + "", + "\1\u01ba", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u01bb", - "\1\u01bc", "\1\u01bd", "\1\u01be", - "", "\1\u01bf", "\1\u01c0", + "", "\1\u01c1", "\1\u01c2", + "\1\u01c3", + "\1\u01c4", "", "", - "\1\u01c3\3\uffff\1\u01c4", - "\1\u01c5", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01c5\3\uffff\1\u01c6", "\1\u01c7", - "\1\u01c8", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\44\1\u01ca\30\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\26\44\1\u01cc\3\44", - "\1\u01ce", + "\1\u01c9", + "\1\u01ca", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\1\44\1\u01cc\30\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\26\44\1\u01ce\3\44", + "\1\u01d0", "", "", "", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\u01cf\25\44", - "\1\u01d1", - "\1\u01d2", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\4\44\1\u01d1\25\44", "\1\u01d3", "\1\u01d4", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01d5", "\1\u01d6", - "\1\u01d7", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01d8", "\1\u01d9", - "", "\1\u01da", - "", - "", - "", - "", "\1\u01db", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", + "\1\u01dc", + "", + "", + "", + "", "\1\u01dd", - "\1\u01de", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01df", - "", "\1\u01e0", - "", "\1\u01e1", + "", "\1\u01e2", + "", "\1\u01e3", "\1\u01e4", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01e5", "\1\u01e6", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01e8", - "\1\u01e9", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01ea", "\1\u01eb", "\1\u01ec", @@ -5039,160 +5046,162 @@ public class InternalRDLLexer extends Lexer { "\1\u01ef", "\1\u01f0", "\1\u01f1", + "\1\u01f2", + "\1\u01f3", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u01f4", - "\1\u01f5", - "", - "", "\1\u01f6", "\1\u01f7", + "", + "", "\1\u01f8", "\1\u01f9", "\1\u01fa", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u01fb", "\1\u01fc", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u01fe", - "\1\u01ff", - "\1\u0200", - "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0200", + "\1\u0201", "\1\u0202", "", - "\1\u0203", - "", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0204", "", "\1\u0205", + "", "\1\u0206", "", "\1\u0207", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0208", + "", "\1\u0209", - "\1\u020a", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u020b", + "\1\u020c", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u020c", - "\1\u020d", "\1\u020e", - "\12\44\7\uffff\27\44\1\u020f\2\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0211", - "", - "\1\u0212", + "\1\u020f", + "\1\u0210", + "\12\44\7\uffff\27\44\1\u0211\2\44\4\uffff\1\44\1\uffff\32\44", "\1\u0213", + "", "\1\u0214", "\1\u0215", "\1\u0216", "\1\u0217", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0218", "\1\u0219", - "", - "\1\u021a", - "", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u021b", + "", "\1\u021c", + "", "\1\u021d", "\1\u021e", "\1\u021f", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0220", "\1\u0221", - "\1\u0222", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0223", "\1\u0224", - "", - "", "\1\u0225", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0226", + "", + "", "\1\u0227", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0229", - "\1\u022a", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u022b", - "", "\1\u022c", - "", "\1\u022d", - "\1\u022e", - "\1\u022f", "", + "\1\u022e", + "", + "\1\u022f", "\1\u0230", "\1\u0231", + "", "\1\u0232", "\1\u0233", "\1\u0234", + "\1\u0235", + "\1\u0236", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0237", + "\1\u0239", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u023a", + "\1\u023c", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u023e", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0240", - "\1\u0241", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0242", - "", "\1\u0243", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0247", - "\1\u0248", - "\1\u0249", + "\1\u0244", "", + "\1\u0245", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0249", "\1\u024a", "\1\u024b", + "", + "\1\u024c", + "\1\u024d", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u024e", + "\1\u0250", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0253", - "\1\u0254", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0255", "\1\u0256", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0258", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u0259", - "\1\u025a", "\1\u025b", - "", - "", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", - "", + "\1\u025c", "\1\u025d", "", "", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", - "\1\u025e", "", "\1\u025f", + "", + "", + "", + "\1\u0260", + "", + "\1\u0261", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", "", "", - "\1\u0263", - "\1\u0264", "\1\u0265", "\1\u0266", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", - "", + "\1\u0267", "\1\u0268", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", + "", + "\1\u026a", "", "", "", @@ -5200,21 +5209,21 @@ public class InternalRDLLexer extends Lexer { "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", - "\1\u026b", - "", - "", - "\1\u026c", "\1\u026d", + "", + "", "\1\u026e", - "", "\1\u026f", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0270", + "", "\1\u0271", - "", - "", - "", - "\1\u0272", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\1\u0273", + "", + "", + "", + "\1\u0274", + "\1\u0275", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "", @@ -5224,12 +5233,12 @@ public class InternalRDLLexer extends Lexer { "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "\1\u027a", - "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", - "", "\1\u027c", "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "", "\1\u027e", + "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44", + "\1\u0280", "", "", "", @@ -5246,37 +5255,37 @@ public class InternalRDLLexer extends Lexer { "" }; - static final short[] DFA23_eot = DFA.unpackEncodedString(DFA23_eotS); - static final short[] DFA23_eof = DFA.unpackEncodedString(DFA23_eofS); - static final char[] DFA23_min = DFA.unpackEncodedStringToUnsignedChars(DFA23_minS); - static final char[] DFA23_max = DFA.unpackEncodedStringToUnsignedChars(DFA23_maxS); - static final short[] DFA23_accept = DFA.unpackEncodedString(DFA23_acceptS); - static final short[] DFA23_special = DFA.unpackEncodedString(DFA23_specialS); - static final short[][] DFA23_transition; + static final short[] DFA22_eot = DFA.unpackEncodedString(DFA22_eotS); + static final short[] DFA22_eof = DFA.unpackEncodedString(DFA22_eofS); + static final char[] DFA22_min = DFA.unpackEncodedStringToUnsignedChars(DFA22_minS); + static final char[] DFA22_max = DFA.unpackEncodedStringToUnsignedChars(DFA22_maxS); + static final short[] DFA22_accept = DFA.unpackEncodedString(DFA22_acceptS); + static final short[] DFA22_special = DFA.unpackEncodedString(DFA22_specialS); + static final short[][] DFA22_transition; static { - int numStates = DFA23_transitionS.length; - DFA23_transition = new short[numStates][]; + int numStates = DFA22_transitionS.length; + DFA22_transition = new short[numStates][]; for (int i=0; i", "", "", "", "RULE_STR", "RULE_ID", "RULE_NUM", "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "'`include'", "'property'", "'{'", "'type'", "'='", "';'", "'}'", "'default'", "'true'", "'false'", "'component'", "'|'", "'external'", "'internal'", "'alias'", "','", "'@'", "'+='", "'%='", "'['", "':'", "']'", "'->'", "'.'", "'enum'", "'name'", "'desc'", "'string'", "'number'", "'boolean'", "'addrmap'", "'reg'", "'regfile'", "'field'", "'ref'", "'signal'", "'all'", "'arbiter'", "'rset'", "'rclr'", "'woclr'", "'woset'", "'we'", "'wel'", "'swwe'", "'swwel'", "'hwset'", "'hwclr'", "'swmod'", "'swacc'", "'sticky'", "'stickybit'", "'intr'", "'anded'", "'ored'", "'xored'", "'counter'", "'overflow'", "'sharedextbus'", "'errextbus'", "'reset'", "'littleendian'", "'bigendian'", "'rsvdset'", "'rsvdsetX'", "'bridge'", "'shared'", "'msb0'", "'lsb0'", "'sync'", "'async'", "'cpuif_reset'", "'field_reset'", "'activehigh'", "'activelow'", "'singlepulse'", "'underflow'", "'incr'", "'decr'", "'incrwidth'", "'decrwidth'", "'incrvalue'", "'decrvalue'", "'saturate'", "'decrsaturate'", "'threshold'", "'decrthreshold'", "'dontcompare'", "'donttest'", "'alignment'", "'regwidth'", "'fieldwidth'", "'signalwidth'", "'accesswidth'", "'sw'", "'hw'", "'addressing'", "'precedence'", "'encode'", "'resetsignal'", "'clock'", "'mask'", "'enable'", "'hwenable'", "'hwmask'", "'haltmask'", "'haltenable'", "'halt'", "'next'", "'UNDEFINED'", "'rw'", "'wr'", "'r'", "'w'", "'na'", "'compact'", "'regalign'", "'fullalign'", "'posedge'", "'negedge'", "'bothedge'", "'level'", "'nonsticky'" + "", "", "", "", "RULE_STR", "RULE_ID", "RULE_NUM", "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ESCAPE_JSP", "RULE_ESCAPE_ORDL", "'`include'", "'property'", "'{'", "'type'", "'='", "';'", "'}'", "'default'", "'true'", "'false'", "'component'", "'|'", "'external'", "'internal'", "'alias'", "','", "'@'", "'+='", "'%='", "'['", "':'", "']'", "'->'", "'.'", "'enum'", "'name'", "'desc'", "'string'", "'number'", "'boolean'", "'addrmap'", "'reg'", "'regfile'", "'field'", "'ref'", "'signal'", "'all'", "'arbiter'", "'rset'", "'rclr'", "'woclr'", "'woset'", "'we'", "'wel'", "'swwe'", "'swwel'", "'hwset'", "'hwclr'", "'swmod'", "'swacc'", "'sticky'", "'stickybit'", "'intr'", "'anded'", "'ored'", "'xored'", "'counter'", "'overflow'", "'sharedextbus'", "'errextbus'", "'reset'", "'littleendian'", "'bigendian'", "'rsvdset'", "'rsvdsetX'", "'bridge'", "'shared'", "'msb0'", "'lsb0'", "'sync'", "'async'", "'cpuif_reset'", "'field_reset'", "'activehigh'", "'activelow'", "'singlepulse'", "'underflow'", "'incr'", "'decr'", "'incrwidth'", "'decrwidth'", "'incrvalue'", "'decrvalue'", "'saturate'", "'decrsaturate'", "'threshold'", "'decrthreshold'", "'dontcompare'", "'donttest'", "'alignment'", "'regwidth'", "'fieldwidth'", "'signalwidth'", "'accesswidth'", "'sw'", "'hw'", "'addressing'", "'precedence'", "'encode'", "'resetsignal'", "'clock'", "'mask'", "'enable'", "'hwenable'", "'hwmask'", "'haltmask'", "'haltenable'", "'halt'", "'next'", "'UNDEFINED'", "'rw'", "'wr'", "'r'", "'w'", "'na'", "'compact'", "'regalign'", "'fullalign'", "'posedge'", "'negedge'", "'bothedge'", "'level'", "'nonsticky'" }; public static final int T__50=50; public static final int T__59=59; @@ -34,9 +34,11 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { public static final int T__52=52; public static final int T__53=53; public static final int T__54=54; + public static final int T__133=133; 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=5; public static final int T__131=131; public static final int T__130=130; @@ -88,7 +90,6 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { public static final int T__16=16; public static final int T__17=17; public static final int T__18=18; - public static final int T__11=11; public static final int T__99=99; public static final int RULE_NUM=6; public static final int T__12=12; @@ -97,8 +98,8 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { public static final int T__95=95; public static final int T__96=96; public static final int T__97=97; - public static final int T__10=10; public static final int T__98=98; + public static final int RULE_ESCAPE_ORDL=11; public static final int T__26=26; public static final int T__27=27; public static final int T__28=28; @@ -136,6 +137,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { public static final int T__111=111; public static final int T__81=81; public static final int T__110=110; + public static final int RULE_ESCAPE_JSP=10; public static final int T__82=82; public static final int T__113=113; public static final int T__83=83; @@ -562,7 +564,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:217:2: (otherlv_0= '`include' ( (lv_importURI_1_0= RULE_STR ) ) ) // InternalRDL.g:218:3: otherlv_0= '`include' ( (lv_importURI_1_0= RULE_STR ) ) { - otherlv_0=(Token)match(input,10,FOLLOW_4); + otherlv_0=(Token)match(input,12,FOLLOW_4); newLeafNode(otherlv_0, grammarAccess.getIncludeAccess().getIncludeKeyword_0()); @@ -716,7 +718,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:258:2: (otherlv_0= 'property' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( (otherlv_3= 'type' otherlv_4= '=' ( (lv_type_5_0= rulePropertyTypeName ) ) otherlv_6= ';' ( ( ( (lv_usage_7_0= rulePropertyUsage ) ) ( (lv_default_8_0= rulePropertyDefault ) )? ) | ( ( (lv_default_9_0= rulePropertyDefault ) ) ( (lv_usage_10_0= rulePropertyUsage ) ) ) ) ) | ( ( (lv_usage_11_0= rulePropertyUsage ) ) ( (otherlv_12= 'type' otherlv_13= '=' ( (lv_type_14_0= rulePropertyTypeName ) ) otherlv_15= ';' ( (lv_default_16_0= rulePropertyDefault ) )? ) | ( ( (lv_default_17_0= rulePropertyDefault ) ) otherlv_18= 'type' otherlv_19= '=' ( (lv_type_20_0= rulePropertyTypeName ) ) otherlv_21= ';' ) ) ) | ( ( (lv_default_22_0= rulePropertyDefault ) ) ( (otherlv_23= 'type' otherlv_24= '=' ( (lv_type_25_0= rulePropertyTypeName ) ) otherlv_26= ';' ( (lv_usage_27_0= rulePropertyUsage ) ) ) | ( ( (lv_usage_28_0= rulePropertyUsage ) ) otherlv_29= 'type' otherlv_30= '=' ( (lv_type_31_0= rulePropertyTypeName ) ) otherlv_32= ';' ) ) ) ) otherlv_33= '}' otherlv_34= ';' ) // InternalRDL.g:259:3: otherlv_0= 'property' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '{' ( (otherlv_3= 'type' otherlv_4= '=' ( (lv_type_5_0= rulePropertyTypeName ) ) otherlv_6= ';' ( ( ( (lv_usage_7_0= rulePropertyUsage ) ) ( (lv_default_8_0= rulePropertyDefault ) )? ) | ( ( (lv_default_9_0= rulePropertyDefault ) ) ( (lv_usage_10_0= rulePropertyUsage ) ) ) ) ) | ( ( (lv_usage_11_0= rulePropertyUsage ) ) ( (otherlv_12= 'type' otherlv_13= '=' ( (lv_type_14_0= rulePropertyTypeName ) ) otherlv_15= ';' ( (lv_default_16_0= rulePropertyDefault ) )? ) | ( ( (lv_default_17_0= rulePropertyDefault ) ) otherlv_18= 'type' otherlv_19= '=' ( (lv_type_20_0= rulePropertyTypeName ) ) otherlv_21= ';' ) ) ) | ( ( (lv_default_22_0= rulePropertyDefault ) ) ( (otherlv_23= 'type' otherlv_24= '=' ( (lv_type_25_0= rulePropertyTypeName ) ) otherlv_26= ';' ( (lv_usage_27_0= rulePropertyUsage ) ) ) | ( ( (lv_usage_28_0= rulePropertyUsage ) ) otherlv_29= 'type' otherlv_30= '=' ( (lv_type_31_0= rulePropertyTypeName ) ) otherlv_32= ';' ) ) ) ) otherlv_33= '}' otherlv_34= ';' { - otherlv_0=(Token)match(input,11,FOLLOW_5); + otherlv_0=(Token)match(input,13,FOLLOW_5); newLeafNode(otherlv_0, grammarAccess.getPropertyDefinitionAccess().getPropertyKeyword_0()); @@ -746,24 +748,24 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_2=(Token)match(input,12,FOLLOW_7); + otherlv_2=(Token)match(input,14,FOLLOW_7); newLeafNode(otherlv_2, grammarAccess.getPropertyDefinitionAccess().getLeftCurlyBracketKeyword_2()); // InternalRDL.g:285:3: ( (otherlv_3= 'type' otherlv_4= '=' ( (lv_type_5_0= rulePropertyTypeName ) ) otherlv_6= ';' ( ( ( (lv_usage_7_0= rulePropertyUsage ) ) ( (lv_default_8_0= rulePropertyDefault ) )? ) | ( ( (lv_default_9_0= rulePropertyDefault ) ) ( (lv_usage_10_0= rulePropertyUsage ) ) ) ) ) | ( ( (lv_usage_11_0= rulePropertyUsage ) ) ( (otherlv_12= 'type' otherlv_13= '=' ( (lv_type_14_0= rulePropertyTypeName ) ) otherlv_15= ';' ( (lv_default_16_0= rulePropertyDefault ) )? ) | ( ( (lv_default_17_0= rulePropertyDefault ) ) otherlv_18= 'type' otherlv_19= '=' ( (lv_type_20_0= rulePropertyTypeName ) ) otherlv_21= ';' ) ) ) | ( ( (lv_default_22_0= rulePropertyDefault ) ) ( (otherlv_23= 'type' otherlv_24= '=' ( (lv_type_25_0= rulePropertyTypeName ) ) otherlv_26= ';' ( (lv_usage_27_0= rulePropertyUsage ) ) ) | ( ( (lv_usage_28_0= rulePropertyUsage ) ) otherlv_29= 'type' otherlv_30= '=' ( (lv_type_31_0= rulePropertyTypeName ) ) otherlv_32= ';' ) ) ) ) int alt7=3; switch ( input.LA(1) ) { - case 13: + case 15: { alt7=1; } break; - case 20: + case 22: { alt7=2; } break; - case 17: + case 19: { alt7=3; } @@ -782,11 +784,11 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:286:4: (otherlv_3= 'type' otherlv_4= '=' ( (lv_type_5_0= rulePropertyTypeName ) ) otherlv_6= ';' ( ( ( (lv_usage_7_0= rulePropertyUsage ) ) ( (lv_default_8_0= rulePropertyDefault ) )? ) | ( ( (lv_default_9_0= rulePropertyDefault ) ) ( (lv_usage_10_0= rulePropertyUsage ) ) ) ) ) // InternalRDL.g:287:5: otherlv_3= 'type' otherlv_4= '=' ( (lv_type_5_0= rulePropertyTypeName ) ) otherlv_6= ';' ( ( ( (lv_usage_7_0= rulePropertyUsage ) ) ( (lv_default_8_0= rulePropertyDefault ) )? ) | ( ( (lv_default_9_0= rulePropertyDefault ) ) ( (lv_usage_10_0= rulePropertyUsage ) ) ) ) { - otherlv_3=(Token)match(input,13,FOLLOW_8); + otherlv_3=(Token)match(input,15,FOLLOW_8); newLeafNode(otherlv_3, grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_0_0()); - otherlv_4=(Token)match(input,14,FOLLOW_9); + otherlv_4=(Token)match(input,16,FOLLOW_9); newLeafNode(otherlv_4, grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_0_1()); @@ -821,7 +823,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,15,FOLLOW_7); + otherlv_6=(Token)match(input,17,FOLLOW_7); newLeafNode(otherlv_6, grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_0_3()); @@ -829,10 +831,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt3=2; int LA3_0 = input.LA(1); - if ( (LA3_0==20) ) { + if ( (LA3_0==22) ) { alt3=1; } - else if ( (LA3_0==17) ) { + else if ( (LA3_0==19) ) { alt3=2; } else { @@ -883,7 +885,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt2=2; int LA2_0 = input.LA(1); - if ( (LA2_0==17) ) { + if ( (LA2_0==19) ) { alt2=1; } switch (alt2) { @@ -1051,10 +1053,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt5=2; int LA5_0 = input.LA(1); - if ( (LA5_0==13) ) { + if ( (LA5_0==15) ) { alt5=1; } - else if ( (LA5_0==17) ) { + else if ( (LA5_0==19) ) { alt5=2; } else { @@ -1070,11 +1072,11 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:424:6: (otherlv_12= 'type' otherlv_13= '=' ( (lv_type_14_0= rulePropertyTypeName ) ) otherlv_15= ';' ( (lv_default_16_0= rulePropertyDefault ) )? ) // InternalRDL.g:425:7: otherlv_12= 'type' otherlv_13= '=' ( (lv_type_14_0= rulePropertyTypeName ) ) otherlv_15= ';' ( (lv_default_16_0= rulePropertyDefault ) )? { - otherlv_12=(Token)match(input,13,FOLLOW_8); + otherlv_12=(Token)match(input,15,FOLLOW_8); newLeafNode(otherlv_12, grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_1_1_0_0()); - otherlv_13=(Token)match(input,14,FOLLOW_9); + otherlv_13=(Token)match(input,16,FOLLOW_9); newLeafNode(otherlv_13, grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_1_1_0_1()); @@ -1109,7 +1111,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_15=(Token)match(input,15,FOLLOW_11); + otherlv_15=(Token)match(input,17,FOLLOW_11); newLeafNode(otherlv_15, grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_1_1_0_3()); @@ -1117,7 +1119,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt4=2; int LA4_0 = input.LA(1); - if ( (LA4_0==17) ) { + if ( (LA4_0==19) ) { alt4=1; } switch (alt4) { @@ -1198,11 +1200,11 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_18=(Token)match(input,13,FOLLOW_8); + otherlv_18=(Token)match(input,15,FOLLOW_8); newLeafNode(otherlv_18, grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_1_1_1_1()); - otherlv_19=(Token)match(input,14,FOLLOW_9); + otherlv_19=(Token)match(input,16,FOLLOW_9); newLeafNode(otherlv_19, grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_1_1_1_2()); @@ -1237,7 +1239,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_21=(Token)match(input,15,FOLLOW_12); + otherlv_21=(Token)match(input,17,FOLLOW_12); newLeafNode(otherlv_21, grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_1_1_1_4()); @@ -1297,10 +1299,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt6=2; int LA6_0 = input.LA(1); - if ( (LA6_0==13) ) { + if ( (LA6_0==15) ) { alt6=1; } - else if ( (LA6_0==20) ) { + else if ( (LA6_0==22) ) { alt6=2; } else { @@ -1316,11 +1318,11 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:553:6: (otherlv_23= 'type' otherlv_24= '=' ( (lv_type_25_0= rulePropertyTypeName ) ) otherlv_26= ';' ( (lv_usage_27_0= rulePropertyUsage ) ) ) // InternalRDL.g:554:7: otherlv_23= 'type' otherlv_24= '=' ( (lv_type_25_0= rulePropertyTypeName ) ) otherlv_26= ';' ( (lv_usage_27_0= rulePropertyUsage ) ) { - otherlv_23=(Token)match(input,13,FOLLOW_8); + otherlv_23=(Token)match(input,15,FOLLOW_8); newLeafNode(otherlv_23, grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_2_1_0_0()); - otherlv_24=(Token)match(input,14,FOLLOW_9); + otherlv_24=(Token)match(input,16,FOLLOW_9); newLeafNode(otherlv_24, grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_2_1_0_1()); @@ -1355,7 +1357,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_26=(Token)match(input,15,FOLLOW_13); + otherlv_26=(Token)match(input,17,FOLLOW_13); newLeafNode(otherlv_26, grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_2_1_0_3()); @@ -1433,11 +1435,11 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_29=(Token)match(input,13,FOLLOW_8); + otherlv_29=(Token)match(input,15,FOLLOW_8); newLeafNode(otherlv_29, grammarAccess.getPropertyDefinitionAccess().getTypeKeyword_3_2_1_1_1()); - otherlv_30=(Token)match(input,14,FOLLOW_9); + otherlv_30=(Token)match(input,16,FOLLOW_9); newLeafNode(otherlv_30, grammarAccess.getPropertyDefinitionAccess().getEqualsSignKeyword_3_2_1_1_2()); @@ -1472,7 +1474,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_32=(Token)match(input,15,FOLLOW_12); + otherlv_32=(Token)match(input,17,FOLLOW_12); newLeafNode(otherlv_32, grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_3_2_1_1_4()); @@ -1494,11 +1496,11 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_33=(Token)match(input,16,FOLLOW_10); + otherlv_33=(Token)match(input,18,FOLLOW_10); newLeafNode(otherlv_33, grammarAccess.getPropertyDefinitionAccess().getRightCurlyBracketKeyword_4()); - otherlv_34=(Token)match(input,15,FOLLOW_2); + otherlv_34=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_34, grammarAccess.getPropertyDefinitionAccess().getSemicolonKeyword_5()); @@ -1583,11 +1585,11 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:687:2: (otherlv_0= 'default' otherlv_1= '=' ( ( (lv_string_2_0= RULE_STR ) ) | ( (lv_value_3_0= RULE_NUM ) ) | ( (lv_string_4_0= 'true' ) ) | ( (lv_string_5_0= 'false' ) ) ) otherlv_6= ';' ) // InternalRDL.g:688:3: otherlv_0= 'default' otherlv_1= '=' ( ( (lv_string_2_0= RULE_STR ) ) | ( (lv_value_3_0= RULE_NUM ) ) | ( (lv_string_4_0= 'true' ) ) | ( (lv_string_5_0= 'false' ) ) ) otherlv_6= ';' { - otherlv_0=(Token)match(input,17,FOLLOW_8); + otherlv_0=(Token)match(input,19,FOLLOW_8); newLeafNode(otherlv_0, grammarAccess.getPropertyDefaultAccess().getDefaultKeyword_0()); - otherlv_1=(Token)match(input,14,FOLLOW_16); + otherlv_1=(Token)match(input,16,FOLLOW_16); newLeafNode(otherlv_1, grammarAccess.getPropertyDefaultAccess().getEqualsSignKeyword_1()); @@ -1604,12 +1606,12 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { alt8=2; } break; - case 18: + case 20: { alt8=3; } break; - case 19: + case 21: { alt8=4; } @@ -1695,7 +1697,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:736:5: (lv_string_4_0= 'true' ) // InternalRDL.g:737:6: lv_string_4_0= 'true' { - lv_string_4_0=(Token)match(input,18,FOLLOW_10); + lv_string_4_0=(Token)match(input,20,FOLLOW_10); newLeafNode(lv_string_4_0, grammarAccess.getPropertyDefaultAccess().getStringTrueKeyword_2_2_0()); @@ -1723,7 +1725,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:751:5: (lv_string_5_0= 'false' ) // InternalRDL.g:752:6: lv_string_5_0= 'false' { - lv_string_5_0=(Token)match(input,19,FOLLOW_10); + lv_string_5_0=(Token)match(input,21,FOLLOW_10); newLeafNode(lv_string_5_0, grammarAccess.getPropertyDefaultAccess().getStringFalseKeyword_2_3_0()); @@ -1745,7 +1747,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,15,FOLLOW_2); + otherlv_6=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_6, grammarAccess.getPropertyDefaultAccess().getSemicolonKeyword_3()); @@ -1831,11 +1833,11 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:787:2: (otherlv_0= 'component' otherlv_1= '=' ( (lv_components_2_0= rulePropertyComponent ) ) (otherlv_3= '|' ( (lv_components_4_0= rulePropertyComponent ) ) )* otherlv_5= ';' ) // InternalRDL.g:788:3: otherlv_0= 'component' otherlv_1= '=' ( (lv_components_2_0= rulePropertyComponent ) ) (otherlv_3= '|' ( (lv_components_4_0= rulePropertyComponent ) ) )* otherlv_5= ';' { - otherlv_0=(Token)match(input,20,FOLLOW_8); + otherlv_0=(Token)match(input,22,FOLLOW_8); newLeafNode(otherlv_0, grammarAccess.getPropertyUsageAccess().getComponentKeyword_0()); - otherlv_1=(Token)match(input,14,FOLLOW_17); + otherlv_1=(Token)match(input,16,FOLLOW_17); newLeafNode(otherlv_1, grammarAccess.getPropertyUsageAccess().getEqualsSignKeyword_1()); @@ -1876,7 +1878,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt9=2; int LA9_0 = input.LA(1); - if ( (LA9_0==21) ) { + if ( (LA9_0==23) ) { alt9=1; } @@ -1885,7 +1887,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { case 1 : // InternalRDL.g:816:4: otherlv_3= '|' ( (lv_components_4_0= rulePropertyComponent ) ) { - otherlv_3=(Token)match(input,21,FOLLOW_17); + otherlv_3=(Token)match(input,23,FOLLOW_17); newLeafNode(otherlv_3, grammarAccess.getPropertyUsageAccess().getVerticalLineKeyword_3_0()); @@ -1929,7 +1931,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_5=(Token)match(input,15,FOLLOW_2); + otherlv_5=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_5, grammarAccess.getPropertyUsageAccess().getSemicolonKeyword_4()); @@ -2091,7 +2093,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_2=(Token)match(input,12,FOLLOW_20); + otherlv_2=(Token)match(input,14,FOLLOW_20); newLeafNode(otherlv_2, grammarAccess.getComponentDefinitionAccess().getLeftCurlyBracketKeyword_2()); @@ -2100,29 +2102,29 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { do { int alt11=5; switch ( input.LA(1) ) { - case 40: - case 41: case 42: case 43: + case 44: case 45: + case 47: { alt11=1; } break; - case 22: case 24: + case 26: { alt11=2; } break; - case 23: + case 25: { int LA11_4 = input.LA(2); - if ( (LA11_4==RULE_ID||LA11_4==24) ) { + if ( (LA11_4==RULE_ID||LA11_4==26) ) { alt11=2; } - else if ( ((LA11_4>=14 && LA11_4<=15)) ) { + else if ( ((LA11_4>=16 && LA11_4<=17)) ) { alt11=3; } @@ -2133,7 +2135,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { { int LA11_5 = input.LA(2); - if ( ((LA11_5>=14 && LA11_5<=15)||(LA11_5>=32 && LA11_5<=33)) ) { + if ( ((LA11_5>=16 && LA11_5<=17)||(LA11_5>=34 && LA11_5<=35)) ) { alt11=3; } else if ( (LA11_5==RULE_ID) ) { @@ -2143,11 +2145,9 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } break; - case 17: - case 35: - case 36: - case 47: - case 48: + case 19: + case 37: + case 38: case 49: case 50: case 51: @@ -2219,16 +2219,18 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { case 117: case 118: case 119: - case 128: - case 129: + case 120: + case 121: case 130: case 131: case 132: + case 133: + case 134: { alt11=3; } break; - case 34: + case 36: { alt11=4; } @@ -2391,7 +2393,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_7=(Token)match(input,16,FOLLOW_21); + otherlv_7=(Token)match(input,18,FOLLOW_21); newLeafNode(otherlv_7, grammarAccess.getComponentDefinitionAccess().getRightCurlyBracketKeyword_4()); @@ -2399,7 +2401,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt12=2; int LA12_0 = input.LA(1); - if ( (LA12_0==RULE_ID||LA12_0==22) ) { + if ( (LA12_0==RULE_ID||LA12_0==24) ) { alt12=1; } switch (alt12) { @@ -2437,7 +2439,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_9=(Token)match(input,15,FOLLOW_2); + otherlv_9=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_9, grammarAccess.getComponentDefinitionAccess().getSemicolonKeyword_6()); @@ -2530,7 +2532,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt13=2; int LA13_0 = input.LA(1); - if ( (LA13_0==22) ) { + if ( (LA13_0==24) ) { alt13=1; } switch (alt13) { @@ -2540,7 +2542,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:1032:4: (lv_external_0_0= 'external' ) // InternalRDL.g:1033:5: lv_external_0_0= 'external' { - lv_external_0_0=(Token)match(input,22,FOLLOW_22); + lv_external_0_0=(Token)match(input,24,FOLLOW_22); newLeafNode(lv_external_0_0, grammarAccess.getNamedInstantiationAccess().getExternalExternalKeyword_0_0()); @@ -2563,7 +2565,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt14=2; int LA14_0 = input.LA(1); - if ( (LA14_0==23) ) { + if ( (LA14_0==25) ) { alt14=1; } switch (alt14) { @@ -2573,7 +2575,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:1046:4: (lv_internal_1_0= 'internal' ) // InternalRDL.g:1047:5: lv_internal_1_0= 'internal' { - lv_internal_1_0=(Token)match(input,23,FOLLOW_23); + lv_internal_1_0=(Token)match(input,25,FOLLOW_23); newLeafNode(lv_internal_1_0, grammarAccess.getNamedInstantiationAccess().getInternalInternalKeyword_1_0()); @@ -2596,14 +2598,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt15=2; int LA15_0 = input.LA(1); - if ( (LA15_0==24) ) { + if ( (LA15_0==26) ) { alt15=1; } switch (alt15) { case 1 : // InternalRDL.g:1060:4: otherlv_2= 'alias' ( (lv_alias_3_0= RULE_ID ) ) { - otherlv_2=(Token)match(input,24,FOLLOW_5); + otherlv_2=(Token)match(input,26,FOLLOW_5); newLeafNode(otherlv_2, grammarAccess.getNamedInstantiationAccess().getAliasKeyword_2_0()); @@ -2697,7 +2699,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt16=2; int LA16_0 = input.LA(1); - if ( (LA16_0==25) ) { + if ( (LA16_0==27) ) { alt16=1; } @@ -2706,7 +2708,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { case 1 : // InternalRDL.g:1116:4: otherlv_6= ',' ( (lv_componentInstances_7_0= ruleComponentInstance ) ) { - otherlv_6=(Token)match(input,25,FOLLOW_24); + otherlv_6=(Token)match(input,27,FOLLOW_24); newLeafNode(otherlv_6, grammarAccess.getNamedInstantiationAccess().getCommaKeyword_5_0()); @@ -2750,7 +2752,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_8=(Token)match(input,15,FOLLOW_2); + otherlv_8=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_8, grammarAccess.getNamedInstantiationAccess().getSemicolonKeyword_6()); @@ -2838,7 +2840,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt17=2; int LA17_0 = input.LA(1); - if ( (LA17_0==22) ) { + if ( (LA17_0==24) ) { alt17=1; } switch (alt17) { @@ -2848,7 +2850,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:1164:4: (lv_external_0_0= 'external' ) // InternalRDL.g:1165:5: lv_external_0_0= 'external' { - lv_external_0_0=(Token)match(input,22,FOLLOW_24); + lv_external_0_0=(Token)match(input,24,FOLLOW_24); newLeafNode(lv_external_0_0, grammarAccess.getImmediateInstantiationAccess().getExternalExternalKeyword_0_0()); @@ -2904,7 +2906,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt18=2; int LA18_0 = input.LA(1); - if ( (LA18_0==25) ) { + if ( (LA18_0==27) ) { alt18=1; } @@ -2913,7 +2915,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { case 1 : // InternalRDL.g:1197:4: otherlv_2= ',' ( (lv_componentInstances_3_0= ruleComponentInstance ) ) { - otherlv_2=(Token)match(input,25,FOLLOW_24); + otherlv_2=(Token)match(input,27,FOLLOW_24); newLeafNode(otherlv_2, grammarAccess.getImmediateInstantiationAccess().getCommaKeyword_2_0()); @@ -3072,7 +3074,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt19=2; int LA19_0 = input.LA(1); - if ( (LA19_0==29) ) { + if ( (LA19_0==31) ) { alt19=1; } switch (alt19) { @@ -3114,14 +3116,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt20=2; int LA20_0 = input.LA(1); - if ( (LA20_0==14) ) { + if ( (LA20_0==16) ) { alt20=1; } switch (alt20) { case 1 : // InternalRDL.g:1278:4: otherlv_2= '=' ( (lv_reset_3_0= RULE_NUM ) ) { - otherlv_2=(Token)match(input,14,FOLLOW_29); + otherlv_2=(Token)match(input,16,FOLLOW_29); newLeafNode(otherlv_2, grammarAccess.getComponentInstanceAccess().getEqualsSignKeyword_2_0()); @@ -3161,14 +3163,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt21=2; int LA21_0 = input.LA(1); - if ( (LA21_0==26) ) { + if ( (LA21_0==28) ) { alt21=1; } switch (alt21) { case 1 : // InternalRDL.g:1302:4: otherlv_4= '@' ( (lv_address_5_0= RULE_NUM ) ) { - otherlv_4=(Token)match(input,26,FOLLOW_29); + otherlv_4=(Token)match(input,28,FOLLOW_29); newLeafNode(otherlv_4, grammarAccess.getComponentInstanceAccess().getCommercialAtKeyword_3_0()); @@ -3208,14 +3210,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt22=2; int LA22_0 = input.LA(1); - if ( (LA22_0==27) ) { + if ( (LA22_0==29) ) { alt22=1; } switch (alt22) { case 1 : // InternalRDL.g:1326:4: otherlv_6= '+=' ( (lv_addrInc_7_0= RULE_NUM ) ) { - otherlv_6=(Token)match(input,27,FOLLOW_29); + otherlv_6=(Token)match(input,29,FOLLOW_29); newLeafNode(otherlv_6, grammarAccess.getComponentInstanceAccess().getPlusSignEqualsSignKeyword_4_0()); @@ -3255,14 +3257,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt23=2; int LA23_0 = input.LA(1); - if ( (LA23_0==28) ) { + if ( (LA23_0==30) ) { alt23=1; } switch (alt23) { case 1 : // InternalRDL.g:1350:4: otherlv_8= '%=' ( (lv_addrMod_9_0= RULE_NUM ) ) { - otherlv_8=(Token)match(input,28,FOLLOW_29); + otherlv_8=(Token)match(input,30,FOLLOW_29); newLeafNode(otherlv_8, grammarAccess.getComponentInstanceAccess().getPercentSignEqualsSignKeyword_5_0()); @@ -3378,7 +3380,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:1391:2: (otherlv_0= '[' ( ( ( (lv_start_1_0= RULE_NUM ) ) otherlv_2= ':' ( (lv_end_3_0= RULE_NUM ) ) ) | ( (lv_size_4_0= RULE_NUM ) ) ) otherlv_5= ']' ) // InternalRDL.g:1392:3: otherlv_0= '[' ( ( ( (lv_start_1_0= RULE_NUM ) ) otherlv_2= ':' ( (lv_end_3_0= RULE_NUM ) ) ) | ( (lv_size_4_0= RULE_NUM ) ) ) otherlv_5= ']' { - otherlv_0=(Token)match(input,29,FOLLOW_29); + otherlv_0=(Token)match(input,31,FOLLOW_29); newLeafNode(otherlv_0, grammarAccess.getRangeAccess().getLeftSquareBracketKeyword_0()); @@ -3389,10 +3391,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { if ( (LA24_0==RULE_NUM) ) { int LA24_1 = input.LA(2); - if ( (LA24_1==30) ) { + if ( (LA24_1==32) ) { alt24=1; } - else if ( (LA24_1==31) ) { + else if ( (LA24_1==33) ) { alt24=2; } else { @@ -3441,7 +3443,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_2=(Token)match(input,30,FOLLOW_29); + otherlv_2=(Token)match(input,32,FOLLOW_29); newLeafNode(otherlv_2, grammarAccess.getRangeAccess().getColonKeyword_1_0_1()); @@ -3512,7 +3514,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_5=(Token)match(input,31,FOLLOW_2); + otherlv_5=(Token)match(input,33,FOLLOW_2); newLeafNode(otherlv_5, grammarAccess.getRangeAccess().getRightSquareBracketKeyword_2()); @@ -3596,16 +3598,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:1481:2: (this_DefaultProperyAssignment_0= ruleDefaultProperyAssignment | this_ExplicitPropertyAssignment_1= ruleExplicitPropertyAssignment | this_PostPropertyAssignment_2= rulePostPropertyAssignment ) int alt25=3; switch ( input.LA(1) ) { - case 17: + case 19: { alt25=1; } break; - case 23: - case 35: - case 36: - case 47: - case 48: + case 25: + case 37: + case 38: case 49: case 50: case 51: @@ -3677,11 +3677,13 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { case 117: case 118: case 119: - case 128: - case 129: + case 120: + case 121: case 130: case 131: case 132: + case 133: + case 134: { alt25=2; } @@ -3830,7 +3832,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:1526:2: (otherlv_0= 'default' this_ExplicitPropertyAssignment_1= ruleExplicitPropertyAssignment ) // InternalRDL.g:1527:3: otherlv_0= 'default' this_ExplicitPropertyAssignment_1= ruleExplicitPropertyAssignment { - otherlv_0=(Token)match(input,17,FOLLOW_35); + otherlv_0=(Token)match(input,19,FOLLOW_35); newLeafNode(otherlv_0, grammarAccess.getDefaultProperyAssignmentAccess().getDefaultKeyword_0()); @@ -3932,10 +3934,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt27=2; int LA27_0 = input.LA(1); - if ( (LA27_0==119||(LA27_0>=128 && LA27_0<=132)) ) { + if ( (LA27_0==121||(LA27_0>=130 && LA27_0<=134)) ) { alt27=1; } - else if ( (LA27_0==23||(LA27_0>=35 && LA27_0<=36)||(LA27_0>=47 && LA27_0<=118)) ) { + else if ( (LA27_0==25||(LA27_0>=37 && LA27_0<=38)||(LA27_0>=49 && LA27_0<=120)) ) { alt27=2; } else { @@ -4013,7 +4015,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_2=(Token)match(input,15,FOLLOW_2); + otherlv_2=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_2, grammarAccess.getExplicitPropertyAssignmentAccess().getSemicolonKeyword_0_2()); @@ -4064,14 +4066,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt26=2; int LA26_0 = input.LA(1); - if ( (LA26_0==14) ) { + if ( (LA26_0==16) ) { alt26=1; } switch (alt26) { case 1 : // InternalRDL.g:1624:5: otherlv_4= '=' ( (lv_rhs_5_0= rulePropertyAssignmentRhs ) ) { - otherlv_4=(Token)match(input,14,FOLLOW_37); + otherlv_4=(Token)match(input,16,FOLLOW_37); newLeafNode(otherlv_4, grammarAccess.getExplicitPropertyAssignmentAccess().getEqualsSignKeyword_1_1_0()); @@ -4112,7 +4114,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,15,FOLLOW_2); + otherlv_6=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_6, grammarAccess.getExplicitPropertyAssignmentAccess().getSemicolonKeyword_1_2()); @@ -4214,10 +4216,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { if ( (LA29_0==RULE_ID) ) { int LA29_1 = input.LA(2); - if ( ((LA29_1>=14 && LA29_1<=15)) ) { + if ( ((LA29_1>=16 && LA29_1<=17)) ) { alt29=2; } - else if ( ((LA29_1>=32 && LA29_1<=33)) ) { + else if ( ((LA29_1>=34 && LA29_1<=35)) ) { alt29=1; } else { @@ -4271,7 +4273,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,32,FOLLOW_39); + otherlv_1=(Token)match(input,34,FOLLOW_39); newLeafNode(otherlv_1, grammarAccess.getPostPropertyAssignmentAccess().getHyphenMinusGreaterThanSignKeyword_0_0_1()); @@ -4279,7 +4281,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt28=2; int LA28_0 = input.LA(1); - if ( (LA28_0==23||(LA28_0>=35 && LA28_0<=36)||(LA28_0>=47 && LA28_0<=118)) ) { + if ( (LA28_0==25||(LA28_0>=37 && LA28_0<=38)||(LA28_0>=49 && LA28_0<=120)) ) { alt28=1; } else if ( (LA28_0==RULE_ID) ) { @@ -4399,14 +4401,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt30=2; int LA30_0 = input.LA(1); - if ( (LA30_0==14) ) { + if ( (LA30_0==16) ) { alt30=1; } switch (alt30) { case 1 : // InternalRDL.g:1749:4: otherlv_5= '=' ( (lv_rhs_6_0= rulePropertyAssignmentRhs ) ) { - otherlv_5=(Token)match(input,14,FOLLOW_37); + otherlv_5=(Token)match(input,16,FOLLOW_37); newLeafNode(otherlv_5, grammarAccess.getPostPropertyAssignmentAccess().getEqualsSignKeyword_1_0()); @@ -4447,7 +4449,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_7=(Token)match(input,15,FOLLOW_2); + otherlv_7=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_7, grammarAccess.getPostPropertyAssignmentAccess().getSemicolonKeyword_2()); @@ -4566,14 +4568,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt32=2; int LA32_0 = input.LA(1); - if ( (LA32_0==32) ) { + if ( (LA32_0==34) ) { alt32=1; } switch (alt32) { case 1 : // InternalRDL.g:1816:4: otherlv_1= '->' ( ( (lv_propertyEnum_2_0= ruleProperty ) ) | ( (otherlv_3= RULE_ID ) ) ) { - otherlv_1=(Token)match(input,32,FOLLOW_39); + otherlv_1=(Token)match(input,34,FOLLOW_39); newLeafNode(otherlv_1, grammarAccess.getInstancePropertyRefAccess().getHyphenMinusGreaterThanSignKeyword_1_0()); @@ -4581,7 +4583,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt31=2; int LA31_0 = input.LA(1); - if ( (LA31_0==23||(LA31_0>=35 && LA31_0<=36)||(LA31_0>=47 && LA31_0<=118)) ) { + if ( (LA31_0==25||(LA31_0>=37 && LA31_0<=38)||(LA31_0>=49 && LA31_0<=120)) ) { alt31=1; } else if ( (LA31_0==RULE_ID) ) { @@ -4770,14 +4772,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt33=2; int LA33_0 = input.LA(1); - if ( (LA33_0==33) ) { + if ( (LA33_0==35) ) { alt33=1; } switch (alt33) { case 1 : // InternalRDL.g:1889:4: otherlv_1= '.' ( (lv_tail_2_0= ruleHierInstanceRef ) ) { - otherlv_1=(Token)match(input,33,FOLLOW_5); + otherlv_1=(Token)match(input,35,FOLLOW_5); newLeafNode(otherlv_1, grammarAccess.getInstanceRefAccess().getFullStopKeyword_1_0()); @@ -4921,14 +4923,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt34=2; int LA34_0 = input.LA(1); - if ( (LA34_0==33) ) { + if ( (LA34_0==35) ) { alt34=1; } switch (alt34) { case 1 : // InternalRDL.g:1946:4: otherlv_1= '.' ( (lv_tail_2_0= ruleHierInstanceRef ) ) { - otherlv_1=(Token)match(input,33,FOLLOW_5); + otherlv_1=(Token)match(input,35,FOLLOW_5); newLeafNode(otherlv_1, grammarAccess.getHierInstanceRefAccess().getFullStopKeyword_1_0()); @@ -5055,12 +5057,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { switch ( input.LA(1) ) { case RULE_STR: case RULE_NUM: - case 18: - case 19: - case 104: - case 105: - case 119: - case 120: + case 20: + case 21: + case 106: + case 107: case 121: case 122: case 123: @@ -5068,6 +5068,8 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { case 125: case 126: case 127: + case 128: + case 129: { alt35=1; } @@ -5076,10 +5078,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { { int LA35_2 = input.LA(2); - if ( (LA35_2==34) ) { + if ( (LA35_2==36) ) { alt35=3; } - else if ( (LA35_2==EOF||LA35_2==15||(LA35_2>=32 && LA35_2<=33)) ) { + else if ( (LA35_2==EOF||LA35_2==17||(LA35_2>=34 && LA35_2<=35)) ) { alt35=2; } else { @@ -5090,7 +5092,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } } break; - case 12: + case 14: { alt35=4; } @@ -5204,7 +5206,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,34,FOLLOW_6); + otherlv_3=(Token)match(input,36,FOLLOW_6); newLeafNode(otherlv_3, grammarAccess.getPropertyAssignmentRhsAccess().getEnumKeyword_2_1()); @@ -5363,7 +5365,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2105:2: (otherlv_0= '{' ( (lv_elements_1_0= ruleConcatElem ) ) (otherlv_2= ',' ( (lv_elements_3_0= ruleConcatElem ) ) )* otherlv_4= '}' ) // InternalRDL.g:2106:3: otherlv_0= '{' ( (lv_elements_1_0= ruleConcatElem ) ) (otherlv_2= ',' ( (lv_elements_3_0= ruleConcatElem ) ) )* otherlv_4= '}' { - otherlv_0=(Token)match(input,12,FOLLOW_43); + otherlv_0=(Token)match(input,14,FOLLOW_43); newLeafNode(otherlv_0, grammarAccess.getConcatAccess().getLeftCurlyBracketKeyword_0()); @@ -5404,7 +5406,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt36=2; int LA36_0 = input.LA(1); - if ( (LA36_0==25) ) { + if ( (LA36_0==27) ) { alt36=1; } @@ -5413,7 +5415,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { case 1 : // InternalRDL.g:2130:4: otherlv_2= ',' ( (lv_elements_3_0= ruleConcatElem ) ) { - otherlv_2=(Token)match(input,25,FOLLOW_43); + otherlv_2=(Token)match(input,27,FOLLOW_43); newLeafNode(otherlv_2, grammarAccess.getConcatAccess().getCommaKeyword_2_0()); @@ -5457,7 +5459,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_4=(Token)match(input,16,FOLLOW_2); + otherlv_4=(Token)match(input,18,FOLLOW_2); newLeafNode(otherlv_4, grammarAccess.getConcatAccess().getRightCurlyBracketKeyword_3()); @@ -5699,12 +5701,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2233:2: ( ( (lv_val_0_0= ruleRValueConstant ) ) | ( (lv_num_1_0= RULE_NUM ) ) | ( (lv_str_2_0= RULE_STR ) ) ) int alt38=3; switch ( input.LA(1) ) { - case 18: - case 19: - case 104: - case 105: - case 119: - case 120: + case 20: + case 21: + case 106: + case 107: case 121: case 122: case 123: @@ -5712,6 +5712,8 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { case 125: case 126: case 127: + case 128: + case 129: { alt38=1; } @@ -5914,7 +5916,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2309:2: (otherlv_0= 'enum' ( (lv_name_1_0= RULE_ID ) ) ( (lv_body_2_0= ruleEnumBody ) ) otherlv_3= ';' ) // InternalRDL.g:2310:3: otherlv_0= 'enum' ( (lv_name_1_0= RULE_ID ) ) ( (lv_body_2_0= ruleEnumBody ) ) otherlv_3= ';' { - otherlv_0=(Token)match(input,34,FOLLOW_5); + otherlv_0=(Token)match(input,36,FOLLOW_5); newLeafNode(otherlv_0, grammarAccess.getEnumDefinitionAccess().getEnumKeyword_0()); @@ -5975,7 +5977,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,15,FOLLOW_2); + otherlv_3=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_3, grammarAccess.getEnumDefinitionAccess().getSemicolonKeyword_3()); @@ -6057,7 +6059,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2373:2: (otherlv_0= '{' () ( (lv_entries_2_0= ruleEnumEntry ) )* otherlv_3= '}' ) // InternalRDL.g:2374:3: otherlv_0= '{' () ( (lv_entries_2_0= ruleEnumEntry ) )* otherlv_3= '}' { - otherlv_0=(Token)match(input,12,FOLLOW_45); + otherlv_0=(Token)match(input,14,FOLLOW_45); newLeafNode(otherlv_0, grammarAccess.getEnumBodyAccess().getLeftCurlyBracketKeyword_0()); @@ -6121,7 +6123,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_3=(Token)match(input,16,FOLLOW_2); + otherlv_3=(Token)match(input,18,FOLLOW_2); newLeafNode(otherlv_3, grammarAccess.getEnumBodyAccess().getRightCurlyBracketKeyword_3()); @@ -6233,7 +6235,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,14,FOLLOW_29); + otherlv_1=(Token)match(input,16,FOLLOW_29); newLeafNode(otherlv_1, grammarAccess.getEnumEntryAccess().getEqualsSignKeyword_1()); @@ -6267,14 +6269,14 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt41=2; int LA41_0 = input.LA(1); - if ( (LA41_0==12) ) { + if ( (LA41_0==14) ) { alt41=1; } switch (alt41) { case 1 : // InternalRDL.g:2468:4: otherlv_3= '{' ( (lv_properties_4_0= ruleEnumProperty ) )* otherlv_5= '}' { - otherlv_3=(Token)match(input,12,FOLLOW_47); + otherlv_3=(Token)match(input,14,FOLLOW_47); newLeafNode(otherlv_3, grammarAccess.getEnumEntryAccess().getLeftCurlyBracketKeyword_3_0()); @@ -6284,7 +6286,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt40=2; int LA40_0 = input.LA(1); - if ( ((LA40_0>=35 && LA40_0<=36)) ) { + if ( ((LA40_0>=37 && LA40_0<=38)) ) { alt40=1; } @@ -6327,7 +6329,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } } while (true); - otherlv_5=(Token)match(input,16,FOLLOW_10); + otherlv_5=(Token)match(input,18,FOLLOW_10); newLeafNode(otherlv_5, grammarAccess.getEnumEntryAccess().getRightCurlyBracketKeyword_3_2()); @@ -6337,7 +6339,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,15,FOLLOW_2); + otherlv_6=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_6, grammarAccess.getEnumEntryAccess().getSemicolonKeyword_4()); @@ -6426,10 +6428,10 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { int alt42=2; int LA42_0 = input.LA(1); - if ( (LA42_0==35) ) { + if ( (LA42_0==37) ) { alt42=1; } - else if ( (LA42_0==36) ) { + else if ( (LA42_0==38) ) { alt42=2; } else { @@ -6451,7 +6453,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2522:6: (lv_name_0_0= 'name' ) // InternalRDL.g:2523:7: lv_name_0_0= 'name' { - lv_name_0_0=(Token)match(input,35,FOLLOW_8); + lv_name_0_0=(Token)match(input,37,FOLLOW_8); newLeafNode(lv_name_0_0, grammarAccess.getEnumPropertyAccess().getNameNameKeyword_0_0_0_0()); @@ -6467,7 +6469,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,14,FOLLOW_4); + otherlv_1=(Token)match(input,16,FOLLOW_4); newLeafNode(otherlv_1, grammarAccess.getEnumPropertyAccess().getEqualsSignKeyword_0_0_1()); @@ -6515,7 +6517,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2561:6: (lv_name_3_0= 'desc' ) // InternalRDL.g:2562:7: lv_name_3_0= 'desc' { - lv_name_3_0=(Token)match(input,36,FOLLOW_8); + lv_name_3_0=(Token)match(input,38,FOLLOW_8); newLeafNode(lv_name_3_0, grammarAccess.getEnumPropertyAccess().getNameDescKeyword_0_1_0_0()); @@ -6531,7 +6533,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_4=(Token)match(input,14,FOLLOW_4); + otherlv_4=(Token)match(input,16,FOLLOW_4); newLeafNode(otherlv_4, grammarAccess.getEnumPropertyAccess().getEqualsSignKeyword_0_1_1()); @@ -6570,7 +6572,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,15,FOLLOW_2); + otherlv_6=(Token)match(input,17,FOLLOW_2); newLeafNode(otherlv_6, grammarAccess.getEnumPropertyAccess().getSemicolonKeyword_1()); @@ -6620,42 +6622,42 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2613:2: ( (enumLiteral_0= 'string' ) | (enumLiteral_1= 'number' ) | (enumLiteral_2= 'boolean' ) | (enumLiteral_3= 'addrmap' ) | (enumLiteral_4= 'reg' ) | (enumLiteral_5= 'regfile' ) | (enumLiteral_6= 'field' ) | (enumLiteral_7= 'ref' ) ) int alt43=8; switch ( input.LA(1) ) { - case 37: + case 39: { alt43=1; } break; - case 38: + case 40: { alt43=2; } break; - case 39: + case 41: { alt43=3; } break; - case 40: + case 42: { alt43=4; } break; - case 41: + case 43: { alt43=5; } break; - case 42: + case 44: { alt43=6; } break; - case 43: + case 45: { alt43=7; } break; - case 44: + case 46: { alt43=8; } @@ -6674,7 +6676,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2614:3: (enumLiteral_0= 'string' ) // InternalRDL.g:2615:4: enumLiteral_0= 'string' { - enumLiteral_0=(Token)match(input,37,FOLLOW_2); + enumLiteral_0=(Token)match(input,39,FOLLOW_2); current = grammarAccess.getPropertyTypeNameAccess().getSTRINGEnumLiteralDeclaration_0().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_0, grammarAccess.getPropertyTypeNameAccess().getSTRINGEnumLiteralDeclaration_0()); @@ -6691,7 +6693,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2622:3: (enumLiteral_1= 'number' ) // InternalRDL.g:2623:4: enumLiteral_1= 'number' { - enumLiteral_1=(Token)match(input,38,FOLLOW_2); + enumLiteral_1=(Token)match(input,40,FOLLOW_2); current = grammarAccess.getPropertyTypeNameAccess().getNUMBEREnumLiteralDeclaration_1().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_1, grammarAccess.getPropertyTypeNameAccess().getNUMBEREnumLiteralDeclaration_1()); @@ -6708,7 +6710,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2630:3: (enumLiteral_2= 'boolean' ) // InternalRDL.g:2631:4: enumLiteral_2= 'boolean' { - enumLiteral_2=(Token)match(input,39,FOLLOW_2); + enumLiteral_2=(Token)match(input,41,FOLLOW_2); current = grammarAccess.getPropertyTypeNameAccess().getBOOLEANEnumLiteralDeclaration_2().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_2, grammarAccess.getPropertyTypeNameAccess().getBOOLEANEnumLiteralDeclaration_2()); @@ -6725,7 +6727,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2638:3: (enumLiteral_3= 'addrmap' ) // InternalRDL.g:2639:4: enumLiteral_3= 'addrmap' { - enumLiteral_3=(Token)match(input,40,FOLLOW_2); + enumLiteral_3=(Token)match(input,42,FOLLOW_2); current = grammarAccess.getPropertyTypeNameAccess().getADDRMAPEnumLiteralDeclaration_3().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_3, grammarAccess.getPropertyTypeNameAccess().getADDRMAPEnumLiteralDeclaration_3()); @@ -6742,7 +6744,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2646:3: (enumLiteral_4= 'reg' ) // InternalRDL.g:2647:4: enumLiteral_4= 'reg' { - enumLiteral_4=(Token)match(input,41,FOLLOW_2); + enumLiteral_4=(Token)match(input,43,FOLLOW_2); current = grammarAccess.getPropertyTypeNameAccess().getREGEnumLiteralDeclaration_4().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_4, grammarAccess.getPropertyTypeNameAccess().getREGEnumLiteralDeclaration_4()); @@ -6759,7 +6761,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2654:3: (enumLiteral_5= 'regfile' ) // InternalRDL.g:2655:4: enumLiteral_5= 'regfile' { - enumLiteral_5=(Token)match(input,42,FOLLOW_2); + enumLiteral_5=(Token)match(input,44,FOLLOW_2); current = grammarAccess.getPropertyTypeNameAccess().getREGFILEEnumLiteralDeclaration_5().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_5, grammarAccess.getPropertyTypeNameAccess().getREGFILEEnumLiteralDeclaration_5()); @@ -6776,7 +6778,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2662:3: (enumLiteral_6= 'field' ) // InternalRDL.g:2663:4: enumLiteral_6= 'field' { - enumLiteral_6=(Token)match(input,43,FOLLOW_2); + enumLiteral_6=(Token)match(input,45,FOLLOW_2); current = grammarAccess.getPropertyTypeNameAccess().getFIELDEnumLiteralDeclaration_6().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_6, grammarAccess.getPropertyTypeNameAccess().getFIELDEnumLiteralDeclaration_6()); @@ -6793,7 +6795,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2670:3: (enumLiteral_7= 'ref' ) // InternalRDL.g:2671:4: enumLiteral_7= 'ref' { - enumLiteral_7=(Token)match(input,44,FOLLOW_2); + enumLiteral_7=(Token)match(input,46,FOLLOW_2); current = grammarAccess.getPropertyTypeNameAccess().getREFEnumLiteralDeclaration_7().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_7, grammarAccess.getPropertyTypeNameAccess().getREFEnumLiteralDeclaration_7()); @@ -6848,32 +6850,32 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2688:2: ( (enumLiteral_0= 'signal' ) | (enumLiteral_1= 'addrmap' ) | (enumLiteral_2= 'reg' ) | (enumLiteral_3= 'regfile' ) | (enumLiteral_4= 'field' ) | (enumLiteral_5= 'all' ) ) int alt44=6; switch ( input.LA(1) ) { - case 45: + case 47: { alt44=1; } break; - case 40: + case 42: { alt44=2; } break; - case 41: + case 43: { alt44=3; } break; - case 42: + case 44: { alt44=4; } break; - case 43: + case 45: { alt44=5; } break; - case 46: + case 48: { alt44=6; } @@ -6892,7 +6894,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2689:3: (enumLiteral_0= 'signal' ) // InternalRDL.g:2690:4: enumLiteral_0= 'signal' { - enumLiteral_0=(Token)match(input,45,FOLLOW_2); + enumLiteral_0=(Token)match(input,47,FOLLOW_2); current = grammarAccess.getPropertyComponentAccess().getSIGNALEnumLiteralDeclaration_0().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_0, grammarAccess.getPropertyComponentAccess().getSIGNALEnumLiteralDeclaration_0()); @@ -6909,7 +6911,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2697:3: (enumLiteral_1= 'addrmap' ) // InternalRDL.g:2698:4: enumLiteral_1= 'addrmap' { - enumLiteral_1=(Token)match(input,40,FOLLOW_2); + enumLiteral_1=(Token)match(input,42,FOLLOW_2); current = grammarAccess.getPropertyComponentAccess().getADDRMAPEnumLiteralDeclaration_1().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_1, grammarAccess.getPropertyComponentAccess().getADDRMAPEnumLiteralDeclaration_1()); @@ -6926,7 +6928,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2705:3: (enumLiteral_2= 'reg' ) // InternalRDL.g:2706:4: enumLiteral_2= 'reg' { - enumLiteral_2=(Token)match(input,41,FOLLOW_2); + enumLiteral_2=(Token)match(input,43,FOLLOW_2); current = grammarAccess.getPropertyComponentAccess().getREGEnumLiteralDeclaration_2().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_2, grammarAccess.getPropertyComponentAccess().getREGEnumLiteralDeclaration_2()); @@ -6943,7 +6945,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2713:3: (enumLiteral_3= 'regfile' ) // InternalRDL.g:2714:4: enumLiteral_3= 'regfile' { - enumLiteral_3=(Token)match(input,42,FOLLOW_2); + enumLiteral_3=(Token)match(input,44,FOLLOW_2); current = grammarAccess.getPropertyComponentAccess().getREGFILEEnumLiteralDeclaration_3().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_3, grammarAccess.getPropertyComponentAccess().getREGFILEEnumLiteralDeclaration_3()); @@ -6960,7 +6962,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2721:3: (enumLiteral_4= 'field' ) // InternalRDL.g:2722:4: enumLiteral_4= 'field' { - enumLiteral_4=(Token)match(input,43,FOLLOW_2); + enumLiteral_4=(Token)match(input,45,FOLLOW_2); current = grammarAccess.getPropertyComponentAccess().getFIELDEnumLiteralDeclaration_4().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_4, grammarAccess.getPropertyComponentAccess().getFIELDEnumLiteralDeclaration_4()); @@ -6977,7 +6979,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2729:3: (enumLiteral_5= 'all' ) // InternalRDL.g:2730:4: enumLiteral_5= 'all' { - enumLiteral_5=(Token)match(input,46,FOLLOW_2); + enumLiteral_5=(Token)match(input,48,FOLLOW_2); current = grammarAccess.getPropertyComponentAccess().getALLEnumLiteralDeclaration_5().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_5, grammarAccess.getPropertyComponentAccess().getALLEnumLiteralDeclaration_5()); @@ -7031,27 +7033,27 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2747:2: ( (enumLiteral_0= 'signal' ) | (enumLiteral_1= 'addrmap' ) | (enumLiteral_2= 'regfile' ) | (enumLiteral_3= 'reg' ) | (enumLiteral_4= 'field' ) ) int alt45=5; switch ( input.LA(1) ) { - case 45: + case 47: { alt45=1; } break; - case 40: + case 42: { alt45=2; } break; - case 42: + case 44: { alt45=3; } break; - case 41: + case 43: { alt45=4; } break; - case 43: + case 45: { alt45=5; } @@ -7070,7 +7072,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2748:3: (enumLiteral_0= 'signal' ) // InternalRDL.g:2749:4: enumLiteral_0= 'signal' { - enumLiteral_0=(Token)match(input,45,FOLLOW_2); + enumLiteral_0=(Token)match(input,47,FOLLOW_2); current = grammarAccess.getComponentDefinitionTypeAccess().getSIGNALEnumLiteralDeclaration_0().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_0, grammarAccess.getComponentDefinitionTypeAccess().getSIGNALEnumLiteralDeclaration_0()); @@ -7087,7 +7089,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2756:3: (enumLiteral_1= 'addrmap' ) // InternalRDL.g:2757:4: enumLiteral_1= 'addrmap' { - enumLiteral_1=(Token)match(input,40,FOLLOW_2); + enumLiteral_1=(Token)match(input,42,FOLLOW_2); current = grammarAccess.getComponentDefinitionTypeAccess().getADDRMAPEnumLiteralDeclaration_1().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_1, grammarAccess.getComponentDefinitionTypeAccess().getADDRMAPEnumLiteralDeclaration_1()); @@ -7104,7 +7106,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2764:3: (enumLiteral_2= 'regfile' ) // InternalRDL.g:2765:4: enumLiteral_2= 'regfile' { - enumLiteral_2=(Token)match(input,42,FOLLOW_2); + enumLiteral_2=(Token)match(input,44,FOLLOW_2); current = grammarAccess.getComponentDefinitionTypeAccess().getREGFILEEnumLiteralDeclaration_2().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_2, grammarAccess.getComponentDefinitionTypeAccess().getREGFILEEnumLiteralDeclaration_2()); @@ -7121,7 +7123,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2772:3: (enumLiteral_3= 'reg' ) // InternalRDL.g:2773:4: enumLiteral_3= 'reg' { - enumLiteral_3=(Token)match(input,41,FOLLOW_2); + enumLiteral_3=(Token)match(input,43,FOLLOW_2); current = grammarAccess.getComponentDefinitionTypeAccess().getREGEnumLiteralDeclaration_3().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_3, grammarAccess.getComponentDefinitionTypeAccess().getREGEnumLiteralDeclaration_3()); @@ -7138,7 +7140,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2780:3: (enumLiteral_4= 'field' ) // InternalRDL.g:2781:4: enumLiteral_4= 'field' { - enumLiteral_4=(Token)match(input,43,FOLLOW_2); + enumLiteral_4=(Token)match(input,45,FOLLOW_2); current = grammarAccess.getComponentDefinitionTypeAccess().getFIELDEnumLiteralDeclaration_4().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_4, grammarAccess.getComponentDefinitionTypeAccess().getFIELDEnumLiteralDeclaration_4()); @@ -7262,377 +7264,377 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2798:2: ( (enumLiteral_0= 'name' ) | (enumLiteral_1= 'desc' ) | (enumLiteral_2= 'arbiter' ) | (enumLiteral_3= 'rset' ) | (enumLiteral_4= 'rclr' ) | (enumLiteral_5= 'woclr' ) | (enumLiteral_6= 'woset' ) | (enumLiteral_7= 'we' ) | (enumLiteral_8= 'wel' ) | (enumLiteral_9= 'swwe' ) | (enumLiteral_10= 'swwel' ) | (enumLiteral_11= 'hwset' ) | (enumLiteral_12= 'hwclr' ) | (enumLiteral_13= 'swmod' ) | (enumLiteral_14= 'swacc' ) | (enumLiteral_15= 'sticky' ) | (enumLiteral_16= 'stickybit' ) | (enumLiteral_17= 'intr' ) | (enumLiteral_18= 'anded' ) | (enumLiteral_19= 'ored' ) | (enumLiteral_20= 'xored' ) | (enumLiteral_21= 'counter' ) | (enumLiteral_22= 'overflow' ) | (enumLiteral_23= 'sharedextbus' ) | (enumLiteral_24= 'errextbus' ) | (enumLiteral_25= 'reset' ) | (enumLiteral_26= 'littleendian' ) | (enumLiteral_27= 'bigendian' ) | (enumLiteral_28= 'rsvdset' ) | (enumLiteral_29= 'rsvdsetX' ) | (enumLiteral_30= 'bridge' ) | (enumLiteral_31= 'shared' ) | (enumLiteral_32= 'msb0' ) | (enumLiteral_33= 'lsb0' ) | (enumLiteral_34= 'sync' ) | (enumLiteral_35= 'async' ) | (enumLiteral_36= 'cpuif_reset' ) | (enumLiteral_37= 'field_reset' ) | (enumLiteral_38= 'activehigh' ) | (enumLiteral_39= 'activelow' ) | (enumLiteral_40= 'singlepulse' ) | (enumLiteral_41= 'underflow' ) | (enumLiteral_42= 'incr' ) | (enumLiteral_43= 'decr' ) | (enumLiteral_44= 'incrwidth' ) | (enumLiteral_45= 'decrwidth' ) | (enumLiteral_46= 'incrvalue' ) | (enumLiteral_47= 'decrvalue' ) | (enumLiteral_48= 'saturate' ) | (enumLiteral_49= 'decrsaturate' ) | (enumLiteral_50= 'threshold' ) | (enumLiteral_51= 'decrthreshold' ) | (enumLiteral_52= 'dontcompare' ) | (enumLiteral_53= 'donttest' ) | (enumLiteral_54= 'internal' ) | (enumLiteral_55= 'alignment' ) | (enumLiteral_56= 'regwidth' ) | (enumLiteral_57= 'fieldwidth' ) | (enumLiteral_58= 'signalwidth' ) | (enumLiteral_59= 'accesswidth' ) | (enumLiteral_60= 'sw' ) | (enumLiteral_61= 'hw' ) | (enumLiteral_62= 'addressing' ) | (enumLiteral_63= 'precedence' ) | (enumLiteral_64= 'encode' ) | (enumLiteral_65= 'resetsignal' ) | (enumLiteral_66= 'clock' ) | (enumLiteral_67= 'mask' ) | (enumLiteral_68= 'enable' ) | (enumLiteral_69= 'hwenable' ) | (enumLiteral_70= 'hwmask' ) | (enumLiteral_71= 'haltmask' ) | (enumLiteral_72= 'haltenable' ) | (enumLiteral_73= 'halt' ) | (enumLiteral_74= 'next' ) ) int alt46=75; switch ( input.LA(1) ) { - case 35: + case 37: { alt46=1; } break; - case 36: + case 38: { alt46=2; } break; - case 47: + case 49: { alt46=3; } break; - case 48: + case 50: { alt46=4; } break; - case 49: + case 51: { alt46=5; } break; - case 50: + case 52: { alt46=6; } break; - case 51: + case 53: { alt46=7; } break; - case 52: + case 54: { alt46=8; } break; - case 53: + case 55: { alt46=9; } break; - case 54: + case 56: { alt46=10; } break; - case 55: + case 57: { alt46=11; } break; - case 56: + case 58: { alt46=12; } break; - case 57: + case 59: { alt46=13; } break; - case 58: + case 60: { alt46=14; } break; - case 59: + case 61: { alt46=15; } break; - case 60: + case 62: { alt46=16; } break; - case 61: + case 63: { alt46=17; } break; - case 62: + case 64: { alt46=18; } break; - case 63: + case 65: { alt46=19; } break; - case 64: + case 66: { alt46=20; } break; - case 65: + case 67: { alt46=21; } break; - case 66: + case 68: { alt46=22; } break; - case 67: + case 69: { alt46=23; } break; - case 68: + case 70: { alt46=24; } break; - case 69: + case 71: { alt46=25; } break; - case 70: + case 72: { alt46=26; } break; - case 71: + case 73: { alt46=27; } break; - case 72: + case 74: { alt46=28; } break; - case 73: + case 75: { alt46=29; } break; - case 74: + case 76: { alt46=30; } break; - case 75: + case 77: { alt46=31; } break; - case 76: + case 78: { alt46=32; } break; - case 77: + case 79: { alt46=33; } break; - case 78: + case 80: { alt46=34; } break; - case 79: + case 81: { alt46=35; } break; - case 80: + case 82: { alt46=36; } break; - case 81: + case 83: { alt46=37; } break; - case 82: + case 84: { alt46=38; } break; - case 83: + case 85: { alt46=39; } break; - case 84: + case 86: { alt46=40; } break; - case 85: + case 87: { alt46=41; } break; - case 86: + case 88: { alt46=42; } break; - case 87: + case 89: { alt46=43; } break; - case 88: + case 90: { alt46=44; } break; - case 89: + case 91: { alt46=45; } break; - case 90: + case 92: { alt46=46; } break; - case 91: + case 93: { alt46=47; } break; - case 92: + case 94: { alt46=48; } break; - case 93: + case 95: { alt46=49; } break; - case 94: + case 96: { alt46=50; } break; - case 95: + case 97: { alt46=51; } break; - case 96: + case 98: { alt46=52; } break; - case 97: + case 99: { alt46=53; } break; - case 98: + case 100: { alt46=54; } break; - case 23: + case 25: { alt46=55; } break; - case 99: + case 101: { alt46=56; } break; - case 100: + case 102: { alt46=57; } break; - case 101: + case 103: { alt46=58; } break; - case 102: + case 104: { alt46=59; } break; - case 103: + case 105: { alt46=60; } break; - case 104: + case 106: { alt46=61; } break; - case 105: + case 107: { alt46=62; } break; - case 106: + case 108: { alt46=63; } break; - case 107: + case 109: { alt46=64; } break; - case 108: + case 110: { alt46=65; } break; - case 109: + case 111: { alt46=66; } break; - case 110: + case 112: { alt46=67; } break; - case 111: + case 113: { alt46=68; } break; - case 112: + case 114: { alt46=69; } break; - case 113: + case 115: { alt46=70; } break; - case 114: + case 116: { alt46=71; } break; - case 115: + case 117: { alt46=72; } break; - case 116: + case 118: { alt46=73; } break; - case 117: + case 119: { alt46=74; } break; - case 118: + case 120: { alt46=75; } @@ -7651,7 +7653,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2799:3: (enumLiteral_0= 'name' ) // InternalRDL.g:2800:4: enumLiteral_0= 'name' { - enumLiteral_0=(Token)match(input,35,FOLLOW_2); + enumLiteral_0=(Token)match(input,37,FOLLOW_2); current = grammarAccess.getPropertyAccess().getNAMEEnumLiteralDeclaration_0().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_0, grammarAccess.getPropertyAccess().getNAMEEnumLiteralDeclaration_0()); @@ -7668,7 +7670,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2807:3: (enumLiteral_1= 'desc' ) // InternalRDL.g:2808:4: enumLiteral_1= 'desc' { - enumLiteral_1=(Token)match(input,36,FOLLOW_2); + enumLiteral_1=(Token)match(input,38,FOLLOW_2); current = grammarAccess.getPropertyAccess().getDESCEnumLiteralDeclaration_1().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_1, grammarAccess.getPropertyAccess().getDESCEnumLiteralDeclaration_1()); @@ -7685,7 +7687,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2815:3: (enumLiteral_2= 'arbiter' ) // InternalRDL.g:2816:4: enumLiteral_2= 'arbiter' { - enumLiteral_2=(Token)match(input,47,FOLLOW_2); + enumLiteral_2=(Token)match(input,49,FOLLOW_2); current = grammarAccess.getPropertyAccess().getARBITEREnumLiteralDeclaration_2().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_2, grammarAccess.getPropertyAccess().getARBITEREnumLiteralDeclaration_2()); @@ -7702,7 +7704,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2823:3: (enumLiteral_3= 'rset' ) // InternalRDL.g:2824:4: enumLiteral_3= 'rset' { - enumLiteral_3=(Token)match(input,48,FOLLOW_2); + enumLiteral_3=(Token)match(input,50,FOLLOW_2); current = grammarAccess.getPropertyAccess().getRSETEnumLiteralDeclaration_3().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_3, grammarAccess.getPropertyAccess().getRSETEnumLiteralDeclaration_3()); @@ -7719,7 +7721,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2831:3: (enumLiteral_4= 'rclr' ) // InternalRDL.g:2832:4: enumLiteral_4= 'rclr' { - enumLiteral_4=(Token)match(input,49,FOLLOW_2); + enumLiteral_4=(Token)match(input,51,FOLLOW_2); current = grammarAccess.getPropertyAccess().getRCLREnumLiteralDeclaration_4().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_4, grammarAccess.getPropertyAccess().getRCLREnumLiteralDeclaration_4()); @@ -7736,7 +7738,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2839:3: (enumLiteral_5= 'woclr' ) // InternalRDL.g:2840:4: enumLiteral_5= 'woclr' { - enumLiteral_5=(Token)match(input,50,FOLLOW_2); + enumLiteral_5=(Token)match(input,52,FOLLOW_2); current = grammarAccess.getPropertyAccess().getWOCLREnumLiteralDeclaration_5().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_5, grammarAccess.getPropertyAccess().getWOCLREnumLiteralDeclaration_5()); @@ -7753,7 +7755,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2847:3: (enumLiteral_6= 'woset' ) // InternalRDL.g:2848:4: enumLiteral_6= 'woset' { - enumLiteral_6=(Token)match(input,51,FOLLOW_2); + enumLiteral_6=(Token)match(input,53,FOLLOW_2); current = grammarAccess.getPropertyAccess().getWOSETEnumLiteralDeclaration_6().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_6, grammarAccess.getPropertyAccess().getWOSETEnumLiteralDeclaration_6()); @@ -7770,7 +7772,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2855:3: (enumLiteral_7= 'we' ) // InternalRDL.g:2856:4: enumLiteral_7= 'we' { - enumLiteral_7=(Token)match(input,52,FOLLOW_2); + enumLiteral_7=(Token)match(input,54,FOLLOW_2); current = grammarAccess.getPropertyAccess().getWEEnumLiteralDeclaration_7().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_7, grammarAccess.getPropertyAccess().getWEEnumLiteralDeclaration_7()); @@ -7787,7 +7789,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2863:3: (enumLiteral_8= 'wel' ) // InternalRDL.g:2864:4: enumLiteral_8= 'wel' { - enumLiteral_8=(Token)match(input,53,FOLLOW_2); + enumLiteral_8=(Token)match(input,55,FOLLOW_2); current = grammarAccess.getPropertyAccess().getWELEnumLiteralDeclaration_8().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_8, grammarAccess.getPropertyAccess().getWELEnumLiteralDeclaration_8()); @@ -7804,7 +7806,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2871:3: (enumLiteral_9= 'swwe' ) // InternalRDL.g:2872:4: enumLiteral_9= 'swwe' { - enumLiteral_9=(Token)match(input,54,FOLLOW_2); + enumLiteral_9=(Token)match(input,56,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSWWEEnumLiteralDeclaration_9().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_9, grammarAccess.getPropertyAccess().getSWWEEnumLiteralDeclaration_9()); @@ -7821,7 +7823,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2879:3: (enumLiteral_10= 'swwel' ) // InternalRDL.g:2880:4: enumLiteral_10= 'swwel' { - enumLiteral_10=(Token)match(input,55,FOLLOW_2); + enumLiteral_10=(Token)match(input,57,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSWWELEnumLiteralDeclaration_10().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_10, grammarAccess.getPropertyAccess().getSWWELEnumLiteralDeclaration_10()); @@ -7838,7 +7840,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2887:3: (enumLiteral_11= 'hwset' ) // InternalRDL.g:2888:4: enumLiteral_11= 'hwset' { - enumLiteral_11=(Token)match(input,56,FOLLOW_2); + enumLiteral_11=(Token)match(input,58,FOLLOW_2); current = grammarAccess.getPropertyAccess().getHWSETEnumLiteralDeclaration_11().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_11, grammarAccess.getPropertyAccess().getHWSETEnumLiteralDeclaration_11()); @@ -7855,7 +7857,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2895:3: (enumLiteral_12= 'hwclr' ) // InternalRDL.g:2896:4: enumLiteral_12= 'hwclr' { - enumLiteral_12=(Token)match(input,57,FOLLOW_2); + enumLiteral_12=(Token)match(input,59,FOLLOW_2); current = grammarAccess.getPropertyAccess().getHWCLREnumLiteralDeclaration_12().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_12, grammarAccess.getPropertyAccess().getHWCLREnumLiteralDeclaration_12()); @@ -7872,7 +7874,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2903:3: (enumLiteral_13= 'swmod' ) // InternalRDL.g:2904:4: enumLiteral_13= 'swmod' { - enumLiteral_13=(Token)match(input,58,FOLLOW_2); + enumLiteral_13=(Token)match(input,60,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSWMODEnumLiteralDeclaration_13().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_13, grammarAccess.getPropertyAccess().getSWMODEnumLiteralDeclaration_13()); @@ -7889,7 +7891,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2911:3: (enumLiteral_14= 'swacc' ) // InternalRDL.g:2912:4: enumLiteral_14= 'swacc' { - enumLiteral_14=(Token)match(input,59,FOLLOW_2); + enumLiteral_14=(Token)match(input,61,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSWACCEnumLiteralDeclaration_14().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_14, grammarAccess.getPropertyAccess().getSWACCEnumLiteralDeclaration_14()); @@ -7906,7 +7908,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2919:3: (enumLiteral_15= 'sticky' ) // InternalRDL.g:2920:4: enumLiteral_15= 'sticky' { - enumLiteral_15=(Token)match(input,60,FOLLOW_2); + enumLiteral_15=(Token)match(input,62,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSTICKYEnumLiteralDeclaration_15().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_15, grammarAccess.getPropertyAccess().getSTICKYEnumLiteralDeclaration_15()); @@ -7923,7 +7925,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2927:3: (enumLiteral_16= 'stickybit' ) // InternalRDL.g:2928:4: enumLiteral_16= 'stickybit' { - enumLiteral_16=(Token)match(input,61,FOLLOW_2); + enumLiteral_16=(Token)match(input,63,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSTICKYBITEnumLiteralDeclaration_16().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_16, grammarAccess.getPropertyAccess().getSTICKYBITEnumLiteralDeclaration_16()); @@ -7940,7 +7942,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2935:3: (enumLiteral_17= 'intr' ) // InternalRDL.g:2936:4: enumLiteral_17= 'intr' { - enumLiteral_17=(Token)match(input,62,FOLLOW_2); + enumLiteral_17=(Token)match(input,64,FOLLOW_2); current = grammarAccess.getPropertyAccess().getINTREnumLiteralDeclaration_17().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_17, grammarAccess.getPropertyAccess().getINTREnumLiteralDeclaration_17()); @@ -7957,7 +7959,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2943:3: (enumLiteral_18= 'anded' ) // InternalRDL.g:2944:4: enumLiteral_18= 'anded' { - enumLiteral_18=(Token)match(input,63,FOLLOW_2); + enumLiteral_18=(Token)match(input,65,FOLLOW_2); current = grammarAccess.getPropertyAccess().getANDEDEnumLiteralDeclaration_18().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_18, grammarAccess.getPropertyAccess().getANDEDEnumLiteralDeclaration_18()); @@ -7974,7 +7976,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2951:3: (enumLiteral_19= 'ored' ) // InternalRDL.g:2952:4: enumLiteral_19= 'ored' { - enumLiteral_19=(Token)match(input,64,FOLLOW_2); + enumLiteral_19=(Token)match(input,66,FOLLOW_2); current = grammarAccess.getPropertyAccess().getOREDEnumLiteralDeclaration_19().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_19, grammarAccess.getPropertyAccess().getOREDEnumLiteralDeclaration_19()); @@ -7991,7 +7993,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2959:3: (enumLiteral_20= 'xored' ) // InternalRDL.g:2960:4: enumLiteral_20= 'xored' { - enumLiteral_20=(Token)match(input,65,FOLLOW_2); + enumLiteral_20=(Token)match(input,67,FOLLOW_2); current = grammarAccess.getPropertyAccess().getXOREDEnumLiteralDeclaration_20().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_20, grammarAccess.getPropertyAccess().getXOREDEnumLiteralDeclaration_20()); @@ -8008,7 +8010,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2967:3: (enumLiteral_21= 'counter' ) // InternalRDL.g:2968:4: enumLiteral_21= 'counter' { - enumLiteral_21=(Token)match(input,66,FOLLOW_2); + enumLiteral_21=(Token)match(input,68,FOLLOW_2); current = grammarAccess.getPropertyAccess().getCOUNTEREnumLiteralDeclaration_21().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_21, grammarAccess.getPropertyAccess().getCOUNTEREnumLiteralDeclaration_21()); @@ -8025,7 +8027,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2975:3: (enumLiteral_22= 'overflow' ) // InternalRDL.g:2976:4: enumLiteral_22= 'overflow' { - enumLiteral_22=(Token)match(input,67,FOLLOW_2); + enumLiteral_22=(Token)match(input,69,FOLLOW_2); current = grammarAccess.getPropertyAccess().getOVERFLOWEnumLiteralDeclaration_22().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_22, grammarAccess.getPropertyAccess().getOVERFLOWEnumLiteralDeclaration_22()); @@ -8042,7 +8044,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2983:3: (enumLiteral_23= 'sharedextbus' ) // InternalRDL.g:2984:4: enumLiteral_23= 'sharedextbus' { - enumLiteral_23=(Token)match(input,68,FOLLOW_2); + enumLiteral_23=(Token)match(input,70,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSHAREDEXTBUSEnumLiteralDeclaration_23().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_23, grammarAccess.getPropertyAccess().getSHAREDEXTBUSEnumLiteralDeclaration_23()); @@ -8059,7 +8061,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2991:3: (enumLiteral_24= 'errextbus' ) // InternalRDL.g:2992:4: enumLiteral_24= 'errextbus' { - enumLiteral_24=(Token)match(input,69,FOLLOW_2); + enumLiteral_24=(Token)match(input,71,FOLLOW_2); current = grammarAccess.getPropertyAccess().getERREXTBUSEnumLiteralDeclaration_24().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_24, grammarAccess.getPropertyAccess().getERREXTBUSEnumLiteralDeclaration_24()); @@ -8076,7 +8078,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:2999:3: (enumLiteral_25= 'reset' ) // InternalRDL.g:3000:4: enumLiteral_25= 'reset' { - enumLiteral_25=(Token)match(input,70,FOLLOW_2); + enumLiteral_25=(Token)match(input,72,FOLLOW_2); current = grammarAccess.getPropertyAccess().getRESETEnumLiteralDeclaration_25().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_25, grammarAccess.getPropertyAccess().getRESETEnumLiteralDeclaration_25()); @@ -8093,7 +8095,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3007:3: (enumLiteral_26= 'littleendian' ) // InternalRDL.g:3008:4: enumLiteral_26= 'littleendian' { - enumLiteral_26=(Token)match(input,71,FOLLOW_2); + enumLiteral_26=(Token)match(input,73,FOLLOW_2); current = grammarAccess.getPropertyAccess().getLITTLEENDIANEnumLiteralDeclaration_26().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_26, grammarAccess.getPropertyAccess().getLITTLEENDIANEnumLiteralDeclaration_26()); @@ -8110,7 +8112,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3015:3: (enumLiteral_27= 'bigendian' ) // InternalRDL.g:3016:4: enumLiteral_27= 'bigendian' { - enumLiteral_27=(Token)match(input,72,FOLLOW_2); + enumLiteral_27=(Token)match(input,74,FOLLOW_2); current = grammarAccess.getPropertyAccess().getBIGENDIANEnumLiteralDeclaration_27().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_27, grammarAccess.getPropertyAccess().getBIGENDIANEnumLiteralDeclaration_27()); @@ -8127,7 +8129,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3023:3: (enumLiteral_28= 'rsvdset' ) // InternalRDL.g:3024:4: enumLiteral_28= 'rsvdset' { - enumLiteral_28=(Token)match(input,73,FOLLOW_2); + enumLiteral_28=(Token)match(input,75,FOLLOW_2); current = grammarAccess.getPropertyAccess().getRSVDSETEnumLiteralDeclaration_28().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_28, grammarAccess.getPropertyAccess().getRSVDSETEnumLiteralDeclaration_28()); @@ -8144,7 +8146,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3031:3: (enumLiteral_29= 'rsvdsetX' ) // InternalRDL.g:3032:4: enumLiteral_29= 'rsvdsetX' { - enumLiteral_29=(Token)match(input,74,FOLLOW_2); + enumLiteral_29=(Token)match(input,76,FOLLOW_2); current = grammarAccess.getPropertyAccess().getRSVDSETXEnumLiteralDeclaration_29().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_29, grammarAccess.getPropertyAccess().getRSVDSETXEnumLiteralDeclaration_29()); @@ -8161,7 +8163,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3039:3: (enumLiteral_30= 'bridge' ) // InternalRDL.g:3040:4: enumLiteral_30= 'bridge' { - enumLiteral_30=(Token)match(input,75,FOLLOW_2); + enumLiteral_30=(Token)match(input,77,FOLLOW_2); current = grammarAccess.getPropertyAccess().getBRIDGEEnumLiteralDeclaration_30().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_30, grammarAccess.getPropertyAccess().getBRIDGEEnumLiteralDeclaration_30()); @@ -8178,7 +8180,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3047:3: (enumLiteral_31= 'shared' ) // InternalRDL.g:3048:4: enumLiteral_31= 'shared' { - enumLiteral_31=(Token)match(input,76,FOLLOW_2); + enumLiteral_31=(Token)match(input,78,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSHAREDEnumLiteralDeclaration_31().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_31, grammarAccess.getPropertyAccess().getSHAREDEnumLiteralDeclaration_31()); @@ -8195,7 +8197,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3055:3: (enumLiteral_32= 'msb0' ) // InternalRDL.g:3056:4: enumLiteral_32= 'msb0' { - enumLiteral_32=(Token)match(input,77,FOLLOW_2); + enumLiteral_32=(Token)match(input,79,FOLLOW_2); current = grammarAccess.getPropertyAccess().getMSB0EnumLiteralDeclaration_32().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_32, grammarAccess.getPropertyAccess().getMSB0EnumLiteralDeclaration_32()); @@ -8212,7 +8214,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3063:3: (enumLiteral_33= 'lsb0' ) // InternalRDL.g:3064:4: enumLiteral_33= 'lsb0' { - enumLiteral_33=(Token)match(input,78,FOLLOW_2); + enumLiteral_33=(Token)match(input,80,FOLLOW_2); current = grammarAccess.getPropertyAccess().getLSB0EnumLiteralDeclaration_33().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_33, grammarAccess.getPropertyAccess().getLSB0EnumLiteralDeclaration_33()); @@ -8229,7 +8231,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3071:3: (enumLiteral_34= 'sync' ) // InternalRDL.g:3072:4: enumLiteral_34= 'sync' { - enumLiteral_34=(Token)match(input,79,FOLLOW_2); + enumLiteral_34=(Token)match(input,81,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSYNCEnumLiteralDeclaration_34().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_34, grammarAccess.getPropertyAccess().getSYNCEnumLiteralDeclaration_34()); @@ -8246,7 +8248,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3079:3: (enumLiteral_35= 'async' ) // InternalRDL.g:3080:4: enumLiteral_35= 'async' { - enumLiteral_35=(Token)match(input,80,FOLLOW_2); + enumLiteral_35=(Token)match(input,82,FOLLOW_2); current = grammarAccess.getPropertyAccess().getASYNCEnumLiteralDeclaration_35().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_35, grammarAccess.getPropertyAccess().getASYNCEnumLiteralDeclaration_35()); @@ -8263,7 +8265,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3087:3: (enumLiteral_36= 'cpuif_reset' ) // InternalRDL.g:3088:4: enumLiteral_36= 'cpuif_reset' { - enumLiteral_36=(Token)match(input,81,FOLLOW_2); + enumLiteral_36=(Token)match(input,83,FOLLOW_2); current = grammarAccess.getPropertyAccess().getCPUIF_RESETEnumLiteralDeclaration_36().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_36, grammarAccess.getPropertyAccess().getCPUIF_RESETEnumLiteralDeclaration_36()); @@ -8280,7 +8282,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3095:3: (enumLiteral_37= 'field_reset' ) // InternalRDL.g:3096:4: enumLiteral_37= 'field_reset' { - enumLiteral_37=(Token)match(input,82,FOLLOW_2); + enumLiteral_37=(Token)match(input,84,FOLLOW_2); current = grammarAccess.getPropertyAccess().getFIELD_RESETEnumLiteralDeclaration_37().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_37, grammarAccess.getPropertyAccess().getFIELD_RESETEnumLiteralDeclaration_37()); @@ -8297,7 +8299,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3103:3: (enumLiteral_38= 'activehigh' ) // InternalRDL.g:3104:4: enumLiteral_38= 'activehigh' { - enumLiteral_38=(Token)match(input,83,FOLLOW_2); + enumLiteral_38=(Token)match(input,85,FOLLOW_2); current = grammarAccess.getPropertyAccess().getACTIVEHIGHEnumLiteralDeclaration_38().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_38, grammarAccess.getPropertyAccess().getACTIVEHIGHEnumLiteralDeclaration_38()); @@ -8314,7 +8316,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3111:3: (enumLiteral_39= 'activelow' ) // InternalRDL.g:3112:4: enumLiteral_39= 'activelow' { - enumLiteral_39=(Token)match(input,84,FOLLOW_2); + enumLiteral_39=(Token)match(input,86,FOLLOW_2); current = grammarAccess.getPropertyAccess().getACTIVELOWEnumLiteralDeclaration_39().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_39, grammarAccess.getPropertyAccess().getACTIVELOWEnumLiteralDeclaration_39()); @@ -8331,7 +8333,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3119:3: (enumLiteral_40= 'singlepulse' ) // InternalRDL.g:3120:4: enumLiteral_40= 'singlepulse' { - enumLiteral_40=(Token)match(input,85,FOLLOW_2); + enumLiteral_40=(Token)match(input,87,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSINGLEPULSEEnumLiteralDeclaration_40().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_40, grammarAccess.getPropertyAccess().getSINGLEPULSEEnumLiteralDeclaration_40()); @@ -8348,7 +8350,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3127:3: (enumLiteral_41= 'underflow' ) // InternalRDL.g:3128:4: enumLiteral_41= 'underflow' { - enumLiteral_41=(Token)match(input,86,FOLLOW_2); + enumLiteral_41=(Token)match(input,88,FOLLOW_2); current = grammarAccess.getPropertyAccess().getUNDERFLOWEnumLiteralDeclaration_41().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_41, grammarAccess.getPropertyAccess().getUNDERFLOWEnumLiteralDeclaration_41()); @@ -8365,7 +8367,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3135:3: (enumLiteral_42= 'incr' ) // InternalRDL.g:3136:4: enumLiteral_42= 'incr' { - enumLiteral_42=(Token)match(input,87,FOLLOW_2); + enumLiteral_42=(Token)match(input,89,FOLLOW_2); current = grammarAccess.getPropertyAccess().getINCREnumLiteralDeclaration_42().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_42, grammarAccess.getPropertyAccess().getINCREnumLiteralDeclaration_42()); @@ -8382,7 +8384,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3143:3: (enumLiteral_43= 'decr' ) // InternalRDL.g:3144:4: enumLiteral_43= 'decr' { - enumLiteral_43=(Token)match(input,88,FOLLOW_2); + enumLiteral_43=(Token)match(input,90,FOLLOW_2); current = grammarAccess.getPropertyAccess().getDECREnumLiteralDeclaration_43().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_43, grammarAccess.getPropertyAccess().getDECREnumLiteralDeclaration_43()); @@ -8399,7 +8401,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3151:3: (enumLiteral_44= 'incrwidth' ) // InternalRDL.g:3152:4: enumLiteral_44= 'incrwidth' { - enumLiteral_44=(Token)match(input,89,FOLLOW_2); + enumLiteral_44=(Token)match(input,91,FOLLOW_2); current = grammarAccess.getPropertyAccess().getINCRWIDTHEnumLiteralDeclaration_44().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_44, grammarAccess.getPropertyAccess().getINCRWIDTHEnumLiteralDeclaration_44()); @@ -8416,7 +8418,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3159:3: (enumLiteral_45= 'decrwidth' ) // InternalRDL.g:3160:4: enumLiteral_45= 'decrwidth' { - enumLiteral_45=(Token)match(input,90,FOLLOW_2); + enumLiteral_45=(Token)match(input,92,FOLLOW_2); current = grammarAccess.getPropertyAccess().getDECRWIDTHEnumLiteralDeclaration_45().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_45, grammarAccess.getPropertyAccess().getDECRWIDTHEnumLiteralDeclaration_45()); @@ -8433,7 +8435,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3167:3: (enumLiteral_46= 'incrvalue' ) // InternalRDL.g:3168:4: enumLiteral_46= 'incrvalue' { - enumLiteral_46=(Token)match(input,91,FOLLOW_2); + enumLiteral_46=(Token)match(input,93,FOLLOW_2); current = grammarAccess.getPropertyAccess().getINCRVALUEEnumLiteralDeclaration_46().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_46, grammarAccess.getPropertyAccess().getINCRVALUEEnumLiteralDeclaration_46()); @@ -8450,7 +8452,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3175:3: (enumLiteral_47= 'decrvalue' ) // InternalRDL.g:3176:4: enumLiteral_47= 'decrvalue' { - enumLiteral_47=(Token)match(input,92,FOLLOW_2); + enumLiteral_47=(Token)match(input,94,FOLLOW_2); current = grammarAccess.getPropertyAccess().getDECRVALUEEnumLiteralDeclaration_47().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_47, grammarAccess.getPropertyAccess().getDECRVALUEEnumLiteralDeclaration_47()); @@ -8467,7 +8469,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3183:3: (enumLiteral_48= 'saturate' ) // InternalRDL.g:3184:4: enumLiteral_48= 'saturate' { - enumLiteral_48=(Token)match(input,93,FOLLOW_2); + enumLiteral_48=(Token)match(input,95,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSATURATEEnumLiteralDeclaration_48().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_48, grammarAccess.getPropertyAccess().getSATURATEEnumLiteralDeclaration_48()); @@ -8484,7 +8486,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3191:3: (enumLiteral_49= 'decrsaturate' ) // InternalRDL.g:3192:4: enumLiteral_49= 'decrsaturate' { - enumLiteral_49=(Token)match(input,94,FOLLOW_2); + enumLiteral_49=(Token)match(input,96,FOLLOW_2); current = grammarAccess.getPropertyAccess().getDECRSATURATEEnumLiteralDeclaration_49().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_49, grammarAccess.getPropertyAccess().getDECRSATURATEEnumLiteralDeclaration_49()); @@ -8501,7 +8503,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3199:3: (enumLiteral_50= 'threshold' ) // InternalRDL.g:3200:4: enumLiteral_50= 'threshold' { - enumLiteral_50=(Token)match(input,95,FOLLOW_2); + enumLiteral_50=(Token)match(input,97,FOLLOW_2); current = grammarAccess.getPropertyAccess().getTHRESHOLDEnumLiteralDeclaration_50().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_50, grammarAccess.getPropertyAccess().getTHRESHOLDEnumLiteralDeclaration_50()); @@ -8518,7 +8520,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3207:3: (enumLiteral_51= 'decrthreshold' ) // InternalRDL.g:3208:4: enumLiteral_51= 'decrthreshold' { - enumLiteral_51=(Token)match(input,96,FOLLOW_2); + enumLiteral_51=(Token)match(input,98,FOLLOW_2); current = grammarAccess.getPropertyAccess().getDECRTHRESHOLDEnumLiteralDeclaration_51().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_51, grammarAccess.getPropertyAccess().getDECRTHRESHOLDEnumLiteralDeclaration_51()); @@ -8535,7 +8537,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3215:3: (enumLiteral_52= 'dontcompare' ) // InternalRDL.g:3216:4: enumLiteral_52= 'dontcompare' { - enumLiteral_52=(Token)match(input,97,FOLLOW_2); + enumLiteral_52=(Token)match(input,99,FOLLOW_2); current = grammarAccess.getPropertyAccess().getDONTCOMPAREEnumLiteralDeclaration_52().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_52, grammarAccess.getPropertyAccess().getDONTCOMPAREEnumLiteralDeclaration_52()); @@ -8552,7 +8554,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3223:3: (enumLiteral_53= 'donttest' ) // InternalRDL.g:3224:4: enumLiteral_53= 'donttest' { - enumLiteral_53=(Token)match(input,98,FOLLOW_2); + enumLiteral_53=(Token)match(input,100,FOLLOW_2); current = grammarAccess.getPropertyAccess().getDONTTESTEnumLiteralDeclaration_53().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_53, grammarAccess.getPropertyAccess().getDONTTESTEnumLiteralDeclaration_53()); @@ -8569,7 +8571,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3231:3: (enumLiteral_54= 'internal' ) // InternalRDL.g:3232:4: enumLiteral_54= 'internal' { - enumLiteral_54=(Token)match(input,23,FOLLOW_2); + enumLiteral_54=(Token)match(input,25,FOLLOW_2); current = grammarAccess.getPropertyAccess().getINTERNALEnumLiteralDeclaration_54().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_54, grammarAccess.getPropertyAccess().getINTERNALEnumLiteralDeclaration_54()); @@ -8586,7 +8588,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3239:3: (enumLiteral_55= 'alignment' ) // InternalRDL.g:3240:4: enumLiteral_55= 'alignment' { - enumLiteral_55=(Token)match(input,99,FOLLOW_2); + enumLiteral_55=(Token)match(input,101,FOLLOW_2); current = grammarAccess.getPropertyAccess().getALIGNMENTEnumLiteralDeclaration_55().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_55, grammarAccess.getPropertyAccess().getALIGNMENTEnumLiteralDeclaration_55()); @@ -8603,7 +8605,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3247:3: (enumLiteral_56= 'regwidth' ) // InternalRDL.g:3248:4: enumLiteral_56= 'regwidth' { - enumLiteral_56=(Token)match(input,100,FOLLOW_2); + enumLiteral_56=(Token)match(input,102,FOLLOW_2); current = grammarAccess.getPropertyAccess().getREGWIDTHEnumLiteralDeclaration_56().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_56, grammarAccess.getPropertyAccess().getREGWIDTHEnumLiteralDeclaration_56()); @@ -8620,7 +8622,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3255:3: (enumLiteral_57= 'fieldwidth' ) // InternalRDL.g:3256:4: enumLiteral_57= 'fieldwidth' { - enumLiteral_57=(Token)match(input,101,FOLLOW_2); + enumLiteral_57=(Token)match(input,103,FOLLOW_2); current = grammarAccess.getPropertyAccess().getFIELDWIDTHEnumLiteralDeclaration_57().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_57, grammarAccess.getPropertyAccess().getFIELDWIDTHEnumLiteralDeclaration_57()); @@ -8637,7 +8639,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3263:3: (enumLiteral_58= 'signalwidth' ) // InternalRDL.g:3264:4: enumLiteral_58= 'signalwidth' { - enumLiteral_58=(Token)match(input,102,FOLLOW_2); + enumLiteral_58=(Token)match(input,104,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSIGNALWIDTHEnumLiteralDeclaration_58().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_58, grammarAccess.getPropertyAccess().getSIGNALWIDTHEnumLiteralDeclaration_58()); @@ -8654,7 +8656,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3271:3: (enumLiteral_59= 'accesswidth' ) // InternalRDL.g:3272:4: enumLiteral_59= 'accesswidth' { - enumLiteral_59=(Token)match(input,103,FOLLOW_2); + enumLiteral_59=(Token)match(input,105,FOLLOW_2); current = grammarAccess.getPropertyAccess().getACCESSWIDTHEnumLiteralDeclaration_59().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_59, grammarAccess.getPropertyAccess().getACCESSWIDTHEnumLiteralDeclaration_59()); @@ -8671,7 +8673,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3279:3: (enumLiteral_60= 'sw' ) // InternalRDL.g:3280:4: enumLiteral_60= 'sw' { - enumLiteral_60=(Token)match(input,104,FOLLOW_2); + enumLiteral_60=(Token)match(input,106,FOLLOW_2); current = grammarAccess.getPropertyAccess().getSWEnumLiteralDeclaration_60().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_60, grammarAccess.getPropertyAccess().getSWEnumLiteralDeclaration_60()); @@ -8688,7 +8690,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3287:3: (enumLiteral_61= 'hw' ) // InternalRDL.g:3288:4: enumLiteral_61= 'hw' { - enumLiteral_61=(Token)match(input,105,FOLLOW_2); + enumLiteral_61=(Token)match(input,107,FOLLOW_2); current = grammarAccess.getPropertyAccess().getHWEnumLiteralDeclaration_61().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_61, grammarAccess.getPropertyAccess().getHWEnumLiteralDeclaration_61()); @@ -8705,7 +8707,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3295:3: (enumLiteral_62= 'addressing' ) // InternalRDL.g:3296:4: enumLiteral_62= 'addressing' { - enumLiteral_62=(Token)match(input,106,FOLLOW_2); + enumLiteral_62=(Token)match(input,108,FOLLOW_2); current = grammarAccess.getPropertyAccess().getADDRESSINGEnumLiteralDeclaration_62().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_62, grammarAccess.getPropertyAccess().getADDRESSINGEnumLiteralDeclaration_62()); @@ -8722,7 +8724,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3303:3: (enumLiteral_63= 'precedence' ) // InternalRDL.g:3304:4: enumLiteral_63= 'precedence' { - enumLiteral_63=(Token)match(input,107,FOLLOW_2); + enumLiteral_63=(Token)match(input,109,FOLLOW_2); current = grammarAccess.getPropertyAccess().getPRECEDENCEEnumLiteralDeclaration_63().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_63, grammarAccess.getPropertyAccess().getPRECEDENCEEnumLiteralDeclaration_63()); @@ -8739,7 +8741,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3311:3: (enumLiteral_64= 'encode' ) // InternalRDL.g:3312:4: enumLiteral_64= 'encode' { - enumLiteral_64=(Token)match(input,108,FOLLOW_2); + enumLiteral_64=(Token)match(input,110,FOLLOW_2); current = grammarAccess.getPropertyAccess().getENCODEEnumLiteralDeclaration_64().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_64, grammarAccess.getPropertyAccess().getENCODEEnumLiteralDeclaration_64()); @@ -8756,7 +8758,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3319:3: (enumLiteral_65= 'resetsignal' ) // InternalRDL.g:3320:4: enumLiteral_65= 'resetsignal' { - enumLiteral_65=(Token)match(input,109,FOLLOW_2); + enumLiteral_65=(Token)match(input,111,FOLLOW_2); current = grammarAccess.getPropertyAccess().getRESETSIGNALEnumLiteralDeclaration_65().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_65, grammarAccess.getPropertyAccess().getRESETSIGNALEnumLiteralDeclaration_65()); @@ -8773,7 +8775,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3327:3: (enumLiteral_66= 'clock' ) // InternalRDL.g:3328:4: enumLiteral_66= 'clock' { - enumLiteral_66=(Token)match(input,110,FOLLOW_2); + enumLiteral_66=(Token)match(input,112,FOLLOW_2); current = grammarAccess.getPropertyAccess().getCLOCKEnumLiteralDeclaration_66().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_66, grammarAccess.getPropertyAccess().getCLOCKEnumLiteralDeclaration_66()); @@ -8790,7 +8792,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3335:3: (enumLiteral_67= 'mask' ) // InternalRDL.g:3336:4: enumLiteral_67= 'mask' { - enumLiteral_67=(Token)match(input,111,FOLLOW_2); + enumLiteral_67=(Token)match(input,113,FOLLOW_2); current = grammarAccess.getPropertyAccess().getMASKEnumLiteralDeclaration_67().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_67, grammarAccess.getPropertyAccess().getMASKEnumLiteralDeclaration_67()); @@ -8807,7 +8809,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3343:3: (enumLiteral_68= 'enable' ) // InternalRDL.g:3344:4: enumLiteral_68= 'enable' { - enumLiteral_68=(Token)match(input,112,FOLLOW_2); + enumLiteral_68=(Token)match(input,114,FOLLOW_2); current = grammarAccess.getPropertyAccess().getENABLEEnumLiteralDeclaration_68().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_68, grammarAccess.getPropertyAccess().getENABLEEnumLiteralDeclaration_68()); @@ -8824,7 +8826,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3351:3: (enumLiteral_69= 'hwenable' ) // InternalRDL.g:3352:4: enumLiteral_69= 'hwenable' { - enumLiteral_69=(Token)match(input,113,FOLLOW_2); + enumLiteral_69=(Token)match(input,115,FOLLOW_2); current = grammarAccess.getPropertyAccess().getHWENABLEEnumLiteralDeclaration_69().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_69, grammarAccess.getPropertyAccess().getHWENABLEEnumLiteralDeclaration_69()); @@ -8841,7 +8843,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3359:3: (enumLiteral_70= 'hwmask' ) // InternalRDL.g:3360:4: enumLiteral_70= 'hwmask' { - enumLiteral_70=(Token)match(input,114,FOLLOW_2); + enumLiteral_70=(Token)match(input,116,FOLLOW_2); current = grammarAccess.getPropertyAccess().getHWMASKEnumLiteralDeclaration_70().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_70, grammarAccess.getPropertyAccess().getHWMASKEnumLiteralDeclaration_70()); @@ -8858,7 +8860,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3367:3: (enumLiteral_71= 'haltmask' ) // InternalRDL.g:3368:4: enumLiteral_71= 'haltmask' { - enumLiteral_71=(Token)match(input,115,FOLLOW_2); + enumLiteral_71=(Token)match(input,117,FOLLOW_2); current = grammarAccess.getPropertyAccess().getHALTMASKEnumLiteralDeclaration_71().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_71, grammarAccess.getPropertyAccess().getHALTMASKEnumLiteralDeclaration_71()); @@ -8875,7 +8877,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3375:3: (enumLiteral_72= 'haltenable' ) // InternalRDL.g:3376:4: enumLiteral_72= 'haltenable' { - enumLiteral_72=(Token)match(input,116,FOLLOW_2); + enumLiteral_72=(Token)match(input,118,FOLLOW_2); current = grammarAccess.getPropertyAccess().getHALTENABLEEnumLiteralDeclaration_72().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_72, grammarAccess.getPropertyAccess().getHALTENABLEEnumLiteralDeclaration_72()); @@ -8892,7 +8894,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3383:3: (enumLiteral_73= 'halt' ) // InternalRDL.g:3384:4: enumLiteral_73= 'halt' { - enumLiteral_73=(Token)match(input,117,FOLLOW_2); + enumLiteral_73=(Token)match(input,119,FOLLOW_2); current = grammarAccess.getPropertyAccess().getHALTEnumLiteralDeclaration_73().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_73, grammarAccess.getPropertyAccess().getHALTEnumLiteralDeclaration_73()); @@ -8909,7 +8911,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3391:3: (enumLiteral_74= 'next' ) // InternalRDL.g:3392:4: enumLiteral_74= 'next' { - enumLiteral_74=(Token)match(input,118,FOLLOW_2); + enumLiteral_74=(Token)match(input,120,FOLLOW_2); current = grammarAccess.getPropertyAccess().getNEXTEnumLiteralDeclaration_74().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_74, grammarAccess.getPropertyAccess().getNEXTEnumLiteralDeclaration_74()); @@ -8971,67 +8973,67 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3409:2: ( (enumLiteral_0= 'UNDEFINED' ) | (enumLiteral_1= 'true' ) | (enumLiteral_2= 'false' ) | (enumLiteral_3= 'rw' ) | (enumLiteral_4= 'wr' ) | (enumLiteral_5= 'r' ) | (enumLiteral_6= 'w' ) | (enumLiteral_7= 'na' ) | (enumLiteral_8= 'compact' ) | (enumLiteral_9= 'regalign' ) | (enumLiteral_10= 'fullalign' ) | (enumLiteral_11= 'hw' ) | (enumLiteral_12= 'sw' ) ) int alt47=13; switch ( input.LA(1) ) { - case 119: + case 121: { alt47=1; } break; - case 18: + case 20: { alt47=2; } break; - case 19: + case 21: { alt47=3; } break; - case 120: + case 122: { alt47=4; } break; - case 121: + case 123: { alt47=5; } break; - case 122: + case 124: { alt47=6; } break; - case 123: + case 125: { alt47=7; } break; - case 124: + case 126: { alt47=8; } break; - case 125: + case 127: { alt47=9; } break; - case 126: + case 128: { alt47=10; } break; - case 127: + case 129: { alt47=11; } break; - case 105: + case 107: { alt47=12; } break; - case 104: + case 106: { alt47=13; } @@ -9050,7 +9052,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3410:3: (enumLiteral_0= 'UNDEFINED' ) // InternalRDL.g:3411:4: enumLiteral_0= 'UNDEFINED' { - enumLiteral_0=(Token)match(input,119,FOLLOW_2); + enumLiteral_0=(Token)match(input,121,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getUNDEFINEDEnumLiteralDeclaration_0().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_0, grammarAccess.getRValueConstantAccess().getUNDEFINEDEnumLiteralDeclaration_0()); @@ -9067,7 +9069,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3418:3: (enumLiteral_1= 'true' ) // InternalRDL.g:3419:4: enumLiteral_1= 'true' { - enumLiteral_1=(Token)match(input,18,FOLLOW_2); + enumLiteral_1=(Token)match(input,20,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getTRUEEnumLiteralDeclaration_1().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_1, grammarAccess.getRValueConstantAccess().getTRUEEnumLiteralDeclaration_1()); @@ -9084,7 +9086,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3426:3: (enumLiteral_2= 'false' ) // InternalRDL.g:3427:4: enumLiteral_2= 'false' { - enumLiteral_2=(Token)match(input,19,FOLLOW_2); + enumLiteral_2=(Token)match(input,21,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getFALSEEnumLiteralDeclaration_2().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_2, grammarAccess.getRValueConstantAccess().getFALSEEnumLiteralDeclaration_2()); @@ -9101,7 +9103,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3434:3: (enumLiteral_3= 'rw' ) // InternalRDL.g:3435:4: enumLiteral_3= 'rw' { - enumLiteral_3=(Token)match(input,120,FOLLOW_2); + enumLiteral_3=(Token)match(input,122,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getRWEnumLiteralDeclaration_3().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_3, grammarAccess.getRValueConstantAccess().getRWEnumLiteralDeclaration_3()); @@ -9118,7 +9120,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3442:3: (enumLiteral_4= 'wr' ) // InternalRDL.g:3443:4: enumLiteral_4= 'wr' { - enumLiteral_4=(Token)match(input,121,FOLLOW_2); + enumLiteral_4=(Token)match(input,123,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getWREnumLiteralDeclaration_4().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_4, grammarAccess.getRValueConstantAccess().getWREnumLiteralDeclaration_4()); @@ -9135,7 +9137,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3450:3: (enumLiteral_5= 'r' ) // InternalRDL.g:3451:4: enumLiteral_5= 'r' { - enumLiteral_5=(Token)match(input,122,FOLLOW_2); + enumLiteral_5=(Token)match(input,124,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getREnumLiteralDeclaration_5().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_5, grammarAccess.getRValueConstantAccess().getREnumLiteralDeclaration_5()); @@ -9152,7 +9154,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3458:3: (enumLiteral_6= 'w' ) // InternalRDL.g:3459:4: enumLiteral_6= 'w' { - enumLiteral_6=(Token)match(input,123,FOLLOW_2); + enumLiteral_6=(Token)match(input,125,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getWEnumLiteralDeclaration_6().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_6, grammarAccess.getRValueConstantAccess().getWEnumLiteralDeclaration_6()); @@ -9169,7 +9171,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3466:3: (enumLiteral_7= 'na' ) // InternalRDL.g:3467:4: enumLiteral_7= 'na' { - enumLiteral_7=(Token)match(input,124,FOLLOW_2); + enumLiteral_7=(Token)match(input,126,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getNAEnumLiteralDeclaration_7().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_7, grammarAccess.getRValueConstantAccess().getNAEnumLiteralDeclaration_7()); @@ -9186,7 +9188,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3474:3: (enumLiteral_8= 'compact' ) // InternalRDL.g:3475:4: enumLiteral_8= 'compact' { - enumLiteral_8=(Token)match(input,125,FOLLOW_2); + enumLiteral_8=(Token)match(input,127,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getCOMPACTEnumLiteralDeclaration_8().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_8, grammarAccess.getRValueConstantAccess().getCOMPACTEnumLiteralDeclaration_8()); @@ -9203,7 +9205,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3482:3: (enumLiteral_9= 'regalign' ) // InternalRDL.g:3483:4: enumLiteral_9= 'regalign' { - enumLiteral_9=(Token)match(input,126,FOLLOW_2); + enumLiteral_9=(Token)match(input,128,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getREGALIGNEnumLiteralDeclaration_9().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_9, grammarAccess.getRValueConstantAccess().getREGALIGNEnumLiteralDeclaration_9()); @@ -9220,7 +9222,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3490:3: (enumLiteral_10= 'fullalign' ) // InternalRDL.g:3491:4: enumLiteral_10= 'fullalign' { - enumLiteral_10=(Token)match(input,127,FOLLOW_2); + enumLiteral_10=(Token)match(input,129,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getFULLALIGNEnumLiteralDeclaration_10().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_10, grammarAccess.getRValueConstantAccess().getFULLALIGNEnumLiteralDeclaration_10()); @@ -9237,7 +9239,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3498:3: (enumLiteral_11= 'hw' ) // InternalRDL.g:3499:4: enumLiteral_11= 'hw' { - enumLiteral_11=(Token)match(input,105,FOLLOW_2); + enumLiteral_11=(Token)match(input,107,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getHWEnumLiteralDeclaration_11().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_11, grammarAccess.getRValueConstantAccess().getHWEnumLiteralDeclaration_11()); @@ -9254,7 +9256,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3506:3: (enumLiteral_12= 'sw' ) // InternalRDL.g:3507:4: enumLiteral_12= 'sw' { - enumLiteral_12=(Token)match(input,104,FOLLOW_2); + enumLiteral_12=(Token)match(input,106,FOLLOW_2); current = grammarAccess.getRValueConstantAccess().getSWEnumLiteralDeclaration_12().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_12, grammarAccess.getRValueConstantAccess().getSWEnumLiteralDeclaration_12()); @@ -9309,32 +9311,32 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3524:2: ( (enumLiteral_0= 'UNDEFINED' ) | (enumLiteral_1= 'posedge' ) | (enumLiteral_2= 'negedge' ) | (enumLiteral_3= 'bothedge' ) | (enumLiteral_4= 'level' ) | (enumLiteral_5= 'nonsticky' ) ) int alt48=6; switch ( input.LA(1) ) { - case 119: + case 121: { alt48=1; } break; - case 128: + case 130: { alt48=2; } break; - case 129: + case 131: { alt48=3; } break; - case 130: + case 132: { alt48=4; } break; - case 131: + case 133: { alt48=5; } break; - case 132: + case 134: { alt48=6; } @@ -9353,7 +9355,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3525:3: (enumLiteral_0= 'UNDEFINED' ) // InternalRDL.g:3526:4: enumLiteral_0= 'UNDEFINED' { - enumLiteral_0=(Token)match(input,119,FOLLOW_2); + enumLiteral_0=(Token)match(input,121,FOLLOW_2); current = grammarAccess.getPropertyModifierAccess().getUNDEFINEDEnumLiteralDeclaration_0().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_0, grammarAccess.getPropertyModifierAccess().getUNDEFINEDEnumLiteralDeclaration_0()); @@ -9370,7 +9372,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3533:3: (enumLiteral_1= 'posedge' ) // InternalRDL.g:3534:4: enumLiteral_1= 'posedge' { - enumLiteral_1=(Token)match(input,128,FOLLOW_2); + enumLiteral_1=(Token)match(input,130,FOLLOW_2); current = grammarAccess.getPropertyModifierAccess().getPOSEDGEEnumLiteralDeclaration_1().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_1, grammarAccess.getPropertyModifierAccess().getPOSEDGEEnumLiteralDeclaration_1()); @@ -9387,7 +9389,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3541:3: (enumLiteral_2= 'negedge' ) // InternalRDL.g:3542:4: enumLiteral_2= 'negedge' { - enumLiteral_2=(Token)match(input,129,FOLLOW_2); + enumLiteral_2=(Token)match(input,131,FOLLOW_2); current = grammarAccess.getPropertyModifierAccess().getNEGEDGEEnumLiteralDeclaration_2().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_2, grammarAccess.getPropertyModifierAccess().getNEGEDGEEnumLiteralDeclaration_2()); @@ -9404,7 +9406,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3549:3: (enumLiteral_3= 'bothedge' ) // InternalRDL.g:3550:4: enumLiteral_3= 'bothedge' { - enumLiteral_3=(Token)match(input,130,FOLLOW_2); + enumLiteral_3=(Token)match(input,132,FOLLOW_2); current = grammarAccess.getPropertyModifierAccess().getBOTHEDGEEnumLiteralDeclaration_3().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_3, grammarAccess.getPropertyModifierAccess().getBOTHEDGEEnumLiteralDeclaration_3()); @@ -9421,7 +9423,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3557:3: (enumLiteral_4= 'level' ) // InternalRDL.g:3558:4: enumLiteral_4= 'level' { - enumLiteral_4=(Token)match(input,131,FOLLOW_2); + enumLiteral_4=(Token)match(input,133,FOLLOW_2); current = grammarAccess.getPropertyModifierAccess().getLEVELEnumLiteralDeclaration_4().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_4, grammarAccess.getPropertyModifierAccess().getLEVELEnumLiteralDeclaration_4()); @@ -9438,7 +9440,7 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { // InternalRDL.g:3565:3: (enumLiteral_5= 'nonsticky' ) // InternalRDL.g:3566:4: enumLiteral_5= 'nonsticky' { - enumLiteral_5=(Token)match(input,132,FOLLOW_2); + enumLiteral_5=(Token)match(input,134,FOLLOW_2); current = grammarAccess.getPropertyModifierAccess().getNONSTICKYEnumLiteralDeclaration_5().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_5, grammarAccess.getPropertyModifierAccess().getNONSTICKYEnumLiteralDeclaration_5()); @@ -9477,18 +9479,18 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { static final String dfa_1s = "\12\uffff"; static final String dfa_2s = "\1\1\11\uffff"; static final String dfa_3s = "\1\5\5\uffff\2\5\2\uffff"; - static final String dfa_4s = "\1\u0084\5\uffff\1\30\1\41\2\uffff"; + static final String dfa_4s = "\1\u0086\5\uffff\1\32\1\43\2\uffff"; static final String dfa_5s = "\1\uffff\1\7\1\1\1\2\1\3\1\4\2\uffff\1\5\1\6"; static final String dfa_6s = "\12\uffff}>"; static final String[] dfa_7s = { - "\1\7\4\uffff\1\2\1\11\5\uffff\1\10\4\uffff\1\5\1\6\1\5\11\uffff\1\4\2\10\3\uffff\4\3\1\uffff\1\3\1\uffff\111\10\10\uffff\5\10", + "\1\7\6\uffff\1\2\1\11\5\uffff\1\10\4\uffff\1\5\1\6\1\5\11\uffff\1\4\2\10\3\uffff\4\3\1\uffff\1\3\1\uffff\111\10\10\uffff\5\10", "", "", "", "", "", - "\1\5\10\uffff\2\10\10\uffff\1\5", - "\1\5\10\uffff\2\10\20\uffff\2\10", + "\1\5\12\uffff\2\10\10\uffff\1\5", + "\1\5\12\uffff\2\10\20\uffff\2\10", "", "" }; @@ -9522,50 +9524,50 @@ public class InternalRDLParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_3 = new BitSet(new long[]{0xFFFFAF1C01C20C22L,0x00FFFFFFFFFFFFFFL,0x000000000000001FL}); + public static final BitSet FOLLOW_3 = new BitSet(new long[]{0xFFFEBC7007083022L,0x03FFFFFFFFFFFFFFL,0x000000000000007CL}); public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000000010L}); public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000122000L}); - public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000004000L}); - public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x00001FE000000000L}); - public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000132000L}); - public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000100000L}); - public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000102000L}); - public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x00000000000C0050L}); - public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x00006F0000000000L}); - public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000208000L}); - public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000001020L}); - public static final BitSet FOLLOW_20 = new BitSet(new long[]{0xFFFFAF1C01C30020L,0x00FFFFFFFFFFFFFFL,0x000000000000001FL}); - public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000000408020L}); - public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000001800020L}); - public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000001000020L}); - public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000400020L}); - public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000002008000L}); - public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000002000002L}); - public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x000000003C004002L}); - public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x000000001C004002L}); + public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000004000L}); + public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000488000L}); + public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x00007F8000000000L}); + public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000020000L}); + public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x00000000004C8000L}); + public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000040000L}); + public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000400000L}); + public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000408000L}); + public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000300050L}); + public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0001BC0000000000L}); + public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000820000L}); + public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000004020L}); + public static final BitSet FOLLOW_20 = new BitSet(new long[]{0xFFFEBC70070C0020L,0x03FFFFFFFFFFFFFFL,0x000000000000007CL}); + public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000001020020L}); + public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000006000020L}); + public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000004000020L}); + public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000001000020L}); + public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000008020000L}); + public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000008000002L}); + public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x00000000F0010002L}); + public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000070010002L}); public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x000000001C000002L}); - public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000018000002L}); - public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000010000002L}); - public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_35 = new BitSet(new long[]{0xFFFF801800800000L,0x00FFFFFFFFFFFFFFL,0x000000000000001FL}); - public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x000000000000C000L}); - public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x00000000000C1070L,0xFF80030000000000L}); - public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_39 = new BitSet(new long[]{0xFFFF801800800020L,0x00FFFFFFFFFFFFFFL,0x000000000000001FL}); - public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000100000002L}); - public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000200000002L}); - public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000070000002L}); + public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000060000002L}); + public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000040000002L}); + public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000200000000L}); + public static final BitSet FOLLOW_35 = new BitSet(new long[]{0xFFFE006002000000L,0x03FFFFFFFFFFFFFFL,0x000000000000007CL}); + public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000030000L}); + public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000304070L,0xFE000C0000000000L,0x0000000000000003L}); + public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000400000000L}); + public static final BitSet FOLLOW_39 = new BitSet(new long[]{0xFFFE006002000020L,0x03FFFFFFFFFFFFFFL,0x000000000000007CL}); + public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000400000002L}); + public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000800000002L}); + public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000001000000000L}); public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000000060L}); - public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000002010000L}); - public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000010020L}); - public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000009000L}); - public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000001800010000L}); + public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000008040000L}); + public static final BitSet FOLLOW_45 = new BitSet(new long[]{0x0000000000040020L}); + public static final BitSet FOLLOW_46 = new BitSet(new long[]{0x0000000000024000L}); + public static final BitSet FOLLOW_47 = new BitSet(new long[]{0x0000006000040000L}); } \ No newline at end of file diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java index 11db4f2..1e255ae 100644 --- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java +++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java @@ -3381,6 +3381,8 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder { private final TerminalRule tWS; private final TerminalRule tML_COMMENT; private final TerminalRule tSL_COMMENT; + private final TerminalRule tESCAPE_JSP; + private final TerminalRule tESCAPE_ORDL; private final TerminalRule tNUM; private final TerminalRule tSTR; @@ -3426,6 +3428,8 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder { this.tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.WS"); this.tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.ML_COMMENT"); this.tSL_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.SL_COMMENT"); + this.tESCAPE_JSP = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.ESCAPE_JSP"); + this.tESCAPE_ORDL = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.ESCAPE_ORDL"); this.tNUM = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.NUM"); this.tSTR = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.STR"); } @@ -3962,7 +3966,7 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder { } //terminal ML_COMMENT: - // '/*'->'*/' | '<%'->'%>' | '('->')'; + // '/*'->'*/'; public TerminalRule getML_COMMENTRule() { return tML_COMMENT; } @@ -3973,6 +3977,18 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder { return tSL_COMMENT; } + //terminal ESCAPE_JSP: + // '<%'->'%>'; + public TerminalRule getESCAPE_JSPRule() { + return tESCAPE_JSP; + } + + //terminal ESCAPE_ORDL: + // '('->')'; + public TerminalRule getESCAPE_ORDLRule() { + return tESCAPE_ORDL; + } + //terminal NUM returns ecore::EJavaObject: // <= verilog like numbers with size and base (16'123 'h1fff, ...====================================================================================> <= hexa decimal numbers =============> ////'0'..'9'* '\'' ( 'b' ('0' | '1' | '_')+ | 'd'? ('0'..'9' | '_')+ | 'o' ('0'..'7' | '_')+ | 'h' ('0'..'9' | 'a'..'f' | 'A'..'F' | '_')+) | "0x" ('0'..'9' | 'a'..'f' | 'A'..'F')+ | '0'..'9'+; // '0'..'9'+ '\'b' ('0' | '1' | '_')+ | '0'..'9'+ '\'o' ('0'..'7' | '_')+ | '0'..'9'+ '\'h' ('0'..'9' | 'a'..'f' | From 80440c6c5889b988f0bcb53a67a7008899f5412f Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Wed, 13 Sep 2017 10:43:04 +0200 Subject: [PATCH 3/3] Added RDL Editor product --- .gitignore | 6 +- .../com.minres.rdl.feature/feature.xml | 71 +- .../com.minres.rdl.platform.feature/.project | 23 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../build.properties | 1 + .../feature.xml | 1904 +++++++++++++++++ .../com.minres.rdl.platform.feature/pom.xml | 15 + .../com.minres.rdl.product.feature/.project | 23 + .../org.eclipse.core.resources.prefs | 2 + .../build.properties | 1 + .../feature.xml | 20 + .../com.minres.rdl.product.feature/pom.xml | 15 + .../com.minres.rdl.product/.classpath | 7 + .../com.minres.rdl.product/.project | 40 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 7 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../org.eclipse.xtend.core.Xtend.prefs | 7 + .../META-INF/MANIFEST.MF | 8 + .../com.minres.rdl.product/build.properties | 5 + .../com.minres.rdl.product.product | 119 ++ .../com.minres.rdl.product/plugin.xml | 17 + .../com.minres.rdl.product/pom.xml | 21 + .../com.minres.rdl.repository/category.xml | 12 +- .../com.minres.rdl.target.target | 20 +- .../com/minres/rdl/ui/RDLUiModule.java | 4 +- com.minres.rdl.parent/pom.xml | 17 +- 28 files changed, 2329 insertions(+), 48 deletions(-) create mode 100644 com.minres.rdl.parent/com.minres.rdl.platform.feature/.project create mode 100644 com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.core.resources.prefs create mode 100644 com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.m2e.core.prefs create mode 100644 com.minres.rdl.parent/com.minres.rdl.platform.feature/build.properties create mode 100644 com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml create mode 100644 com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml create mode 100644 com.minres.rdl.parent/com.minres.rdl.product.feature/.project create mode 100644 com.minres.rdl.parent/com.minres.rdl.product.feature/.settings/org.eclipse.core.resources.prefs create mode 100644 com.minres.rdl.parent/com.minres.rdl.product.feature/build.properties create mode 100644 com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml create mode 100644 com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/.classpath create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/.project create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.core.resources.prefs create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.jdt.core.prefs create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.m2e.core.prefs create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.xtend.core.Xtend.prefs create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/build.properties create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/com.minres.rdl.product.product create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/plugin.xml create mode 100644 com.minres.rdl.parent/com.minres.rdl.product/pom.xml diff --git a/.gitignore b/.gitignore index 274513b..cf64e51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,5 @@ com.minres.rdl.parent/com.minres.rdl/.launch -com.minres.rdl.parent/com.minres.rdl.ui/target -com.minres.rdl.parent/com.minres.rdl.ui.tests/target -com.minres.rdl.parent/com.minres.rdl.tests/target -com.minres.rdl.parent/com.minres.rdl.ide/target -com.minres.rdl.parent/com.minres.rdl/target +com.minres.rdl.parent/*/target *.xtextbin *.xtendbin *._trace diff --git a/com.minres.rdl.parent/com.minres.rdl.feature/feature.xml b/com.minres.rdl.parent/com.minres.rdl.feature/feature.xml index cb5ccc5..25da556 100644 --- a/com.minres.rdl.parent/com.minres.rdl.feature/feature.xml +++ b/com.minres.rdl.parent/com.minres.rdl.feature/feature.xml @@ -1,23 +1,52 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/.project b/com.minres.rdl.parent/com.minres.rdl.platform.feature/.project new file mode 100644 index 0000000..bda33da --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/.project @@ -0,0 +1,23 @@ + + + com.minres.rdl.platform.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.FeatureNature + + diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.core.resources.prefs b/com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.m2e.core.prefs b/com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/build.properties b/com.minres.rdl.parent/com.minres.rdl.platform.feature/build.properties new file mode 100644 index 0000000..64f93a9 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml b/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml new file mode 100644 index 0000000..5b73f16 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml @@ -0,0 +1,1904 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml b/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml new file mode 100644 index 0000000..04355a6 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + + com.minres.rdl + com.minres.rdl.parent + 1.0.0-SNAPSHOT + + com.minres.rdl.platform.feature + eclipse-feature + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product.feature/.project b/com.minres.rdl.parent/com.minres.rdl.product.feature/.project new file mode 100644 index 0000000..a8bd246 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product.feature/.project @@ -0,0 +1,23 @@ + + + com.minres.rdl.product.feature + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.FeatureNature + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product.feature/.settings/org.eclipse.core.resources.prefs b/com.minres.rdl.parent/com.minres.rdl.product.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.rdl.parent/com.minres.rdl.product.feature/build.properties b/com.minres.rdl.parent/com.minres.rdl.product.feature/build.properties new file mode 100644 index 0000000..64f93a9 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml b/com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml new file mode 100644 index 0000000..92aa4cd --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml b/com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml new file mode 100644 index 0000000..96178d2 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + + com.minres.rdl + com.minres.rdl.parent + 1.0.0-SNAPSHOT + + com.minres.rdl.product.feature + eclipse-feature + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product/.classpath b/com.minres.rdl.parent/com.minres.rdl.product/.classpath new file mode 100644 index 0000000..eca7bdb --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product/.project b/com.minres.rdl.parent/com.minres.rdl.product/.project new file mode 100644 index 0000000..d0b8292 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/.project @@ -0,0 +1,40 @@ + + + com.minres.rdl.product + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.core.resources.prefs b/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.jdt.core.prefs b/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..0c68a61 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.m2e.core.prefs b/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.xtend.core.Xtend.prefs b/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 0000000..fdf3191 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,7 @@ +//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen +//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF new file mode 100644 index 0000000..ab60b2c --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: RDL Editor +Bundle-SymbolicName: com.minres.rdl.product;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: MINRES +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0" diff --git a/com.minres.rdl.parent/com.minres.rdl.product/build.properties b/com.minres.rdl.parent/com.minres.rdl.product/build.properties new file mode 100644 index 0000000..e9863e2 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml diff --git a/com.minres.rdl.parent/com.minres.rdl.product/com.minres.rdl.product.product b/com.minres.rdl.parent/com.minres.rdl.product/com.minres.rdl.product.product new file mode 100644 index 0000000..baf0f9b --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/com.minres.rdl.product.product @@ -0,0 +1,119 @@ + + + + + + + + + + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product/plugin.xml b/com.minres.rdl.parent/com.minres.rdl.product/plugin.xml new file mode 100644 index 0000000..9cbd490 --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/plugin.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.product/pom.xml b/com.minres.rdl.parent/com.minres.rdl.product/pom.xml new file mode 100644 index 0000000..23174cb --- /dev/null +++ b/com.minres.rdl.parent/com.minres.rdl.product/pom.xml @@ -0,0 +1,21 @@ + + 4.0.0 + + com.minres.rdl + com.minres.rdl.parent + 1.0.0-SNAPSHOT + + com.minres.rdl.product + eclipse-application + + + + + org.eclipse.xtend + xtend-maven-plugin + + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.repository/category.xml b/com.minres.rdl.parent/com.minres.rdl.repository/category.xml index 857ad4a..66d9e31 100644 --- a/com.minres.rdl.parent/com.minres.rdl.repository/category.xml +++ b/com.minres.rdl.parent/com.minres.rdl.repository/category.xml @@ -1,11 +1,7 @@ - - - - - - - - + + + + diff --git a/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target b/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target index 3110d7d..1d2613f 100644 --- a/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target +++ b/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target @@ -1,8 +1,16 @@ - - + + + + + + + + + + @@ -13,13 +21,5 @@ - - - - - - - - diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java index 38135bf..f4a8c89 100644 --- a/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java +++ b/com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java @@ -25,7 +25,7 @@ public class RDLUiModule extends AbstractRDLUiModule { return RDLEObjectDocumentationProvider.class; } - public RDLUiModule(final AbstractUIPlugin plugin) { - super(plugin); + public RDLUiModule(final AbstractUIPlugin arg0) { + super(arg0); } } diff --git a/com.minres.rdl.parent/pom.xml b/com.minres.rdl.parent/pom.xml index ab964df..6b0a372 100644 --- a/com.minres.rdl.parent/pom.xml +++ b/com.minres.rdl.parent/pom.xml @@ -22,6 +22,9 @@ com.minres.rdl.repository com.minres.rdl.tests com.minres.rdl.ui.tests + com.minres.rdl.product + com.minres.rdl.product.feature + com.minres.rdl.platform.feature @@ -31,7 +34,7 @@ ${tycho-version} true - + org.eclipse.tycho tycho-p2-plugin ${tycho-version} @@ -90,11 +93,21 @@ cocoa x86_64 + + win32 + win32 + x86 + win32 win32 x86_64 + + linux + gtk + x86 + linux gtk