Skip to content

Commit 006b636

Browse files
eyckeyck
authored
Merge pull request #1 from Minres/develop
Develop
2 parents 894e97c + 80440c6 commit 006b636

File tree

41 files changed

+6044
-3728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+6044
-3728
lines changed

‎.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
com.minres.rdl.parent/com.minres.rdl/.launch
2-
com.minres.rdl.parent/com.minres.rdl.ui/target
3-
com.minres.rdl.parent/com.minres.rdl.ui.tests/target
4-
com.minres.rdl.parent/com.minres.rdl.tests/target
5-
com.minres.rdl.parent/com.minres.rdl.ide/target
6-
com.minres.rdl.parent/com.minres.rdl/target
2+
com.minres.rdl.parent/*/target
73
*.xtextbin
84
*.xtendbin
95
*._trace

‎com.minres.rdl.parent/com.minres.rdl.feature/feature.xml

Lines changed: 50 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,52 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<feature id="com.minres.rdl.feature"
3-
label="RDL Feature "
4-
version="1.0.0.qualifier">
5-
<plugin
6-
id="com.minres.rdl"
7-
download-size="0"
8-
install-size="0"
9-
version="0.0.0"
10-
unpack="false"/>
11-
<plugin
12-
id="com.minres.rdl.ide"
13-
download-size="0"
14-
install-size="0"
15-
version="0.0.0"
16-
unpack="false"/>
17-
<plugin
18-
id="com.minres.rdl.ui"
19-
download-size="0"
20-
install-size="0"
21-
version="0.0.0"
22-
unpack="false"/>
2+
<feature
3+
id="com.minres.rdl.feature"
4+
label="RDL Feature "
5+
version="1.0.0.qualifier">
6+
7+
<requires>
8+
<import plugin="org.eclipse.xtext"/>
9+
<import plugin="org.eclipse.xtext.xbase"/>
10+
<import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
11+
<import plugin="org.eclipse.emf.ecore"/>
12+
<import plugin="org.eclipse.xtext.xbase.lib"/>
13+
<import plugin="org.antlr.runtime"/>
14+
<import plugin="org.eclipse.xtext.util"/>
15+
<import plugin="org.eclipse.xtend.lib"/>
16+
<import plugin="org.eclipse.emf.common"/>
17+
<import plugin="org.eclipse.equinox.preferences"/>
18+
<import plugin="org.apache.log4j"/>
19+
<import plugin="org.eclipse.xtext.ide"/>
20+
<import plugin="org.eclipse.xtext.xbase.ide"/>
21+
<import plugin="org.eclipse.xtext.ui"/>
22+
<import plugin="org.eclipse.xtext.ui.shared"/>
23+
<import plugin="org.eclipse.xtext.ui.codetemplates.ui"/>
24+
<import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
25+
<import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
26+
<import plugin="org.eclipse.ui"/>
27+
<import plugin="org.eclipse.compare"/>
28+
<import plugin="org.eclipse.xtext.builder"/>
29+
</requires>
30+
31+
<plugin
32+
id="com.minres.rdl"
33+
download-size="0"
34+
install-size="0"
35+
version="0.0.0"
36+
unpack="false"/>
37+
38+
<plugin
39+
id="com.minres.rdl.ide"
40+
download-size="0"
41+
install-size="0"
42+
version="0.0.0"
43+
unpack="false"/>
44+
45+
<plugin
46+
id="com.minres.rdl.ui"
47+
download-size="0"
48+
install-size="0"
49+
version="0.0.0"
50+
unpack="false"/>
51+
2352
</feature>

‎com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ protected String getRuleName(AbstractElement element) {
206206

207207
@Override
208208
protected String[] getInitialHiddenTokens() {
209-
return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" };
209+
return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ESCAPE_JSP", "RULE_ESCAPE_ORDL" };
210210
}
211211

212212
public RDLGrammarAccess getGrammarAccess() {

‎com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7643,10 +7643,14 @@ RULE_ID : '\\'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
76437643

76447644
RULE_WS : (' '|'\t'|'\r'|'\n')+;
76457645

7646-
RULE_ML_COMMENT : ('/*' ( options {greedy=false;} : . )*'*/'|'<%' ( options {greedy=false;} : . )*'%>'|'(' ( options {greedy=false;} : . )*')');
7646+
RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
76477647

76487648
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
76497649

7650+
RULE_ESCAPE_JSP : '<%' ( options {greedy=false;} : . )*'%>';
7651+
7652+
RULE_ESCAPE_ORDL : '(' ( options {greedy=false;} : . )*')';
7653+
76507654
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')+);
76517655

76527656
RULE_STR : '"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"';

‎com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.tokens

Lines changed: 127 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,128 @@
1-
'%='=125
2-
'+='=124
3-
','=122
4-
'->'=129
5-
'.'=130
6-
':'=128
7-
';'=115
8-
'='=117
9-
'@'=123
10-
'UNDEFINED'=95
11-
'['=126
12-
']'=127
13-
'`include'=111
14-
'accesswidth'=79
15-
'activehigh'=58
16-
'activelow'=59
17-
'addressing'=82
18-
'addrmap'=13
19-
'alias'=121
20-
'alignment'=75
21-
'all'=19
22-
'anded'=38
23-
'arbiter'=22
24-
'async'=55
25-
'bigendian'=47
26-
'boolean'=12
27-
'bothedge'=108
28-
'bridge'=50
29-
'clock'=86
30-
'compact'=103
31-
'component'=119
32-
'counter'=41
33-
'cpuif_reset'=56
34-
'decr'=63
35-
'decrsaturate'=69
36-
'decrthreshold'=71
37-
'decrvalue'=67
38-
'decrwidth'=65
39-
'default'=118
40-
'desc'=21
41-
'dontcompare'=72
42-
'donttest'=73
43-
'enable'=88
44-
'encode'=84
45-
'enum'=131
46-
'errextbus'=44
47-
'external'=132
48-
'false'=97
49-
'field'=16
50-
'field_reset'=57
51-
'fieldwidth'=77
52-
'fullalign'=105
53-
'halt'=93
54-
'haltenable'=92
55-
'haltmask'=91
56-
'hw'=81
57-
'hwclr'=32
58-
'hwenable'=89
59-
'hwmask'=90
60-
'hwset'=31
61-
'incr'=62
62-
'incrvalue'=66
63-
'incrwidth'=64
64-
'internal'=74
65-
'intr'=37
66-
'level'=109
67-
'littleendian'=46
68-
'lsb0'=53
69-
'mask'=87
70-
'msb0'=52
71-
'na'=102
72-
'name'=20
73-
'negedge'=107
74-
'next'=94
75-
'nonsticky'=110
76-
'number'=11
77-
'ored'=39
78-
'overflow'=42
79-
'posedge'=106
80-
'precedence'=83
81-
'property'=112
82-
'r'=100
83-
'rclr'=24
84-
'ref'=17
85-
'reg'=14
86-
'regalign'=104
87-
'regfile'=15
88-
'regwidth'=76
89-
'reset'=45
90-
'resetsignal'=85
91-
'rset'=23
92-
'rsvdset'=48
93-
'rsvdsetX'=49
94-
'rw'=98
95-
'saturate'=68
96-
'shared'=51
97-
'sharedextbus'=43
98-
'signal'=18
99-
'signalwidth'=78
100-
'singlepulse'=60
101-
'sticky'=35
102-
'stickybit'=36
103-
'string'=10
104-
'sw'=80
105-
'swacc'=34
106-
'swmod'=33
107-
'swwe'=29
108-
'swwel'=30
109-
'sync'=54
110-
'threshold'=70
111-
'true'=96
112-
'type'=116
113-
'underflow'=61
114-
'w'=101
115-
'we'=27
116-
'wel'=28
117-
'woclr'=25
118-
'woset'=26
119-
'wr'=99
120-
'xored'=40
121-
'{'=113
122-
'|'=120
123-
'}'=114
1+
'%='=127
2+
'+='=126
3+
','=124
4+
'->'=131
5+
'.'=132
6+
':'=130
7+
';'=117
8+
'='=119
9+
'@'=125
10+
'UNDEFINED'=97
11+
'['=128
12+
']'=129
13+
'`include'=113
14+
'accesswidth'=81
15+
'activehigh'=60
16+
'activelow'=61
17+
'addressing'=84
18+
'addrmap'=15
19+
'alias'=123
20+
'alignment'=77
21+
'all'=21
22+
'anded'=40
23+
'arbiter'=24
24+
'async'=57
25+
'bigendian'=49
26+
'boolean'=14
27+
'bothedge'=110
28+
'bridge'=52
29+
'clock'=88
30+
'compact'=105
31+
'component'=121
32+
'counter'=43
33+
'cpuif_reset'=58
34+
'decr'=65
35+
'decrsaturate'=71
36+
'decrthreshold'=73
37+
'decrvalue'=69
38+
'decrwidth'=67
39+
'default'=120
40+
'desc'=23
41+
'dontcompare'=74
42+
'donttest'=75
43+
'enable'=90
44+
'encode'=86
45+
'enum'=133
46+
'errextbus'=46
47+
'external'=134
48+
'false'=99
49+
'field'=18
50+
'field_reset'=59
51+
'fieldwidth'=79
52+
'fullalign'=107
53+
'halt'=95
54+
'haltenable'=94
55+
'haltmask'=93
56+
'hw'=83
57+
'hwclr'=34
58+
'hwenable'=91
59+
'hwmask'=92
60+
'hwset'=33
61+
'incr'=64
62+
'incrvalue'=68
63+
'incrwidth'=66
64+
'internal'=76
65+
'intr'=39
66+
'level'=111
67+
'littleendian'=48
68+
'lsb0'=55
69+
'mask'=89
70+
'msb0'=54
71+
'na'=104
72+
'name'=22
73+
'negedge'=109
74+
'next'=96
75+
'nonsticky'=112
76+
'number'=13
77+
'ored'=41
78+
'overflow'=44
79+
'posedge'=108
80+
'precedence'=85
81+
'property'=114
82+
'r'=102
83+
'rclr'=26
84+
'ref'=19
85+
'reg'=16
86+
'regalign'=106
87+
'regfile'=17
88+
'regwidth'=78
89+
'reset'=47
90+
'resetsignal'=87
91+
'rset'=25
92+
'rsvdset'=50
93+
'rsvdsetX'=51
94+
'rw'=100
95+
'saturate'=70
96+
'shared'=53
97+
'sharedextbus'=45
98+
'signal'=20
99+
'signalwidth'=80
100+
'singlepulse'=62
101+
'sticky'=37
102+
'stickybit'=38
103+
'string'=12
104+
'sw'=82
105+
'swacc'=36
106+
'swmod'=35
107+
'swwe'=31
108+
'swwel'=32
109+
'sync'=56
110+
'threshold'=72
111+
'true'=98
112+
'type'=118
113+
'underflow'=63
114+
'w'=103
115+
'we'=29
116+
'wel'=30
117+
'woclr'=27
118+
'woset'=28
119+
'wr'=101
120+
'xored'=42
121+
'{'=115
122+
'|'=122
123+
'}'=116
124+
RULE_ESCAPE_JSP=10
125+
RULE_ESCAPE_ORDL=11
124126
RULE_ID=5
125127
RULE_ML_COMMENT=8
126128
RULE_NUM=6
@@ -137,7 +139,6 @@ T__106=106
137139
T__107=107
138140
T__108=108
139141
T__109=109
140-
T__10=10
141142
T__110=110
142143
T__111=111
143144
T__112=112
@@ -148,7 +149,6 @@ T__116=116
148149
T__117=117
149150
T__118=118
150151
T__119=119
151-
T__11=11
152152
T__120=120
153153
T__121=121
154154
T__122=122
@@ -163,6 +163,8 @@ T__12=12
163163
T__130=130
164164
T__131=131
165165
T__132=132
166+
T__133=133
167+
T__134=134
166168
T__13=13
167169
T__14=14
168170
T__15=15

0 commit comments

Comments
 (0)