Merge pull request #1 from Minres/develop

Develop
Minres · Sep 13, 2017 · 006b636 · 006b636
2 parents 894e97c + 80440c6
commit 006b636
Show file tree

Hide file tree

Showing 41 changed files with 6,044 additions and 3,728 deletions.
diff --git 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
@@ -1,23 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="com.minres.rdl.feature"
-	label="RDL Feature "
-	version="1.0.0.qualifier">
-	<plugin
-			id="com.minres.rdl"
-			download-size="0"
-			install-size="0"
-			version="0.0.0"
-			unpack="false"/>
-	<plugin
-			id="com.minres.rdl.ide"
-			download-size="0"
-			install-size="0"
-			version="0.0.0"
-			unpack="false"/>
-	<plugin
-			id="com.minres.rdl.ui"
-			download-size="0"
-			install-size="0"
-			version="0.0.0"
-			unpack="false"/>
+<feature
+      id="com.minres.rdl.feature"
+      label="RDL Feature "
+      version="1.0.0.qualifier">
+
+   <requires>
+      <import plugin="org.eclipse.xtext"/>
+      <import plugin="org.eclipse.xtext.xbase"/>
+      <import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.ecore"/>
+      <import plugin="org.eclipse.xtext.xbase.lib"/>
+      <import plugin="org.antlr.runtime"/>
+      <import plugin="org.eclipse.xtext.util"/>
+      <import plugin="org.eclipse.xtend.lib"/>
+      <import plugin="org.eclipse.emf.common"/>
+      <import plugin="org.eclipse.equinox.preferences"/>
+      <import plugin="org.apache.log4j"/>
+      <import plugin="org.eclipse.xtext.ide"/>
+      <import plugin="org.eclipse.xtext.xbase.ide"/>
+      <import plugin="org.eclipse.xtext.ui"/>
+      <import plugin="org.eclipse.xtext.ui.shared"/>
+      <import plugin="org.eclipse.xtext.ui.codetemplates.ui"/>
+      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.compare"/>
+      <import plugin="org.eclipse.xtext.builder"/>
+   </requires>
+
+   <plugin
+         id="com.minres.rdl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.minres.rdl.ide"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.minres.rdl.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/...l.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java b/...l.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java
@@ -206,7 +206,7 @@ protected String getRuleName(AbstractElement element) {
 
 	@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.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g b/.../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/...minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.tokens b/...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