Skip to content

Commit ebec79d

Browse files
toolgoodtoolgood
committed
fix
1 parent 3bcd8d2 commit ebec79d

File tree

2 files changed

+69
-77
lines changed

2 files changed

+69
-77
lines changed

‎JavaScript2/src/math/mathjsLexer.js‎

Lines changed: 67 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -3,86 +3,79 @@
33
import antlr4 from '../antlr4/index.web.js';
44

55

6-
const serializedATN = [4,0,20,217,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,
6+
const serializedATN = [4,0,20,202,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,
77
4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,
88
12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,18,2,19,7,19,
99
2,20,7,20,1,0,1,0,1,1,1,1,1,2,1,2,1,3,1,3,1,4,1,4,1,5,1,5,1,6,1,6,1,7,1,
1010
7,1,8,1,8,1,9,1,9,1,10,1,10,1,11,1,11,1,12,1,12,1,13,1,13,1,13,3,13,73,8,
1111
13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,3,13,82,8,13,1,14,4,14,85,8,14,11,
1212
14,12,14,86,1,14,1,14,4,14,91,8,14,11,14,12,14,92,3,14,95,8,14,1,14,1,14,
13-
3,14,99,8,14,1,14,4,14,102,8,14,11,14,12,14,103,3,14,106,8,14,1,14,4,14,
14-
109,8,14,11,14,12,14,110,1,14,1,14,4,14,115,8,14,11,14,12,14,116,3,14,119,
15-
8,14,1,14,3,14,122,8,14,1,14,1,14,3,14,126,8,14,1,14,3,14,129,8,14,1,14,
16-
1,14,3,14,133,8,14,1,14,1,14,3,14,137,8,14,3,14,139,8,14,1,15,1,15,1,15,
17-
1,15,5,15,145,8,15,10,15,12,15,148,9,15,1,15,1,15,1,15,1,15,1,15,5,15,155,
18-
8,15,10,15,12,15,158,9,15,1,15,1,15,1,15,1,15,1,15,5,15,165,8,15,10,15,12,
19-
15,168,9,15,1,15,3,15,171,8,15,1,16,1,16,3,16,175,8,16,1,16,1,16,5,16,179,
20-
8,16,10,16,12,16,182,9,16,1,17,1,17,1,18,4,18,187,8,18,11,18,12,18,188,1,
21-
18,1,18,1,19,1,19,1,19,1,19,5,19,197,8,19,10,19,12,19,200,9,19,1,19,1,19,
22-
1,19,1,19,1,19,1,20,1,20,1,20,1,20,5,20,211,8,20,10,20,12,20,214,9,20,1,
23-
20,1,20,1,198,0,21,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,8,17,9,19,10,21,11,23,
24-
12,25,13,27,14,29,15,31,16,33,17,35,0,37,18,39,19,41,20,1,0,14,2,0,33,33,
25-
60,62,4,0,38,38,42,43,47,47,60,62,1,0,48,57,2,0,43,43,45,45,3,0,67,68,75,
26-
75,77,77,1,0,50,51,2,0,39,39,92,92,2,0,34,34,92,92,2,0,92,92,96,96,2,0,65,
27-
90,95,95,3,0,48,57,65,90,95,95,10,0,192,214,216,246,248,8191,11264,12287,
28-
12352,12687,13056,13183,13312,16383,19968,55295,63744,64255,65280,65520,
29-
3,0,9,10,12,13,32,32,2,0,10,10,13,13,251,0,1,1,0,0,0,0,3,1,0,0,0,0,5,1,0,
30-
0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,11,1,0,0,0,0,13,1,0,0,0,0,15,1,0,0,0,0,17,
31-
1,0,0,0,0,19,1,0,0,0,0,21,1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,0,0,
32-
0,29,1,0,0,0,0,31,1,0,0,0,0,33,1,0,0,0,0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,
33-
0,0,0,1,43,1,0,0,0,3,45,1,0,0,0,5,47,1,0,0,0,7,49,1,0,0,0,9,51,1,0,0,0,11,
34-
53,1,0,0,0,13,55,1,0,0,0,15,57,1,0,0,0,17,59,1,0,0,0,19,61,1,0,0,0,21,63,
35-
1,0,0,0,23,65,1,0,0,0,25,67,1,0,0,0,27,81,1,0,0,0,29,138,1,0,0,0,31,170,
36-
1,0,0,0,33,174,1,0,0,0,35,183,1,0,0,0,37,186,1,0,0,0,39,192,1,0,0,0,41,206,
37-
1,0,0,0,43,44,5,40,0,0,44,2,1,0,0,0,45,46,5,41,0,0,46,4,1,0,0,0,47,48,5,
38-
46,0,0,48,6,1,0,0,0,49,50,5,44,0,0,50,8,1,0,0,0,51,52,5,91,0,0,52,10,1,0,
39-
0,0,53,54,5,93,0,0,54,12,1,0,0,0,55,56,5,33,0,0,56,14,1,0,0,0,57,58,5,63,
40-
0,0,58,16,1,0,0,0,59,60,5,58,0,0,60,18,1,0,0,0,61,62,5,123,0,0,62,20,1,0,
41-
0,0,63,64,5,125,0,0,64,22,1,0,0,0,65,66,5,37,0,0,66,24,1,0,0,0,67,68,5,45,
42-
0,0,68,26,1,0,0,0,69,70,7,0,0,0,70,72,5,61,0,0,71,73,5,61,0,0,72,71,1,0,
43-
0,0,72,73,1,0,0,0,73,82,1,0,0,0,74,82,7,1,0,0,75,76,5,60,0,0,76,82,5,62,
44-
0,0,77,78,5,38,0,0,78,82,5,38,0,0,79,80,5,124,0,0,80,82,5,124,0,0,81,69,
45-
1,0,0,0,81,74,1,0,0,0,81,75,1,0,0,0,81,77,1,0,0,0,81,79,1,0,0,0,82,28,1,
46-
0,0,0,83,85,7,2,0,0,84,83,1,0,0,0,85,86,1,0,0,0,86,84,1,0,0,0,86,87,1,0,
47-
0,0,87,94,1,0,0,0,88,90,5,46,0,0,89,91,7,2,0,0,90,89,1,0,0,0,91,92,1,0,0,
48-
0,92,90,1,0,0,0,92,93,1,0,0,0,93,95,1,0,0,0,94,88,1,0,0,0,94,95,1,0,0,0,
49-
95,105,1,0,0,0,96,98,5,69,0,0,97,99,7,3,0,0,98,97,1,0,0,0,98,99,1,0,0,0,
50-
99,101,1,0,0,0,100,102,7,2,0,0,101,100,1,0,0,0,102,103,1,0,0,0,103,101,1,
51-
0,0,0,103,104,1,0,0,0,104,106,1,0,0,0,105,96,1,0,0,0,105,106,1,0,0,0,106,
52-
139,1,0,0,0,107,109,7,2,0,0,108,107,1,0,0,0,109,110,1,0,0,0,110,108,1,0,
53-
0,0,110,111,1,0,0,0,111,118,1,0,0,0,112,114,5,46,0,0,113,115,7,2,0,0,114,
54-
113,1,0,0,0,115,116,1,0,0,0,116,114,1,0,0,0,116,117,1,0,0,0,117,119,1,0,
55-
0,0,118,112,1,0,0,0,118,119,1,0,0,0,119,136,1,0,0,0,120,122,7,4,0,0,121,
56-
120,1,0,0,0,121,122,1,0,0,0,122,123,1,0,0,0,123,125,5,77,0,0,124,126,7,5,
57-
0,0,125,124,1,0,0,0,125,126,1,0,0,0,126,137,1,0,0,0,127,129,5,77,0,0,128,
58-
127,1,0,0,0,128,129,1,0,0,0,129,130,1,0,0,0,130,137,5,76,0,0,131,133,5,75,
59-
0,0,132,131,1,0,0,0,132,133,1,0,0,0,133,134,1,0,0,0,134,137,5,71,0,0,135,
60-
137,5,84,0,0,136,121,1,0,0,0,136,128,1,0,0,0,136,132,1,0,0,0,136,135,1,0,
61-
0,0,137,139,1,0,0,0,138,84,1,0,0,0,138,108,1,0,0,0,139,30,1,0,0,0,140,146,
62-
5,39,0,0,141,145,8,6,0,0,142,143,5,92,0,0,143,145,9,0,0,0,144,141,1,0,0,
63-
0,144,142,1,0,0,0,145,148,1,0,0,0,146,144,1,0,0,0,146,147,1,0,0,0,147,149,
64-
1,0,0,0,148,146,1,0,0,0,149,171,5,39,0,0,150,156,5,34,0,0,151,155,8,7,0,
65-
0,152,153,5,92,0,0,153,155,9,0,0,0,154,151,1,0,0,0,154,152,1,0,0,0,155,158,
66-
1,0,0,0,156,154,1,0,0,0,156,157,1,0,0,0,157,159,1,0,0,0,158,156,1,0,0,0,
67-
159,171,5,34,0,0,160,166,5,96,0,0,161,165,8,8,0,0,162,163,5,92,0,0,163,165,
68-
9,0,0,0,164,161,1,0,0,0,164,162,1,0,0,0,165,168,1,0,0,0,166,164,1,0,0,0,
69-
166,167,1,0,0,0,167,169,1,0,0,0,168,166,1,0,0,0,169,171,5,96,0,0,170,140,
70-
1,0,0,0,170,150,1,0,0,0,170,160,1,0,0,0,171,32,1,0,0,0,172,175,7,9,0,0,173,
71-
175,3,35,17,0,174,172,1,0,0,0,174,173,1,0,0,0,175,180,1,0,0,0,176,179,7,
72-
10,0,0,177,179,3,35,17,0,178,176,1,0,0,0,178,177,1,0,0,0,179,182,1,0,0,0,
73-
180,178,1,0,0,0,180,181,1,0,0,0,181,34,1,0,0,0,182,180,1,0,0,0,183,184,7,
74-
11,0,0,184,36,1,0,0,0,185,187,7,12,0,0,186,185,1,0,0,0,187,188,1,0,0,0,188,
75-
186,1,0,0,0,188,189,1,0,0,0,189,190,1,0,0,0,190,191,6,18,0,0,191,38,1,0,
76-
0,0,192,193,5,47,0,0,193,194,5,42,0,0,194,198,1,0,0,0,195,197,9,0,0,0,196,
77-
195,1,0,0,0,197,200,1,0,0,0,198,199,1,0,0,0,198,196,1,0,0,0,199,201,1,0,
78-
0,0,200,198,1,0,0,0,201,202,5,42,0,0,202,203,5,47,0,0,203,204,1,0,0,0,204,
79-
205,6,19,0,0,205,40,1,0,0,0,206,207,5,47,0,0,207,208,5,47,0,0,208,212,1,
80-
0,0,0,209,211,8,13,0,0,210,209,1,0,0,0,211,214,1,0,0,0,212,210,1,0,0,0,212,
81-
213,1,0,0,0,213,215,1,0,0,0,214,212,1,0,0,0,215,216,6,20,0,0,216,42,1,0,
82-
0,0,31,0,72,81,86,92,94,98,103,105,110,116,118,121,125,128,132,136,138,144,
83-
146,154,156,164,166,170,174,178,180,188,198,212,1,6,0,0];
84-
85-
13+
3,14,99,8,14,1,14,4,14,102,8,14,11,14,12,14,103,3,14,106,8,14,1,14,3,14,
14+
109,8,14,1,14,1,14,3,14,113,8,14,1,14,3,14,116,8,14,1,14,1,14,3,14,120,8,
15+
14,1,14,1,14,3,14,124,8,14,1,15,1,15,1,15,1,15,5,15,130,8,15,10,15,12,15,
16+
133,9,15,1,15,1,15,1,15,1,15,1,15,5,15,140,8,15,10,15,12,15,143,9,15,1,15,
17+
1,15,1,15,1,15,1,15,5,15,150,8,15,10,15,12,15,153,9,15,1,15,3,15,156,8,15,
18+
1,16,1,16,3,16,160,8,16,1,16,1,16,5,16,164,8,16,10,16,12,16,167,9,16,1,17,
19+
1,17,1,18,4,18,172,8,18,11,18,12,18,173,1,18,1,18,1,19,1,19,1,19,1,19,5,
20+
19,182,8,19,10,19,12,19,185,9,19,1,19,1,19,1,19,1,19,1,19,1,20,1,20,1,20,
21+
1,20,5,20,196,8,20,10,20,12,20,199,9,20,1,20,1,20,1,183,0,21,1,1,3,2,5,3,
22+
7,4,9,5,11,6,13,7,15,8,17,9,19,10,21,11,23,12,25,13,27,14,29,15,31,16,33,
23+
17,35,0,37,18,39,19,41,20,1,0,14,2,0,33,33,60,62,4,0,38,38,42,43,47,47,60,
24+
62,1,0,48,57,2,0,43,43,45,45,3,0,67,68,75,75,77,77,1,0,50,51,2,0,39,39,92,
25+
92,2,0,34,34,92,92,2,0,92,92,96,96,2,0,65,90,95,95,3,0,48,57,65,90,95,95,
26+
10,0,192,214,216,246,248,8191,11264,12287,12352,12687,13056,13183,13312,
27+
16383,19968,55295,63744,64255,65280,65520,3,0,9,10,12,13,32,32,2,0,10,10,
28+
13,13,233,0,1,1,0,0,0,0,3,1,0,0,0,0,5,1,0,0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,
29+
11,1,0,0,0,0,13,1,0,0,0,0,15,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,21,1,0,
30+
0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,0,0,0,29,1,0,0,0,0,31,1,0,0,0,0,33,
31+
1,0,0,0,0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,1,43,1,0,0,0,3,45,1,0,0,0,
32+
5,47,1,0,0,0,7,49,1,0,0,0,9,51,1,0,0,0,11,53,1,0,0,0,13,55,1,0,0,0,15,57,
33+
1,0,0,0,17,59,1,0,0,0,19,61,1,0,0,0,21,63,1,0,0,0,23,65,1,0,0,0,25,67,1,
34+
0,0,0,27,81,1,0,0,0,29,84,1,0,0,0,31,155,1,0,0,0,33,159,1,0,0,0,35,168,1,
35+
0,0,0,37,171,1,0,0,0,39,177,1,0,0,0,41,191,1,0,0,0,43,44,5,40,0,0,44,2,1,
36+
0,0,0,45,46,5,41,0,0,46,4,1,0,0,0,47,48,5,46,0,0,48,6,1,0,0,0,49,50,5,44,
37+
0,0,50,8,1,0,0,0,51,52,5,91,0,0,52,10,1,0,0,0,53,54,5,93,0,0,54,12,1,0,0,
38+
0,55,56,5,33,0,0,56,14,1,0,0,0,57,58,5,63,0,0,58,16,1,0,0,0,59,60,5,58,0,
39+
0,60,18,1,0,0,0,61,62,5,123,0,0,62,20,1,0,0,0,63,64,5,125,0,0,64,22,1,0,
40+
0,0,65,66,5,37,0,0,66,24,1,0,0,0,67,68,5,45,0,0,68,26,1,0,0,0,69,70,7,0,
41+
0,0,70,72,5,61,0,0,71,73,5,61,0,0,72,71,1,0,0,0,72,73,1,0,0,0,73,82,1,0,
42+
0,0,74,82,7,1,0,0,75,76,5,60,0,0,76,82,5,62,0,0,77,78,5,38,0,0,78,82,5,38,
43+
0,0,79,80,5,124,0,0,80,82,5,124,0,0,81,69,1,0,0,0,81,74,1,0,0,0,81,75,1,
44+
0,0,0,81,77,1,0,0,0,81,79,1,0,0,0,82,28,1,0,0,0,83,85,7,2,0,0,84,83,1,0,
45+
0,0,85,86,1,0,0,0,86,84,1,0,0,0,86,87,1,0,0,0,87,94,1,0,0,0,88,90,5,46,0,
46+
0,89,91,7,2,0,0,90,89,1,0,0,0,91,92,1,0,0,0,92,90,1,0,0,0,92,93,1,0,0,0,
47+
93,95,1,0,0,0,94,88,1,0,0,0,94,95,1,0,0,0,95,123,1,0,0,0,96,98,5,69,0,0,
48+
97,99,7,3,0,0,98,97,1,0,0,0,98,99,1,0,0,0,99,101,1,0,0,0,100,102,7,2,0,0,
49+
101,100,1,0,0,0,102,103,1,0,0,0,103,101,1,0,0,0,103,104,1,0,0,0,104,106,
50+
1,0,0,0,105,96,1,0,0,0,105,106,1,0,0,0,106,124,1,0,0,0,107,109,7,4,0,0,108,
51+
107,1,0,0,0,108,109,1,0,0,0,109,110,1,0,0,0,110,112,5,77,0,0,111,113,7,5,
52+
0,0,112,111,1,0,0,0,112,113,1,0,0,0,113,124,1,0,0,0,114,116,5,77,0,0,115,
53+
114,1,0,0,0,115,116,1,0,0,0,116,117,1,0,0,0,117,124,5,76,0,0,118,120,5,75,
54+
0,0,119,118,1,0,0,0,119,120,1,0,0,0,120,121,1,0,0,0,121,124,5,71,0,0,122,
55+
124,5,84,0,0,123,105,1,0,0,0,123,108,1,0,0,0,123,115,1,0,0,0,123,119,1,0,
56+
0,0,123,122,1,0,0,0,124,30,1,0,0,0,125,131,5,39,0,0,126,130,8,6,0,0,127,
57+
128,5,92,0,0,128,130,9,0,0,0,129,126,1,0,0,0,129,127,1,0,0,0,130,133,1,0,
58+
0,0,131,129,1,0,0,0,131,132,1,0,0,0,132,134,1,0,0,0,133,131,1,0,0,0,134,
59+
156,5,39,0,0,135,141,5,34,0,0,136,140,8,7,0,0,137,138,5,92,0,0,138,140,9,
60+
0,0,0,139,136,1,0,0,0,139,137,1,0,0,0,140,143,1,0,0,0,141,139,1,0,0,0,141,
61+
142,1,0,0,0,142,144,1,0,0,0,143,141,1,0,0,0,144,156,5,34,0,0,145,151,5,96,
62+
0,0,146,150,8,8,0,0,147,148,5,92,0,0,148,150,9,0,0,0,149,146,1,0,0,0,149,
63+
147,1,0,0,0,150,153,1,0,0,0,151,149,1,0,0,0,151,152,1,0,0,0,152,154,1,0,
64+
0,0,153,151,1,0,0,0,154,156,5,96,0,0,155,125,1,0,0,0,155,135,1,0,0,0,155,
65+
145,1,0,0,0,156,32,1,0,0,0,157,160,7,9,0,0,158,160,3,35,17,0,159,157,1,0,
66+
0,0,159,158,1,0,0,0,160,165,1,0,0,0,161,164,7,10,0,0,162,164,3,35,17,0,163,
67+
161,1,0,0,0,163,162,1,0,0,0,164,167,1,0,0,0,165,163,1,0,0,0,165,166,1,0,
68+
0,0,166,34,1,0,0,0,167,165,1,0,0,0,168,169,7,11,0,0,169,36,1,0,0,0,170,172,
69+
7,12,0,0,171,170,1,0,0,0,172,173,1,0,0,0,173,171,1,0,0,0,173,174,1,0,0,0,
70+
174,175,1,0,0,0,175,176,6,18,0,0,176,38,1,0,0,0,177,178,5,47,0,0,178,179,
71+
5,42,0,0,179,183,1,0,0,0,180,182,9,0,0,0,181,180,1,0,0,0,182,185,1,0,0,0,
72+
183,184,1,0,0,0,183,181,1,0,0,0,184,186,1,0,0,0,185,183,1,0,0,0,186,187,
73+
5,42,0,0,187,188,5,47,0,0,188,189,1,0,0,0,189,190,6,19,0,0,190,40,1,0,0,
74+
0,191,192,5,47,0,0,192,193,5,47,0,0,193,197,1,0,0,0,194,196,8,13,0,0,195,
75+
194,1,0,0,0,196,199,1,0,0,0,197,195,1,0,0,0,197,198,1,0,0,0,198,200,1,0,
76+
0,0,199,197,1,0,0,0,200,201,6,20,0,0,201,42,1,0,0,0,27,0,72,81,86,92,94,
77+
98,103,105,108,112,115,119,123,129,131,139,141,149,151,155,159,163,165,173,
78+
183,197,1,6,0,0];
8679

8780
const atn = new antlr4.atn.ATNDeserializer().deserialize(serializedATN);
8881

‎g4/mathjs.g4‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ OPMOD: '%';
2525
OPSUB: '-';
2626
OP: [>=<!] '=' '='? | [+*/&><=] | '<>' | '&&' | '||' ;
2727

28-
NUM: [0-9]+ ('.' [0-9]+)? ('E' [+-]? [0-9]+)?
29-
| [0-9]+ ('.' [0-9]+)? (
30-
[KDCM]? 'M' [23]?
28+
NUM: [0-9]+ ('.' [0-9]+)? (('E' [+-]? [0-9]+)?
29+
| [KDCM]? 'M' [23]?
3130
| 'M'? 'L'
3231
| 'K'? 'G' | 'T')
3332
;

0 commit comments

Comments
 (0)