Skip to content

Commit aa745f4

Browse files
NeverbirthNeverbirth
committed
Merge branch 'fd5' into 64bits
Conflicts: PluginCore/ScintillaNet/ScintillaControl.cs
2 parents 94877d2 + a58b5cb commit aa745f4

File tree

30 files changed

+38050
-25576
lines changed

30 files changed

+38050
-25576
lines changed

‎External/Plugins/CodeFormatter/ANTLR/AS3_GRAMMAR/AS3_ex.g3

Lines changed: 1846 additions & 837 deletions
Large diffs are not rendered by default.

‎External/Plugins/CodeFormatter/ANTLR/AS3_GRAMMAR/AS3_ex.tokens

Lines changed: 219 additions & 221 deletions
Large diffs are not rendered by default.

‎External/Plugins/CodeFormatter/ANTLR/AS3_GRAMMAR/AS3_exLexer.cs

Lines changed: 805 additions & 769 deletions
Large diffs are not rendered by default.

‎External/Plugins/CodeFormatter/ANTLR/AS3_GRAMMAR/AS3_exParser.cs

Lines changed: 10952 additions & 9282 deletions
Large diffs are not rendered by default.

‎External/Plugins/CodeFormatter/ANTLR/FLEX_GRAMMAR/MXMLLexer.cs

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// $ANTLR 3.1.1 MXMLLexer.g3 2009-08-02 16:01:26
1+
// $ANTLR 3.1.1 MXMLLexer.g3 2015-02-17 22:19:22
22

33
using System.Collections.Generic;
44

@@ -12,43 +12,43 @@
1212

1313
/** XML parser by Oliver Zeigermann October 10, 2005; posted to Antlr examples */
1414
public class MXMLLexer : Lexer {
15+
public const int LETTER = 37;
16+
public const int SYSTEM_tag = 13;
17+
public const int DECL_STOP = 20;
18+
public const int PUBLIC_tag = 15;
1519
public const int VALUE_int = 35;
16-
public const int END_TAG = 27;
17-
public const int CDATA = 26;
1820
public const int EMPTY_TAG_OPEN = 4;
19-
public const int EQ_int = 31;
20-
public const int TAG_CLOSE = 17;
21+
public const int VALUE = 14;
22+
public const int COMMENT = 8;
23+
public const int PCDATA = 25;
24+
public const int DOCTYPE_tag = 11;
2125
public const int EMPTY_ELEMENT = 28;
22-
public const int LETTER = 37;
23-
public const int DECL_START = 18;
26+
public const int DOCUMENT = 10;
27+
public const int DOCTYPE = 6;
28+
public const int WS = 9;
29+
public const int INTERNAL_DTD = 16;
30+
public const int EOF = -1;
2431
public const int ATTRIBUTE = 19;
32+
public const int EOL = 24;
33+
public const int END_TAG = 27;
2534
public const int END_TAG_OPEN = 33;
26-
public const int XMLDECL = 5;
35+
public const int COMMENT_int = 34;
36+
public const int GENERIC_ID = 12;
2737
public const int EOL_HELPER = 39;
28-
public const int START_TAG = 23;
29-
public const int DECL_STOP = 20;
30-
public const int EMPTYTAG_CLOSE = 30;
31-
public const int VALUE = 14;
32-
public const int INTERNAL_DTD = 16;
33-
public const int EOF = -1;
34-
public const int DOCTYPE_tag = 11;
38+
public const int EQ = 32;
3539
public const int GENERIC_ID_int = 36;
3640
public const int TAG_OPEN = 29;
37-
public const int PCDATA = 25;
38-
public const int EOL = 24;
39-
public const int WS = 9;
40-
public const int DOCUMENT = 10;
41-
public const int GENERIC_ID = 12;
4241
public const int ELEMENT = 7;
43-
public const int PI = 21;
44-
public const int DOCTYPE = 6;
45-
public const int EQ = 32;
46-
public const int COMMENT = 8;
47-
public const int OTHERWS = 38;
48-
public const int SYSTEM_tag = 13;
42+
public const int EMPTYTAG_CLOSE = 30;
4943
public const int XML = 22;
50-
public const int COMMENT_int = 34;
51-
public const int PUBLIC_tag = 15;
44+
public const int OTHERWS = 38;
45+
public const int TAG_CLOSE = 17;
46+
public const int XMLDECL = 5;
47+
public const int PI = 21;
48+
public const int DECL_START = 18;
49+
public const int START_TAG = 23;
50+
public const int EQ_int = 31;
51+
public const int CDATA = 26;
5252

5353
private List<CommonToken> mRawTokens=new List<CommonToken>();
5454
int lastLine=1;
@@ -2331,7 +2331,7 @@ private void InitializeCyclicDFAs()
23312331
const string DFA14_acceptS =
23322332
"\x10\uffff\x01\x01\x01\x02\x25\uffff";
23332333
const string DFA14_specialS =
2334-
"\x22\uffff\x01\x00\x01\x01\x0a\uffff\x01\x02\x01\uffff\x01\x03"+
2334+
"\x22\uffff\x01\x02\x01\x01\x0a\uffff\x01\x03\x01\uffff\x01\x00"+
23352335
"\x06\uffff}>";
23362336
static readonly string[] DFA14_transitionS = {
23372337
"\x01\x01",
@@ -2348,9 +2348,9 @@ private void InitializeCyclicDFAs()
23482348
"\uffff\x1a\x07\x04\uffff\x01\x0b\x01\uffff\x1a\x07",
23492349
"\x01\x02\x01\x03\x02\uffff\x01\x04\x12\uffff\x01\x02\x19\uffff"+
23502350
"\x01\x05\x06\uffff\x1a\x05\x04\uffff\x01\x05\x01\uffff\x1a\x05",
2351-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0c\uffff"+
2352-
"\x01\x19\x01\x18\x01\x11\x0a\x17\x01\x1a\x02\uffff\x01\x1b\x01"+
2353-
"\x10\x02\uffff\x1a\x15\x04\uffff\x01\x16\x01\uffff\x1a\x15",
2351+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0c\uffff"+
2352+
"\x01\x15\x01\x14\x01\x11\x0a\x13\x01\x17\x02\uffff\x01\x1b\x01"+
2353+
"\x10\x02\uffff\x1a\x12\x04\uffff\x01\x16\x01\uffff\x1a\x12",
23542354
"\x01\x0d\x01\x0e\x02\uffff\x01\x0f\x12\uffff\x01\x0d\x0c\uffff"+
23552355
"\x01\x0a\x01\x09\x01\x11\x0a\x08\x01\x0c\x03\uffff\x01\x10\x02"+
23562356
"\uffff\x1a\x07\x04\uffff\x01\x0b\x01\uffff\x1a\x07",
@@ -2360,12 +2360,12 @@ private void InitializeCyclicDFAs()
23602360
"\x01\x0d\x01\x0e\x02\uffff\x01\x0f\x12\uffff\x01\x0d\x0c\uffff"+
23612361
"\x01\x0a\x01\x09\x01\x11\x0a\x08\x01\x0c\x03\uffff\x01\x10\x02"+
23622362
"\uffff\x1a\x07\x04\uffff\x01\x0b\x01\uffff\x1a\x07",
2363-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0c\uffff"+
2364-
"\x01\x19\x01\x18\x01\x11\x0a\x17\x01\x1a\x02\uffff\x01\x1b\x01"+
2365-
"\x10\x02\uffff\x1a\x15\x04\uffff\x01\x16\x01\uffff\x1a\x15",
2366-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0c\uffff"+
2367-
"\x01\x19\x01\x18\x01\x11\x0a\x17\x01\x1a\x02\uffff\x01\x1b\x01"+
2368-
"\x10\x02\uffff\x1a\x15\x04\uffff\x01\x16\x01\uffff\x1a\x15",
2363+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0c\uffff"+
2364+
"\x01\x15\x01\x14\x01\x11\x0a\x13\x01\x17\x02\uffff\x01\x1b\x01"+
2365+
"\x10\x02\uffff\x1a\x12\x04\uffff\x01\x16\x01\uffff\x1a\x12",
2366+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0c\uffff"+
2367+
"\x01\x15\x01\x14\x01\x11\x0a\x13\x01\x17\x02\uffff\x01\x1b\x01"+
2368+
"\x10\x02\uffff\x1a\x12\x04\uffff\x01\x16\x01\uffff\x1a\x12",
23692369
"\x01\x0d\x01\x0e\x02\uffff\x01\x0f\x12\uffff\x01\x0d\x0e\uffff"+
23702370
"\x01\x11\x0a\uffff\x01\x1c\x03\uffff\x01\x10\x02\uffff\x1a\x1c"+
23712371
"\x04\uffff\x01\x1c\x01\uffff\x1a\x1c",
@@ -2377,33 +2377,33 @@ private void InitializeCyclicDFAs()
23772377
"\x04\uffff\x01\x1c\x01\uffff\x1a\x1c",
23782378
"",
23792379
"",
2380-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0e\uffff"+
2380+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0c\uffff"+
2381+
"\x01\x15\x01\x14\x01\x11\x0a\x13\x01\x17\x02\uffff\x01\x1b\x01"+
2382+
"\x10\x02\uffff\x1a\x12\x04\uffff\x01\x16\x01\uffff\x1a\x12",
2383+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0c\uffff"+
2384+
"\x01\x15\x01\x14\x01\x11\x0a\x13\x01\x17\x02\uffff\x01\x1b\x01"+
2385+
"\x10\x02\uffff\x1a\x12\x04\uffff\x01\x16\x01\uffff\x1a\x12",
2386+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0c\uffff"+
2387+
"\x01\x15\x01\x14\x01\x11\x0a\x13\x01\x17\x02\uffff\x01\x1b\x01"+
2388+
"\x10\x02\uffff\x1a\x12\x04\uffff\x01\x16\x01\uffff\x1a\x12",
2389+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0c\uffff"+
2390+
"\x01\x15\x01\x14\x01\x11\x0a\x13\x01\x17\x02\uffff\x01\x1b\x01"+
2391+
"\x10\x02\uffff\x1a\x12\x04\uffff\x01\x16\x01\uffff\x1a\x12",
2392+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0c\uffff"+
2393+
"\x01\x15\x01\x14\x01\x11\x0a\x13\x01\x17\x02\uffff\x01\x1b\x01"+
2394+
"\x10\x02\uffff\x1a\x12\x04\uffff\x01\x16\x01\uffff\x1a\x12",
2395+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0c\uffff"+
2396+
"\x01\x15\x01\x14\x01\x11\x0a\x13\x01\x17\x02\uffff\x01\x1b\x01"+
2397+
"\x10\x02\uffff\x1a\x12\x04\uffff\x01\x16\x01\uffff\x1a\x12",
2398+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0e\uffff"+
23812399
"\x01\x11\x0a\uffff\x01\x1c\x02\uffff\x01\x1b\x01\x10\x02\uffff"+
23822400
"\x1a\x1c\x04\uffff\x01\x1c\x01\uffff\x1a\x1c",
2383-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0e\uffff"+
2401+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0e\uffff"+
23842402
"\x01\x11\x0a\uffff\x01\x1c\x02\uffff\x01\x1b\x01\x10\x02\uffff"+
23852403
"\x1a\x1c\x04\uffff\x01\x1c\x01\uffff\x1a\x1c",
2386-
"\x01\x12\x01\x1e\x02\uffff\x01\x14\x12\uffff\x01\x12\x0e\uffff"+
2404+
"\x01\x18\x01\x1e\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0e\uffff"+
23872405
"\x01\x11\x0a\uffff\x01\x1c\x02\uffff\x01\x1b\x01\x10\x02\uffff"+
23882406
"\x1a\x1c\x04\uffff\x01\x1c\x01\uffff\x1a\x1c",
2389-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0c\uffff"+
2390-
"\x01\x19\x01\x18\x01\x11\x0a\x17\x01\x1a\x02\uffff\x01\x1b\x01"+
2391-
"\x10\x02\uffff\x1a\x15\x04\uffff\x01\x16\x01\uffff\x1a\x15",
2392-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0c\uffff"+
2393-
"\x01\x19\x01\x18\x01\x11\x0a\x17\x01\x1a\x02\uffff\x01\x1b\x01"+
2394-
"\x10\x02\uffff\x1a\x15\x04\uffff\x01\x16\x01\uffff\x1a\x15",
2395-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0c\uffff"+
2396-
"\x01\x19\x01\x18\x01\x11\x0a\x17\x01\x1a\x02\uffff\x01\x1b\x01"+
2397-
"\x10\x02\uffff\x1a\x15\x04\uffff\x01\x16\x01\uffff\x1a\x15",
2398-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0c\uffff"+
2399-
"\x01\x19\x01\x18\x01\x11\x0a\x17\x01\x1a\x02\uffff\x01\x1b\x01"+
2400-
"\x10\x02\uffff\x1a\x15\x04\uffff\x01\x16\x01\uffff\x1a\x15",
2401-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0c\uffff"+
2402-
"\x01\x19\x01\x18\x01\x11\x0a\x17\x01\x1a\x02\uffff\x01\x1b\x01"+
2403-
"\x10\x02\uffff\x1a\x15\x04\uffff\x01\x16\x01\uffff\x1a\x15",
2404-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0c\uffff"+
2405-
"\x01\x19\x01\x18\x01\x11\x0a\x17\x01\x1a\x02\uffff\x01\x1b\x01"+
2406-
"\x10\x02\uffff\x1a\x15\x04\uffff\x01\x16\x01\uffff\x1a\x15",
24072407
"\x01\x1f\x01\x20\x02\uffff\x01\x21\x12\uffff\x01\x1f\x01\uffff"+
24082408
"\x01\x22\x04\uffff\x01\x23",
24092409
"\x01\x2a\x01\x2b\x02\uffff\x01\x2c\x12\uffff\x01\x2a\x0c\uffff"+
@@ -2412,7 +2412,7 @@ private void InitializeCyclicDFAs()
24122412
"\x01\x0d\x01\x0e\x02\uffff\x01\x0f\x12\uffff\x01\x0d\x0e\uffff"+
24132413
"\x01\x11\x0a\uffff\x01\x1c\x03\uffff\x01\x10\x02\uffff\x1a\x1c"+
24142414
"\x04\uffff\x01\x1c\x01\uffff\x1a\x1c",
2415-
"\x01\x12\x01\x13\x02\uffff\x01\x14\x12\uffff\x01\x12\x0e\uffff"+
2415+
"\x01\x18\x01\x19\x02\uffff\x01\x1a\x12\uffff\x01\x18\x0e\uffff"+
24162416
"\x01\x11\x0a\uffff\x01\x1c\x02\uffff\x01\x1b\x01\x10\x02\uffff"+
24172417
"\x1a\x1c\x04\uffff\x01\x1c\x01\uffff\x1a\x1c",
24182418
"\x01\x1f\x01\x20\x02\uffff\x01\x21\x12\uffff\x01\x1f\x01\uffff"+
@@ -2512,12 +2512,12 @@ protected internal int DFA14_SpecialStateTransition(DFA dfa, int s, IIntStream _
25122512
switch ( s )
25132513
{
25142514
case 0 :
2515-
int LA14_34 = input.LA(1);
2515+
int LA14_48 = input.LA(1);
25162516

25172517
s = -1;
2518-
if ( ((LA14_34 >= '\u0000' && LA14_34 <= '!') || (LA14_34 >= '#' && LA14_34 <= '\uFFFF')) ) { s = 46; }
2518+
if ( (LA14_48 == '\'') ) { s = 49; }
25192519

2520-
else if ( (LA14_34 == '\"') ) { s = 47; }
2520+
else if ( ((LA14_48 >= '\u0000' && LA14_48 <= '&') || (LA14_48 >= '(' && LA14_48 <= '\uFFFF')) ) { s = 48; }
25212521

25222522
if ( s >= 0 ) return s;
25232523
break;
@@ -2532,22 +2532,22 @@ protected internal int DFA14_SpecialStateTransition(DFA dfa, int s, IIntStream _
25322532
if ( s >= 0 ) return s;
25332533
break;
25342534
case 2 :
2535-
int LA14_46 = input.LA(1);
2535+
int LA14_34 = input.LA(1);
25362536

25372537
s = -1;
2538-
if ( (LA14_46 == '\"') ) { s = 47; }
2538+
if ( ((LA14_34 >= '\u0000' && LA14_34 <= '!') || (LA14_34 >= '#' && LA14_34 <= '\uFFFF')) ) { s = 46; }
25392539

2540-
else if ( ((LA14_46 >= '\u0000' && LA14_46 <= '!') || (LA14_46 >= '#' && LA14_46 <= '\uFFFF')) ) { s = 46; }
2540+
else if ( (LA14_34 == '\"') ) { s = 47; }
25412541

25422542
if ( s >= 0 ) return s;
25432543
break;
25442544
case 3 :
2545-
int LA14_48 = input.LA(1);
2545+
int LA14_46 = input.LA(1);
25462546

25472547
s = -1;
2548-
if ( (LA14_48 == '\'') ) { s = 49; }
2548+
if ( (LA14_46 == '\"') ) { s = 47; }
25492549

2550-
else if ( ((LA14_48 >= '\u0000' && LA14_48 <= '&') || (LA14_48 >= '(' && LA14_48 <= '\uFFFF')) ) { s = 48; }
2550+
else if ( ((LA14_46 >= '\u0000' && LA14_46 <= '!') || (LA14_46 >= '#' && LA14_46 <= '\uFFFF')) ) { s = 46; }
25512551

25522552
if ( s >= 0 ) return s;
25532553
break;

‎External/Plugins/CodeFormatter/ANTLR/FLEX_GRAMMAR/MXMLLexer.tokens

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1+
LETTER=37
2+
SYSTEM_tag=13
3+
DECL_STOP=20
4+
PUBLIC_tag=15
15
VALUE_int=35
2-
END_TAG=27
3-
CDATA=26
46
EMPTY_TAG_OPEN=4
5-
EQ_int=31
6-
TAG_CLOSE=17
7+
VALUE=14
8+
COMMENT=8
9+
PCDATA=25
10+
DOCTYPE_tag=11
711
EMPTY_ELEMENT=28
8-
LETTER=37
9-
DECL_START=18
12+
DOCUMENT=10
13+
DOCTYPE=6
14+
WS=9
15+
INTERNAL_DTD=16
1016
ATTRIBUTE=19
17+
EOL=24
18+
END_TAG=27
1119
END_TAG_OPEN=33
12-
XMLDECL=5
20+
COMMENT_int=34
21+
GENERIC_ID=12
1322
EOL_HELPER=39
14-
START_TAG=23
15-
DECL_STOP=20
16-
EMPTYTAG_CLOSE=30
17-
VALUE=14
18-
INTERNAL_DTD=16
19-
DOCTYPE_tag=11
23+
EQ=32
2024
GENERIC_ID_int=36
2125
TAG_OPEN=29
22-
PCDATA=25
23-
EOL=24
24-
WS=9
25-
DOCUMENT=10
26-
GENERIC_ID=12
2726
ELEMENT=7
28-
PI=21
29-
DOCTYPE=6
30-
EQ=32
31-
COMMENT=8
32-
OTHERWS=38
33-
SYSTEM_tag=13
27+
EMPTYTAG_CLOSE=30
3428
XML=22
35-
COMMENT_int=34
36-
PUBLIC_tag=15
29+
OTHERWS=38
30+
TAG_CLOSE=17
31+
XMLDECL=5
32+
PI=21
33+
DECL_START=18
34+
START_TAG=23
35+
EQ_int=31
36+
CDATA=26

0 commit comments

Comments
 (0)