@magnusopera/fscript 0.94.3 → 0.95.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/README.md +2 -0
- package/dist/FScript.Language/Ast.js +217 -68
- package/dist/FScript.Language/Eval.js +303 -90
- package/dist/FScript.Language/ExportSignatures.js +13 -7
- package/dist/FScript.Language/IncludeResolver.js +52 -48
- package/dist/FScript.Language/OpaqueInference.js +18 -18
- package/dist/FScript.Language/Parser.js +36 -36
- package/dist/FScript.Language/Pretty.js +1 -1
- package/dist/FScript.Language/TypeInfer.js +353 -103
- package/dist/FScript.Language/Value.js +45 -1
- package/dist/fable_modules/project_cracked.json +1 -1
- package/package.json +3 -3
|
@@ -44,13 +44,19 @@ function flattenParameterNames(expression) {
|
|
|
44
44
|
loop:
|
|
45
45
|
while (true) {
|
|
46
46
|
const acc = acc_mut, current = current_mut;
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
47
|
+
switch (current.tag) {
|
|
48
|
+
case 7: {
|
|
49
|
+
acc_mut = cons(current.fields[0].Name, acc);
|
|
50
|
+
current_mut = current.fields[1];
|
|
51
|
+
continue loop;
|
|
52
|
+
}
|
|
53
|
+
case 5: {
|
|
54
|
+
acc_mut = acc;
|
|
55
|
+
current_mut = current.fields[0];
|
|
56
|
+
continue loop;
|
|
57
|
+
}
|
|
58
|
+
default:
|
|
59
|
+
return reverse(acc);
|
|
54
60
|
}
|
|
55
61
|
break;
|
|
56
62
|
}
|
|
@@ -9,6 +9,7 @@ import { union, toList, ofList, FSharpSet__Contains, empty as empty_1, add } fro
|
|
|
9
9
|
import { compare as compare_1, curry4, defaultOf, disposeSafe, getEnumerator, Exception, curry2, comparePrimitives } from "../fable_modules/fable-library-js.5.27.0/Util.js";
|
|
10
10
|
import { toSeq, ofSeq, empty as empty_2, add as add_1, FSharpMap__ContainsKey, FSharpMap__get_Item } from "../fable_modules/fable-library-js.5.27.0/Map.js";
|
|
11
11
|
import { Stmt, TypeDef, InterpolatedPart, MapEntry, Param, Expr, Pattern, TypeRef } from "./Ast.js";
|
|
12
|
+
import { Operators_InvalidOp } from "../fable_modules/fable-library-js.5.27.0/FSharp.Core.js";
|
|
12
13
|
import { parseProgramWithRecordFieldLabels, parseProgramWithSourceName } from "./Parser.js";
|
|
13
14
|
import { FSharpRef } from "../fable_modules/fable-library-js.5.27.0/Types.js";
|
|
14
15
|
import { Span, Position } from "./Span.js";
|
|
@@ -419,7 +420,7 @@ function tryFlattenExprPath(expr) {
|
|
|
419
420
|
switch (current.tag) {
|
|
420
421
|
case 2:
|
|
421
422
|
return append(parseDotted(current.fields[0]), acc);
|
|
422
|
-
case
|
|
423
|
+
case 24: {
|
|
423
424
|
acc_mut = cons(current.fields[1], acc);
|
|
424
425
|
current_mut = current.fields[0];
|
|
425
426
|
continue loop;
|
|
@@ -488,38 +489,41 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
|
|
|
488
489
|
switch (expr.tag) {
|
|
489
490
|
case 2:
|
|
490
491
|
return new Expr(/* EVar */ 2, [rewriteValueName(boundNames_1, expr.fields[0]), expr.fields[1]]);
|
|
492
|
+
case 4:
|
|
493
|
+
case 5:
|
|
494
|
+
throw Operators_InvalidOp("Includes resolve before type inference.");
|
|
491
495
|
case 3:
|
|
492
496
|
return new Expr(/* ETypeApply */ 3, [rewriteExpr(boundNames_1, expr.fields[0]), map((tref) => rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, tref), expr.fields[1]), expr.fields[2]]);
|
|
493
|
-
case
|
|
494
|
-
return new Expr(/* ENameOf */
|
|
495
|
-
case
|
|
496
|
-
return new Expr(/* ETypeOf */
|
|
497
|
-
case
|
|
498
|
-
return new Expr(/* EParen */
|
|
499
|
-
case
|
|
497
|
+
case 32:
|
|
498
|
+
return new Expr(/* ENameOf */ 32, [rewriteValueName(boundNames_1, expr.fields[0]), expr.fields[1]]);
|
|
499
|
+
case 31:
|
|
500
|
+
return new Expr(/* ETypeOf */ 31, [rewriteTypeName(aliases, selfPrefix, topLevelTypeNames, expr.fields[0]), expr.fields[1]]);
|
|
501
|
+
case 6:
|
|
502
|
+
return new Expr(/* EParen */ 6, [rewriteExpr(boundNames_1, expr.fields[0]), expr.fields[1]]);
|
|
503
|
+
case 7: {
|
|
500
504
|
const param = expr.fields[0];
|
|
501
|
-
return new Expr(/* ELambda */
|
|
505
|
+
return new Expr(/* ELambda */ 7, [new Param(param.Name, (option_1 = param.Annotation, (option_1 != null) ? rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, option_1) : undefined), param.Span), rewriteExpr(add(param.Name, boundNames_1), expr.fields[1]), expr.fields[2]]);
|
|
502
506
|
}
|
|
503
|
-
case 6:
|
|
504
|
-
return new Expr(/* EApply */ 6, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
|
|
505
|
-
case 7:
|
|
506
|
-
return new Expr(/* EIf */ 7, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundNames_1, expr.fields[2]), expr.fields[3]]);
|
|
507
507
|
case 8:
|
|
508
|
-
return new Expr(/*
|
|
509
|
-
case 9:
|
|
508
|
+
return new Expr(/* EApply */ 8, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
|
|
509
|
+
case 9:
|
|
510
|
+
return new Expr(/* EIf */ 9, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundNames_1, expr.fields[2]), expr.fields[3]]);
|
|
511
|
+
case 10:
|
|
512
|
+
return new Expr(/* ERaise */ 10, [rewriteExpr(boundNames_1, expr.fields[0]), expr.fields[1]]);
|
|
513
|
+
case 11: {
|
|
510
514
|
const name_6 = expr.fields[0];
|
|
511
|
-
return new Expr(/* EFor */
|
|
515
|
+
return new Expr(/* EFor */ 11, [name_6, rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(add(name_6, boundNames_1), expr.fields[2]), expr.fields[3]]);
|
|
512
516
|
}
|
|
513
|
-
case
|
|
517
|
+
case 12: {
|
|
514
518
|
const rewrittenCases = map((tupledArg_1) => {
|
|
515
519
|
let mapping_4, option_3;
|
|
516
520
|
const rewrittenPattern = rewritePattern(aliases, selfPrefix, topLevelTypeNames, tupledArg_1[0]);
|
|
517
521
|
const boundWithPattern = union(boundNames_1, collectPatternBindings(rewrittenPattern));
|
|
518
522
|
return [rewrittenPattern, (mapping_4 = curry2(rewriteExpr)(boundWithPattern), (option_3 = tupledArg_1[1], (option_3 != null) ? mapping_4(option_3) : undefined)), rewriteExpr(boundWithPattern, tupledArg_1[2]), tupledArg_1[3]];
|
|
519
523
|
}, expr.fields[1]);
|
|
520
|
-
return new Expr(/* EMatch */
|
|
524
|
+
return new Expr(/* EMatch */ 12, [rewriteExpr(boundNames_1, expr.fields[0]), rewrittenCases, expr.fields[2]]);
|
|
521
525
|
}
|
|
522
|
-
case
|
|
526
|
+
case 13: {
|
|
523
527
|
const valueExpr_1 = expr.fields[1];
|
|
524
528
|
const span_11 = expr.fields[6];
|
|
525
529
|
const name_7 = expr.fields[0];
|
|
@@ -530,23 +534,23 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
|
|
|
530
534
|
rewrittenReturnAnnotation = ((option_5 != null) ? rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, option_5) : undefined);
|
|
531
535
|
if (expr.fields[3]) {
|
|
532
536
|
const boundWithName = add(name_7, boundNames_1);
|
|
533
|
-
return new Expr(/* ELet */
|
|
537
|
+
return new Expr(/* ELet */ 13, [name_7, rewriteExpr(boundWithName, valueExpr_1), rewriteExpr(boundWithName, bodyExpr), true, rewrittenReturnAnnotation, arity, span_11]);
|
|
534
538
|
}
|
|
535
539
|
else {
|
|
536
|
-
return new Expr(/* ELet */
|
|
540
|
+
return new Expr(/* ELet */ 13, [name_7, rewriteExpr(boundNames_1, valueExpr_1), rewriteExpr(add(name_7, boundNames_1), bodyExpr), false, rewrittenReturnAnnotation, arity, span_11]);
|
|
537
541
|
}
|
|
538
542
|
}
|
|
539
|
-
case
|
|
543
|
+
case 14: {
|
|
540
544
|
const rewrittenPattern_1 = rewritePattern(aliases, selfPrefix, topLevelTypeNames, expr.fields[0]);
|
|
541
545
|
const boundWithPattern_1 = union(boundNames_1, collectPatternBindings(rewrittenPattern_1));
|
|
542
|
-
return new Expr(/* ELetPattern */
|
|
546
|
+
return new Expr(/* ELetPattern */ 14, [rewrittenPattern_1, rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundWithPattern_1, expr.fields[2]), expr.fields[3]]);
|
|
543
547
|
}
|
|
544
|
-
case
|
|
548
|
+
case 15: {
|
|
545
549
|
const bindings_1 = expr.fields[0];
|
|
546
550
|
const recursiveBound = union(boundNames_1, ofList(map((tupledArg_2) => tupledArg_2[0], bindings_1), {
|
|
547
551
|
Compare: (x_2, y_2) => (comparePrimitives(x_2, y_2) | 0),
|
|
548
552
|
}));
|
|
549
|
-
return new Expr(/* ELetRecGroup */
|
|
553
|
+
return new Expr(/* ELetRecGroup */ 15, [map((tupledArg_3) => {
|
|
550
554
|
let option_9;
|
|
551
555
|
const rewrittenArgs = map((p) => {
|
|
552
556
|
let option_7;
|
|
@@ -555,18 +559,18 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
|
|
|
555
559
|
return [tupledArg_3[0], rewrittenArgs, (option_9 = tupledArg_3[2], (option_9 != null) ? rewriteTypeRef(aliases, selfPrefix, topLevelTypeNames, option_9) : undefined), rewriteExpr(fold_1((s, p_1) => add(p_1.Name, s), recursiveBound, rewrittenArgs), tupledArg_3[3]), tupledArg_3[4]];
|
|
556
560
|
}, bindings_1), rewriteExpr(recursiveBound, expr.fields[1]), expr.fields[2]]);
|
|
557
561
|
}
|
|
558
|
-
case 14:
|
|
559
|
-
return new Expr(/* EList */ 14, [map(curry2(rewriteExpr)(boundNames_1), expr.fields[0]), expr.fields[1]]);
|
|
560
|
-
case 15:
|
|
561
|
-
return new Expr(/* ERange */ 15, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
|
|
562
562
|
case 16:
|
|
563
|
-
return new Expr(/*
|
|
563
|
+
return new Expr(/* EList */ 16, [map(curry2(rewriteExpr)(boundNames_1), expr.fields[0]), expr.fields[1]]);
|
|
564
564
|
case 17:
|
|
565
|
-
return new Expr(/*
|
|
565
|
+
return new Expr(/* ERange */ 17, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
|
|
566
566
|
case 18:
|
|
567
|
-
return new Expr(/*
|
|
567
|
+
return new Expr(/* ETuple */ 18, [map(curry2(rewriteExpr)(boundNames_1), expr.fields[0]), expr.fields[1]]);
|
|
568
568
|
case 19:
|
|
569
|
-
return new Expr(/*
|
|
569
|
+
return new Expr(/* ERecord */ 19, [map((tupledArg_4) => [tupledArg_4[0], rewriteExpr(boundNames_1, tupledArg_4[1])], expr.fields[0]), expr.fields[1]]);
|
|
570
|
+
case 20:
|
|
571
|
+
return new Expr(/* EStructuralRecord */ 20, [map((tupledArg_5) => [tupledArg_5[0], rewriteExpr(boundNames_1, tupledArg_5[1])], expr.fields[0]), expr.fields[1]]);
|
|
572
|
+
case 21:
|
|
573
|
+
return new Expr(/* EMap */ 21, [map((_arg_11) => {
|
|
570
574
|
if (_arg_11.tag === 1) {
|
|
571
575
|
return new MapEntry(/* MESpread */ 1, [rewriteExpr(boundNames_1, _arg_11.fields[0])]);
|
|
572
576
|
}
|
|
@@ -574,11 +578,11 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
|
|
|
574
578
|
return new MapEntry(/* MEKeyValue */ 0, [rewriteExpr(boundNames_1, _arg_11.fields[0]), rewriteExpr(boundNames_1, _arg_11.fields[1])]);
|
|
575
579
|
}
|
|
576
580
|
}, expr.fields[0]), expr.fields[1]]);
|
|
577
|
-
case
|
|
578
|
-
return new Expr(/* ERecordUpdate */
|
|
579
|
-
case
|
|
580
|
-
return new Expr(/* EStructuralRecordUpdate */
|
|
581
|
-
case
|
|
581
|
+
case 22:
|
|
582
|
+
return new Expr(/* ERecordUpdate */ 22, [rewriteExpr(boundNames_1, expr.fields[0]), map((tupledArg_6) => [tupledArg_6[0], rewriteExpr(boundNames_1, tupledArg_6[1])], expr.fields[1]), expr.fields[2]]);
|
|
583
|
+
case 23:
|
|
584
|
+
return new Expr(/* EStructuralRecordUpdate */ 23, [rewriteExpr(boundNames_1, expr.fields[0]), map((tupledArg_7) => [tupledArg_7[0], rewriteExpr(boundNames_1, tupledArg_7[1])], expr.fields[1]), expr.fields[2]]);
|
|
585
|
+
case 24: {
|
|
582
586
|
const target_3 = expr.fields[0];
|
|
583
587
|
const span_22 = expr.fields[2];
|
|
584
588
|
const fieldName = expr.fields[1];
|
|
@@ -606,21 +610,21 @@ function rewriteModuleScopedStatements(selfPrefix, aliases, statements) {
|
|
|
606
610
|
case 0:
|
|
607
611
|
return new Expr(/* EVar */ 2, [(FSharpMap__get_Item(aliases, root_1) + ".") + joinDotted(append(rest_1, singleton(fieldName))), span_22]);
|
|
608
612
|
default:
|
|
609
|
-
return new Expr(/* EFieldGet */
|
|
613
|
+
return new Expr(/* EFieldGet */ 24, [rewriteExpr(boundNames_1, target_3), fieldName, span_22]);
|
|
610
614
|
}
|
|
611
615
|
}
|
|
612
|
-
case 23:
|
|
613
|
-
return new Expr(/* EIndexGet */ 23, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
|
|
614
|
-
case 24:
|
|
615
|
-
return new Expr(/* ECons */ 24, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
|
|
616
616
|
case 25:
|
|
617
|
-
return new Expr(/*
|
|
617
|
+
return new Expr(/* EIndexGet */ 25, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
|
|
618
618
|
case 26:
|
|
619
|
-
return new Expr(/*
|
|
619
|
+
return new Expr(/* ECons */ 26, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
|
|
620
620
|
case 27:
|
|
621
|
-
return new Expr(/*
|
|
622
|
-
case
|
|
623
|
-
return new Expr(/*
|
|
621
|
+
return new Expr(/* EAppend */ 27, [rewriteExpr(boundNames_1, expr.fields[0]), rewriteExpr(boundNames_1, expr.fields[1]), expr.fields[2]]);
|
|
622
|
+
case 28:
|
|
623
|
+
return new Expr(/* EBinOp */ 28, [expr.fields[0], rewriteExpr(boundNames_1, expr.fields[1]), rewriteExpr(boundNames_1, expr.fields[2]), expr.fields[3]]);
|
|
624
|
+
case 29:
|
|
625
|
+
return new Expr(/* ESome */ 29, [rewriteExpr(boundNames_1, expr.fields[0]), expr.fields[1]]);
|
|
626
|
+
case 33:
|
|
627
|
+
return new Expr(/* EInterpolatedString */ 33, [map((_arg_12) => {
|
|
624
628
|
if (_arg_12.tag === 1) {
|
|
625
629
|
return new InterpolatedPart(/* IPExpr */ 1, [rewriteExpr(boundNames_1, _arg_12.fields[0])]);
|
|
626
630
|
}
|
|
@@ -292,9 +292,9 @@ export function factoryDelay(known_mut, expression_mut) {
|
|
|
292
292
|
case 2:
|
|
293
293
|
case 0:
|
|
294
294
|
case 1:
|
|
295
|
-
case
|
|
296
|
-
case
|
|
297
|
-
case
|
|
295
|
+
case 30:
|
|
296
|
+
case 31:
|
|
297
|
+
case 32: {
|
|
298
298
|
matchResult = 1;
|
|
299
299
|
break;
|
|
300
300
|
}
|
|
@@ -303,34 +303,34 @@ export function factoryDelay(known_mut, expression_mut) {
|
|
|
303
303
|
value_1 = expression.fields[0];
|
|
304
304
|
break;
|
|
305
305
|
}
|
|
306
|
-
case
|
|
306
|
+
case 6: {
|
|
307
307
|
matchResult = 2;
|
|
308
308
|
value_2 = expression.fields[0];
|
|
309
309
|
break;
|
|
310
310
|
}
|
|
311
|
-
case
|
|
311
|
+
case 24: {
|
|
312
312
|
matchResult = 2;
|
|
313
313
|
value_2 = expression.fields[0];
|
|
314
314
|
break;
|
|
315
315
|
}
|
|
316
|
-
case
|
|
316
|
+
case 29: {
|
|
317
317
|
matchResult = 2;
|
|
318
318
|
value_2 = expression.fields[0];
|
|
319
319
|
break;
|
|
320
320
|
}
|
|
321
|
-
case
|
|
321
|
+
case 7: {
|
|
322
322
|
matchResult = 3;
|
|
323
323
|
body_1 = expression.fields[1];
|
|
324
324
|
parameter = expression.fields[0];
|
|
325
325
|
break;
|
|
326
326
|
}
|
|
327
|
-
case
|
|
327
|
+
case 8: {
|
|
328
328
|
matchResult = 4;
|
|
329
329
|
argument_1 = expression.fields[1];
|
|
330
330
|
fn_1 = expression.fields[0];
|
|
331
331
|
break;
|
|
332
332
|
}
|
|
333
|
-
case
|
|
333
|
+
case 28: {
|
|
334
334
|
if (expression.fields[0] === "|>") {
|
|
335
335
|
matchResult = 4;
|
|
336
336
|
argument_1 = expression.fields[1];
|
|
@@ -341,34 +341,34 @@ export function factoryDelay(known_mut, expression_mut) {
|
|
|
341
341
|
}
|
|
342
342
|
break;
|
|
343
343
|
}
|
|
344
|
-
case
|
|
344
|
+
case 9: {
|
|
345
345
|
matchResult = 5;
|
|
346
346
|
condition = expression.fields[0];
|
|
347
347
|
left = expression.fields[1];
|
|
348
348
|
right = expression.fields[2];
|
|
349
349
|
break;
|
|
350
350
|
}
|
|
351
|
-
case
|
|
351
|
+
case 18: {
|
|
352
352
|
matchResult = 6;
|
|
353
353
|
items = expression.fields[0];
|
|
354
354
|
break;
|
|
355
355
|
}
|
|
356
|
-
case
|
|
356
|
+
case 16: {
|
|
357
357
|
matchResult = 6;
|
|
358
358
|
items = expression.fields[0];
|
|
359
359
|
break;
|
|
360
360
|
}
|
|
361
|
-
case
|
|
361
|
+
case 19: {
|
|
362
362
|
matchResult = 7;
|
|
363
363
|
fields = expression.fields[0];
|
|
364
364
|
break;
|
|
365
365
|
}
|
|
366
|
-
case
|
|
366
|
+
case 20: {
|
|
367
367
|
matchResult = 7;
|
|
368
368
|
fields = expression.fields[0];
|
|
369
369
|
break;
|
|
370
370
|
}
|
|
371
|
-
case
|
|
371
|
+
case 13: {
|
|
372
372
|
if (expression.fields[3]) {
|
|
373
373
|
matchResult = 10;
|
|
374
374
|
}
|
|
@@ -383,7 +383,7 @@ export function factoryDelay(known_mut, expression_mut) {
|
|
|
383
383
|
}
|
|
384
384
|
break;
|
|
385
385
|
}
|
|
386
|
-
case
|
|
386
|
+
case 12: {
|
|
387
387
|
matchResult = 9;
|
|
388
388
|
cases = expression.fields[1];
|
|
389
389
|
target = expression.fields[0];
|
|
@@ -512,12 +512,12 @@ export function forwardingFunction(known_mut, expression_mut) {
|
|
|
512
512
|
}
|
|
513
513
|
case 2:
|
|
514
514
|
return tryFind(expression.fields[0], known);
|
|
515
|
-
case
|
|
515
|
+
case 6: {
|
|
516
516
|
known_mut = known;
|
|
517
517
|
expression_mut = expression.fields[0];
|
|
518
518
|
continue forwardingFunction;
|
|
519
519
|
}
|
|
520
|
-
case
|
|
520
|
+
case 7:
|
|
521
521
|
return factoryDelay(remove(expression.fields[0].Name, known), expression.fields[1]);
|
|
522
522
|
default:
|
|
523
523
|
return undefined;
|
|
@@ -1352,7 +1352,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1352
1352
|
}
|
|
1353
1353
|
}
|
|
1354
1354
|
flushText();
|
|
1355
|
-
return new Expr(/* EInterpolatedString */
|
|
1355
|
+
return new Expr(/* EInterpolatedString */ 33, [(parts.length === 0) ? singleton(new InterpolatedPart(/* IPText */ 0, [""])) : toList(parts), span_1]);
|
|
1356
1356
|
}
|
|
1357
1357
|
case 2:
|
|
1358
1358
|
throw new ParseException(new ParseError("\'export let\' is only supported at top level", t_6.Span));
|
|
@@ -1360,10 +1360,10 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1360
1360
|
const t_9 = TokenStream__Next(stream);
|
|
1361
1361
|
switch (name_11) {
|
|
1362
1362
|
case "None":
|
|
1363
|
-
return new Expr(/* ENone */
|
|
1363
|
+
return new Expr(/* ENone */ 30, [t_9.Span]);
|
|
1364
1364
|
case "Some": {
|
|
1365
1365
|
const arg = parsePrimary();
|
|
1366
|
-
return new Expr(/* ESome */
|
|
1366
|
+
return new Expr(/* ESome */ 29, [arg, mkSpanFrom(t_9.Span, Ast_spanOfExpr(arg))]);
|
|
1367
1367
|
}
|
|
1368
1368
|
default:
|
|
1369
1369
|
return new Expr(/* EVar */ 2, [name_11, t_9.Span]);
|
|
@@ -1384,10 +1384,10 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1384
1384
|
void (elements_2.push(parseExpr()));
|
|
1385
1385
|
}
|
|
1386
1386
|
const rp_4 = TokenStream__Expect_77B9EE56(stream, TokenKind.RParen, "Expected \')\' after tuple expression");
|
|
1387
|
-
return new Expr(/* ETuple */
|
|
1387
|
+
return new Expr(/* ETuple */ 18, [toList(elements_2), mkSpanFrom(lp_2.Span, rp_4.Span)]);
|
|
1388
1388
|
}
|
|
1389
1389
|
else {
|
|
1390
|
-
return new Expr(/* EParen */
|
|
1390
|
+
return new Expr(/* EParen */ 6, [first_4, mkSpanFrom(lp_2.Span, TokenStream__Expect_77B9EE56(stream, TokenKind.RParen, "Expected \')\' after expression").Span)]);
|
|
1391
1391
|
}
|
|
1392
1392
|
}
|
|
1393
1393
|
}
|
|
@@ -1399,7 +1399,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1399
1399
|
}
|
|
1400
1400
|
consumeLayoutSeparators();
|
|
1401
1401
|
if (TokenStream__Match_5CEB78CD(stream, TokenKind.RBracket)) {
|
|
1402
|
-
return new Expr(/* EList */
|
|
1402
|
+
return new Expr(/* EList */ 16, [empty(), mkSpanFrom(lb_3.Span, lb_3.Span)]);
|
|
1403
1403
|
}
|
|
1404
1404
|
else {
|
|
1405
1405
|
const first_5 = parseEntryExpr();
|
|
@@ -1408,7 +1408,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1408
1408
|
if (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon) ? true : TokenStream__Match_5CEB78CD(stream, TokenKind.RangeDots)) {
|
|
1409
1409
|
throw new ParseException(new ParseError("Invalid range syntax", TokenStream__Peek(stream).Span));
|
|
1410
1410
|
}
|
|
1411
|
-
return new Expr(/* ERange */
|
|
1411
|
+
return new Expr(/* ERange */ 17, [first_5, second, mkSpanFrom(lb_3.Span, TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' in range expression").Span)]);
|
|
1412
1412
|
}
|
|
1413
1413
|
else {
|
|
1414
1414
|
const elements_3 = [];
|
|
@@ -1427,7 +1427,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1427
1427
|
if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_6, rb_7.Span.Start.Line)) {
|
|
1428
1428
|
throw new ParseException(new ParseError("Closing \']\' cannot be on its own line; keep it with the last element", rb_7.Span));
|
|
1429
1429
|
}
|
|
1430
|
-
return new Expr(/* EList */
|
|
1430
|
+
return new Expr(/* EList */ 16, [toList(elements_3), mkSpanFrom(lb_3.Span, rb_7.Span)]);
|
|
1431
1431
|
}
|
|
1432
1432
|
}
|
|
1433
1433
|
}
|
|
@@ -1439,7 +1439,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1439
1439
|
}
|
|
1440
1440
|
consumeLayoutSeparators();
|
|
1441
1441
|
if (TokenStream__Match_5CEB78CD(stream, TokenKind.RBrace)) {
|
|
1442
|
-
return new Expr(/* EMap */
|
|
1442
|
+
return new Expr(/* EMap */ 21, [empty(), mkSpanFrom(lb_4.Span, lb_4.Span)]);
|
|
1443
1443
|
}
|
|
1444
1444
|
else if (TokenStream__Match_5CEB78CD(stream, TokenKind.Bar)) {
|
|
1445
1445
|
if (equals(TokenStream__Peek(stream).Kind, TokenKind.Bar)) {
|
|
@@ -1480,7 +1480,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1480
1480
|
if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_7, rb_8.Span.Start.Line)) {
|
|
1481
1481
|
throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_8.Span));
|
|
1482
1482
|
}
|
|
1483
|
-
matchValue_27 = (new Expr(/* EStructuralRecordUpdate */
|
|
1483
|
+
matchValue_27 = (new Expr(/* EStructuralRecordUpdate */ 23, [baseExpr, toList(updates), mkSpanFrom(lb_4.Span, rb_8.Span)]));
|
|
1484
1484
|
}
|
|
1485
1485
|
if (matchValue_27 == null) {
|
|
1486
1486
|
const fields_6 = [];
|
|
@@ -1509,7 +1509,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1509
1509
|
if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_8, rb_9.Span.Start.Line)) {
|
|
1510
1510
|
throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_9.Span));
|
|
1511
1511
|
}
|
|
1512
|
-
return new Expr(/* EStructuralRecord */
|
|
1512
|
+
return new Expr(/* EStructuralRecord */ 20, [toList(fields_6), mkSpanFrom(lb_4.Span, rb_9.Span)]);
|
|
1513
1513
|
}
|
|
1514
1514
|
else {
|
|
1515
1515
|
return matchValue_27;
|
|
@@ -1553,7 +1553,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1553
1553
|
if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_9, rb_10.Span.Start.Line)) {
|
|
1554
1554
|
throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_10.Span));
|
|
1555
1555
|
}
|
|
1556
|
-
return new Expr(/* EMap */
|
|
1556
|
+
return new Expr(/* EMap */ 21, [toList(entries), mkSpanFrom(lb_4.Span, rb_10.Span)]);
|
|
1557
1557
|
}
|
|
1558
1558
|
else {
|
|
1559
1559
|
const mark_2 = TokenStream__Mark(stream) | 0;
|
|
@@ -1590,7 +1590,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1590
1590
|
if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_10, rb_11.Span.Start.Line)) {
|
|
1591
1591
|
throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_11.Span));
|
|
1592
1592
|
}
|
|
1593
|
-
matchValue_30 = (new Expr(/* ERecordUpdate */
|
|
1593
|
+
matchValue_30 = (new Expr(/* ERecordUpdate */ 22, [baseExpr_1, toList(updates_1), mkSpanFrom(lb_4.Span, rb_11.Span)]));
|
|
1594
1594
|
}
|
|
1595
1595
|
if (matchValue_30 == null) {
|
|
1596
1596
|
const fields_7 = [];
|
|
@@ -1623,7 +1623,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1623
1623
|
}
|
|
1624
1624
|
const span_3 = mkSpanFrom(lb_4.Span, rb_12.Span);
|
|
1625
1625
|
recordFieldLabels(span_3, labels_3);
|
|
1626
|
-
return new Expr(/* ERecord */
|
|
1626
|
+
return new Expr(/* ERecord */ 19, [toList(fields_7), span_3]);
|
|
1627
1627
|
}
|
|
1628
1628
|
else {
|
|
1629
1629
|
return matchValue_30;
|
|
@@ -1639,7 +1639,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1639
1639
|
case 10: {
|
|
1640
1640
|
const raiseTok = TokenStream__Next(stream);
|
|
1641
1641
|
const value_62 = parsePrimary();
|
|
1642
|
-
return new Expr(/* ERaise */
|
|
1642
|
+
return new Expr(/* ERaise */ 10, [value_62, mkSpanFrom(raiseTok.Span, Ast_spanOfExpr(value_62))]);
|
|
1643
1643
|
}
|
|
1644
1644
|
case 11:
|
|
1645
1645
|
return parseFor();
|
|
@@ -1648,12 +1648,12 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1648
1648
|
case 13: {
|
|
1649
1649
|
const t_10 = TokenStream__Next(stream);
|
|
1650
1650
|
const nameTok_10 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected type name after \'typeof\'");
|
|
1651
|
-
return new Expr(/* ETypeOf */
|
|
1651
|
+
return new Expr(/* ETypeOf */ 31, [(matchValue_32 = nameTok_10.Kind, (matchValue_32.tag === 4) ? matchValue_32.fields[0] : ""), mkSpanFrom(t_10.Span, nameTok_10.Span)]);
|
|
1652
1652
|
}
|
|
1653
1653
|
case 14: {
|
|
1654
1654
|
const t_11 = TokenStream__Next(stream);
|
|
1655
1655
|
const nameTok_11 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'nameof\'");
|
|
1656
|
-
return new Expr(/* ENameOf */
|
|
1656
|
+
return new Expr(/* ENameOf */ 32, [(matchValue_33 = nameTok_11.Kind, (matchValue_33.tag === 4) ? matchValue_33.fields[0] : ""), mkSpanFrom(t_11.Span, nameTok_11.Span)]);
|
|
1657
1657
|
}
|
|
1658
1658
|
case 15:
|
|
1659
1659
|
throw new ParseException(new ParseError("Indentation error: unexpected indent in expression", t_6.Span));
|
|
@@ -1672,9 +1672,9 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1672
1672
|
let fieldName_3;
|
|
1673
1673
|
const matchValue_34 = fieldTok_1.Kind;
|
|
1674
1674
|
fieldName_3 = ((matchValue_34.tag === 4) ? matchValue_34.fields[0] : "");
|
|
1675
|
-
expr_3 = (new Expr(/* EFieldGet */
|
|
1675
|
+
expr_3 = (new Expr(/* EFieldGet */ 24, [expr_3, fieldName_3, mkSpanFrom(Ast_spanOfExpr(expr_3), fieldTok_1.Span)]));
|
|
1676
1676
|
}
|
|
1677
|
-
else if ((equals(TokenStream__Peek(stream).Kind, TokenKind.Less) && equals(TokenStream__Peek(stream).Span.Start, Ast_spanOfExpr(expr_3).End)) && ((expr_3.tag === 2) ? true : (expr_3.tag ===
|
|
1677
|
+
else if ((equals(TokenStream__Peek(stream).Kind, TokenKind.Less) && equals(TokenStream__Peek(stream).Span.Start, Ast_spanOfExpr(expr_3).End)) && ((expr_3.tag === 2) ? true : (expr_3.tag === 24))) {
|
|
1678
1678
|
const mark_3 = TokenStream__Mark(stream) | 0;
|
|
1679
1679
|
TokenStream__Next(stream);
|
|
1680
1680
|
let application;
|
|
@@ -1731,7 +1731,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1731
1731
|
TokenStream__Next(stream);
|
|
1732
1732
|
const keyExpr_1 = parseExpr();
|
|
1733
1733
|
const rb_13 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' after index expression");
|
|
1734
|
-
expr_3 = (new Expr(/* EIndexGet */
|
|
1734
|
+
expr_3 = (new Expr(/* EIndexGet */ 25, [expr_3, keyExpr_1, mkSpanFrom(targetSpan, rb_13.Span)]));
|
|
1735
1735
|
}
|
|
1736
1736
|
else {
|
|
1737
1737
|
keepGoing_1 = false;
|
|
@@ -1751,7 +1751,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1751
1751
|
const next_2 = TokenStream__Peek(stream);
|
|
1752
1752
|
if ((next_2.Span.Start.Line === Ast_spanOfExpr(expr_4).End.Line) && isStartAtom(next_2.Kind)) {
|
|
1753
1753
|
const arg_1 = parsePostfix();
|
|
1754
|
-
expr_4 = (new Expr(/* EApply */
|
|
1754
|
+
expr_4 = (new Expr(/* EApply */ 8, [expr_4, arg_1, mkSpanFrom(Ast_spanOfExpr(expr_4), Ast_spanOfExpr(arg_1))]));
|
|
1755
1755
|
}
|
|
1756
1756
|
else {
|
|
1757
1757
|
const mark_4 = TokenStream__Mark(stream) | 0;
|
|
@@ -1766,7 +1766,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1766
1766
|
const candidate = TokenStream__Peek(stream);
|
|
1767
1767
|
if ((candidate.Span.Start.Column > Ast_spanOfExpr(expr_4).Start.Column) && isStartAtom(candidate.Kind)) {
|
|
1768
1768
|
const arg_2 = parsePostfix();
|
|
1769
|
-
expr_4 = (new Expr(/* EApply */
|
|
1769
|
+
expr_4 = (new Expr(/* EApply */ 8, [expr_4, arg_2, mkSpanFrom(Ast_spanOfExpr(expr_4), Ast_spanOfExpr(arg_2))]));
|
|
1770
1770
|
}
|
|
1771
1771
|
else if (hasMultilineArgBlock && equals(candidate.Kind, TokenKind.Dedent)) {
|
|
1772
1772
|
TokenStream__Next(stream);
|
|
@@ -1843,7 +1843,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1843
1843
|
if (prec >= minPrec) {
|
|
1844
1844
|
const opTok = TokenStream__Next(stream);
|
|
1845
1845
|
const right_2 = parseBinary(prec + 1);
|
|
1846
|
-
left_2 = (new Expr(/* EBinOp */
|
|
1846
|
+
left_2 = (new Expr(/* EBinOp */ 28, [(op_1 = opTok.Kind, (op_1.tag === 50) ? "+" : ((op_1.tag === 51) ? "-" : ((op_1.tag === 52) ? "*" : ((op_1.tag === 53) ? "/" : ((op_1.tag === 54) ? "%" : ((op_1.tag === 26) ? "=" : ((op_1.tag === 55) ? "<" : ((op_1.tag === 56) ? ">" : ((op_1.tag === 57) ? "<=" : ((op_1.tag === 58) ? ">=" : ((op_1.tag === 59) ? "&&" : ((op_1.tag === 60) ? "||" : ((op_1.tag === 61) ? "|>" : ((op_1.tag === 62) ? "::" : ((op_1.tag === 63) ? "@" : "?"))))))))))))))), left_2, right_2, mkSpanFrom(Ast_spanOfExpr(left_2), Ast_spanOfExpr(right_2))]));
|
|
1847
1847
|
}
|
|
1848
1848
|
else {
|
|
1849
1849
|
looping = false;
|
|
@@ -1876,7 +1876,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1876
1876
|
default:
|
|
1877
1877
|
throw new ParseException(new ParseError("Expected \'else\' or \'elif\'", TokenStream__Peek(stream).Span));
|
|
1878
1878
|
}
|
|
1879
|
-
return new Expr(/* EIf */
|
|
1879
|
+
return new Expr(/* EIf */ 9, [cond, thenExpr, elseExpr, mkSpanFrom(startSpan, Ast_spanOfExpr(elseExpr))]);
|
|
1880
1880
|
};
|
|
1881
1881
|
const parseFor = () => {
|
|
1882
1882
|
const forTok = TokenStream__Expect_77B9EE56(stream, TokenKind.For, "Expected \'for\'");
|
|
@@ -1933,7 +1933,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1933
1933
|
}
|
|
1934
1934
|
}
|
|
1935
1935
|
const body = parseExprOrBlock();
|
|
1936
|
-
return new Expr(/* EFor */
|
|
1936
|
+
return new Expr(/* EFor */ 11, [name_20, source_19, body, mkSpanFrom(forTok.Span, Ast_spanOfExpr(body))]);
|
|
1937
1937
|
};
|
|
1938
1938
|
const parseLambda = () => {
|
|
1939
1939
|
const funTok = TokenStream__Expect_77B9EE56(stream, TokenKind.Fun, "Expected \'fun\'");
|
|
@@ -1957,7 +1957,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
1957
1957
|
}
|
|
1958
1958
|
TokenStream__SkipNewlines(stream);
|
|
1959
1959
|
TokenStream__Expect_77B9EE56(stream, TokenKind.Arrow, "Expected \'->\' in lambda");
|
|
1960
|
-
return foldBack_1((param_1, acc) => (new Expr(/* ELambda */
|
|
1960
|
+
return foldBack_1((param_1, acc) => (new Expr(/* ELambda */ 7, [param_1, acc, mkSpanFrom(funTok.Span, Ast_spanOfExpr(acc))])), parameters_2, parseExprOrBlock());
|
|
1961
1961
|
};
|
|
1962
1962
|
const parseMatch = () => {
|
|
1963
1963
|
const matchTok = TokenStream__Expect_77B9EE56(stream, TokenKind.Match, "Expected \'match\'");
|
|
@@ -2079,7 +2079,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
2079
2079
|
}
|
|
2080
2080
|
}
|
|
2081
2081
|
}
|
|
2082
|
-
return new Expr(/* EMatch */
|
|
2082
|
+
return new Expr(/* EMatch */ 12, [expr_5, toList(cases_2), mkSpanFrom(matchTok.Span, Ast_spanOfExpr(expr_5))]);
|
|
2083
2083
|
};
|
|
2084
2084
|
const parseLetExpr = () => {
|
|
2085
2085
|
let matchValue_45;
|
|
@@ -2198,10 +2198,10 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
2198
2198
|
body_3 = parseExprOrBlock();
|
|
2199
2199
|
}
|
|
2200
2200
|
if (bindings.length === 1) {
|
|
2201
|
-
return new Expr(/* ELet */
|
|
2201
|
+
return new Expr(/* ELet */ 13, [bindingName, foldBack_1((arg_3, acc_1) => (new Expr(/* ELambda */ 7, [arg_3, acc_1, Ast_spanOfExpr(acc_1)])), args_2, value_75), body_3, true, returnAnnotation_1, args_2.length, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_3))]);
|
|
2202
2202
|
}
|
|
2203
2203
|
else {
|
|
2204
|
-
return new Expr(/* ELetRecGroup */
|
|
2204
|
+
return new Expr(/* ELetRecGroup */ 15, [toList(bindings), body_3, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_3))]);
|
|
2205
2205
|
}
|
|
2206
2206
|
}
|
|
2207
2207
|
}
|
|
@@ -2233,7 +2233,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
2233
2233
|
body_4 = parseExprOrBlock();
|
|
2234
2234
|
}
|
|
2235
2235
|
if (tuplePatternOpt == null) {
|
|
2236
|
-
return new Expr(/* ELet */
|
|
2236
|
+
return new Expr(/* ELet */ 13, [bindingName, foldBack_1((arg_4, acc_2) => (new Expr(/* ELambda */ 7, [arg_4, acc_2, Ast_spanOfExpr(acc_2)])), args_2, value_75), body_4, false, returnAnnotation_1, args_2.length, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_4))]);
|
|
2237
2237
|
}
|
|
2238
2238
|
else if (args_2.length > 0) {
|
|
2239
2239
|
const pattern_3 = tuplePatternOpt;
|
|
@@ -2241,7 +2241,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
2241
2241
|
}
|
|
2242
2242
|
else {
|
|
2243
2243
|
const pattern_4 = tuplePatternOpt;
|
|
2244
|
-
return new Expr(/* ELetPattern */
|
|
2244
|
+
return new Expr(/* ELetPattern */ 14, [pattern_4, value_75, body_4, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_4))]);
|
|
2245
2245
|
}
|
|
2246
2246
|
}
|
|
2247
2247
|
}
|
|
@@ -2398,9 +2398,9 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
2398
2398
|
throw new ParseException(new ParseError("Block cannot end with a let binding; add a final expression", head_1(stmts).fields[6]));
|
|
2399
2399
|
}
|
|
2400
2400
|
else {
|
|
2401
|
-
const valExpr = foldBack_1((arg_5, acc_3) => (new Expr(/* ELambda */
|
|
2401
|
+
const valExpr = foldBack_1((arg_5, acc_3) => (new Expr(/* ELambda */ 7, [arg_5, acc_3, head_1(stmts).fields[6]])), head_1(stmts).fields[1], head_1(stmts).fields[3]);
|
|
2402
2402
|
const body_5 = desugar(tail_1(stmts));
|
|
2403
|
-
return new Expr(/* ELet */
|
|
2403
|
+
return new Expr(/* ELet */ 13, [head_1(stmts).fields[0], valExpr, body_5, head_1(stmts).fields[4], head_1(stmts).fields[2], length(head_1(stmts).fields[1]), mkSpanFrom(head_1(stmts).fields[6], Ast_spanOfExpr(body_5))]);
|
|
2404
2404
|
}
|
|
2405
2405
|
case 3:
|
|
2406
2406
|
if (isEmpty(tail_1(stmts))) {
|
|
@@ -2408,7 +2408,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
2408
2408
|
}
|
|
2409
2409
|
else {
|
|
2410
2410
|
const body_6 = desugar(tail_1(stmts));
|
|
2411
|
-
return new Expr(/* ELetPattern */
|
|
2411
|
+
return new Expr(/* ELetPattern */ 14, [head_1(stmts).fields[0], head_1(stmts).fields[1], body_6, mkSpanFrom(head_1(stmts).fields[3], Ast_spanOfExpr(body_6))]);
|
|
2412
2412
|
}
|
|
2413
2413
|
case 4:
|
|
2414
2414
|
if (isEmpty(tail_1(stmts))) {
|
|
@@ -2416,7 +2416,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
2416
2416
|
}
|
|
2417
2417
|
else {
|
|
2418
2418
|
const body_7 = desugar(tail_1(stmts));
|
|
2419
|
-
return new Expr(/* ELetRecGroup */
|
|
2419
|
+
return new Expr(/* ELetRecGroup */ 15, [head_1(stmts).fields[0], body_7, mkSpanFrom(head_1(stmts).fields[2], Ast_spanOfExpr(body_7))]);
|
|
2420
2420
|
}
|
|
2421
2421
|
case 5:
|
|
2422
2422
|
throw new ParseException(new ParseError("Backend imports are only supported at top level", head_1(stmts).fields[3]));
|
|
@@ -2432,7 +2432,7 @@ function parseProgramWithSourceNameAndOrigin(captureFieldLabels, sourceName, sta
|
|
|
2432
2432
|
}
|
|
2433
2433
|
else {
|
|
2434
2434
|
const body_8 = desugar(tail_1(stmts));
|
|
2435
|
-
return new Expr(/* ELet */
|
|
2435
|
+
return new Expr(/* ELet */ 13, ["_", head_1(stmts).fields[0], body_8, false, undefined, 0, mkSpanFrom(Ast_spanOfExpr(head_1(stmts).fields[0]), Ast_spanOfExpr(body_8))]);
|
|
2436
2436
|
}
|
|
2437
2437
|
}
|
|
2438
2438
|
}
|
|
@@ -10,7 +10,7 @@ function closureParameters(firstArg, body) {
|
|
|
10
10
|
loop:
|
|
11
11
|
while (true) {
|
|
12
12
|
const acc = acc_mut, expr = expr_mut;
|
|
13
|
-
if (expr.tag ===
|
|
13
|
+
if (expr.tag === 7) {
|
|
14
14
|
acc_mut = append(acc, singleton(expr.fields[0].Name));
|
|
15
15
|
expr_mut = expr.fields[1];
|
|
16
16
|
continue loop;
|