@magnusopera/fscript 0.79.0 → 0.80.0

package/dist/FScript.Language/IncludeResolver.js

@@ -372,9 +372,11 @@ function rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref) {
         case 3:
             return new TypeRef(/* TRPostfix */ 3, [rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[0]), tref.fields[1]]);
         case 4:
-            return new TypeRef(/* TRRecord */ 4, [map((tupledArg) => [tupledArg[0], rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tupledArg[1])], tref.fields[0])]);
+            return new TypeRef(/* TRMap */ 4, [rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[0]), rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tref.fields[1])]);
         case 5:
-            return new TypeRef(/* TRStructuralRecord */ 5, [map((tupledArg_1) => [tupledArg_1[0], rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tupledArg_1[1])], tref.fields[0])]);
+            return new TypeRef(/* TRRecord */ 5, [map((tupledArg) => [tupledArg[0], rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tupledArg[1])], tref.fields[0])]);
+        case 6:
+            return new TypeRef(/* TRStructuralRecord */ 6, [map((tupledArg_1) => [tupledArg_1[0], rewriteTypeRef(aliases, selfPrefix, selfTypeNames, tupledArg_1[1])], tref.fields[0])]);
         default:
             return new TypeRef(/* TRName */ 0, [rewriteTypeName(aliases, selfPrefix, selfTypeNames, tref.fields[0])]);
     }

package/dist/FScript.Language/Parser.js

@@ -290,10 +290,10 @@ export function parseProgramWithSourceName(sourceName, src) {
                 }
                 TokenStream__Expect_77B9EE56(stream, TokenKind.RBrace, "Expected \'}\' in inline record type");
                 if (isStructural) {
-                    return new TypeRef(/* TRStructuralRecord */ 5, [toList(fields)]);
+                    return new TypeRef(/* TRStructuralRecord */ 6, [toList(fields)]);
                 }
                 else {
-                    return new TypeRef(/* TRRecord */ 4, [toList(fields)]);
+                    return new TypeRef(/* TRRecord */ 5, [toList(fields)]);
                 }
             }
             case 27: {
@@ -362,7 +362,14 @@ export function parseProgramWithSourceName(sourceName, src) {
                 }
                 case 2: {
                     TokenStream__Next(stream);
-                    t = (new TypeRef(/* TRPostfix */ 3, [t, "map"]));
+                    if (TokenStream__Match_5CEB78CD(stream, TokenKind.LBracket)) {
+                        const keyType = parseTypeRef();
+                        TokenStream__Expect_77B9EE56(stream, TokenKind.RBracket, "Expected \']\' after map key type");
+                        t = (new TypeRef(/* TRMap */ 4, [keyType, t]));
+                    }
+                    else {
+                        t = (new TypeRef(/* TRPostfix */ 3, [t, "map"]));
+                    }
                     break;
                 }
                 case 3: {
@@ -760,7 +767,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     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(/* PTypeRef */ 11, [new TypeRef(/* TRStructuralRecord */ 5, [toList(fields_3)]), mkSpanFrom(lb_2.Span, rb_2.Span)]);
+                    return new Pattern(/* PTypeRef */ 11, [new TypeRef(/* TRStructuralRecord */ 6, [toList(fields_3)]), mkSpanFrom(lb_2.Span, rb_2.Span)]);
                 }
                 else if (equals(TokenStream__Peek(stream).Kind, TokenKind.LBracket)) {
                     const clauses = [];
@@ -858,7 +865,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                         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(/* PTypeRef */ 11, [new TypeRef(/* TRRecord */ 4, [toList(fields_4)]), mkSpanFrom(lb_2.Span, rb_4.Span)]);
+                        return new Pattern(/* PTypeRef */ 11, [new TypeRef(/* TRRecord */ 5, [toList(fields_4)]), mkSpanFrom(lb_2.Span, rb_4.Span)]);
                     }
                     else {
                         const fields_5 = [];
@@ -1221,8 +1228,8 @@ export function parseProgramWithSourceName(sourceName, src) {
                             name_8 = ((matchValue_23.tag === 4) ? matchValue_23.fields[0] : "");
                             TokenStream__SkipNewlines(stream);
                             TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in structural record update field");
-                            const value_40 = parseEntryExpr();
-                            void (updates.push([name_8, value_40]));
+                            const value_41 = parseEntryExpr();
+                            void (updates.push([name_8, value_41]));
                         };
                         parseUpdateField();
                         let keepParsing_1 = true;
@@ -1250,8 +1257,8 @@ export function parseProgramWithSourceName(sourceName, src) {
                             name_9 = ((matchValue_25.tag === 4) ? matchValue_25.fields[0] : "");
                             TokenStream__SkipNewlines(stream);
                             TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in structural record field");
-                            const value_44 = parseEntryExpr();
-                            void (fields_6.push([name_9, value_44]));
+                            const value_45 = parseEntryExpr();
+                            void (fields_6.push([name_9, value_45]));
                         };
                         parseField_3();
                         let keepParsing_2 = true;
@@ -1332,8 +1339,8 @@ export function parseProgramWithSourceName(sourceName, src) {
                             name_10 = ((matchValue_26.tag === 4) ? matchValue_26.fields[0] : "");
                             TokenStream__SkipNewlines(stream);
                             TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in record update field");
-                            const value_53 = parseEntryExpr();
-                            void (updates_1.push([name_10, value_53]));
+                            const value_54 = parseEntryExpr();
+                            void (updates_1.push([name_10, value_54]));
                         };
                         parseUpdateField_1();
                         let keepParsing_4 = true;
@@ -1360,8 +1367,8 @@ export function parseProgramWithSourceName(sourceName, src) {
                             name_11 = ((matchValue_28.tag === 4) ? matchValue_28.fields[0] : "");
                             TokenStream__SkipNewlines(stream);
                             TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in record field");
-                            const value_56 = parseEntryExpr();
-                            void (fields_7.push([name_11, value_56]));
+                            const value_57 = parseEntryExpr();
+                            void (fields_7.push([name_11, value_57]));
                         };
                         parseField_4();
                         let keepParsing_5 = true;
@@ -1393,8 +1400,8 @@ export function parseProgramWithSourceName(sourceName, src) {
                 return parseIf();
             case 21: {
                 const raiseTok = TokenStream__Next(stream);
-                const value_58 = parsePrimary();
-                return new Expr(/* ERaise */ 7, [value_58, mkSpanFrom(raiseTok.Span, Ast_spanOfExpr(value_58))]);
+                const value_59 = parsePrimary();
+                return new Expr(/* ERaise */ 7, [value_59, mkSpanFrom(raiseTok.Span, Ast_spanOfExpr(value_59))]);
             }
             case 22:
                 return parseFor();
@@ -1840,11 +1847,11 @@ export function parseProgramWithSourceName(sourceName, src) {
             throw new ParseException(new ParseError("Annotated parameters must be parenthesized as (x: T)", TokenStream__Peek(stream).Span));
         }
         TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in let binding");
-        const value_70 = parseExprOrBlock();
+        const value_71 = parseExprOrBlock();
         if (isRec_1) {
             const bindings = [];
-            const firstSpan = mkSpanFrom(patternInput_2[3], Ast_spanOfExpr(value_70));
-            void (bindings.push([bindingName, toList(args_2), returnAnnotation, value_70, firstSpan]));
+            const firstSpan = mkSpanFrom(patternInput_2[3], Ast_spanOfExpr(value_71));
+            void (bindings.push([bindingName, toList(args_2), returnAnnotation, value_71, firstSpan]));
             let doneBindings = false;
             while (!doneBindings) {
                 TokenStream__SkipNewlines(stream);
@@ -1897,7 +1904,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                         body_3 = parseExprOrBlock();
                     }
                     if (bindings.length === 1) {
-                        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))]);
+                        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_71), body_3, true, returnAnnotation, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_3))]);
                     }
                     else {
                         return new Expr(/* ELetRecGroup */ 12, [toList(bindings), body_3, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_3))]);
@@ -1932,7 +1939,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                         body_4 = parseExprOrBlock();
                     }
                     if (tuplePatternOpt == null) {
-                        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))]);
+                        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_71), body_4, false, returnAnnotation, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_4))]);
                     }
                     else if (args_2.length > 0) {
                         const pattern_3 = tuplePatternOpt;
@@ -1940,7 +1947,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                     }
                     else {
                         const pattern_4 = tuplePatternOpt;
-                        return new Expr(/* ELetPattern */ 11, [pattern_4, value_70, body_4, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_4))]);
+                        return new Expr(/* ELetPattern */ 11, [pattern_4, value_71, body_4, mkSpanFrom(letTok.Span, Ast_spanOfExpr(body_4))]);
                     }
                 }
             }
@@ -2192,11 +2199,11 @@ export function parseProgramWithSourceName(sourceName, src) {
             throw new ParseException(new ParseError("Annotated parameters must be parenthesized as (x: T)", TokenStream__Peek(stream).Span));
         }
         TokenStream__Expect_77B9EE56(stream, TokenKind.Equals, "Expected \'=\' in let binding");
-        const value_78 = parseExprOrBlock();
+        const value_79 = parseExprOrBlock();
         if (isRec_3) {
             const bindings_2 = [];
-            const firstSpan_1 = mkSpanFrom(patternInput_3[3], Ast_spanOfExpr(value_78));
-            void (bindings_2.push([bindingName_1, toList(args_5), returnAnnotation_2, value_78, firstSpan_1]));
+            const firstSpan_1 = mkSpanFrom(patternInput_3[3], Ast_spanOfExpr(value_79));
+            void (bindings_2.push([bindingName_1, toList(args_5), returnAnnotation_2, value_79, firstSpan_1]));
             let doneBindings_1 = false;
             while (!doneBindings_1) {
                 TokenStream__SkipNewlines(stream);
@@ -2224,7 +2231,7 @@ export function parseProgramWithSourceName(sourceName, src) {
                 }
             }
             if (bindings_2.length === 1) {
-                return new Stmt(/* SLet */ 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_79, true, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_79))]);
             }
             else {
                 const patternInput_4 = item_1(bindings_2.length - 1, bindings_2);
@@ -2232,7 +2239,7 @@ export function parseProgramWithSourceName(sourceName, src) {
             }
         }
         else if (tuplePatternOpt_1 == null) {
-            return new Stmt(/* SLet */ 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_79, false, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_79))]);
         }
         else if (args_5.length > 0) {
             const pattern_9 = tuplePatternOpt_1;
@@ -2240,7 +2247,7 @@ export function parseProgramWithSourceName(sourceName, src) {
         }
         else {
             const pattern_10 = tuplePatternOpt_1;
-            return new Stmt(/* SLetPattern */ 3, [pattern_10, value_78, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_78))]);
+            return new Stmt(/* SLetPattern */ 3, [pattern_10, value_79, isExported, mkSpanFrom(letTok_1.Span, Ast_spanOfExpr(value_79))]);
         }
     };
     const parseAttributeName = () => {

package/dist/FScript.Language/Pretty.js

@@ -64,7 +64,7 @@ export function valueToString(v) {
             const arg_8 = join("; ", map((tupledArg_1) => {
                 let arg_6;
                 const key = tupledArg_1[0];
-                arg_6 = ((key.tag === 1) ? int64ToString(key.fields[0]) : concat("\"", escapeStringLiteral(key.fields[0]), "\""));
+                arg_6 = ((key.tag === 1) ? int64ToString(key.fields[0]) : ((key.tag === 2) ? (key.fields[0] ? "true" : "false") : ((key.tag === 3) ? concat(key.fields[0], ".", key.fields[1]) : concat("\"", escapeStringLiteral(key.fields[0]), "\""))));
                 const arg_7 = valueToString(tupledArg_1[1]);
                 return toText(printf("%s => %s"))(arg_6)(arg_7);
             }, toList(v.fields[0])));