yukigo-haskell-parser 0.1.3 → 0.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.mocharc.json +3 -3
- package/CHANGELOG.md +51 -9
- package/README.md +5 -5
- package/dist/index.js +21 -13
- package/dist/index.js.map +1 -1
- package/dist/parser/grammar.cjs +397 -0
- package/dist/parser/grammar.cjs.map +1 -0
- package/dist/parser/grammar.d.cts +38 -0
- package/dist/parser/lexer.d.ts +2 -1
- package/dist/parser/lexer.js +6 -1
- package/dist/parser/lexer.js.map +1 -1
- package/dist/prelude.js +279 -279
- package/dist/typechecker/DeclarationCollector.d.ts +2 -0
- package/dist/typechecker/DeclarationCollector.js +6 -5
- package/dist/typechecker/DeclarationCollector.js.map +1 -1
- package/dist/typechecker/TypeBuilder.js +9 -7
- package/dist/typechecker/TypeBuilder.js.map +1 -1
- package/dist/typechecker/checker.d.ts +9 -4
- package/dist/typechecker/checker.js +66 -94
- package/dist/typechecker/checker.js.map +1 -1
- package/dist/typechecker/core.js +8 -7
- package/dist/typechecker/core.js.map +1 -1
- package/dist/typechecker/inference.d.ts +4 -1
- package/dist/typechecker/inference.js +39 -19
- package/dist/typechecker/inference.js.map +1 -1
- package/dist/utils/helpers.d.ts +3 -0
- package/dist/utils/helpers.js +5 -0
- package/dist/utils/helpers.js.map +1 -1
- package/dist/utils/types.d.ts +12 -3
- package/dist/utils/types.js +34 -22
- package/dist/utils/types.js.map +1 -1
- package/package.json +6 -9
- package/src/index.ts +223 -192
- package/src/parser/{grammar.ts → grammar.cjs} +191 -223
- package/src/parser/grammar.d.ts +3 -0
- package/src/parser/grammar.ne +521 -518
- package/src/parser/lexer.ts +357 -353
- package/src/prelude.ts +281 -281
- package/src/typechecker/DeclarationCollector.ts +160 -157
- package/src/typechecker/TypeBuilder.ts +153 -150
- package/src/typechecker/checker.ts +487 -501
- package/src/typechecker/core.ts +195 -192
- package/src/typechecker/inference.ts +1442 -1421
- package/src/utils/helpers.ts +34 -29
- package/src/utils/types.ts +75 -63
- package/tests/hspec.spec.ts +95 -92
- package/tests/lexer.spec.ts +175 -175
- package/tests/parser.spec.ts +838 -829
- package/tests/prelude.spec.ts +17 -17
- package/tests/typechecker.spec.ts +326 -327
- package/tsconfig.build.json +16 -0
- package/tsconfig.build.tsbuildinfo +1 -0
- package/tsconfig.json +29 -26
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/parser/grammar.d.ts +0 -28
- package/dist/parser/grammar.js +0 -393
- package/dist/parser/grammar.js.map +0 -1
package/src/parser/lexer.ts
CHANGED
|
@@ -1,353 +1,357 @@
|
|
|
1
|
-
import moo, { Lexer, LexerState, Token } from "moo";
|
|
2
|
-
import { keywords } from "../utils/types.js";
|
|
3
|
-
declare module "moo" {
|
|
4
|
-
interface Lexer {
|
|
5
|
-
index: number; // Add the missing property to the type definition
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
interface LayoutState {
|
|
10
|
-
stack: number[]; // indentation stack (follows moo naming)
|
|
11
|
-
tokenBuffer: Token[];
|
|
12
|
-
expectingBlock: boolean;
|
|
13
|
-
firstTokenProcessed: boolean;
|
|
14
|
-
}
|
|
15
|
-
type FullState = {
|
|
16
|
-
layoutState: LayoutState;
|
|
17
|
-
mooIndex?: number;
|
|
18
|
-
} & LexerState;
|
|
19
|
-
|
|
20
|
-
export const HaskellLexerConfig = {
|
|
21
|
-
comment: { match: /--.*?$|{-[\s\S]*?-}/, lineBreaks: true },
|
|
22
|
-
|
|
23
|
-
number:
|
|
24
|
-
/0[xX][0-9a-fA-F]+|0[bB][01]+|0[oO][0-7]+|(?:\d*\.\d+|\d+)(?:[eE][+-]?\d+)?/,
|
|
25
|
-
char: /'(?:\\['\\bfnrtv0]|\\u[0-9a-fA-F]{4}|[^'\\\n\r])?'/,
|
|
26
|
-
string: { match: /"(?:\\[\s\S]|[^"\\])*"/, lineBreaks: true },
|
|
27
|
-
|
|
28
|
-
lparen: "(",
|
|
29
|
-
rparen: ")",
|
|
30
|
-
lbracket: "{",
|
|
31
|
-
rbracket: "}",
|
|
32
|
-
lsquare: "[",
|
|
33
|
-
rsquare: "]",
|
|
34
|
-
semicolon: ";",
|
|
35
|
-
|
|
36
|
-
typeArrow: "->",
|
|
37
|
-
leftArrow: "<-",
|
|
38
|
-
typeEquals: "::",
|
|
39
|
-
fatArrow: "=>",
|
|
40
|
-
op: {
|
|
41
|
-
match:
|
|
42
|
-
|
|
43
|
-
lineBreaks: false,
|
|
44
|
-
},
|
|
45
|
-
assign: "=",
|
|
46
|
-
backslash: "\\",
|
|
47
|
-
pipe: "|",
|
|
48
|
-
at: "@",
|
|
49
|
-
tilde: "~",
|
|
50
|
-
|
|
51
|
-
anonymousVariable: "_",
|
|
52
|
-
|
|
53
|
-
constructor: {
|
|
54
|
-
match: /[A-Z][a-zA-Z0-9']*/,
|
|
55
|
-
type: moo.keywords({ bool: ["True", "False"] }),
|
|
56
|
-
},
|
|
57
|
-
variable: {
|
|
58
|
-
match: /[a-z_][a-zA-Z0-9_']*/,
|
|
59
|
-
type: moo.keywords({ otherwise: "otherwise", keyword: keywords }),
|
|
60
|
-
},
|
|
61
|
-
|
|
62
|
-
NL: { match: /\r?\n/, lineBreaks: true },
|
|
63
|
-
WS: { match: /[ \t]+/, lineBreaks: false },
|
|
64
|
-
};
|
|
65
|
-
|
|
66
|
-
export class HaskellLayoutLexer implements Lexer {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
"
|
|
81
|
-
"
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
this.
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
this.
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
this.mooLexer.
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
return this.mooLexer.
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
if (
|
|
169
|
-
this.
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
if (
|
|
189
|
-
|
|
190
|
-
if (
|
|
191
|
-
|
|
192
|
-
return rawToken;
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
this.
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
this.state.stack.
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
this.state.
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
}
|
|
273
|
-
|
|
274
|
-
private
|
|
275
|
-
this.state.
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
this.
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
if (
|
|
289
|
-
this.
|
|
290
|
-
this.
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
private
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
private
|
|
338
|
-
type
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
1
|
+
import moo, { Lexer, LexerState, Token } from "moo";
|
|
2
|
+
import { keywords } from "../utils/types.js";
|
|
3
|
+
declare module "moo" {
|
|
4
|
+
interface Lexer {
|
|
5
|
+
index: number; // Add the missing property to the type definition
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
interface LayoutState {
|
|
10
|
+
stack: number[]; // indentation stack (follows moo naming)
|
|
11
|
+
tokenBuffer: Token[];
|
|
12
|
+
expectingBlock: boolean;
|
|
13
|
+
firstTokenProcessed: boolean;
|
|
14
|
+
}
|
|
15
|
+
type FullState = {
|
|
16
|
+
layoutState: LayoutState;
|
|
17
|
+
mooIndex?: number;
|
|
18
|
+
} & LexerState;
|
|
19
|
+
|
|
20
|
+
export const HaskellLexerConfig = {
|
|
21
|
+
comment: { match: /--.*?$|{-[\s\S]*?-}/, lineBreaks: true },
|
|
22
|
+
|
|
23
|
+
number:
|
|
24
|
+
/0[xX][0-9a-fA-F]+|0[bB][01]+|0[oO][0-7]+|(?:\d*\.\d+|\d+)(?:[eE][+-]?\d+)?/,
|
|
25
|
+
char: /'(?:\\['\\bfnrtv0]|\\u[0-9a-fA-F]{4}|[^'\\\n\r])?'/,
|
|
26
|
+
string: { match: /"(?:\\[\s\S]|[^"\\])*"/, lineBreaks: true },
|
|
27
|
+
|
|
28
|
+
lparen: "(",
|
|
29
|
+
rparen: ")",
|
|
30
|
+
lbracket: "{",
|
|
31
|
+
rbracket: "}",
|
|
32
|
+
lsquare: "[",
|
|
33
|
+
rsquare: "]",
|
|
34
|
+
semicolon: ";",
|
|
35
|
+
|
|
36
|
+
typeArrow: "->",
|
|
37
|
+
leftArrow: "<-",
|
|
38
|
+
typeEquals: "::",
|
|
39
|
+
fatArrow: "=>",
|
|
40
|
+
op: {
|
|
41
|
+
match:
|
|
42
|
+
/,|>>=|>>|\\\\|\\|\.\.|\.|\+\+|\+|\-|\*\*|\*|===|!==|==|\/=|<=|>=|<|>|&&|\/|\|\||\$!|\$|\^\^|\^|#|@|~|!!|!|%|\?|:|&|`/,
|
|
43
|
+
lineBreaks: false,
|
|
44
|
+
},
|
|
45
|
+
assign: "=",
|
|
46
|
+
backslash: "\\",
|
|
47
|
+
pipe: "|",
|
|
48
|
+
at: "@",
|
|
49
|
+
tilde: "~",
|
|
50
|
+
|
|
51
|
+
anonymousVariable: "_",
|
|
52
|
+
|
|
53
|
+
constructor: {
|
|
54
|
+
match: /[A-Z][a-zA-Z0-9']*/,
|
|
55
|
+
type: moo.keywords({ bool: ["True", "False"] }),
|
|
56
|
+
},
|
|
57
|
+
variable: {
|
|
58
|
+
match: /[a-z_][a-zA-Z0-9_']*/,
|
|
59
|
+
type: moo.keywords({ otherwise: "otherwise", keyword: keywords }),
|
|
60
|
+
},
|
|
61
|
+
|
|
62
|
+
NL: { match: /\r?\n/, lineBreaks: true },
|
|
63
|
+
WS: { match: /[ \t]+/, lineBreaks: false },
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
export class HaskellLayoutLexer implements Lexer {
|
|
67
|
+
get index(): number {
|
|
68
|
+
return this.mooLexer.index;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
set index(value: number) {
|
|
72
|
+
this.mooLexer.index = value;
|
|
73
|
+
}
|
|
74
|
+
private mooLexer: Lexer;
|
|
75
|
+
private state: LayoutState;
|
|
76
|
+
|
|
77
|
+
private readonly layoutTriggers = new Set(["where", "let", "do", "of"]);
|
|
78
|
+
private readonly noSemicolonKeywords = new Set(["in", "then", "else", "of"]);
|
|
79
|
+
private readonly alwaysNewDeclarationKeywords = new Set([
|
|
80
|
+
"type",
|
|
81
|
+
"data",
|
|
82
|
+
"class",
|
|
83
|
+
"instance",
|
|
84
|
+
"describe",
|
|
85
|
+
"it",
|
|
86
|
+
"module",
|
|
87
|
+
"import",
|
|
88
|
+
]);
|
|
89
|
+
|
|
90
|
+
constructor() {
|
|
91
|
+
this.mooLexer = moo.compile(HaskellLexerConfig);
|
|
92
|
+
this.state = {
|
|
93
|
+
stack: [1],
|
|
94
|
+
tokenBuffer: [],
|
|
95
|
+
expectingBlock: false,
|
|
96
|
+
firstTokenProcessed: false,
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
[Symbol.iterator](): Iterator<Token> {
|
|
101
|
+
return {
|
|
102
|
+
next: () => {
|
|
103
|
+
const value = this.next();
|
|
104
|
+
return value
|
|
105
|
+
? { value, done: false }
|
|
106
|
+
: { value: undefined, done: true };
|
|
107
|
+
},
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
reset(chunk?: string, state?: FullState): this {
|
|
112
|
+
if (state && state.layoutState) {
|
|
113
|
+
const fullState = state;
|
|
114
|
+
this.state = {
|
|
115
|
+
stack: [...fullState.layoutState.stack],
|
|
116
|
+
tokenBuffer: [...fullState.layoutState.tokenBuffer],
|
|
117
|
+
expectingBlock: fullState.layoutState.expectingBlock,
|
|
118
|
+
firstTokenProcessed: fullState.layoutState.firstTokenProcessed,
|
|
119
|
+
};
|
|
120
|
+
this.mooLexer.reset(chunk, fullState);
|
|
121
|
+
if (typeof fullState.mooIndex === "number") {
|
|
122
|
+
this.mooLexer.index = fullState.mooIndex;
|
|
123
|
+
}
|
|
124
|
+
} else {
|
|
125
|
+
this.state = {
|
|
126
|
+
stack: [1],
|
|
127
|
+
tokenBuffer: [],
|
|
128
|
+
expectingBlock: false,
|
|
129
|
+
firstTokenProcessed: false,
|
|
130
|
+
};
|
|
131
|
+
this.mooLexer.reset(chunk);
|
|
132
|
+
}
|
|
133
|
+
return this;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
save(): FullState {
|
|
137
|
+
return {
|
|
138
|
+
...this.mooLexer.save(),
|
|
139
|
+
mooIndex: this.mooLexer.index,
|
|
140
|
+
layoutState: {
|
|
141
|
+
stack: [...this.state.stack],
|
|
142
|
+
tokenBuffer: [...this.state.tokenBuffer],
|
|
143
|
+
expectingBlock: this.state.expectingBlock,
|
|
144
|
+
firstTokenProcessed: this.state.firstTokenProcessed,
|
|
145
|
+
},
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
pushState(state: string) {
|
|
150
|
+
this.mooLexer.pushState(state);
|
|
151
|
+
}
|
|
152
|
+
popState() {
|
|
153
|
+
return this.mooLexer.popState();
|
|
154
|
+
}
|
|
155
|
+
setState(state: string) {
|
|
156
|
+
this.mooLexer.setState(state);
|
|
157
|
+
}
|
|
158
|
+
formatError(token: Token, message?: string) {
|
|
159
|
+
return this.mooLexer.formatError(token, message);
|
|
160
|
+
}
|
|
161
|
+
has(tokenType: string) {
|
|
162
|
+
return true; // deprecated in moo but Lexer interface requires it.
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
next(): Token | undefined {
|
|
166
|
+
let token: Token | undefined;
|
|
167
|
+
|
|
168
|
+
if (this.state.tokenBuffer.length > 0) {
|
|
169
|
+
token = this.state.tokenBuffer.shift();
|
|
170
|
+
} else {
|
|
171
|
+
token = this.fetchAndProcessNextToken();
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
if (token) {
|
|
175
|
+
this.checkLayoutTrigger(token);
|
|
176
|
+
if (!this.state.firstTokenProcessed && token.col > 1) {
|
|
177
|
+
this.state.stack[0] = token.col;
|
|
178
|
+
}
|
|
179
|
+
this.state.firstTokenProcessed = true;
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
return token;
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
private fetchAndProcessNextToken(): Token | undefined {
|
|
186
|
+
let { token: rawToken, crossedNewline } = this.advanceSkippingWhitespace();
|
|
187
|
+
|
|
188
|
+
if (!rawToken) return this.emitEOF();
|
|
189
|
+
|
|
190
|
+
if (this.state.expectingBlock) return this.handleBlockStart(rawToken);
|
|
191
|
+
|
|
192
|
+
if (this.isInToken(rawToken)) return this.handleInKeyword(rawToken);
|
|
193
|
+
|
|
194
|
+
if (crossedNewline) return this.handleIndentationChange(rawToken);
|
|
195
|
+
|
|
196
|
+
return rawToken;
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
private advanceSkippingWhitespace(): {
|
|
200
|
+
token: Token | undefined;
|
|
201
|
+
crossedNewline: boolean;
|
|
202
|
+
} {
|
|
203
|
+
let token = this.mooLexer.next();
|
|
204
|
+
let crossedNewline = false;
|
|
205
|
+
|
|
206
|
+
while (token && this.isSkippableToken(token)) {
|
|
207
|
+
if (this.isNewlineToken(token)) crossedNewline = true;
|
|
208
|
+
token = this.mooLexer.next();
|
|
209
|
+
}
|
|
210
|
+
return { token, crossedNewline };
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
private closeBlocksUntil(targetIndent: number, sourceToken: Token): Token {
|
|
214
|
+
const ops: Token[] = [];
|
|
215
|
+
|
|
216
|
+
while (
|
|
217
|
+
this.state.stack.length > 1 &&
|
|
218
|
+
this.state.stack[this.state.stack.length - 1] > targetIndent
|
|
219
|
+
) {
|
|
220
|
+
this.state.stack.pop();
|
|
221
|
+
ops.push(this.createVirtualToken("rbracket", "}", sourceToken));
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
const isAlwaysNewDeclaration =
|
|
225
|
+
this.state.stack.length === 1 &&
|
|
226
|
+
sourceToken.type === "keyword" &&
|
|
227
|
+
this.alwaysNewDeclarationKeywords.has(sourceToken.value);
|
|
228
|
+
|
|
229
|
+
const shouldInjectSemicolon =
|
|
230
|
+
!sourceToken.value || !this.noSemicolonKeywords.has(sourceToken.value);
|
|
231
|
+
|
|
232
|
+
if (
|
|
233
|
+
this.state.stack.length > 1 &&
|
|
234
|
+
this.state.stack[this.state.stack.length - 1] === targetIndent &&
|
|
235
|
+
this.isInToken(sourceToken)
|
|
236
|
+
) {
|
|
237
|
+
this.state.stack.pop();
|
|
238
|
+
ops.push(this.createVirtualToken("rbracket", "}", sourceToken));
|
|
239
|
+
} else if (
|
|
240
|
+
(this.state.stack.length > 0 &&
|
|
241
|
+
this.state.stack[this.state.stack.length - 1] === targetIndent &&
|
|
242
|
+
shouldInjectSemicolon) ||
|
|
243
|
+
isAlwaysNewDeclaration
|
|
244
|
+
) {
|
|
245
|
+
ops.push(this.createVirtualToken("semicolon", ";", sourceToken));
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
this.state.tokenBuffer.unshift(...ops);
|
|
249
|
+
|
|
250
|
+
return this.state.tokenBuffer.shift()!;
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
private emitEOF(): Token | undefined {
|
|
254
|
+
if (this.state.stack.length > 1) {
|
|
255
|
+
const dummy = {
|
|
256
|
+
line: 0,
|
|
257
|
+
col: 0,
|
|
258
|
+
text: "",
|
|
259
|
+
value: "",
|
|
260
|
+
offset: 0,
|
|
261
|
+
lineBreaks: 0,
|
|
262
|
+
};
|
|
263
|
+
const ops: Token[] = [];
|
|
264
|
+
while (this.state.stack.length > 1) {
|
|
265
|
+
this.state.stack.pop();
|
|
266
|
+
ops.push(this.createVirtualToken("rbracket", "}", dummy));
|
|
267
|
+
}
|
|
268
|
+
this.state.tokenBuffer.push(...ops);
|
|
269
|
+
return this.state.tokenBuffer.shift();
|
|
270
|
+
}
|
|
271
|
+
return undefined;
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
private enqueue(token: Token) {
|
|
275
|
+
this.state.tokenBuffer.push(token);
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
private handleBlockStart(token: Token) {
|
|
279
|
+
this.state.expectingBlock = false;
|
|
280
|
+
if (token.type === "lbracket") return token;
|
|
281
|
+
|
|
282
|
+
this.state.stack.push(token.col);
|
|
283
|
+
this.enqueue(token);
|
|
284
|
+
return this.createVirtualToken("lbracket", "{", token);
|
|
285
|
+
}
|
|
286
|
+
private handleInKeyword(token: Token) {
|
|
287
|
+
const stackTop = this.state.stack[this.state.stack.length - 1];
|
|
288
|
+
if (token.col < stackTop) {
|
|
289
|
+
this.enqueue(token);
|
|
290
|
+
return this.closeBlocksUntil(token.col, token);
|
|
291
|
+
}
|
|
292
|
+
if (this.state.stack.length > 1) {
|
|
293
|
+
this.state.stack.pop();
|
|
294
|
+
this.enqueue(token);
|
|
295
|
+
return this.createVirtualToken("rbracket", "}", token);
|
|
296
|
+
}
|
|
297
|
+
return token;
|
|
298
|
+
}
|
|
299
|
+
private handleIndentationChange(token: Token) {
|
|
300
|
+
const currentIndent = token.col;
|
|
301
|
+
const stackTop = this.state.stack[this.state.stack.length - 1];
|
|
302
|
+
|
|
303
|
+
const isAlwaysNewDeclaration =
|
|
304
|
+
this.state.stack.length === 1 &&
|
|
305
|
+
token.type === "keyword" &&
|
|
306
|
+
this.alwaysNewDeclarationKeywords.has(token.value);
|
|
307
|
+
|
|
308
|
+
if (currentIndent === stackTop || isAlwaysNewDeclaration) {
|
|
309
|
+
const isContinuationKeyword =
|
|
310
|
+
token.value && this.noSemicolonKeywords.has(token.value);
|
|
311
|
+
if (this.state.firstTokenProcessed && !isContinuationKeyword) {
|
|
312
|
+
this.enqueue(token);
|
|
313
|
+
return this.createVirtualToken("semicolon", ";", token);
|
|
314
|
+
}
|
|
315
|
+
return token;
|
|
316
|
+
} else if (currentIndent < stackTop) {
|
|
317
|
+
this.enqueue(token);
|
|
318
|
+
return this.closeBlocksUntil(currentIndent, token);
|
|
319
|
+
}
|
|
320
|
+
return token;
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
private checkLayoutTrigger(token: Token) {
|
|
324
|
+
if (token && token.value && this.layoutTriggers.has(token.value))
|
|
325
|
+
this.state.expectingBlock = true;
|
|
326
|
+
}
|
|
327
|
+
private isSkippableToken(token: Token) {
|
|
328
|
+
return (
|
|
329
|
+
token.type === "WS" ||
|
|
330
|
+
this.isNewlineToken(token) ||
|
|
331
|
+
token.type === "comment"
|
|
332
|
+
);
|
|
333
|
+
}
|
|
334
|
+
private isNewlineToken(token: Token) {
|
|
335
|
+
return token.type === "NL";
|
|
336
|
+
}
|
|
337
|
+
private isInToken(token: Token) {
|
|
338
|
+
return token.type === "keyword" && token.value === "in";
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
private createVirtualToken(
|
|
342
|
+
type: string,
|
|
343
|
+
value: string,
|
|
344
|
+
source: Token,
|
|
345
|
+
): Token {
|
|
346
|
+
return {
|
|
347
|
+
type,
|
|
348
|
+
value,
|
|
349
|
+
text: value,
|
|
350
|
+
line: source.line,
|
|
351
|
+
col: source.col,
|
|
352
|
+
offset: source.offset,
|
|
353
|
+
lineBreaks: 0,
|
|
354
|
+
toString: () => value,
|
|
355
|
+
};
|
|
356
|
+
}
|
|
357
|
+
}
|