@magnusopera/fscript 0.80.1 → 0.81.0

package/dist/FScript.Language/Parser.js

@@ -941,16 +941,98 @@ export function parseProgramWithSourceName(sourceName, src) {
         TokenStream__SkipNewlines(stream);
         const t_6 = TokenStream__Peek(stream);
         const matchValue_22 = t_6.Kind;
+        let matchResult_2, raw_1, name_7;
         switch (matchValue_22.tag) {
             case 5:
             case 6:
             case 7:
             case 9: {
+                matchResult_2 = 0;
+                break;
+            }
+            case 27: {
+                matchResult_2 = 4;
+                break;
+            }
+            case 29: {
+                matchResult_2 = 5;
+                break;
+            }
+            case 43: {
+                matchResult_2 = 6;
+                break;
+            }
+            case 10: {
+                matchResult_2 = 7;
+                break;
+            }
+            case 13: {
+                matchResult_2 = 8;
+                break;
+            }
+            case 17: {
+                matchResult_2 = 9;
+                break;
+            }
+            case 21: {
+                matchResult_2 = 10;
+                break;
+            }
+            case 22: {
+                matchResult_2 = 11;
+                break;
+            }
+            case 14: {
+                matchResult_2 = 12;
+                break;
+            }
+            case 46: {
+                matchResult_2 = 13;
+                break;
+            }
+            case 47: {
+                matchResult_2 = 14;
+                break;
+            }
+            case 2: {
+                matchResult_2 = 15;
+                break;
+            }
+            case 3: {
+                matchResult_2 = 16;
+                break;
+            }
+            case 8: {
+                matchResult_2 = 1;
+                raw_1 = matchValue_22.fields[0];
+                break;
+            }
+            case 4: {
+                if (matchValue_22.fields[0] === "export") {
+                    if (equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Let)) {
+                        matchResult_2 = 2;
+                    }
+                    else {
+                        matchResult_2 = 3;
+                        name_7 = matchValue_22.fields[0];
+                    }
+                }
+                else {
+                    matchResult_2 = 3;
+                    name_7 = matchValue_22.fields[0];
+                }
+                break;
+            }
+            default:
+                matchResult_2 = 17;
+        }
+        switch (matchResult_2) {
+            case 0: {
                 const t_7 = TokenStream__Next(stream);
                 return new Expr(/* ELiteral */ 1, [parseLiteral(t_7), t_7.Span]);
             }
-            case 8: {
-                const raw = matchValue_22.fields[0];
+            case 1: {
+                const raw = raw_1;
                 const span = TokenStream__Next(stream).Span;
                 const parts = [];
                 const text = StringBuilder_$ctor();
@@ -964,42 +1046,42 @@ export function parseProgramWithSourceName(sourceName, src) {
                 while (i_1 < raw.length) {
                     let parsed;
                     const matchValue = raw[i_1];
-                    let matchResult_2, ch_1;
+                    let matchResult_3, ch_1;
                     switch (matchValue) {
                         case "\\": {
                             if ((i_1 + 1) < raw.length) {
-                                matchResult_2 = 4;
+                                matchResult_3 = 4;
                             }
                             else {
-                                matchResult_2 = 5;
+                                matchResult_3 = 5;
                                 ch_1 = matchValue;
                             }
                             break;
                         }
                         case "{": {
                             if (((i_1 + 1) < raw.length) && (raw[i_1 + 1] === "{")) {
-                                matchResult_2 = 0;
+                                matchResult_3 = 0;
                             }
                             else {
-                                matchResult_2 = 2;
+                                matchResult_3 = 2;
                             }
                             break;
                         }
                         case "}": {
                             if (((i_1 + 1) < raw.length) && (raw[i_1 + 1] === "}")) {
-                                matchResult_2 = 1;
+                                matchResult_3 = 1;
                             }
                             else {
-                                matchResult_2 = 3;
+                                matchResult_3 = 3;
                             }
                             break;
                         }
                         default: {
-                            matchResult_2 = 5;
+                            matchResult_3 = 5;
                             ch_1 = matchValue;
                         }
                     }
-                    switch (matchResult_2) {
+                    switch (matchResult_3) {
                         case 0: {
                             StringBuilder__Append_244C7CD6(text, "{");
                             i_1 = ((i_1 + 2) | 0);
@@ -1122,8 +1204,9 @@ export function parseProgramWithSourceName(sourceName, src) {
                 flushText();
                 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];
+            case 2:
+                throw new ParseException(new ParseError("\'export let\' is only supported at top level", t_6.Span));
+            case 3: {
                 const t_9 = TokenStream__Next(stream);
                 switch (name_7) {
                     case "None":
@@ -1136,7 +1219,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                         return new Expr(/* EVar */ 2, [name_7, t_9.Span]);
                 }
             }
-            case 27: {
+            case 4: {
                 const lp_2 = TokenStream__Next(stream);
                 if (equals(TokenStream__Peek(stream).Kind, TokenKind.RParen)) {
                     return new Expr(/* EUnit */ 0, [mkSpanFrom(lp_2.Span, TokenStream__Next(stream).Span)]);
@@ -1158,7 +1241,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     }
                 }
             }
-            case 29: {
+            case 5: {
                 const lbIndex_3 = TokenStream__get_Index(stream) | 0;
                 const lb_3 = TokenStream__Next(stream);
                 if (!hasNonLayoutTokenAfterOnSameLine(lbIndex_3, lb_3.Span.Start.Line)) {
@@ -1198,7 +1281,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     }
                 }
             }
-            case 43: {
+            case 6: {
                 const lbIndex_4 = TokenStream__get_Index(stream) | 0;
                 const lb_4 = TokenStream__Next(stream);
                 if (!hasNonLayoutTokenAfterOnSameLine(lbIndex_4, lb_4.Span.Start.Line)) {
@@ -1392,34 +1475,34 @@ export function parseProgramWithSourceName(sourceName, src) {
                     }
                 }
             }
-            case 10:
+            case 7:
                 return parseLetExpr();
-            case 13:
+            case 8:
                 return parseLambda();
-            case 17:
+            case 9:
                 return parseIf();
-            case 21: {
+            case 10: {
                 const raiseTok = TokenStream__Next(stream);
                 const value_59 = parsePrimary();
                 return new Expr(/* ERaise */ 7, [value_59, mkSpanFrom(raiseTok.Span, Ast_spanOfExpr(value_59))]);
             }
-            case 22:
+            case 11:
                 return parseFor();
-            case 14:
+            case 12:
                 return parseMatch();
-            case 46: {
+            case 13: {
                 const t_10 = TokenStream__Next(stream);
                 const nameTok_10 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected type name after \'typeof\'");
                 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: {
+            case 14: {
                 const t_11 = TokenStream__Next(stream);
                 const nameTok_11 = TokenStream__ExpectIdent_Z721C83C5(stream, "Expected identifier after \'nameof\'");
                 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:
+            case 15:
                 throw new ParseException(new ParseError("Indentation error: unexpected indent in expression", t_6.Span));
-            case 3:
+            case 16:
                 throw new ParseException(new ParseError("Indentation error: unexpected dedent in expression", t_6.Span));
             default:
                 throw new ParseException(new ParseError("Unexpected token in expression", t_6.Span));
@@ -1599,19 +1682,19 @@ export function parseProgramWithSourceName(sourceName, src) {
         name_14 = ((matchValue_33.tag === 4) ? matchValue_33.fields[0] : "");
         TokenStream__SkipNewlines(stream);
         const matchValue_34 = TokenStream__Peek(stream).Kind;
-        let matchResult_3;
+        let matchResult_4;
         if (matchValue_34.tag === 4) {
             if (matchValue_34.fields[0] === "in") {
-                matchResult_3 = 0;
+                matchResult_4 = 0;
             }
             else {
-                matchResult_3 = 1;
+                matchResult_4 = 1;
             }
         }
         else {
-            matchResult_3 = 1;
+            matchResult_4 = 1;
         }
-        switch (matchResult_3) {
+        switch (matchResult_4) {
             case 0: {
                 TokenStream__Next(stream);
                 break;
@@ -1624,19 +1707,19 @@ export function parseProgramWithSourceName(sourceName, src) {
         const source_19 = parsePostfix();
         TokenStream__SkipNewlines(stream);
         const matchValue_35 = TokenStream__Peek(stream).Kind;
-        let matchResult_4;
+        let matchResult_5;
         if (matchValue_35.tag === 4) {
             if (matchValue_35.fields[0] === "do") {
-                matchResult_4 = 0;
+                matchResult_5 = 0;
             }
             else {
-                matchResult_4 = 1;
+                matchResult_5 = 1;
             }
         }
         else {
-            matchResult_4 = 1;
+            matchResult_5 = 1;
         }
-        switch (matchResult_4) {
+        switch (matchResult_5) {
             case 0: {
                 TokenStream__Next(stream);
                 break;
@@ -1723,29 +1806,29 @@ export function parseProgramWithSourceName(sourceName, src) {
             while (!doneCases_1) {
                 TokenStream__SkipNewlines(stream);
                 const matchValue_37 = TokenStream__Peek(stream).Kind;
-                let matchResult_5;
+                let matchResult_6;
                 switch (matchValue_37.tag) {
                     case 26: {
-                        matchResult_5 = 0;
+                        matchResult_6 = 0;
                         break;
                     }
                     case 3: {
                         if (hasIndentedCaseBlock) {
-                            matchResult_5 = 1;
+                            matchResult_6 = 1;
                         }
                         else {
-                            matchResult_5 = 3;
+                            matchResult_6 = 3;
                         }
                         break;
                     }
                     case 2: {
-                        matchResult_5 = 2;
+                        matchResult_6 = 2;
                         break;
                     }
                     default:
-                        matchResult_5 = 3;
+                        matchResult_6 = 3;
                 }
-                switch (matchResult_5) {
+                switch (matchResult_6) {
                     case 0: {
                         ensureAlignedCaseStart();
                         parseCase_1();
@@ -1879,19 +1962,19 @@ export function parseProgramWithSourceName(sourceName, src) {
                 }
             }
             const matchValue_43 = TokenStream__Peek(stream).Kind;
-            let matchResult_6;
+            let matchResult_7;
             if (matchValue_43.tag === 4) {
                 if (matchValue_43.fields[0] === "in") {
-                    matchResult_6 = 0;
+                    matchResult_7 = 0;
                 }
                 else {
-                    matchResult_6 = 1;
+                    matchResult_7 = 1;
                 }
             }
             else {
-                matchResult_6 = 1;
+                matchResult_7 = 1;
             }
-            switch (matchResult_6) {
+            switch (matchResult_7) {
                 case 0:
                     throw new ParseException(new ParseError("\'in\' keyword is not supported", TokenStream__Peek(stream).Span));
                 default: {
@@ -1914,19 +1997,19 @@ export function parseProgramWithSourceName(sourceName, src) {
         }
         else {
             const matchValue_45 = TokenStream__Peek(stream).Kind;
-            let matchResult_7;
+            let matchResult_8;
             if (matchValue_45.tag === 4) {
                 if (matchValue_45.fields[0] === "in") {
-                    matchResult_7 = 0;
+                    matchResult_8 = 0;
                 }
                 else {
-                    matchResult_7 = 1;
+                    matchResult_8 = 1;
                 }
             }
             else {
-                matchResult_7 = 1;
+                matchResult_8 = 1;
             }
-            switch (matchResult_7) {
+            switch (matchResult_8) {
                 case 0:
                     throw new ParseException(new ParseError("\'in\' keyword is not supported", TokenStream__Peek(stream).Span));
                 default: {
@@ -1974,56 +2057,56 @@ export function parseProgramWithSourceName(sourceName, src) {
             let col, matchValue_49;
             TokenStream__SkipNewlines(stream);
             const matchValue_47 = TokenStream__Peek(stream).Kind;
-            let matchResult_8;
+            let matchResult_9;
             switch (matchValue_47.tag) {
                 case 3: {
-                    matchResult_8 = 0;
+                    matchResult_9 = 0;
                     break;
                 }
                 case 28:
                 case 30:
                 case 44: {
-                    matchResult_8 = 1;
+                    matchResult_9 = 1;
                     break;
                 }
                 case 0: {
-                    matchResult_8 = 2;
+                    matchResult_9 = 2;
                     break;
                 }
                 case 10: {
-                    matchResult_8 = 3;
+                    matchResult_9 = 3;
                     break;
                 }
                 case 39: {
-                    matchResult_8 = 4;
+                    matchResult_9 = 4;
                     break;
                 }
                 case 42: {
-                    matchResult_8 = 6;
+                    matchResult_9 = 6;
                     break;
                 }
                 case 38: {
                     if (equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Import) ? true : equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Include)) {
-                        matchResult_8 = 5;
+                        matchResult_9 = 5;
                     }
                     else {
-                        matchResult_8 = 8;
+                        matchResult_9 = 8;
                     }
                     break;
                 }
                 case 29: {
                     if (equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Less)) {
-                        matchResult_8 = 7;
+                        matchResult_9 = 7;
                     }
                     else {
-                        matchResult_8 = 8;
+                        matchResult_9 = 8;
                     }
                     break;
                 }
                 default:
-                    matchResult_8 = 8;
+                    matchResult_9 = 8;
             }
-            switch (matchResult_8) {
+            switch (matchResult_9) {
                 case 0: {
                     TokenStream__Next(stream);
                     TokenStream__SkipNewlines(stream);
@@ -2080,7 +2163,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     break;
                 }
                 case 7: {
-                    throw new ParseException(new ParseError("\'[<export>]\' is only supported at top level", TokenStream__Peek(stream).Span));
+                    throw new ParseException(new ParseError("Attributes are not supported in scripts", TokenStream__Peek(stream).Span));
                     break;
                 }
                 case 8: {
@@ -2250,56 +2333,69 @@ export function parseProgramWithSourceName(sourceName, src) {
             return new Stmt(/* SLetPattern */ 3, [pattern_10, value_79, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_79))]);
         }
     };
-    const parseAttributeName = () => {
-        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, 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;
+        let matchValue_57;
         TokenStream__SkipNewlines(stream);
-        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, TokenKind.LBracket) && equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Less)) {
-                hasAttributes = true;
-                const patternInput_5 = parseAttributeName();
-                const span_9 = patternInput_5[1];
-                const name_21 = patternInput_5[0];
-                if (name_21 === "export") {
-                    if (isExported_1) {
-                        throw new ParseException(new ParseError("Duplicate attribute \'export\'", span_9));
-                    }
-                    isExported_1 = true;
+        const matchValue_54 = TokenStream__Peek(stream).Kind;
+        let matchResult_10;
+        switch (matchValue_54.tag) {
+            case 4: {
+                if (matchValue_54.fields[0] === "export") {
+                    if (equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Let)) {
+                        matchResult_10 = 0;
+                    }
+                    else {
+                        matchResult_10 = 7;
+                    }
                 }
                 else {
-                    throw new ParseException(new ParseError(concat("Unknown attribute \'", name_21, "\'"), span_9));
+                    matchResult_10 = 7;
                 }
-                TokenStream__SkipNewlines(stream);
+                break;
             }
-            else {
-                parsingAttributes = false;
+            case 29: {
+                if (equals(TokenStream__PeekAt_Z524259A4(stream, 1).Kind, TokenKind.Less)) {
+                    matchResult_10 = 1;
+                }
+                else {
+                    matchResult_10 = 7;
+                }
+                break;
             }
-        }
-        const matchValue_55 = TokenStream__Peek(stream).Kind;
-        switch (matchValue_55.tag) {
             case 38: {
-                if (hasAttributes ? true : isExported_1) {
-                    throw new ParseException(new ParseError("Attributes are not supported on \'import\' directives", TokenStream__Peek(stream).Span));
-                }
+                matchResult_10 = 2;
+                break;
+            }
+            case 39: {
+                matchResult_10 = 3;
+                break;
+            }
+            case 42: {
+                matchResult_10 = 4;
+                break;
+            }
+            case 45: {
+                matchResult_10 = 5;
+                break;
+            }
+            case 10: {
+                matchResult_10 = 6;
+                break;
+            }
+            default:
+                matchResult_10 = 7;
+        }
+        switch (matchResult_10) {
+            case 0: {
+                TokenStream__Next(stream);
+                return parseLetStmt(true);
+            }
+            case 1:
+                throw new ParseException(new ParseError("Attributes are not supported in scripts; use \'export let\' for exported bindings", TokenStream__Peek(stream).Span));
+            case 2: {
                 const hashTok = TokenStream__Next(stream);
-                const matchValue_56 = TokenStream__Next(stream).Kind;
-                switch (matchValue_56.tag) {
+                const matchValue_55 = TokenStream__Next(stream).Kind;
+                switch (matchValue_55.tag) {
                     case 41:
                         throw new ParseException(new ParseError("\'#include\' was removed in 0.32.0; use \'import \"file.fss\" as Alias\'", hashTok.Span));
                     case 39:
@@ -2308,18 +2404,15 @@ export function parseProgramWithSourceName(sourceName, src) {
                         throw new ParseException(new ParseError("Unexpected \'#\'; use \'import \"file.fss\" as Alias\'", hashTok.Span));
                 }
             }
-            case 39: {
-                if (hasAttributes ? true : isExported_1) {
-                    throw new ParseException(new ParseError("Attributes are not supported on \'import\' directives", TokenStream__Peek(stream).Span));
-                }
+            case 3: {
                 const importTok = TokenStream__Next(stream);
                 const pathTok = TokenStream__Next(stream);
-                const matchValue_57 = pathTok.Kind;
-                if (matchValue_57.tag === 7) {
-                    if (!isNullOrWhiteSpace(matchValue_57.fields[0])) {
+                const matchValue_56 = pathTok.Kind;
+                if (matchValue_56.tag === 7) {
+                    if (!isNullOrWhiteSpace(matchValue_56.fields[0])) {
                         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(/* SImport */ 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_57 = aliasTok.Kind, (matchValue_57.tag === 4) ? matchValue_57.fields[0] : ""), matchValue_56.fields[0], mkSpanFrom(importTok.Span, aliasTok.Span)]);
                     }
                     else {
                         throw new ParseException(new ParseError("Import path cannot be empty", pathTok.Span));
@@ -2329,30 +2422,21 @@ export function parseProgramWithSourceName(sourceName, src) {
                     throw new ParseException(new ParseError("Expected string literal import path after \'import\'", pathTok.Span));
                 }
             }
-            case 42:
+            case 4:
                 throw new ParseException(new ParseError("\'module\' declarations are not supported in scripts", TokenStream__Peek(stream).Span));
-            case 45: {
-                if (isExported_1) {
-                    throw new ParseException(new ParseError("\'[<export>]\' is only valid for top-level let bindings", TokenStream__Peek(stream).Span));
-                }
+            case 5:
                 return parseTypeDecl();
-            }
-            case 10:
-                return parseLetStmt(isExported_1);
+            case 6:
+                return parseLetStmt(false);
             default:
-                if (hasAttributes) {
-                    throw new ParseException(new ParseError("\'[<export>]\' must be followed by a top-level let binding", TokenStream__Peek(stream).Span));
-                }
-                else {
-                    return new Stmt(/* SExpr */ 5, [parseExpr()]);
-                }
+                return new Stmt(/* SExpr */ 5, [parseExpr()]);
         }
     };
     const program = [];
     TokenStream__SkipNewlines(stream);
     while (!TokenStream__get_AtEnd(stream)) {
-        const matchValue_59 = TokenStream__Peek(stream).Kind;
-        switch (matchValue_59.tag) {
+        const matchValue_58 = TokenStream__Peek(stream).Kind;
+        switch (matchValue_58.tag) {
             case 0: {
                 TokenStream__Next(stream);
                 break;