@magnusopera/fscript 0.77.1 → 0.78.1

package/dist/FScript.Language/Parser.js

@@ -1,19 +1,19 @@
 
-import { class_type } from "../fable_modules/fable-library-js.5.2.0/Reflection.js";
-import { singleton, tail as tail_1, head as head_1, isEmpty, foldBack, empty, length, item } from "../fable_modules/fable-library-js.5.2.0/List.js";
-import { equals } from "../fable_modules/fable-library-js.5.2.0/Util.js";
+import { class_type } from "../fable_modules/fable-library-js.5.13.0/Reflection.js";
+import { singleton, tail as tail_1, head as head_1, isEmpty, foldBack, empty, length, item } from "../fable_modules/fable-library-js.5.13.0/List.js";
+import { equals } from "../fable_modules/fable-library-js.5.13.0/Util.js";
 import { ParseException, ParseError } from "./Error.js";
 import { TokenKind } from "./Token.js";
 import { Span, SpanModule_merge } from "./Span.js";
-import { isNullOrWhiteSpace, substring, concat, join, isNullOrEmpty } from "../fable_modules/fable-library-js.5.2.0/String.js";
-import { isUpper } from "../fable_modules/fable-library-js.5.2.0/Char.js";
+import { isNullOrWhiteSpace, substring, concat, join, isNullOrEmpty } from "../fable_modules/fable-library-js.5.13.0/String.js";
+import { isUpper } from "../fable_modules/fable-library-js.5.13.0/Char.js";
 import { MapEntry, Ast_spanOfExpr, InterpolatedPart, Expr, Ast_spanOfPattern, Pattern, Stmt, TypeDef, Param, TypeRef, Literal } from "./Ast.js";
 import { tokenizeWithSourceName } from "./Lexer.js";
-import { addToSet } from "../fable_modules/fable-library-js.5.2.0/MapUtil.js";
-import { foldBack as foldBack_1, toList } from "../fable_modules/fable-library-js.5.2.0/Seq.js";
-import { StringBuilder__Append_244C7CD6, StringBuilder__Clear, StringBuilder__get_Length, StringBuilder_$ctor } from "../fable_modules/fable-library-js.5.2.0/System.Text.js";
-import { toString } from "../fable_modules/fable-library-js.5.2.0/Types.js";
-import { item as item_1 } from "../fable_modules/fable-library-js.5.2.0/Array.js";
+import { addToSet } from "../fable_modules/fable-library-js.5.13.0/MapUtil.js";
+import { foldBack as foldBack_1, toList } from "../fable_modules/fable-library-js.5.13.0/Seq.js";
+import { StringBuilder__Append_244C7CD6, StringBuilder__Clear, StringBuilder__get_Length, StringBuilder_$ctor } from "../fable_modules/fable-library-js.5.13.0/System.Text.js";
+import { toString } from "../fable_modules/fable-library-js.5.13.0/Types.js";
+import { item as item_1 } from "../fable_modules/fable-library-js.5.13.0/Array.js";
 
 class TokenStream {
     constructor(tokens) {
@@ -93,11 +93,11 @@ function TokenStream__ExpectIdent_Z721C83C5(_, message) {
 }
 
 function TokenStream__get_AtEnd(_) {
-    return equals(item(_.index, _.tokens).Kind, new TokenKind(0, []));
+    return equals(item(_.index, _.tokens).Kind, TokenKind.EOF);
 }
 
 function TokenStream__SkipNewlines(_) {
-    while (equals(item(_.index, _.tokens).Kind, new TokenKind(1, []))) {
+    while (equals(item(_.index, _.tokens).Kind, TokenKind.Newline)) {
         _.index = ((_.index + 1) | 0);
     }
 }
@@ -160,13 +160,13 @@ function parseLiteral(t) {
     const matchValue = t.Kind;
     switch (matchValue.tag) {
         case 5:
-            return new Literal(0, [matchValue.fields[0]]);
+            return new Literal(/* LInt */ 0, [matchValue.fields[0]]);
         case 6:
-            return new Literal(1, [matchValue.fields[0]]);
+            return new Literal(/* LFloat */ 1, [matchValue.fields[0]]);
         case 7:
-            return new Literal(3, [matchValue.fields[0]]);
+            return new Literal(/* LString */ 3, [matchValue.fields[0]]);
         case 9:
-            return new Literal(2, [matchValue.fields[0]]);
+            return new Literal(/* LBool */ 2, [matchValue.fields[0]]);
         default:
             throw new ParseException(new ParseError("Expected literal", t.Span));
     }
@@ -180,15 +180,15 @@ export function parseProgramWithSourceName(sourceName, src) {
         let progress = true;
         while (progress) {
             progress = false;
-            while (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
+            while (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
                 consumed = true;
                 progress = true;
             }
-            while (TokenStream__Match_5CEB78CD(stream, new TokenKind(2, []))) {
+            while (TokenStream__Match_5CEB78CD(stream, TokenKind.Indent)) {
                 consumed = true;
                 progress = true;
             }
-            while (TokenStream__Match_5CEB78CD(stream, new TokenKind(3, []))) {
+            while (TokenStream__Match_5CEB78CD(stream, TokenKind.Dedent)) {
                 consumed = true;
                 progress = true;
             }
@@ -250,8 +250,8 @@ export function parseProgramWithSourceName(sourceName, src) {
         const matchValue_5 = TokenStream__Peek(stream).Kind;
         switch (matchValue_5.tag) {
             case 4:
-                return new TypeRef(0, [(firstName = ((matchValue_3 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected type name").Kind, (matchValue_3.tag === 4) ? matchValue_3.fields[0] : "")), (parts_1 = [], (void (parts_1.push(firstName)), (keepGoing = true, ((() => {
-                    while (keepGoing && TokenStream__Match_5CEB78CD(stream, new TokenKind(36, []))) {
+                return new TypeRef(/* TRName */ 0, [(firstName = ((matchValue_3 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected type name").Kind, (matchValue_3.tag === 4) ? matchValue_3.fields[0] : "")), (parts_1 = [], (void (parts_1.push(firstName)), (keepGoing = true, ((() => {
+                    while (keepGoing && TokenStream__Match_5CEB78CD(stream, TokenKind.Dot)) {
                         const matchValue_4 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'.\' in qualified type name").Kind;
                         if (matchValue_4.tag === 4) {
                             void (parts_1.push(matchValue_4.fields[0]));
@@ -261,7 +261,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                 })(), join(".", parts_1))))))]);
             case 43: {
                 TokenStream__Next(stream);
-                const isStructural = TokenStream__Match_5CEB78CD(stream, new TokenKind(26, []));
+                const isStructural = TokenStream__Match_5CEB78CD(stream, TokenKind.Bar);
                 const fields = [];
                 const seen = new Set([]);
                 const parseField = () => {
@@ -272,45 +272,45 @@ export function parseProgramWithSourceName(sourceName, src) {
                     if (!addToSet(fieldName, seen)) {
                         throw new ParseException(new ParseError(concat("Duplicate field \'", fieldName, "\' in inline record type"), nameTok.Span));
                     }
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(35, []), "Expected \':\' after inline record type field name");
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.Colon, "Expected \':\' after inline record type field name");
                     const fieldType = parseTypeRef();
                     void (fields.push([fieldName, fieldType]));
                 };
-                if ((isStructural && equals(TokenStream__Peek(stream).Kind, new TokenKind(26, []))) ? true : (!isStructural && equals(TokenStream__Peek(stream).Kind, new TokenKind(44, [])))) {
+                if ((isStructural && equals(TokenStream__Peek(stream).Kind, TokenKind.Bar)) ? true : (!isStructural && equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace))) {
                     throw new ParseException(new ParseError("Inline record type must define at least one field", TokenStream__Peek(stream).Span));
                 }
                 parseField();
-                while (TokenStream__Match_5CEB78CD(stream, new TokenKind(33, []))) {
-                    if ((isStructural && !equals(TokenStream__Peek(stream).Kind, new TokenKind(26, []))) ? true : (!isStructural && !equals(TokenStream__Peek(stream).Kind, new TokenKind(44, [])))) {
+                while (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon)) {
+                    if ((isStructural && !equals(TokenStream__Peek(stream).Kind, TokenKind.Bar)) ? true : (!isStructural && !equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace))) {
                         parseField();
                     }
                 }
                 if (isStructural) {
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(26, []), "Expected \'|\' in structural record type");
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.Bar, "Expected \'|\' in structural record type");
                 }
-                TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in inline record type");
+                TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in inline record type");
                 if (isStructural) {
-                    return new TypeRef(5, [toList(fields)]);
+                    return new TypeRef(/* TRStructuralRecord */ 5, [toList(fields)]);
                 }
                 else {
-                    return new TypeRef(4, [toList(fields)]);
+                    return new TypeRef(/* TRRecord */ 4, [toList(fields)]);
                 }
             }
             case 27: {
                 TokenStream__Next(stream);
                 const first_1 = parseTypeRef();
-                if (TokenStream__Match_5CEB78CD(stream, new TokenKind(51, []))) {
+                if (TokenStream__Match_5CEB78CD(stream, TokenKind.Star)) {
                     const items = [];
                     void (items.push(first_1));
                     void (items.push(parseTypeRef()));
-                    while (TokenStream__Match_5CEB78CD(stream, new TokenKind(51, []))) {
+                    while (TokenStream__Match_5CEB78CD(stream, TokenKind.Star)) {
                         void (items.push(parseTypeRef()));
                     }
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(28, []), "Expected \')\' in tuple type");
-                    return new TypeRef(1, [toList(items)]);
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.RParen, "Expected \')\' in tuple type");
+                    return new TypeRef(/* TRTuple */ 1, [toList(items)]);
                 }
                 else {
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(28, []), "Expected \')\' in type expression");
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.RParen, "Expected \')\' in type expression");
                     return first_1;
                 }
             }
@@ -352,22 +352,22 @@ export function parseProgramWithSourceName(sourceName, src) {
             switch (matchResult) {
                 case 0: {
                     TokenStream__Next(stream);
-                    t = (new TypeRef(3, [t, "list"]));
+                    t = (new TypeRef(/* TRPostfix */ 3, [t, "list"]));
                     break;
                 }
                 case 1: {
                     TokenStream__Next(stream);
-                    t = (new TypeRef(3, [t, "option"]));
+                    t = (new TypeRef(/* TRPostfix */ 3, [t, "option"]));
                     break;
                 }
                 case 2: {
                     TokenStream__Next(stream);
-                    t = (new TypeRef(3, [t, "map"]));
+                    t = (new TypeRef(/* TRPostfix */ 3, [t, "map"]));
                     break;
                 }
                 case 3: {
                     TokenStream__Next(stream);
-                    t = (new TypeRef(3, [t, "task"]));
+                    t = (new TypeRef(/* TRPostfix */ 3, [t, "task"]));
                     break;
                 }
                 case 4: {
@@ -380,8 +380,8 @@ export function parseProgramWithSourceName(sourceName, src) {
     };
     const parseTypeRef = () => {
         const left = parseTypeRefPostfix();
-        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(24, []))) {
-            return new TypeRef(2, [left, parseTypeRef()]);
+        if (TokenStream__Match_5CEB78CD(stream, TokenKind.Arrow)) {
+            return new TypeRef(/* TRFun */ 2, [left, parseTypeRef()]);
         }
         else {
             return left;
@@ -396,16 +396,16 @@ export function parseProgramWithSourceName(sourceName, src) {
             case 27: {
                 const lp = TokenStream__Next(stream);
                 TokenStream__SkipNewlines(stream);
-                if (TokenStream__Match_5CEB78CD(stream, new TokenKind(28, []))) {
-                    return new Param("()", new TypeRef(0, ["unit"]), mkSpanFrom(lp.Span, TokenStream__TokenAt_Z524259A4(stream, TokenStream__get_Index(stream) - 1).Span));
+                if (TokenStream__Match_5CEB78CD(stream, TokenKind.RParen)) {
+                    return new Param("()", new TypeRef(/* TRName */ 0, ["unit"]), mkSpanFrom(lp.Span, TokenStream__TokenAt_Z524259A4(stream, TokenStream__get_Index(stream) - 1).Span));
                 }
                 else {
                     let name;
                     const matchValue_9 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected parameter name in annotated parameter").Kind;
                     name = ((matchValue_9.tag === 4) ? matchValue_9.fields[0] : "");
                     TokenStream__SkipNewlines(stream);
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(35, []), "Expected \':\' in annotated parameter");
-                    return new Param(name, parseTypeRef(), mkSpanFrom(lp.Span, TokenStream__Expect_77B9EE56(stream, new TokenKind(28, []), "Expected \')\' after annotated parameter").Span));
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.Colon, "Expected \':\' in annotated parameter");
+                    return new Param(name, parseTypeRef(), mkSpanFrom(lp.Span, TokenStream__Expect_77B9EE56(stream, TokenKind.RParen, "Expected \')\' after annotated parameter").Span));
                 }
             }
             default:
@@ -418,12 +418,12 @@ export function parseProgramWithSourceName(sourceName, src) {
         let firstParamColumn = undefined;
         while (!argsDone) {
             let sawNewline = false;
-            while (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
+            while (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
                 sawNewline = true;
             }
-            while (TokenStream__Match_5CEB78CD(stream, new TokenKind(2, []))) {
+            while (TokenStream__Match_5CEB78CD(stream, TokenKind.Indent)) {
             }
-            while (TokenStream__Match_5CEB78CD(stream, new TokenKind(3, []))) {
+            while (TokenStream__Match_5CEB78CD(stream, TokenKind.Dedent)) {
             }
             const matchValue_10 = TokenStream__Peek(stream).Kind;
             switch (matchValue_10.tag) {
@@ -449,18 +449,18 @@ export function parseProgramWithSourceName(sourceName, src) {
         return args;
     };
     const parseTypeDecl = () => {
-        const typeTok = TokenStream__Expect_77B9EE56(stream, new TokenKind(45, []), "Expected \'type\'");
-        const isRec = TokenStream__Match_5CEB78CD(stream, new TokenKind(11, []));
+        const typeTok = TokenStream__Expect_77B9EE56(stream, TokenKind.Type, "Expected \'type\'");
+        const isRec = TokenStream__Match_5CEB78CD(stream, TokenKind.Rec);
         let name_1;
         const matchValue_11 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'type\'").Kind;
         name_1 = ((matchValue_11.tag === 4) ? matchValue_11.fields[0] : "");
         TokenStream__SkipNewlines(stream);
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in type declaration");
+        TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in type declaration");
         let hasOuterIndent = false;
-        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
-            while (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
+        if (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
+            while (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
             }
-            if (TokenStream__Match_5CEB78CD(stream, new TokenKind(2, []))) {
+            if (TokenStream__Match_5CEB78CD(stream, TokenKind.Indent)) {
                 hasOuterIndent = true;
             }
         }
@@ -469,7 +469,7 @@ export function parseProgramWithSourceName(sourceName, src) {
         switch (matchValue_15.tag) {
             case 43: {
                 const lbIndex = TokenStream__get_Index(stream) | 0;
-                const lb = TokenStream__Expect_77B9EE56(stream, new TokenKind(43, []), "Expected \'{\' in record type declaration");
+                const lb = TokenStream__Expect_77B9EE56(stream, TokenKind.LBrace, "Expected \'{\' in record type declaration");
                 if (!hasNonLayoutTokenAfterOnSameLine(lbIndex, lb.Span.Start.Line)) {
                     throw new ParseException(new ParseError("Opening \'{\' cannot be on its own line; keep it with the first field", lb.Span));
                 }
@@ -481,7 +481,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     const matchValue_12 = fieldTok.Kind;
                     fieldName_1 = ((matchValue_12.tag === 4) ? matchValue_12.fields[0] : "");
                     TokenStream__SkipNewlines(stream);
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(35, []), "Expected \':\' after field name");
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.Colon, "Expected \':\' after field name");
                     const fieldType_1 = parseTypeRef();
                     void (fields_1.push([fieldName_1, fieldType_1]));
                     return fieldTok.Span.Start.Column | 0;
@@ -489,8 +489,8 @@ export function parseProgramWithSourceName(sourceName, src) {
                 const firstFieldColumn = parseField_1() | 0;
                 let doneFields = false;
                 while (!doneFields) {
-                    if (TokenStream__Match_5CEB78CD(stream, new TokenKind(33, []))) {
-                        if (!equals(TokenStream__Peek(stream).Kind, new TokenKind(44, []))) {
+                    if (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon)) {
+                        if (!equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace)) {
                             parseField_1();
                         }
                         else {
@@ -499,12 +499,12 @@ export function parseProgramWithSourceName(sourceName, src) {
                     }
                     else {
                         let sawNewline_1 = false;
-                        while (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
+                        while (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
                             sawNewline_1 = true;
                         }
-                        while (TokenStream__Match_5CEB78CD(stream, new TokenKind(2, []))) {
+                        while (TokenStream__Match_5CEB78CD(stream, TokenKind.Indent)) {
                         }
-                        while (TokenStream__Match_5CEB78CD(stream, new TokenKind(3, []))) {
+                        while (TokenStream__Match_5CEB78CD(stream, TokenKind.Dedent)) {
                         }
                         if (sawNewline_1) {
                             const matchValue_13 = TokenStream__Peek(stream).Kind;
@@ -529,7 +529,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     }
                 }
                 const rbIndex = TokenStream__get_Index(stream) | 0;
-                const rb = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in record type declaration");
+                const rb = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in record type declaration");
                 if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex, rb.Span.Start.Line)) {
                     throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last field", rb.Span));
                 }
@@ -541,7 +541,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                 const cases = [];
                 const parseCase = () => {
                     TokenStream__SkipNewlines(stream);
-                    TokenStream__Match_5CEB78CD(stream, new TokenKind(26, []));
+                    TokenStream__Match_5CEB78CD(stream, TokenKind.Bar);
                     const caseTok = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected union case name");
                     let caseName;
                     const matchValue_14 = caseTok.Kind;
@@ -550,7 +550,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                         throw new ParseException(new ParseError("Union case name must start with uppercase letter", caseTok.Span));
                     }
                     TokenStream__SkipNewlines(stream);
-                    const payload = TokenStream__Match_5CEB78CD(stream, new TokenKind(48, [])) ? parseTypeRef() : undefined;
+                    const payload = TokenStream__Match_5CEB78CD(stream, TokenKind.Of) ? parseTypeRef() : undefined;
                     void (cases.push([caseName, payload]));
                     return caseTok.Span;
                 };
@@ -558,12 +558,12 @@ export function parseProgramWithSourceName(sourceName, src) {
                 let doneCases = false;
                 while (!doneCases) {
                     let sawNewline_2 = false;
-                    while (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
+                    while (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
                         sawNewline_2 = true;
                     }
-                    while (TokenStream__Match_5CEB78CD(stream, new TokenKind(2, []))) {
+                    while (TokenStream__Match_5CEB78CD(stream, TokenKind.Indent)) {
                     }
-                    if (equals(TokenStream__Peek(stream).Kind, new TokenKind(26, []))) {
+                    if (equals(TokenStream__Peek(stream).Kind, TokenKind.Bar)) {
                         const s_1 = parseCase();
                         lastSpan = s_1.End;
                     }
@@ -582,13 +582,13 @@ export function parseProgramWithSourceName(sourceName, src) {
         }
         if (hasOuterIndent) {
             TokenStream__SkipNewlines(stream);
-            if (!TokenStream__Match_5CEB78CD(stream, new TokenKind(3, []))) {
+            if (!TokenStream__Match_5CEB78CD(stream, TokenKind.Dedent)) {
                 throw new ParseException(new ParseError("Expected dedent after type declaration", TokenStream__Peek(stream).Span));
             }
-            while (TokenStream__Match_5CEB78CD(stream, new TokenKind(3, []))) {
+            while (TokenStream__Match_5CEB78CD(stream, TokenKind.Dedent)) {
             }
         }
-        return new Stmt(0, [new TypeDef(name_1, isRec, patternInput_1[0], patternInput_1[1], mkSpanFrom(typeTok.Span, patternInput_1[2]))]);
+        return new Stmt(/* SType */ 0, [new TypeDef(name_1, isRec, patternInput_1[0], patternInput_1[1], mkSpanFrom(typeTok.Span, patternInput_1[2]))]);
     };
     const parsePattern = () => {
         TokenStream__SkipNewlines(stream);
@@ -631,10 +631,10 @@ export function parseProgramWithSourceName(sourceName, src) {
         }
         switch (matchResult_1) {
             case 0:
-                return new Pattern(0, [TokenStream__Next(stream).Span]);
+                return new Pattern(/* PWildcard */ 0, [TokenStream__Next(stream).Span]);
             case 1: {
                 const t_3 = TokenStream__Next(stream);
-                if (isUpperIdent(name_4) && TokenStream__Match_5CEB78CD(stream, new TokenKind(36, []))) {
+                if (isUpperIdent(name_4) && TokenStream__Match_5CEB78CD(stream, TokenKind.Dot)) {
                     const caseTok_1 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected union case name after \'.\'");
                     let caseName_1;
                     const matchValue_17 = caseTok_1.Kind;
@@ -644,39 +644,39 @@ export function parseProgramWithSourceName(sourceName, src) {
                     }
                     if (isStartPatternAtom(TokenStream__Peek(stream).Kind)) {
                         const p = parsePattern();
-                        return new Pattern(10, [name_4, caseName_1, p, mkSpanFrom(t_3.Span, Ast_spanOfPattern(p))]);
+                        return new Pattern(/* PUnionCase */ 10, [name_4, caseName_1, p, mkSpanFrom(t_3.Span, Ast_spanOfPattern(p))]);
                     }
                     else {
-                        return new Pattern(10, [name_4, caseName_1, undefined, mkSpanFrom(t_3.Span, caseTok_1.Span)]);
+                        return new Pattern(/* PUnionCase */ 10, [name_4, caseName_1, undefined, mkSpanFrom(t_3.Span, caseTok_1.Span)]);
                     }
                 }
                 else {
                     switch (name_4) {
                         case "None":
-                            return new Pattern(9, [t_3.Span]);
+                            return new Pattern(/* PNone */ 9, [t_3.Span]);
                         case "Some": {
                             const p_1 = parsePattern();
-                            return new Pattern(8, [p_1, mkSpanFrom(t_3.Span, Ast_spanOfPattern(p_1))]);
+                            return new Pattern(/* PSome */ 8, [p_1, mkSpanFrom(t_3.Span, Ast_spanOfPattern(p_1))]);
                         }
                         default:
                             if (isUpperIdent(name_4)) {
                                 if (isStartPatternAtom(TokenStream__Peek(stream).Kind)) {
                                     const p_2 = parsePattern();
-                                    return new Pattern(10, [undefined, name_4, p_2, mkSpanFrom(t_3.Span, Ast_spanOfPattern(p_2))]);
+                                    return new Pattern(/* PUnionCase */ 10, [undefined, name_4, p_2, mkSpanFrom(t_3.Span, Ast_spanOfPattern(p_2))]);
                                 }
                                 else {
-                                    return new Pattern(10, [undefined, name_4, undefined, t_3.Span]);
+                                    return new Pattern(/* PUnionCase */ 10, [undefined, name_4, undefined, t_3.Span]);
                                 }
                             }
                             else {
-                                return new Pattern(1, [name_4, t_3.Span]);
+                                return new Pattern(/* PVar */ 1, [name_4, t_3.Span]);
                             }
                     }
                 }
             }
             case 2: {
                 const t_4 = TokenStream__Next(stream);
-                return new Pattern(2, [parseLiteral(t_4), t_4.Span]);
+                return new Pattern(/* PLiteral */ 2, [parseLiteral(t_4), t_4.Span]);
             }
             case 3: {
                 const lbIndex_1 = TokenStream__get_Index(stream) | 0;
@@ -684,41 +684,41 @@ export function parseProgramWithSourceName(sourceName, src) {
                 if (!hasNonLayoutTokenAfterOnSameLine(lbIndex_1, lb_1.Span.Start.Line)) {
                     throw new ParseException(new ParseError("Opening \'[\' cannot be on its own line; keep it with the first element", lb_1.Span));
                 }
-                if (TokenStream__Match_5CEB78CD(stream, new TokenKind(30, []))) {
-                    return new Pattern(3, [mkSpanFrom(lb_1.Span, lb_1.Span)]);
+                if (TokenStream__Match_5CEB78CD(stream, TokenKind.RBracket)) {
+                    return new Pattern(/* PNil */ 3, [mkSpanFrom(lb_1.Span, lb_1.Span)]);
                 }
                 else {
                     const first_2 = parsePatternCons();
                     const elements = [];
                     void (elements.push(first_2));
-                    while (TokenStream__Match_5CEB78CD(stream, new TokenKind(33, []))) {
-                        if (!equals(TokenStream__Peek(stream).Kind, new TokenKind(30, []))) {
+                    while (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon)) {
+                        if (!equals(TokenStream__Peek(stream).Kind, TokenKind.RBracket)) {
                             void (elements.push(parsePatternCons()));
                         }
                     }
                     const rbIndex_1 = TokenStream__get_Index(stream) | 0;
-                    const rb_1 = TokenStream__Expect_77B9EE56(stream, new TokenKind(30, []), "Expected \']\' in list pattern");
+                    const rb_1 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' in list pattern");
                     if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_1, rb_1.Span.Start.Line)) {
                         throw new ParseException(new ParseError("Closing \']\' cannot be on its own line; keep it with the last element", rb_1.Span));
                     }
-                    return foldBack((head, tail) => (new Pattern(4, [head, tail, mkSpanFrom(Ast_spanOfPattern(head), Ast_spanOfPattern(tail))])), toList(elements), new Pattern(3, [mkSpanFrom(rb_1.Span, rb_1.Span)]));
+                    return foldBack((head, tail) => (new Pattern(/* PCons */ 4, [head, tail, mkSpanFrom(Ast_spanOfPattern(head), Ast_spanOfPattern(tail))])), toList(elements), new Pattern(/* PNil */ 3, [mkSpanFrom(rb_1.Span, rb_1.Span)]));
                 }
             }
             case 4: {
                 const lp_1 = TokenStream__Next(stream);
                 const first_3 = parsePatternCons();
-                if (TokenStream__Match_5CEB78CD(stream, new TokenKind(34, []))) {
+                if (TokenStream__Match_5CEB78CD(stream, TokenKind.Comma)) {
                     const elements_1 = [];
                     void (elements_1.push(first_3));
                     void (elements_1.push(parsePatternCons()));
-                    while (TokenStream__Match_5CEB78CD(stream, new TokenKind(34, []))) {
+                    while (TokenStream__Match_5CEB78CD(stream, TokenKind.Comma)) {
                         void (elements_1.push(parsePatternCons()));
                     }
-                    const rp_2 = TokenStream__Expect_77B9EE56(stream, new TokenKind(28, []), "Expected \')\' after tuple pattern");
-                    return new Pattern(5, [toList(elements_1), mkSpanFrom(lp_1.Span, rp_2.Span)]);
+                    const rp_2 = TokenStream__Expect_77B9EE56(stream, TokenKind.RParen, "Expected \')\' after tuple pattern");
+                    return new Pattern(/* PTuple */ 5, [toList(elements_1), mkSpanFrom(lp_1.Span, rp_2.Span)]);
                 }
                 else {
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(28, []), "Expected \')\' after parenthesized pattern");
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.RParen, "Expected \')\' after parenthesized pattern");
                     return first_3;
                 }
             }
@@ -729,10 +729,10 @@ export function parseProgramWithSourceName(sourceName, src) {
                     throw new ParseException(new ParseError("Opening \'{\' cannot be on its own line; keep it with the first entry", lb_2.Span));
                 }
                 TokenStream__SkipNewlines(stream);
-                if (TokenStream__Match_5CEB78CD(stream, new TokenKind(44, []))) {
-                    return new Pattern(7, [empty(), undefined, mkSpanFrom(lb_2.Span, lb_2.Span)]);
+                if (TokenStream__Match_5CEB78CD(stream, TokenKind.RBrace)) {
+                    return new Pattern(/* PMap */ 7, [empty(), undefined, mkSpanFrom(lb_2.Span, lb_2.Span)]);
                 }
-                else if (equals(TokenStream__Peek(stream).Kind, new TokenKind(26, []))) {
+                else if (equals(TokenStream__Peek(stream).Kind, TokenKind.Bar)) {
                     TokenStream__Next(stream);
                     const fields_3 = [];
                     const seen_1 = new Set([]);
@@ -744,32 +744,32 @@ export function parseProgramWithSourceName(sourceName, src) {
                         if (!addToSet(fieldName_2, seen_1)) {
                             throw new ParseException(new ParseError(concat("Duplicate field \'", fieldName_2, "\' in structural record type pattern"), nameTok_3.Span));
                         }
-                        TokenStream__Expect_77B9EE56(stream, new TokenKind(35, []), "Expected \':\' in structural record type pattern");
+                        TokenStream__Expect_77B9EE56(stream, TokenKind.Colon, "Expected \':\' in structural record type pattern");
                         const fieldType_2 = parseTypeRef();
                         void (fields_3.push([fieldName_2, fieldType_2]));
                     };
                     parseTypeField();
-                    while (TokenStream__Match_5CEB78CD(stream, new TokenKind(33, []))) {
-                        if (!equals(TokenStream__Peek(stream).Kind, new TokenKind(26, []))) {
+                    while (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon)) {
+                        if (!equals(TokenStream__Peek(stream).Kind, TokenKind.Bar)) {
                             parseTypeField();
                         }
                     }
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(26, []), "Expected \'|\' in structural record type pattern");
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.Bar, "Expected \'|\' in structural record type pattern");
                     const rbIndex_2 = TokenStream__get_Index(stream) | 0;
-                    const rb_2 = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in structural record type pattern");
+                    const rb_2 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in structural record type pattern");
                     if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_2, rb_2.Span.Start.Line)) {
                         throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_2.Span));
                     }
-                    return new Pattern(11, [new TypeRef(5, [toList(fields_3)]), mkSpanFrom(lb_2.Span, rb_2.Span)]);
+                    return new Pattern(/* PTypeRef */ 11, [new TypeRef(/* TRStructuralRecord */ 5, [toList(fields_3)]), mkSpanFrom(lb_2.Span, rb_2.Span)]);
                 }
-                else if (equals(TokenStream__Peek(stream).Kind, new TokenKind(29, []))) {
+                else if (equals(TokenStream__Peek(stream).Kind, TokenKind.LBracket)) {
                     const clauses = [];
                     const parseClause = () => {
-                        TokenStream__Expect_77B9EE56(stream, new TokenKind(29, []), "Expected \'[\' in map pattern key");
+                        TokenStream__Expect_77B9EE56(stream, TokenKind.LBracket, "Expected \'[\' in map pattern key");
                         const keyPattern = parsePatternCons();
-                        TokenStream__Expect_77B9EE56(stream, new TokenKind(30, []), "Expected \']\' in map pattern key");
+                        TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' in map pattern key");
                         TokenStream__SkipNewlines(stream);
-                        TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' after map key pattern");
+                        TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' after map key pattern");
                         const valuePattern = parsePatternCons();
                         void (clauses.push([keyPattern, valuePattern]));
                     };
@@ -778,32 +778,32 @@ export function parseProgramWithSourceName(sourceName, src) {
                     let tailPattern = undefined;
                     let donePattern = false;
                     while (!donePattern) {
-                        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(33, []))) {
+                        if (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon)) {
                             TokenStream__SkipNewlines(stream);
-                            if (equals(TokenStream__Peek(stream).Kind, new TokenKind(37, []))) {
+                            if (equals(TokenStream__Peek(stream).Kind, TokenKind.RangeDots)) {
                                 TokenStream__Next(stream);
                                 tailPattern = parsePatternCons();
                                 TokenStream__SkipNewlines(stream);
                                 donePattern = true;
                             }
-                            else if (equals(TokenStream__Peek(stream).Kind, new TokenKind(29, []))) {
+                            else if (equals(TokenStream__Peek(stream).Kind, TokenKind.LBracket)) {
                                 parseClause();
                                 TokenStream__SkipNewlines(stream);
                             }
-                            else if (equals(TokenStream__Peek(stream).Kind, new TokenKind(44, []))) {
+                            else if (equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace)) {
                                 donePattern = true;
                             }
                             else {
                                 throw new ParseException(new ParseError("Expected map pattern clause or \'..tail\'", TokenStream__Peek(stream).Span));
                             }
                         }
-                        else if (equals(TokenStream__Peek(stream).Kind, new TokenKind(37, []))) {
+                        else if (equals(TokenStream__Peek(stream).Kind, TokenKind.RangeDots)) {
                             TokenStream__Next(stream);
                             tailPattern = parsePatternCons();
                             TokenStream__SkipNewlines(stream);
                             donePattern = true;
                         }
-                        else if (equals(TokenStream__Peek(stream).Kind, new TokenKind(29, []))) {
+                        else if (equals(TokenStream__Peek(stream).Kind, TokenKind.LBracket)) {
                             parseClause();
                             TokenStream__SkipNewlines(stream);
                         }
@@ -812,11 +812,11 @@ export function parseProgramWithSourceName(sourceName, src) {
                         }
                     }
                     const rbIndex_3 = TokenStream__get_Index(stream) | 0;
-                    const rb_3 = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in map pattern");
+                    const rb_3 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in map pattern");
                     if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_3, rb_3.Span.Start.Line)) {
                         throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_3.Span));
                     }
-                    return new Pattern(7, [toList(clauses), tailPattern, mkSpanFrom(lb_2.Span, rb_3.Span)]);
+                    return new Pattern(/* PMap */ 7, [toList(clauses), tailPattern, mkSpanFrom(lb_2.Span, rb_3.Span)]);
                 }
                 else {
                     const mark = TokenStream__Mark(stream) | 0;
@@ -824,7 +824,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     try {
                         TokenStream__ExpectIdent_Z721C83C5(stream, "Expected field name in record type pattern");
                         TokenStream__SkipNewlines(stream);
-                        isTypeRefPattern = TokenStream__Match_5CEB78CD(stream, new TokenKind(35, []));
+                        isTypeRefPattern = TokenStream__Match_5CEB78CD(stream, TokenKind.Colon);
                     }
                     catch (matchValue_19) {
                         isTypeRefPattern = false;
@@ -843,22 +843,22 @@ export function parseProgramWithSourceName(sourceName, src) {
                                 throw new ParseException(new ParseError(concat("Duplicate field \'", name_5, "\' in record type pattern"), nameTok_4.Span));
                             }
                             TokenStream__SkipNewlines(stream);
-                            TokenStream__Expect_77B9EE56(stream, new TokenKind(35, []), "Expected \':\' in record type pattern field");
+                            TokenStream__Expect_77B9EE56(stream, TokenKind.Colon, "Expected \':\' in record type pattern field");
                             const t_5 = parseTypeRef();
                             void (fields_4.push([name_5, t_5]));
                         };
                         parseTypeField_1();
-                        while (TokenStream__Match_5CEB78CD(stream, new TokenKind(33, []))) {
-                            if (!equals(TokenStream__Peek(stream).Kind, new TokenKind(44, []))) {
+                        while (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon)) {
+                            if (!equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace)) {
                                 parseTypeField_1();
                             }
                         }
                         const rbIndex_4 = TokenStream__get_Index(stream) | 0;
-                        const rb_4 = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in record type pattern");
+                        const rb_4 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in record type pattern");
                         if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_4, rb_4.Span.Start.Line)) {
                             throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last field", rb_4.Span));
                         }
-                        return new Pattern(11, [new TypeRef(4, [toList(fields_4)]), mkSpanFrom(lb_2.Span, rb_4.Span)]);
+                        return new Pattern(/* PTypeRef */ 11, [new TypeRef(/* TRRecord */ 4, [toList(fields_4)]), mkSpanFrom(lb_2.Span, rb_4.Span)]);
                     }
                     else {
                         const fields_5 = [];
@@ -873,22 +873,22 @@ export function parseProgramWithSourceName(sourceName, src) {
                                 throw new ParseException(new ParseError(concat("Duplicate field \'", name_6, "\' in record pattern"), nameTok_5.Span));
                             }
                             TokenStream__SkipNewlines(stream);
-                            TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in record pattern field");
+                            TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in record pattern field");
                             const p_3 = parsePatternCons();
                             void (fields_5.push([name_6, p_3]));
                         };
                         parseField_2();
-                        while (TokenStream__Match_5CEB78CD(stream, new TokenKind(33, []))) {
-                            if (!equals(TokenStream__Peek(stream).Kind, new TokenKind(44, []))) {
+                        while (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon)) {
+                            if (!equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace)) {
                                 parseField_2();
                             }
                         }
                         const rbIndex_5 = TokenStream__get_Index(stream) | 0;
-                        const rb_5 = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in record pattern");
+                        const rb_5 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in record pattern");
                         if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_5, rb_5.Span.Start.Line)) {
                             throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last field", rb_5.Span));
                         }
-                        return new Pattern(6, [toList(fields_5), mkSpanFrom(lb_2.Span, rb_5.Span)]);
+                        return new Pattern(/* PRecord */ 6, [toList(fields_5), mkSpanFrom(lb_2.Span, rb_5.Span)]);
                     }
                 }
             }
@@ -898,9 +898,9 @@ export function parseProgramWithSourceName(sourceName, src) {
     };
     const parsePatternCons = () => {
         const left_1 = parsePattern();
-        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(61, []))) {
+        if (TokenStream__Match_5CEB78CD(stream, TokenKind.Cons)) {
             const right_1 = parsePatternCons();
-            return new Pattern(4, [left_1, right_1, mkSpanFrom(Ast_spanOfPattern(left_1), Ast_spanOfPattern(right_1))]);
+            return new Pattern(/* PCons */ 4, [left_1, right_1, mkSpanFrom(Ast_spanOfPattern(left_1), Ast_spanOfPattern(right_1))]);
         }
         else {
             return left_1;
@@ -915,10 +915,10 @@ export function parseProgramWithSourceName(sourceName, src) {
             let progress_1 = true;
             while (progress_1) {
                 progress_1 = false;
-                while (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
+                while (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
                     progress_1 = true;
                 }
-                while (TokenStream__Match_5CEB78CD(stream, new TokenKind(2, []))) {
+                while (TokenStream__Match_5CEB78CD(stream, TokenKind.Indent)) {
                     progress_1 = true;
                 }
             }
@@ -940,7 +940,7 @@ export function parseProgramWithSourceName(sourceName, src) {
             case 7:
             case 9: {
                 const t_7 = TokenStream__Next(stream);
-                return new Expr(1, [parseLiteral(t_7), t_7.Span]);
+                return new Expr(/* ELiteral */ 1, [parseLiteral(t_7), t_7.Span]);
             }
             case 8: {
                 const raw = matchValue_22.fields[0];
@@ -949,7 +949,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                 const text = StringBuilder_$ctor();
                 const flushText = () => {
                     if (StringBuilder__get_Length(text) > 0) {
-                        void (parts.push(new InterpolatedPart(0, [toString(text)])));
+                        void (parts.push(new InterpolatedPart(/* IPText */ 0, [toString(text)])));
                         StringBuilder__Clear(text);
                     }
                 };
@@ -1072,7 +1072,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                             })()) : (() => {
                                 throw new ParseException(new ParseError("Interpolation placeholders must contain a single expression", TokenStream__Peek(stream).Span));
                             })()), i];
-                            void (parts.push(new InterpolatedPart(1, [patternInput[0]])));
+                            void (parts.push(new InterpolatedPart(/* IPExpr */ 1, [patternInput[0]])));
                             i_1 = (patternInput[1] | 0);
                             break;
                         }
@@ -1113,41 +1113,41 @@ export function parseProgramWithSourceName(sourceName, src) {
                     }
                 }
                 flushText();
-                return new Expr(30, [(parts.length === 0) ? singleton(new InterpolatedPart(0, [""])) : toList(parts), span]);
+                return new Expr(/* EInterpolatedString */ 30, [(parts.length === 0) ? singleton(new InterpolatedPart(/* IPText */ 0, [""])) : toList(parts), span]);
             }
             case 4: {
                 const name_7 = matchValue_22.fields[0];
                 const t_9 = TokenStream__Next(stream);
                 switch (name_7) {
                     case "None":
-                        return new Expr(27, [t_9.Span]);
+                        return new Expr(/* ENone */ 27, [t_9.Span]);
                     case "Some": {
                         const arg = parsePrimary();
-                        return new Expr(26, [arg, mkSpanFrom(t_9.Span, Ast_spanOfExpr(arg))]);
+                        return new Expr(/* ESome */ 26, [arg, mkSpanFrom(t_9.Span, Ast_spanOfExpr(arg))]);
                     }
                     default:
-                        return new Expr(2, [name_7, t_9.Span]);
+                        return new Expr(/* EVar */ 2, [name_7, t_9.Span]);
                 }
             }
             case 27: {
                 const lp_2 = TokenStream__Next(stream);
-                if (equals(TokenStream__Peek(stream).Kind, new TokenKind(28, []))) {
-                    return new Expr(0, [mkSpanFrom(lp_2.Span, TokenStream__Next(stream).Span)]);
+                if (equals(TokenStream__Peek(stream).Kind, TokenKind.RParen)) {
+                    return new Expr(/* EUnit */ 0, [mkSpanFrom(lp_2.Span, TokenStream__Next(stream).Span)]);
                 }
                 else {
                     const first_4 = parseExpr();
-                    if (TokenStream__Match_5CEB78CD(stream, new TokenKind(34, []))) {
+                    if (TokenStream__Match_5CEB78CD(stream, TokenKind.Comma)) {
                         const elements_2 = [];
                         void (elements_2.push(first_4));
                         void (elements_2.push(parseExpr()));
-                        while (TokenStream__Match_5CEB78CD(stream, new TokenKind(34, []))) {
+                        while (TokenStream__Match_5CEB78CD(stream, TokenKind.Comma)) {
                             void (elements_2.push(parseExpr()));
                         }
-                        const rp_4 = TokenStream__Expect_77B9EE56(stream, new TokenKind(28, []), "Expected \')\' after tuple expression");
-                        return new Expr(15, [toList(elements_2), mkSpanFrom(lp_2.Span, rp_4.Span)]);
+                        const rp_4 = TokenStream__Expect_77B9EE56(stream, TokenKind.RParen, "Expected \')\' after tuple expression");
+                        return new Expr(/* ETuple */ 15, [toList(elements_2), mkSpanFrom(lp_2.Span, rp_4.Span)]);
                     }
                     else {
-                        return new Expr(3, [first_4, mkSpanFrom(lp_2.Span, TokenStream__Expect_77B9EE56(stream, new TokenKind(28, []), "Expected \')\' after expression").Span)]);
+                        return new Expr(/* EParen */ 3, [first_4, mkSpanFrom(lp_2.Span, TokenStream__Expect_77B9EE56(stream, TokenKind.RParen, "Expected \')\' after expression").Span)]);
                     }
                 }
             }
@@ -1158,24 +1158,24 @@ export function parseProgramWithSourceName(sourceName, src) {
                     throw new ParseException(new ParseError("Opening \'[\' cannot be on its own line; keep it with the first element", lb_3.Span));
                 }
                 consumeLayoutSeparators();
-                if (TokenStream__Match_5CEB78CD(stream, new TokenKind(30, []))) {
-                    return new Expr(13, [empty(), mkSpanFrom(lb_3.Span, lb_3.Span)]);
+                if (TokenStream__Match_5CEB78CD(stream, TokenKind.RBracket)) {
+                    return new Expr(/* EList */ 13, [empty(), mkSpanFrom(lb_3.Span, lb_3.Span)]);
                 }
                 else {
                     const first_5 = parseEntryExpr();
-                    if (TokenStream__Match_5CEB78CD(stream, new TokenKind(37, []))) {
+                    if (TokenStream__Match_5CEB78CD(stream, TokenKind.RangeDots)) {
                         const second = parseEntryExpr();
-                        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(33, [])) ? true : TokenStream__Match_5CEB78CD(stream, new TokenKind(37, []))) {
+                        if (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon) ? true : TokenStream__Match_5CEB78CD(stream, TokenKind.RangeDots)) {
                             throw new ParseException(new ParseError("Invalid range syntax", TokenStream__Peek(stream).Span));
                         }
-                        return new Expr(14, [first_5, second, mkSpanFrom(lb_3.Span, TokenStream__Expect_77B9EE56(stream, new TokenKind(30, []), "Expected \']\' in range expression").Span)]);
+                        return new Expr(/* ERange */ 14, [first_5, second, mkSpanFrom(lb_3.Span, TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' in range expression").Span)]);
                     }
                     else {
                         const elements_3 = [];
                         void (elements_3.push(first_5));
                         let keepParsing = true;
                         while (keepParsing) {
-                            if ((TokenStream__Match_5CEB78CD(stream, new TokenKind(33, [])) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, new TokenKind(30, []))) {
+                            if ((TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, TokenKind.RBracket)) {
                                 void (elements_3.push(parseEntryExpr()));
                             }
                             else {
@@ -1183,11 +1183,11 @@ export function parseProgramWithSourceName(sourceName, src) {
                             }
                         }
                         const rbIndex_6 = TokenStream__get_Index(stream) | 0;
-                        const rb_7 = TokenStream__Expect_77B9EE56(stream, new TokenKind(30, []), "Expected \']\' in list literal");
+                        const rb_7 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' in list literal");
                         if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_6, rb_7.Span.Start.Line)) {
                             throw new ParseException(new ParseError("Closing \']\' cannot be on its own line; keep it with the last element", rb_7.Span));
                         }
-                        return new Expr(13, [toList(elements_3), mkSpanFrom(lb_3.Span, rb_7.Span)]);
+                        return new Expr(/* EList */ 13, [toList(elements_3), mkSpanFrom(lb_3.Span, rb_7.Span)]);
                     }
                 }
             }
@@ -1198,18 +1198,18 @@ export function parseProgramWithSourceName(sourceName, src) {
                     throw new ParseException(new ParseError("Opening \'{\' cannot be on its own line; keep it with the first entry", lb_4.Span));
                 }
                 consumeLayoutSeparators();
-                if (TokenStream__Match_5CEB78CD(stream, new TokenKind(44, []))) {
-                    return new Expr(18, [empty(), mkSpanFrom(lb_4.Span, lb_4.Span)]);
+                if (TokenStream__Match_5CEB78CD(stream, TokenKind.RBrace)) {
+                    return new Expr(/* EMap */ 18, [empty(), mkSpanFrom(lb_4.Span, lb_4.Span)]);
                 }
-                else if (TokenStream__Match_5CEB78CD(stream, new TokenKind(26, []))) {
-                    if (equals(TokenStream__Peek(stream).Kind, new TokenKind(26, []))) {
+                else if (TokenStream__Match_5CEB78CD(stream, TokenKind.Bar)) {
+                    if (equals(TokenStream__Peek(stream).Kind, TokenKind.Bar)) {
                         throw new ParseException(new ParseError("Structural record literal must define at least one field", TokenStream__Peek(stream).Span));
                     }
                     const mark_1 = TokenStream__Mark(stream) | 0;
                     let matchValue_24;
                     const baseExpr = parseExpr();
                     TokenStream__SkipNewlines(stream);
-                    if (!TokenStream__Match_5CEB78CD(stream, new TokenKind(15, []))) {
+                    if (!TokenStream__Match_5CEB78CD(stream, TokenKind.With)) {
                         TokenStream__Restore_Z524259A4(stream, mark_1);
                         matchValue_24 = undefined;
                     }
@@ -1220,27 +1220,27 @@ export function parseProgramWithSourceName(sourceName, src) {
                             const matchValue_23 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected field name in structural record update").Kind;
                             name_8 = ((matchValue_23.tag === 4) ? matchValue_23.fields[0] : "");
                             TokenStream__SkipNewlines(stream);
-                            TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in structural record update field");
+                            TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in structural record update field");
                             const value_40 = parseEntryExpr();
                             void (updates.push([name_8, value_40]));
                         };
                         parseUpdateField();
                         let keepParsing_1 = true;
                         while (keepParsing_1) {
-                            if ((TokenStream__Match_5CEB78CD(stream, new TokenKind(33, [])) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, new TokenKind(26, []))) {
+                            if ((TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, TokenKind.Bar)) {
                                 parseUpdateField();
                             }
                             else {
                                 keepParsing_1 = false;
                             }
                         }
-                        TokenStream__Expect_77B9EE56(stream, new TokenKind(26, []), "Expected \'|\' in structural record update");
+                        TokenStream__Expect_77B9EE56(stream, TokenKind.Bar, "Expected \'|\' in structural record update");
                         const rbIndex_7 = TokenStream__get_Index(stream) | 0;
-                        const rb_8 = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in structural record update");
+                        const rb_8 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in structural record update");
                         if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_7, rb_8.Span.Start.Line)) {
                             throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_8.Span));
                         }
-                        matchValue_24 = (new Expr(20, [baseExpr, toList(updates), mkSpanFrom(lb_4.Span, rb_8.Span)]));
+                        matchValue_24 = (new Expr(/* EStructuralRecordUpdate */ 20, [baseExpr, toList(updates), mkSpanFrom(lb_4.Span, rb_8.Span)]));
                     }
                     if (matchValue_24 == null) {
                         const fields_6 = [];
@@ -1249,59 +1249,59 @@ export function parseProgramWithSourceName(sourceName, src) {
                             const matchValue_25 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected field name in structural record literal").Kind;
                             name_9 = ((matchValue_25.tag === 4) ? matchValue_25.fields[0] : "");
                             TokenStream__SkipNewlines(stream);
-                            TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in structural record field");
+                            TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in structural record field");
                             const value_44 = parseEntryExpr();
                             void (fields_6.push([name_9, value_44]));
                         };
                         parseField_3();
                         let keepParsing_2 = true;
                         while (keepParsing_2) {
-                            if ((TokenStream__Match_5CEB78CD(stream, new TokenKind(33, [])) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, new TokenKind(26, []))) {
+                            if ((TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, TokenKind.Bar)) {
                                 parseField_3();
                             }
                             else {
                                 keepParsing_2 = false;
                             }
                         }
-                        TokenStream__Expect_77B9EE56(stream, new TokenKind(26, []), "Expected \'|\' in structural record literal");
+                        TokenStream__Expect_77B9EE56(stream, TokenKind.Bar, "Expected \'|\' in structural record literal");
                         const rbIndex_8 = TokenStream__get_Index(stream) | 0;
-                        const rb_9 = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in structural record literal");
+                        const rb_9 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in structural record literal");
                         if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_8, rb_9.Span.Start.Line)) {
                             throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_9.Span));
                         }
-                        return new Expr(17, [toList(fields_6), mkSpanFrom(lb_4.Span, rb_9.Span)]);
+                        return new Expr(/* EStructuralRecord */ 17, [toList(fields_6), mkSpanFrom(lb_4.Span, rb_9.Span)]);
                     }
                     else {
                         return matchValue_24;
                     }
                 }
-                else if (equals(TokenStream__Peek(stream).Kind, new TokenKind(29, [])) ? true : equals(TokenStream__Peek(stream).Kind, new TokenKind(37, []))) {
+                else if (equals(TokenStream__Peek(stream).Kind, TokenKind.LBracket) ? true : equals(TokenStream__Peek(stream).Kind, TokenKind.RangeDots)) {
                     const parseMapEntry = () => {
-                        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(37, []))) {
-                            return new MapEntry(1, [parseEntryExpr()]);
+                        if (TokenStream__Match_5CEB78CD(stream, TokenKind.RangeDots)) {
+                            return new MapEntry(/* MESpread */ 1, [parseEntryExpr()]);
                         }
                         else {
-                            TokenStream__Expect_77B9EE56(stream, new TokenKind(29, []), "Expected \'[\' in map entry key");
+                            TokenStream__Expect_77B9EE56(stream, TokenKind.LBracket, "Expected \'[\' in map entry key");
                             const keyExpr = parseExpr();
-                            TokenStream__Expect_77B9EE56(stream, new TokenKind(30, []), "Expected \']\' after map entry key");
+                            TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' after map entry key");
                             TokenStream__SkipNewlines(stream);
-                            TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in map entry");
-                            return new MapEntry(0, [keyExpr, parseEntryExpr()]);
+                            TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in map entry");
+                            return new MapEntry(/* MEKeyValue */ 0, [keyExpr, parseEntryExpr()]);
                         }
                     };
                     const entries = [];
                     void (entries.push(parseMapEntry()));
                     let keepParsing_3 = true;
                     while (keepParsing_3) {
-                        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(33, [])) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) {
-                            if (equals(TokenStream__Peek(stream).Kind, new TokenKind(44, []))) {
+                        if (TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) {
+                            if (equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace)) {
                                 keepParsing_3 = false;
                             }
                             else {
                                 void (entries.push(parseMapEntry()));
                             }
                         }
-                        else if (equals(TokenStream__Peek(stream).Kind, new TokenKind(44, []))) {
+                        else if (equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace)) {
                             keepParsing_3 = false;
                         }
                         else {
@@ -1309,18 +1309,18 @@ export function parseProgramWithSourceName(sourceName, src) {
                         }
                     }
                     const rbIndex_9 = TokenStream__get_Index(stream) | 0;
-                    const rb_10 = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in map literal");
+                    const rb_10 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in map literal");
                     if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_9, rb_10.Span.Start.Line)) {
                         throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_10.Span));
                     }
-                    return new Expr(18, [toList(entries), mkSpanFrom(lb_4.Span, rb_10.Span)]);
+                    return new Expr(/* EMap */ 18, [toList(entries), mkSpanFrom(lb_4.Span, rb_10.Span)]);
                 }
                 else {
                     const mark_2 = TokenStream__Mark(stream) | 0;
                     let matchValue_27;
                     const baseExpr_1 = parseExpr();
                     TokenStream__SkipNewlines(stream);
-                    if (!TokenStream__Match_5CEB78CD(stream, new TokenKind(15, []))) {
+                    if (!TokenStream__Match_5CEB78CD(stream, TokenKind.With)) {
                         TokenStream__Restore_Z524259A4(stream, mark_2);
                         matchValue_27 = undefined;
                     }
@@ -1331,14 +1331,14 @@ export function parseProgramWithSourceName(sourceName, src) {
                             const matchValue_26 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected field name in record update").Kind;
                             name_10 = ((matchValue_26.tag === 4) ? matchValue_26.fields[0] : "");
                             TokenStream__SkipNewlines(stream);
-                            TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in record update field");
+                            TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in record update field");
                             const value_53 = parseEntryExpr();
                             void (updates_1.push([name_10, value_53]));
                         };
                         parseUpdateField_1();
                         let keepParsing_4 = true;
                         while (keepParsing_4) {
-                            if ((TokenStream__Match_5CEB78CD(stream, new TokenKind(33, [])) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, new TokenKind(44, []))) {
+                            if ((TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace)) {
                                 parseUpdateField_1();
                             }
                             else {
@@ -1346,11 +1346,11 @@ export function parseProgramWithSourceName(sourceName, src) {
                             }
                         }
                         const rbIndex_10 = TokenStream__get_Index(stream) | 0;
-                        const rb_11 = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in record update");
+                        const rb_11 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in record update");
                         if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_10, rb_11.Span.Start.Line)) {
                             throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_11.Span));
                         }
-                        matchValue_27 = (new Expr(19, [baseExpr_1, toList(updates_1), mkSpanFrom(lb_4.Span, rb_11.Span)]));
+                        matchValue_27 = (new Expr(/* ERecordUpdate */ 19, [baseExpr_1, toList(updates_1), mkSpanFrom(lb_4.Span, rb_11.Span)]));
                     }
                     if (matchValue_27 == null) {
                         const fields_7 = [];
@@ -1359,14 +1359,14 @@ export function parseProgramWithSourceName(sourceName, src) {
                             const matchValue_28 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected field name in record literal").Kind;
                             name_11 = ((matchValue_28.tag === 4) ? matchValue_28.fields[0] : "");
                             TokenStream__SkipNewlines(stream);
-                            TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in record field");
+                            TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in record field");
                             const value_56 = parseEntryExpr();
                             void (fields_7.push([name_11, value_56]));
                         };
                         parseField_4();
                         let keepParsing_5 = true;
                         while (keepParsing_5) {
-                            if ((TokenStream__Match_5CEB78CD(stream, new TokenKind(33, [])) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, new TokenKind(44, []))) {
+                            if ((TokenStream__Match_5CEB78CD(stream, TokenKind.Semicolon) ? ((void consumeLayoutSeparators(), true)) : consumeLayoutSeparators()) && !equals(TokenStream__Peek(stream).Kind, TokenKind.RBrace)) {
                                 parseField_4();
                             }
                             else {
@@ -1374,11 +1374,11 @@ export function parseProgramWithSourceName(sourceName, src) {
                             }
                         }
                         const rbIndex_11 = TokenStream__get_Index(stream) | 0;
-                        const rb_12 = TokenStream__Expect_77B9EE56(stream, new TokenKind(44, []), "Expected \'}\' in record literal");
+                        const rb_12 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in record literal");
                         if (!hasNonLayoutTokenBeforeOnSameLine(rbIndex_11, rb_12.Span.Start.Line)) {
                             throw new ParseException(new ParseError("Closing \'}\' cannot be on its own line; keep it with the last entry", rb_12.Span));
                         }
-                        return new Expr(16, [toList(fields_7), mkSpanFrom(lb_4.Span, rb_12.Span)]);
+                        return new Expr(/* ERecord */ 16, [toList(fields_7), mkSpanFrom(lb_4.Span, rb_12.Span)]);
                     }
                     else {
                         return matchValue_27;
@@ -1394,7 +1394,7 @@ export function parseProgramWithSourceName(sourceName, src) {
             case 21: {
                 const raiseTok = TokenStream__Next(stream);
                 const value_58 = parsePrimary();
-                return new Expr(7, [value_58, mkSpanFrom(raiseTok.Span, Ast_spanOfExpr(value_58))]);
+                return new Expr(/* ERaise */ 7, [value_58, mkSpanFrom(raiseTok.Span, Ast_spanOfExpr(value_58))]);
             }
             case 22:
                 return parseFor();
@@ -1403,12 +1403,12 @@ export function parseProgramWithSourceName(sourceName, src) {
             case 46: {
                 const t_10 = TokenStream__Next(stream);
                 const nameTok_10 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected type name after \'typeof\'");
-                return new Expr(28, [(matchValue_29 = nameTok_10.Kind, (matchValue_29.tag === 4) ? matchValue_29.fields[0] : ""), mkSpanFrom(t_10.Span, nameTok_10.Span)]);
+                return new Expr(/* ETypeOf */ 28, [(matchValue_29 = nameTok_10.Kind, (matchValue_29.tag === 4) ? matchValue_29.fields[0] : ""), mkSpanFrom(t_10.Span, nameTok_10.Span)]);
             }
             case 47: {
                 const t_11 = TokenStream__Next(stream);
                 const nameTok_11 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'nameof\'");
-                return new Expr(29, [(matchValue_30 = nameTok_11.Kind, (matchValue_30.tag === 4) ? matchValue_30.fields[0] : ""), mkSpanFrom(t_11.Span, nameTok_11.Span)]);
+                return new Expr(/* ENameOf */ 29, [(matchValue_30 = nameTok_11.Kind, (matchValue_30.tag === 4) ? matchValue_30.fields[0] : ""), mkSpanFrom(t_11.Span, nameTok_11.Span)]);
             }
             case 2:
                 throw new ParseException(new ParseError("Indentation error: unexpected indent in expression", t_6.Span));
@@ -1422,21 +1422,23 @@ export function parseProgramWithSourceName(sourceName, src) {
         let expr_3 = parsePrimary();
         let keepGoing_1 = true;
         while (keepGoing_1) {
-            if (TokenStream__Match_5CEB78CD(stream, new TokenKind(36, []))) {
+            if (TokenStream__Match_5CEB78CD(stream, TokenKind.Dot)) {
                 const fieldTok_1 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected field name after \'.\'");
                 let fieldName_3;
                 const matchValue_31 = fieldTok_1.Kind;
                 fieldName_3 = ((matchValue_31.tag === 4) ? matchValue_31.fields[0] : "");
-                expr_3 = (new Expr(21, [expr_3, fieldName_3, mkSpanFrom(Ast_spanOfExpr(expr_3), fieldTok_1.Span)]));
+                expr_3 = (new Expr(/* EFieldGet */ 21, [expr_3, fieldName_3, mkSpanFrom(Ast_spanOfExpr(expr_3), fieldTok_1.Span)]));
             }
-            else if (equals(TokenStream__Peek(stream).Kind, new TokenKind(29, []))) {
+            else if (equals(TokenStream__Peek(stream).Kind, TokenKind.LBracket)) {
                 const lb_5 = TokenStream__Peek(stream);
                 const targetSpan = Ast_spanOfExpr(expr_3);
-                if (((lb_5.Span.Start.Line === targetSpan.End.Line) && (lb_5.Span.Start.Column === targetSpan.End.Column)) && !equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, new TokenKind(30, []))) {
+                const isAdjacent = (lb_5.Span.Start.Line === targetSpan.End.Line) && (lb_5.Span.Start.Column === targetSpan.End.Column);
+                const hasIndexerPayload = !equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.RBracket);
+                if (isAdjacent && hasIndexerPayload) {
                     TokenStream__Next(stream);
                     const keyExpr_1 = parseExpr();
-                    const rb_13 = TokenStream__Expect_77B9EE56(stream, new TokenKind(30, []), "Expected \']\' after index expression");
-                    expr_3 = (new Expr(22, [expr_3, keyExpr_1, mkSpanFrom(targetSpan, rb_13.Span)]));
+                    const rb_13 = TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' after index expression");
+                    expr_3 = (new Expr(/* EIndexGet */ 22, [expr_3, keyExpr_1, mkSpanFrom(targetSpan, rb_13.Span)]));
                 }
                 else {
                     keepGoing_1 = false;
@@ -1456,24 +1458,24 @@ export function parseProgramWithSourceName(sourceName, src) {
             const next_2 = TokenStream__Peek(stream);
             if ((next_2.Span.Start.Line === Ast_spanOfExpr(expr_4).End.Line) && isStartAtom(next_2.Kind)) {
                 const arg_1 = parsePostfix();
-                expr_4 = (new Expr(5, [expr_4, arg_1, mkSpanFrom(Ast_spanOfExpr(expr_4), Ast_spanOfExpr(arg_1))]));
+                expr_4 = (new Expr(/* EApply */ 5, [expr_4, arg_1, mkSpanFrom(Ast_spanOfExpr(expr_4), Ast_spanOfExpr(arg_1))]));
             }
             else {
                 const mark_3 = TokenStream__Mark(stream) | 0;
                 let sawNewline_3 = false;
-                while (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
+                while (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
                     sawNewline_3 = true;
                 }
                 if (sawNewline_3 && allowIndentedApplication) {
-                    if (TokenStream__Match_5CEB78CD(stream, new TokenKind(2, []))) {
+                    if (TokenStream__Match_5CEB78CD(stream, TokenKind.Indent)) {
                         hasMultilineArgBlock = true;
                     }
                     const candidate = TokenStream__Peek(stream);
                     if ((candidate.Span.Start.Column > Ast_spanOfExpr(expr_4).Start.Column) && isStartAtom(candidate.Kind)) {
                         const arg_2 = parsePostfix();
-                        expr_4 = (new Expr(5, [expr_4, arg_2, mkSpanFrom(Ast_spanOfExpr(expr_4), Ast_spanOfExpr(arg_2))]));
+                        expr_4 = (new Expr(/* EApply */ 5, [expr_4, arg_2, mkSpanFrom(Ast_spanOfExpr(expr_4), Ast_spanOfExpr(arg_2))]));
                     }
-                    else if (hasMultilineArgBlock && equals(candidate.Kind, new TokenKind(3, []))) {
+                    else if (hasMultilineArgBlock && equals(candidate.Kind, TokenKind.Dedent)) {
                         TokenStream__Next(stream);
                         hasMultilineArgBlock = false;
                         keepGoing_2 = false;
@@ -1530,7 +1532,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                 while (continueLoop) {
                     TokenStream__SkipNewlines(stream);
                     const mark_4 = TokenStream__Mark(stream) | 0;
-                    if (TokenStream__Match_5CEB78CD(stream, new TokenKind(3, []))) {
+                    if (TokenStream__Match_5CEB78CD(stream, TokenKind.Dedent)) {
                         if (precedence(TokenStream__Peek(stream).Kind) >= minPrec) {
                         }
                         else {
@@ -1548,7 +1550,7 @@ export function parseProgramWithSourceName(sourceName, src) {
             if (prec >= minPrec) {
                 const opTok = TokenStream__Next(stream);
                 const right_2 = parseBinary(prec + 1);
-                left_2 = (new Expr(25, [(op_1 = opTok.Kind, (op_1.tag === 49) ? "+" : ((op_1.tag === 50) ? "-" : ((op_1.tag === 51) ? "*" : ((op_1.tag === 52) ? "/" : ((op_1.tag === 53) ? "%" : ((op_1.tag === 25) ? "=" : ((op_1.tag === 54) ? "<" : ((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) ? "@" : "?"))))))))))))))), left_2, right_2, mkSpanFrom(Ast_spanOfExpr(left_2), Ast_spanOfExpr(right_2))]));
+                left_2 = (new Expr(/* EBinOp */ 25, [(op_1 = opTok.Kind, (op_1.tag === 49) ? "+" : ((op_1.tag === 50) ? "-" : ((op_1.tag === 51) ? "*" : ((op_1.tag === 52) ? "/" : ((op_1.tag === 53) ? "%" : ((op_1.tag === 25) ? "=" : ((op_1.tag === 54) ? "<" : ((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) ? "@" : "?"))))))))))))))), left_2, right_2, mkSpanFrom(Ast_spanOfExpr(left_2), Ast_spanOfExpr(right_2))]));
             }
             else {
                 looping = false;
@@ -1556,14 +1558,14 @@ export function parseProgramWithSourceName(sourceName, src) {
         }
         return left_2;
     };
-    const parseIf = () => parseIfAfterKeyword(TokenStream__Expect_77B9EE56(stream, new TokenKind(17, []), "Expected \'if\'").Span);
+    const parseIf = () => parseIfAfterKeyword(TokenStream__Expect_77B9EE56(stream, TokenKind.If, "Expected \'if\'").Span);
     const parseIfAfterKeyword = (startSpan) => {
         const cond = parseExpr();
         TokenStream__SkipNewlines(stream);
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(18, []), "Expected \'then\'");
+        TokenStream__Expect_77B9EE56(stream, TokenKind.Then, "Expected \'then\'");
         const thenExpr = parseExprOrBlock();
         TokenStream__SkipNewlines(stream);
-        while (TokenStream__Match_5CEB78CD(stream, new TokenKind(3, []))) {
+        while (TokenStream__Match_5CEB78CD(stream, TokenKind.Dedent)) {
             TokenStream__SkipNewlines(stream);
         }
         let elseExpr;
@@ -1581,10 +1583,10 @@ export function parseProgramWithSourceName(sourceName, src) {
             default:
                 throw new ParseException(new ParseError("Expected \'else\' or \'elif\'", TokenStream__Peek(stream).Span));
         }
-        return new Expr(6, [cond, thenExpr, elseExpr, mkSpanFrom(startSpan, Ast_spanOfExpr(elseExpr))]);
+        return new Expr(/* EIf */ 6, [cond, thenExpr, elseExpr, mkSpanFrom(startSpan, Ast_spanOfExpr(elseExpr))]);
     };
     const parseFor = () => {
-        const forTok = TokenStream__Expect_77B9EE56(stream, new TokenKind(22, []), "Expected \'for\'");
+        const forTok = TokenStream__Expect_77B9EE56(stream, TokenKind.For, "Expected \'for\'");
         let name_14;
         const matchValue_33 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'for\'").Kind;
         name_14 = ((matchValue_33.tag === 4) ? matchValue_33.fields[0] : "");
@@ -1638,10 +1640,10 @@ export function parseProgramWithSourceName(sourceName, src) {
             }
         }
         const body = parseExprOrBlock();
-        return new Expr(8, [name_14, source_19, body, mkSpanFrom(forTok.Span, Ast_spanOfExpr(body))]);
+        return new Expr(/* EFor */ 8, [name_14, source_19, body, mkSpanFrom(forTok.Span, Ast_spanOfExpr(body))]);
     };
     const parseLambda = () => {
-        const funTok = TokenStream__Expect_77B9EE56(stream, new TokenKind(13, []), "Expected \'fun\'");
+        const funTok = TokenStream__Expect_77B9EE56(stream, TokenKind.Fun, "Expected \'fun\'");
         const parameters = [];
         let doneParams = false;
         while (!doneParams) {
@@ -1661,23 +1663,23 @@ export function parseProgramWithSourceName(sourceName, src) {
             throw new ParseException(new ParseError("Expected at least one lambda parameter", TokenStream__Peek(stream).Span));
         }
         TokenStream__SkipNewlines(stream);
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(24, []), "Expected \'->\' in lambda");
-        return foldBack_1((param_1, acc) => (new Expr(4, [param_1, acc, mkSpanFrom(funTok.Span, Ast_spanOfExpr(acc))])), parameters, parseExprOrBlock());
+        TokenStream__Expect_77B9EE56(stream, TokenKind.Arrow, "Expected \'->\' in lambda");
+        return foldBack_1((param_1, acc) => (new Expr(/* ELambda */ 4, [param_1, acc, mkSpanFrom(funTok.Span, Ast_spanOfExpr(acc))])), parameters, parseExprOrBlock());
     };
     const parseMatch = () => {
-        const matchTok = TokenStream__Expect_77B9EE56(stream, new TokenKind(14, []), "Expected \'match\'");
+        const matchTok = TokenStream__Expect_77B9EE56(stream, TokenKind.Match, "Expected \'match\'");
         const expr_5 = parseExpr();
         TokenStream__SkipNewlines(stream);
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(15, []), "Expected \'with\' in match");
+        TokenStream__Expect_77B9EE56(stream, TokenKind.With, "Expected \'with\' in match");
         const cases_2 = [];
         const parseCase_1 = () => {
             TokenStream__SkipNewlines(stream);
-            if (TokenStream__Match_5CEB78CD(stream, new TokenKind(26, []))) {
+            if (TokenStream__Match_5CEB78CD(stream, TokenKind.Bar)) {
             }
             const pat = parsePatternCons();
             TokenStream__SkipNewlines(stream);
             let guard;
-            if (TokenStream__Match_5CEB78CD(stream, new TokenKind(16, []))) {
+            if (TokenStream__Match_5CEB78CD(stream, TokenKind.When)) {
                 const g = parseExpr();
                 TokenStream__SkipNewlines(stream);
                 guard = g;
@@ -1685,17 +1687,17 @@ export function parseProgramWithSourceName(sourceName, src) {
             else {
                 guard = undefined;
             }
-            TokenStream__Expect_77B9EE56(stream, new TokenKind(24, []), "Expected \'->\' in match case");
+            TokenStream__Expect_77B9EE56(stream, TokenKind.Arrow, "Expected \'->\' in match case");
             const body_2 = parseExprOrBlock();
             const span_1 = mkSpanFrom(Ast_spanOfPattern(pat), Ast_spanOfExpr(body_2));
             void (cases_2.push([pat, guard, body_2, span_1]));
         };
-        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
-            while (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
+        if (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
+            while (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
             }
-            const hasIndentedCaseBlock = TokenStream__Match_5CEB78CD(stream, new TokenKind(2, []));
+            const hasIndentedCaseBlock = TokenStream__Match_5CEB78CD(stream, TokenKind.Indent);
             const firstCaseToken = TokenStream__Peek(stream);
-            if (equals(firstCaseToken.Kind, new TokenKind(0, [])) ? true : equals(firstCaseToken.Kind, new TokenKind(3, []))) {
+            if (equals(firstCaseToken.Kind, TokenKind.EOF) ? true : equals(firstCaseToken.Kind, TokenKind.Dedent)) {
                 throw new ParseException(new ParseError("Expected match case", firstCaseToken.Span));
             }
             const caseColumn = firstCaseToken.Span.Start.Column | 0;
@@ -1784,15 +1786,15 @@ export function parseProgramWithSourceName(sourceName, src) {
                 }
             }
         }
-        return new Expr(9, [expr_5, toList(cases_2), mkSpanFrom(matchTok.Span, Ast_spanOfExpr(expr_5))]);
+        return new Expr(/* EMatch */ 9, [expr_5, toList(cases_2), mkSpanFrom(matchTok.Span, Ast_spanOfExpr(expr_5))]);
     };
     const parseLetExpr = () => {
-        let matchValue_41, pattern_2;
-        const letTok = TokenStream__Expect_77B9EE56(stream, new TokenKind(10, []), "Expected \'let\'");
-        const isRec_1 = TokenStream__Match_5CEB78CD(stream, new TokenKind(11, []));
+        let matchValue_41;
+        const letTok = TokenStream__Expect_77B9EE56(stream, TokenKind.Let, "Expected \'let\'");
+        const isRec_1 = TokenStream__Match_5CEB78CD(stream, TokenKind.Rec);
         let patternInput_2;
         if (isRec_1) {
-            if (equals(TokenStream__Peek(stream).Kind, new TokenKind(27, []))) {
+            if (equals(TokenStream__Peek(stream).Kind, TokenKind.LParen)) {
                 throw new ParseException(new ParseError("\'let rec\' does not support pattern bindings", TokenStream__Peek(stream).Span));
             }
             const nameTok_13 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'let\'");
@@ -1825,7 +1827,7 @@ export function parseProgramWithSourceName(sourceName, src) {
         const args_2 = patternInput_2[1];
         TokenStream__SkipNewlines(stream);
         let returnAnnotation;
-        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(35, []))) {
+        if (TokenStream__Match_5CEB78CD(stream, TokenKind.Colon)) {
             if (args_2.length === 0) {
                 throw new ParseException(new ParseError("Return type annotations are only supported on function let bindings", TokenStream__Peek(stream).Span));
             }
@@ -1834,10 +1836,10 @@ export function parseProgramWithSourceName(sourceName, src) {
         else {
             returnAnnotation = undefined;
         }
-        if (equals(TokenStream__Peek(stream).Kind, new TokenKind(35, []))) {
+        if (equals(TokenStream__Peek(stream).Kind, TokenKind.Colon)) {
             throw new ParseException(new ParseError("Annotated parameters must be parenthesized as (x: T)", TokenStream__Peek(stream).Span));
         }
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in let binding");
+        TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in let binding");
         const value_70 = parseExprOrBlock();
         if (isRec_1) {
             const bindings = [];
@@ -1846,7 +1848,7 @@ export function parseProgramWithSourceName(sourceName, src) {
             let doneBindings = false;
             while (!doneBindings) {
                 TokenStream__SkipNewlines(stream);
-                if (TokenStream__Match_5CEB78CD(stream, new TokenKind(12, []))) {
+                if (TokenStream__Match_5CEB78CD(stream, TokenKind.And)) {
                     const nextNameTok = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'and\'");
                     let nextName;
                     const matchValue_42 = nextNameTok.Kind;
@@ -1856,11 +1858,11 @@ export function parseProgramWithSourceName(sourceName, src) {
                         throw new ParseException(new ParseError("\'let rec ... and ...\' requires function arguments for each binding", nextNameTok.Span));
                     }
                     TokenStream__SkipNewlines(stream);
-                    const nextReturnAnnotation = TokenStream__Match_5CEB78CD(stream, new TokenKind(35, [])) ? parseTypeRef() : undefined;
-                    if (equals(TokenStream__Peek(stream).Kind, new TokenKind(35, []))) {
+                    const nextReturnAnnotation = TokenStream__Match_5CEB78CD(stream, TokenKind.Colon) ? parseTypeRef() : undefined;
+                    if (equals(TokenStream__Peek(stream).Kind, TokenKind.Colon)) {
                         throw new ParseException(new ParseError("Annotated parameters must be parenthesized as (x: T)", TokenStream__Peek(stream).Span));
                     }
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in let binding");
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in let binding");
                     const nextValue = parseExprOrBlock();
                     const nextSpan = mkSpanFrom(nextNameTok.Span, Ast_spanOfExpr(nextValue));
                     void (bindings.push([nextName, toList(nextArgs), nextReturnAnnotation, nextValue, nextSpan]));
@@ -1895,10 +1897,10 @@ export function parseProgramWithSourceName(sourceName, src) {
                         body_3 = parseExprOrBlock();
                     }
                     if (bindings.length === 1) {
-                        return new Expr(10, [bindingName, foldBack_1((arg_3, acc_1) => (new Expr(4, [arg_3, acc_1, Ast_spanOfExpr(acc_1)])), args_2, value_70), body_3, true, returnAnnotation, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_3))]);
+                        return new Expr(/* ELet */ 10, [bindingName, foldBack_1((arg_3, acc_1) => (new Expr(/* ELambda */ 4, [arg_3, acc_1, Ast_spanOfExpr(acc_1)])), args_2, value_70), body_3, true, returnAnnotation, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_3))]);
                     }
                     else {
-                        return new Expr(12, [toList(bindings), body_3, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_3))]);
+                        return new Expr(/* ELetRecGroup */ 12, [toList(bindings), body_3, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_3))]);
                     }
                 }
             }
@@ -1930,15 +1932,15 @@ export function parseProgramWithSourceName(sourceName, src) {
                         body_4 = parseExprOrBlock();
                     }
                     if (tuplePatternOpt == null) {
-                        return new Expr(10, [bindingName, foldBack_1((arg_4, acc_2) => (new Expr(4, [arg_4, acc_2, Ast_spanOfExpr(acc_2)])), args_2, value_70), body_4, false, returnAnnotation, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_4))]);
+                        return new Expr(/* ELet */ 10, [bindingName, foldBack_1((arg_4, acc_2) => (new Expr(/* ELambda */ 4, [arg_4, acc_2, Ast_spanOfExpr(acc_2)])), args_2, value_70), body_4, false, returnAnnotation, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_4))]);
                     }
-                    else if ((pattern_2 = tuplePatternOpt, args_2.length > 0)) {
+                    else if (args_2.length > 0) {
                         const pattern_3 = tuplePatternOpt;
                         throw new ParseException(new ParseError("Tuple let binding cannot take function parameters", Ast_spanOfPattern(pattern_3)));
                     }
                     else {
                         const pattern_4 = tuplePatternOpt;
-                        return new Expr(11, [pattern_4, value_70, body_4, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_4))]);
+                        return new Expr(/* ELetPattern */ 11, [pattern_4, value_70, body_4, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_4))]);
                     }
                 }
             }
@@ -1946,10 +1948,10 @@ export function parseProgramWithSourceName(sourceName, src) {
     };
     const parseExprOrBlock = () => {
         let sawNewline_4 = false;
-        while (TokenStream__Match_5CEB78CD(stream, new TokenKind(1, []))) {
+        while (TokenStream__Match_5CEB78CD(stream, TokenKind.Newline)) {
             sawNewline_4 = true;
         }
-        if (sawNewline_4 && TokenStream__Match_5CEB78CD(stream, new TokenKind(2, []))) {
+        if (sawNewline_4 && TokenStream__Match_5CEB78CD(stream, TokenKind.Indent)) {
             return parseBlock();
         }
         else {
@@ -1994,7 +1996,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     break;
                 }
                 case 38: {
-                    if (equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, new TokenKind(39, [])) ? true : equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, new TokenKind(41, []))) {
+                    if (equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Import) ? true : equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Include)) {
                         matchResult_8 = 5;
                     }
                     else {
@@ -2003,7 +2005,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     break;
                 }
                 case 29: {
-                    if (equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, new TokenKind(54, []))) {
+                    if (equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Less)) {
                         matchResult_8 = 7;
                     }
                     else {
@@ -2037,7 +2039,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                         }
                     };
                     const nextSignificant = findNextNonLayout(0);
-                    const next_4 = TokenStream__Peek(stream);
+                    TokenStream__Peek(stream);
                     if (!((blockStatementColumn == null) ? false : ((col = (blockStatementColumn | 0), (matchValue_49 = nextSignificant.Kind, (matchValue_49.tag === 0) ? false : ((matchValue_49.tag === 3) ? false : ((matchValue_49.tag === 28) ? false : ((matchValue_49.tag === 30) ? false : ((matchValue_49.tag === 44) ? false : (nextSignificant.Span.Start.Column >= col)))))))))) {
                         doneBlock = true;
                     }
@@ -2079,7 +2081,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                         blockStatementColumn = TokenStream__Peek(stream).Span.Start.Column;
                     }
                     const expr_6 = parseExpr();
-                    void (statements.push(new Stmt(5, [expr_6])));
+                    void (statements.push(new Stmt(/* SExpr */ 5, [expr_6])));
                     break;
                 }
             }
@@ -2095,9 +2097,9 @@ export function parseProgramWithSourceName(sourceName, src) {
                             throw new ParseException(new ParseError("Block cannot end with a let binding; add a final expression", head_1(stmts).fields[6]));
                         }
                         else {
-                            const valExpr = foldBack_1((arg_5, acc_3) => (new Expr(4, [arg_5, acc_3, head_1(stmts).fields[6]])), head_1(stmts).fields[1], head_1(stmts).fields[3]);
+                            const valExpr = foldBack_1((arg_5, acc_3) => (new Expr(/* ELambda */ 4, [arg_5, acc_3, head_1(stmts).fields[6]])), head_1(stmts).fields[1], head_1(stmts).fields[3]);
                             const body_5 = desugar(tail_1(stmts));
-                            return new Expr(10, [head_1(stmts).fields[0], valExpr, body_5, head_1(stmts).fields[4], head_1(stmts).fields[2], mkSpanFrom(head_1(stmts).fields[6], Ast_spanOfExpr(body_5))]);
+                            return new Expr(/* ELet */ 10, [head_1(stmts).fields[0], valExpr, body_5, head_1(stmts).fields[4], head_1(stmts).fields[2], mkSpanFrom(head_1(stmts).fields[6], Ast_spanOfExpr(body_5))]);
                         }
                     case 3:
                         if (isEmpty(tail_1(stmts))) {
@@ -2105,7 +2107,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                         }
                         else {
                             const body_6 = desugar(tail_1(stmts));
-                            return new Expr(11, [head_1(stmts).fields[0], head_1(stmts).fields[1], body_6, mkSpanFrom(head_1(stmts).fields[3], Ast_spanOfExpr(body_6))]);
+                            return new Expr(/* ELetPattern */ 11, [head_1(stmts).fields[0], head_1(stmts).fields[1], body_6, mkSpanFrom(head_1(stmts).fields[3], Ast_spanOfExpr(body_6))]);
                         }
                     case 4:
                         if (isEmpty(tail_1(stmts))) {
@@ -2113,7 +2115,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                         }
                         else {
                             const body_7 = desugar(tail_1(stmts));
-                            return new Expr(12, [head_1(stmts).fields[0], body_7, mkSpanFrom(head_1(stmts).fields[2], Ast_spanOfExpr(body_7))]);
+                            return new Expr(/* ELetRecGroup */ 12, [head_1(stmts).fields[0], body_7, mkSpanFrom(head_1(stmts).fields[2], Ast_spanOfExpr(body_7))]);
                         }
                     case 0:
                         throw new ParseException(new ParseError("Type declarations are only supported at top level", head_1(stmts).fields[0].Span));
@@ -2125,23 +2127,23 @@ export function parseProgramWithSourceName(sourceName, src) {
                         }
                         else {
                             const body_8 = desugar(tail_1(stmts));
-                            return new Expr(10, ["_", head_1(stmts).fields[0], body_8, false, undefined, mkSpanFrom(Ast_spanOfExpr(head_1(stmts).fields[0]), Ast_spanOfExpr(body_8))]);
+                            return new Expr(/* ELet */ 10, ["_", head_1(stmts).fields[0], body_8, false, undefined, mkSpanFrom(Ast_spanOfExpr(head_1(stmts).fields[0]), Ast_spanOfExpr(body_8))]);
                         }
                 }
             }
             else {
-                return new Expr(0, [TokenStream__Peek(stream).Span]);
+                return new Expr(/* EUnit */ 0, [TokenStream__Peek(stream).Span]);
             }
         };
         return desugar(toList(statements));
     };
     const parseLetStmt = (isExported) => {
-        let matchValue_52, pattern_8;
+        let matchValue_52;
         const letTok_1 = TokenStream__Next(stream);
-        const isRec_3 = TokenStream__Match_5CEB78CD(stream, new TokenKind(11, []));
+        const isRec_3 = TokenStream__Match_5CEB78CD(stream, TokenKind.Rec);
         let patternInput_3;
         if (isRec_3) {
-            if (equals(TokenStream__Peek(stream).Kind, new TokenKind(27, []))) {
+            if (equals(TokenStream__Peek(stream).Kind, TokenKind.LParen)) {
                 throw new ParseException(new ParseError("\'let rec\' does not support pattern bindings", TokenStream__Peek(stream).Span));
             }
             const nameTok_15 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'let\'");
@@ -2177,7 +2179,7 @@ export function parseProgramWithSourceName(sourceName, src) {
         const args_5 = patternInput_3[1];
         TokenStream__SkipNewlines(stream);
         let returnAnnotation_2;
-        if (TokenStream__Match_5CEB78CD(stream, new TokenKind(35, []))) {
+        if (TokenStream__Match_5CEB78CD(stream, TokenKind.Colon)) {
             if (args_5.length === 0) {
                 throw new ParseException(new ParseError("Return type annotations are only supported on function let bindings", TokenStream__Peek(stream).Span));
             }
@@ -2186,10 +2188,10 @@ export function parseProgramWithSourceName(sourceName, src) {
         else {
             returnAnnotation_2 = undefined;
         }
-        if (equals(TokenStream__Peek(stream).Kind, new TokenKind(35, []))) {
+        if (equals(TokenStream__Peek(stream).Kind, TokenKind.Colon)) {
             throw new ParseException(new ParseError("Annotated parameters must be parenthesized as (x: T)", TokenStream__Peek(stream).Span));
         }
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in let binding");
+        TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in let binding");
         const value_78 = parseExprOrBlock();
         if (isRec_3) {
             const bindings_2 = [];
@@ -2198,7 +2200,7 @@ export function parseProgramWithSourceName(sourceName, src) {
             let doneBindings_1 = false;
             while (!doneBindings_1) {
                 TokenStream__SkipNewlines(stream);
-                if (TokenStream__Match_5CEB78CD(stream, new TokenKind(12, []))) {
+                if (TokenStream__Match_5CEB78CD(stream, TokenKind.And)) {
                     const nextNameTok_1 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'and\'");
                     let nextName_1;
                     const matchValue_53 = nextNameTok_1.Kind;
@@ -2208,11 +2210,11 @@ export function parseProgramWithSourceName(sourceName, src) {
                         throw new ParseException(new ParseError("\'let rec ... and ...\' requires function arguments for each binding", nextNameTok_1.Span));
                     }
                     TokenStream__SkipNewlines(stream);
-                    const nextReturnAnnotation_1 = TokenStream__Match_5CEB78CD(stream, new TokenKind(35, [])) ? parseTypeRef() : undefined;
-                    if (equals(TokenStream__Peek(stream).Kind, new TokenKind(35, []))) {
+                    const nextReturnAnnotation_1 = TokenStream__Match_5CEB78CD(stream, TokenKind.Colon) ? parseTypeRef() : undefined;
+                    if (equals(TokenStream__Peek(stream).Kind, TokenKind.Colon)) {
                         throw new ParseException(new ParseError("Annotated parameters must be parenthesized as (x: T)", TokenStream__Peek(stream).Span));
                     }
-                    TokenStream__Expect_77B9EE56(stream, new TokenKind(25, []), "Expected \'=\' in let binding");
+                    TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in let binding");
                     const nextValue_1 = parseExprOrBlock();
                     const nextSpan_1 = mkSpanFrom(nextNameTok_1.Span, Ast_spanOfExpr(nextValue_1));
                     void (bindings_2.push([nextName_1, toList(nextArgs_1), nextReturnAnnotation_1, nextValue_1, nextSpan_1]));
@@ -2222,47 +2224,47 @@ export function parseProgramWithSourceName(sourceName, src) {
                 }
             }
             if (bindings_2.length === 1) {
-                return new Stmt(2, [bindingName_1, toList(args_5), returnAnnotation_2, value_78, true, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_78))]);
+                return new Stmt(/* SLet */ 2, [bindingName_1, toList(args_5), returnAnnotation_2, value_78, true, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_78))]);
             }
             else {
                 const patternInput_4 = item_1(bindings_2.length - 1, bindings_2);
-                return new Stmt(4, [toList(bindings_2), isExported, mkSpanFrom(letTok_1.Span, patternInput_4[4])]);
+                return new Stmt(/* SLetRecGroup */ 4, [toList(bindings_2), isExported, mkSpanFrom(letTok_1.Span, patternInput_4[4])]);
             }
         }
         else if (tuplePatternOpt_1 == null) {
-            return new Stmt(2, [bindingName_1, toList(args_5), returnAnnotation_2, value_78, false, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_78))]);
+            return new Stmt(/* SLet */ 2, [bindingName_1, toList(args_5), returnAnnotation_2, value_78, false, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_78))]);
         }
-        else if ((pattern_8 = tuplePatternOpt_1, args_5.length > 0)) {
+        else if (args_5.length > 0) {
             const pattern_9 = tuplePatternOpt_1;
             throw new ParseException(new ParseError("Tuple let binding cannot take function parameters", Ast_spanOfPattern(pattern_9)));
         }
         else {
             const pattern_10 = tuplePatternOpt_1;
-            return new Stmt(3, [pattern_10, value_78, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_78))]);
+            return new Stmt(/* SLetPattern */ 3, [pattern_10, value_78, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_78))]);
         }
     };
     const parseAttributeName = () => {
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(29, []), "Expected \'[\' in attribute");
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(54, []), "Expected \'<\' in attribute");
+        TokenStream__Expect_77B9EE56(stream, TokenKind.LBracket, "Expected \'[\' in attribute");
+        TokenStream__Expect_77B9EE56(stream, TokenKind.Less, "Expected \'<\' in attribute");
         const nameTok_17 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected attribute name");
         let name_20;
         const matchValue_54 = nameTok_17.Kind;
         name_20 = ((matchValue_54.tag === 4) ? matchValue_54.fields[0] : "");
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(55, []), "Expected \'>\' in attribute");
-        TokenStream__Expect_77B9EE56(stream, new TokenKind(30, []), "Expected \']\' in attribute");
+        TokenStream__Expect_77B9EE56(stream, TokenKind.Greater, "Expected \'>\' in attribute");
+        TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' in attribute");
         return [name_20, nameTok_17.Span];
     };
     const parseStmt = () => {
         let matchValue_58;
         TokenStream__SkipNewlines(stream);
-        if (equals(TokenStream__Peek(stream).Kind, new TokenKind(4, ["export"])) && equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, new TokenKind(10, []))) {
+        if (equals(TokenStream__Peek(stream).Kind, new TokenKind(/* Ident */ 4, ["export"])) && equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Let)) {
             throw new ParseException(new ParseError("\'export let\' is no longer supported; use \'[<export>] let ...\'", TokenStream__Peek(stream).Span));
         }
         let isExported_1 = false;
         let hasAttributes = false;
         let parsingAttributes = true;
         while (parsingAttributes) {
-            if (equals(TokenStream__Peek(stream).Kind, new TokenKind(29, [])) && equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, new TokenKind(54, []))) {
+            if (equals(TokenStream__Peek(stream).Kind, TokenKind.LBracket) && equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Less)) {
                 hasAttributes = true;
                 const patternInput_5 = parseAttributeName();
                 const span_9 = patternInput_5[1];
@@ -2308,9 +2310,9 @@ export function parseProgramWithSourceName(sourceName, src) {
                 const matchValue_57 = pathTok.Kind;
                 if (matchValue_57.tag === 7) {
                     if (!isNullOrWhiteSpace(matchValue_57.fields[0])) {
-                        TokenStream__Expect_77B9EE56(stream, new TokenKind(40, []), "Expected \'as\' in import directive. Use: import \"file.fss\" as Alias");
+                        TokenStream__Expect_77B9EE56(stream, TokenKind.As, "Expected \'as\' in import directive. Use: import \"file.fss\" as Alias");
                         const aliasTok = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected module alias after \'as\'");
-                        return new Stmt(1, [(matchValue_58 = aliasTok.Kind, (matchValue_58.tag === 4) ? matchValue_58.fields[0] : ""), matchValue_57.fields[0], mkSpanFrom(importTok.Span, aliasTok.Span)]);
+                        return new Stmt(/* SImport */ 1, [(matchValue_58 = aliasTok.Kind, (matchValue_58.tag === 4) ? matchValue_58.fields[0] : ""), matchValue_57.fields[0], mkSpanFrom(importTok.Span, aliasTok.Span)]);
                     }
                     else {
                         throw new ParseException(new ParseError("Import path cannot be empty", pathTok.Span));
@@ -2335,7 +2337,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     throw new ParseException(new ParseError("\'[<export>]\' must be followed by a top-level let binding", TokenStream__Peek(stream).Span));
                 }
                 else {
-                    return new Stmt(5, [parseExpr()]);
+                    return new Stmt(/* SExpr */ 5, [parseExpr()]);
                 }
         }
     };