@elaraai/east 0.0.1-beta.28 → 0.0.1-beta.29

package/dist/src/expr/block.js

@@ -3,7 +3,7 @@
  * Dual-licensed under AGPL-3.0 and commercial license. See LICENSE for details.
  */
 import {} from "../ast.js";
-import { get_location, printLocation } from "../location.js";
+import { get_location, printLocations } from "../location.js";
 import { FunctionType, isSubtype, NullType, printType, isTypeEqual, StringType, NeverType, VariantType, BooleanType, TypeUnion, IntegerType, StructType, ArrayType, AsyncFunctionType } from "../types.js";
 import { AstSymbol, Expr, TypeSymbol } from "./expr.js";
 import { NeverExpr } from "./never.js";
@@ -85,7 +85,7 @@ export function fromAst(ast) {
         return createAsyncFunctionExpr(ast.type.inputs, ast.type.output, ast, fromAst);
     }
     else {
-        throw new Error(`fromAst not implemented for type ${printType(ast.type)} at ${printLocation(ast.location)}`);
+        throw new Error(`fromAst not implemented for type ${printType(ast.type)} at ${printLocations(ast.location)}`);
     }
 }
 /**
@@ -127,7 +127,7 @@ export function from(value, type) {
         const input_variables = inputs.map(i => ({
             ast_type: "Variable",
             type: i,
-            location: get_location(3),
+            location: get_location(),
             mutable: false,
         }));
         const $ = BlockBuilder(output);
@@ -151,19 +151,19 @@ export function from(value, type) {
         let body_ast;
         if (isTypeEqual(output, NullType)) {
             if (statements.length === 0) {
-                body_ast = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+                body_ast = { ast_type: "Value", type: NullType, location: get_location(), value: null };
             }
             else if (statements.length === 1 && isSubtype(statements[0].type, NullType)) {
                 body_ast = statements[0];
             }
             else {
                 if (!isSubtype(statements[statements.length - 1].type, NullType)) {
-                    statements.push({ ast_type: "Value", type: NullType, location: get_location(3), value: null });
+                    statements.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
                 }
                 body_ast = {
                     ast_type: "Block",
                     type: statements[statements.length - 1].type,
-                    location: get_location(3),
+                    location: get_location(),
                     statements: statements,
                 };
             }
@@ -185,7 +185,7 @@ export function from(value, type) {
                 body_ast = {
                     ast_type: "Block",
                     type: statements[statements.length - 1].type,
-                    location: get_location(3),
+                    location: get_location(),
                     statements: statements,
                 };
             }
@@ -196,7 +196,7 @@ export function from(value, type) {
         const ast = {
             ast_type: "Function",
             type: FunctionType(inputs, output),
-            location: get_location(3),
+            location: get_location(),
             parameters: input_variables,
             body: body_ast,
         };
@@ -210,7 +210,7 @@ export function from(value, type) {
         const input_variables = inputs.map(i => ({
             ast_type: "Variable",
             type: i,
-            location: get_location(3),
+            location: get_location(),
             mutable: false,
         }));
         const $ = BlockBuilder(output);
@@ -234,19 +234,19 @@ export function from(value, type) {
         let body_ast;
         if (isTypeEqual(output, NullType)) {
             if (statements.length === 0) {
-                body_ast = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+                body_ast = { ast_type: "Value", type: NullType, location: get_location(), value: null };
             }
             else if (statements.length === 1 && isSubtype(statements[0].type, NullType)) {
                 body_ast = statements[0];
             }
             else {
                 if (!isSubtype(statements[statements.length - 1].type, NullType)) {
-                    statements.push({ ast_type: "Value", type: NullType, location: get_location(3), value: null });
+                    statements.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
                 }
                 body_ast = {
                     ast_type: "Block",
                     type: statements[statements.length - 1].type,
-                    location: get_location(3),
+                    location: get_location(),
                     statements: statements,
                 };
             }
@@ -268,7 +268,7 @@ export function from(value, type) {
                 body_ast = {
                     ast_type: "Block",
                     type: statements[statements.length - 1].type,
-                    location: get_location(3),
+                    location: get_location(),
                     statements: statements,
                 };
             }
@@ -279,7 +279,7 @@ export function from(value, type) {
         const ast = {
             ast_type: "AsyncFunction",
             type: FunctionType(inputs, output),
-            location: get_location(3),
+            location: get_location(),
             parameters: input_variables,
             body: body_ast,
         };
@@ -292,7 +292,7 @@ export function func(input_types, output_type, body) {
     const parameters = input_types.map(i => ({
         ast_type: "Variable",
         type: i,
-        location: get_location(2),
+        location: get_location(),
         mutable: false,
     }));
     const $ = BlockBuilder(output_type ?? NeverType);
@@ -309,7 +309,7 @@ export function func(input_types, output_type, body) {
         const ret_type = ret_ast.type;
         let body_ast;
         if (statements.length === 0) {
-            body_ast = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+            body_ast = { ast_type: "Value", type: NullType, location: get_location(), value: null };
         }
         else if (statements.length === 1) {
             body_ast = statements[0];
@@ -318,7 +318,7 @@ export function func(input_types, output_type, body) {
             body_ast = {
                 ast_type: "Block",
                 type: statements[statements.length - 1].type,
-                location: get_location(2),
+                location: get_location(),
                 statements: statements,
             };
         }
@@ -328,7 +328,7 @@ export function func(input_types, output_type, body) {
         const ast = {
             ast_type: "Function",
             type: FunctionType(input_types, ret_type),
-            location: get_location(2),
+            location: get_location(),
             parameters: parameters,
             body: body_ast,
         };
@@ -343,7 +343,7 @@ export function func(input_types, output_type, body) {
         }
         let body_ast;
         if (statements.length === 0) {
-            body_ast = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+            body_ast = { ast_type: "Value", type: NullType, location: get_location(), value: null };
         }
         else if (statements.length === 1) {
             body_ast = statements[0];
@@ -352,7 +352,7 @@ export function func(input_types, output_type, body) {
             body_ast = {
                 ast_type: "Block",
                 type: statements[statements.length - 1].type,
-                location: get_location(2),
+                location: get_location(),
                 statements: statements,
             };
         }
@@ -363,7 +363,7 @@ export function func(input_types, output_type, body) {
         const ast = {
             ast_type: "Function",
             type: FunctionType(input_types, output_type),
-            location: get_location(2),
+            location: get_location(),
             parameters: parameters,
             body: body_ast,
         };
@@ -374,7 +374,7 @@ export function asyncFunction(input_types, output_type, body) {
     const parameters = input_types.map(i => ({
         ast_type: "Variable",
         type: i,
-        location: get_location(2),
+        location: get_location(),
         mutable: false,
     }));
     const $ = BlockBuilder(output_type ?? NeverType);
@@ -391,7 +391,7 @@ export function asyncFunction(input_types, output_type, body) {
         const ret_type = ret_ast.type;
         let body_ast;
         if (statements.length === 0) {
-            body_ast = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+            body_ast = { ast_type: "Value", type: NullType, location: get_location(), value: null };
         }
         else if (statements.length === 1) {
             body_ast = statements[0];
@@ -400,7 +400,7 @@ export function asyncFunction(input_types, output_type, body) {
             body_ast = {
                 ast_type: "Block",
                 type: statements[statements.length - 1].type,
-                location: get_location(2),
+                location: get_location(),
                 statements: statements,
             };
         }
@@ -410,7 +410,7 @@ export function asyncFunction(input_types, output_type, body) {
         const ast = {
             ast_type: "AsyncFunction",
             type: AsyncFunctionType(input_types, ret_type),
-            location: get_location(2),
+            location: get_location(),
             parameters: parameters,
             body: body_ast,
         };
@@ -425,7 +425,7 @@ export function asyncFunction(input_types, output_type, body) {
         }
         let body_ast;
         if (statements.length === 0) {
-            body_ast = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+            body_ast = { ast_type: "Value", type: NullType, location: get_location(), value: null };
         }
         else if (statements.length === 1) {
             body_ast = statements[0];
@@ -434,7 +434,7 @@ export function asyncFunction(input_types, output_type, body) {
             body_ast = {
                 ast_type: "Block",
                 type: statements[statements.length - 1].type,
-                location: get_location(2),
+                location: get_location(),
                 statements: statements,
             };
         }
@@ -445,7 +445,7 @@ export function asyncFunction(input_types, output_type, body) {
         const ast = {
             ast_type: "AsyncFunction",
             type: AsyncFunctionType(input_types, output_type),
-            location: get_location(2),
+            location: get_location(),
             parameters: parameters,
             body: body_ast,
         };
@@ -460,7 +460,7 @@ export function asyncFunction(input_types, output_type, body) {
  * ```
 */
 export function str(strings, ...expressions) {
-    const location = get_location(2);
+    const location = get_location();
     // For simple strings, e.g: str`abc`
     if (strings.length === 1) {
         return fromAst({
@@ -576,7 +576,7 @@ export function str(strings, ...expressions) {
         let ret = {
             ast_type: "Value",
             type: StringType,
-            location: get_location(2),
+            location: get_location(),
             value: strings[0],
         };
         for (let i = 1; i < strings.length; i++) {
@@ -671,7 +671,7 @@ export function block(body) {
     if (statements.length === 0) {
         return fromAst({
             ast_type: "Value",
-            location: get_location(2),
+            location: get_location(),
             type: ret_type,
             value: null,
         });
@@ -682,7 +682,7 @@ export function block(body) {
     else {
         return fromAst({
             ast_type: "Block",
-            location: get_location(2),
+            location: get_location(),
             type: ret_type,
             statements: statements,
         });
@@ -691,7 +691,7 @@ export function block(body) {
 /**
  * Create an East error expression
  */
-export function error(message, location = get_location(2)) {
+export function error(message, location = get_location()) {
     const messageAst = message instanceof Expr ? Expr.ast(message) : valueOrExprToAstTyped(message, StringType);
     return fromAst({
         ast_type: "Error",
@@ -712,7 +712,7 @@ export function matchExpr(variant, handlers) {
         const data_variable = {
             ast_type: "Variable",
             type: t,
-            location: get_location(2),
+            location: get_location(),
             mutable: false,
         };
         const ast = handler === undefined ? valueOrExprToAstTyped(null, NullType) : block($ => handler($, fromAst(data_variable)))[AstSymbol];
@@ -723,7 +723,7 @@ export function matchExpr(variant, handlers) {
     return fromAst({
         ast_type: "Match",
         type: out_type,
-        location: get_location(2),
+        location: get_location(),
         variant: Expr.ast(variant),
         cases: cases_out,
     });
@@ -737,13 +737,13 @@ export function tryCatch(try_body, catch_body) {
     const message_variable = {
         ast_type: "Variable",
         type: StringType,
-        location: get_location(2),
+        location: get_location(),
         mutable: false,
     };
     const stack_variable = {
         ast_type: "Variable",
         type: ArrayType(StructType({ filename: StringType, line: IntegerType, column: IntegerType })),
-        location: get_location(2),
+        location: get_location(),
         mutable: false,
     };
     if (typeof catch_body !== "function") {
@@ -756,7 +756,7 @@ export function tryCatch(try_body, catch_body) {
     return fromAst({
         ast_type: "TryCatch",
         type: ret_type,
-        location: get_location(2),
+        location: get_location(),
         try_body: Expr.ast(try_body),
         catch_body: catch_body_ast,
         message: message_variable,
@@ -769,7 +769,7 @@ export function equal(left, right) {
     return fromAst({
         ast_type: "Builtin",
         type: BooleanType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "Equal",
         type_parameters: [Expr.type(left)],
         arguments: [Expr.ast(left), rightAst],
@@ -781,7 +781,7 @@ export function notEqual(left, right) {
     return fromAst({
         ast_type: "Builtin",
         type: BooleanType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "NotEqual",
         type_parameters: [Expr.type(left)],
         arguments: [Expr.ast(left), rightAst],
@@ -793,7 +793,7 @@ export function less(left, right) {
     return fromAst({
         ast_type: "Builtin",
         type: BooleanType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "Less",
         type_parameters: [Expr.type(left)],
         arguments: [Expr.ast(left), rightAst],
@@ -805,7 +805,7 @@ export function lessEqual(left, right) {
     return fromAst({
         ast_type: "Builtin",
         type: BooleanType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "LessEqual",
         type_parameters: [Expr.type(left)],
         arguments: [Expr.ast(left), rightAst],
@@ -817,7 +817,7 @@ export function greater(left, right) {
     return fromAst({
         ast_type: "Builtin",
         type: BooleanType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "Greater",
         type_parameters: [Expr.type(left)],
         arguments: [Expr.ast(left), rightAst],
@@ -829,7 +829,7 @@ export function greaterEqual(left, right) {
     return fromAst({
         ast_type: "Builtin",
         type: BooleanType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "GreaterEqual",
         type_parameters: [Expr.type(left)],
         arguments: [Expr.ast(left), rightAst],
@@ -875,7 +875,7 @@ export function is(left, right) {
     return fromAst({
         ast_type: "Builtin",
         type: BooleanType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "Is",
         type_parameters: [Expr.type(left)],
         arguments: [Expr.ast(left), rightAst],
@@ -887,7 +887,7 @@ export function print(value) {
     return fromAst({
         ast_type: "Builtin",
         type: StringType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "Print",
         type_parameters: [valueAst.type],
         arguments: [valueAst],
@@ -907,7 +907,7 @@ export function diff(before, after) {
     return fromAst({
         ast_type: "Builtin",
         type: patchType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "Diff",
         type_parameters: [valueType, patchType],
         arguments: [beforeAst, afterAst],
@@ -924,7 +924,7 @@ export function applyPatch(value, patch) {
     return fromAst({
         ast_type: "Builtin",
         type: valueType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "ApplyPatch",
         type_parameters: [valueType, patchType],
         arguments: [valueAst, patchAst],
@@ -942,7 +942,7 @@ export function composePatch(first, second, type) {
     return fromAst({
         ast_type: "Builtin",
         type: patchType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "ComposePatch",
         type_parameters: [valueType, patchType],
         arguments: [firstAst, secondAst],
@@ -958,7 +958,7 @@ export function invertPatch(patch, type) {
     return fromAst({
         ast_type: "Builtin",
         type: patchType,
-        location: get_location(2),
+        location: get_location(),
         builtin: "InvertPatch",
         type_parameters: [valueType, patchType],
         arguments: [patchAst],
@@ -1014,7 +1014,7 @@ export function platform(name, input_types, output_type) {
                 ast = {
                     ast_type: "As",
                     type: expectedType,
-                    location: get_location(2),
+                    location: get_location(),
                     value: ast,
                 };
             }
@@ -1023,7 +1023,7 @@ export function platform(name, input_types, output_type) {
         return fromAst({
             ast_type: "Platform",
             type: output_type,
-            location: get_location(2),
+            location: get_location(),
             name: name,
             type_parameters: [],
             arguments: argAsts,
@@ -1104,7 +1104,7 @@ export function asyncPlatform(name, input_types, output_type) {
                 ast = {
                     ast_type: "As",
                     type: expectedType,
-                    location: get_location(2),
+                    location: get_location(),
                     value: ast,
                 };
             }
@@ -1113,7 +1113,7 @@ export function asyncPlatform(name, input_types, output_type) {
         return fromAst({
             ast_type: "Platform",
             type: output_type,
-            location: get_location(2),
+            location: get_location(),
             name: name,
             type_parameters: [],
             arguments: argAsts,
@@ -1295,7 +1295,7 @@ export function genericPlatform(name, typeParams, inputs, output) {
                 ast = {
                     ast_type: "As",
                     type: expectedType,
-                    location: get_location(2),
+                    location: get_location(),
                     value: ast,
                 };
             }
@@ -1305,7 +1305,7 @@ export function genericPlatform(name, typeParams, inputs, output) {
         return fromAst({
             ast_type: "Platform",
             type: outputType,
-            location: get_location(2),
+            location: get_location(),
             name: name,
             type_parameters: type_args,
             arguments: argAsts,
@@ -1431,7 +1431,7 @@ export function asyncGenericPlatform(name, typeParams, inputs, output) {
                 ast = {
                     ast_type: "As",
                     type: expectedType,
-                    location: get_location(2),
+                    location: get_location(),
                     value: ast,
                 };
             }
@@ -1441,7 +1441,7 @@ export function asyncGenericPlatform(name, typeParams, inputs, output) {
         return fromAst({
             ast_type: "Platform",
             type: outputType,
-            location: get_location(2),
+            location: get_location(),
             name: name,
             type_parameters: type_args,
             arguments: argAsts,
@@ -1503,7 +1503,7 @@ export const BlockBuilder = (return_type) => {
     };
     $.const = ((value, type) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         let ast;
         if (value instanceof Expr) {
@@ -1518,13 +1518,13 @@ export const BlockBuilder = (return_type) => {
         const variable = {
             ast_type: "Variable",
             type: type ?? ast.type,
-            location: get_location(2),
+            location: get_location(),
             mutable: false,
         };
         statements.push({
             ast_type: "Let",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             variable,
             value: ast,
         });
@@ -1532,7 +1532,7 @@ export const BlockBuilder = (return_type) => {
     });
     $.let = ((value, type) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         let ast;
         if (value instanceof Expr) {
@@ -1547,13 +1547,13 @@ export const BlockBuilder = (return_type) => {
         const variable = {
             ast_type: "Variable",
             type: type ?? ast.type,
-            location: get_location(2),
+            location: get_location(),
             mutable: true,
         };
         statements.push({
             ast_type: "Let",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             variable,
             value: ast,
         });
@@ -1561,7 +1561,7 @@ export const BlockBuilder = (return_type) => {
     });
     $.assign = ((variable, value) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         let v = Expr.ast(variable);
         // Handle RecursiveType variables which are auto-unwrapped by fromAst
@@ -1572,13 +1572,13 @@ export const BlockBuilder = (return_type) => {
             throw new Error("Can only assign to a variable");
         }
         if (!v.mutable) {
-            throw new Error(`Cannot assign to variable defined at ${printLocation(v.location)} defined as const`);
+            throw new Error(`Cannot assign to variable defined at ${printLocations(v.location)} defined as const`);
         }
         const ast_value = value instanceof Expr ? Expr.ast(value) : valueOrExprToAstTyped(value, v.type);
         const ast = {
             ast_type: "Assign",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             variable: v,
             value: ast_value,
         };
@@ -1588,7 +1588,7 @@ export const BlockBuilder = (return_type) => {
     // TODO if/when we introduce recursion, can we somehow get benefit from the typing?
     $.return = (expr) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         const expAst = expr instanceof Expr ? Expr.ast(expr) : valueOrExprToAst(expr);
         if (!isSubtype(expAst.type, return_type)) {
@@ -1603,7 +1603,7 @@ export const BlockBuilder = (return_type) => {
         const ast = {
             ast_type: "Return",
             type: NeverType,
-            location: get_location(2),
+            location: get_location(),
             value: expAst
         };
         statements.push(ast);
@@ -1611,12 +1611,12 @@ export const BlockBuilder = (return_type) => {
     };
     $.break = (label) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         const ast = {
             ast_type: "Break",
             type: NeverType,
-            location: get_location(2),
+            location: get_location(),
             label,
         };
         statements.push(ast);
@@ -1624,12 +1624,12 @@ export const BlockBuilder = (return_type) => {
     };
     $.continue = (label) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         const ast = {
             ast_type: "Continue",
             type: NeverType,
-            location: get_location(2),
+            location: get_location(),
             label,
         };
         statements.push(ast);
@@ -1637,7 +1637,7 @@ export const BlockBuilder = (return_type) => {
     };
     $.if = (predicate, true_branch) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         const predicateAst = predicate instanceof Expr ? Expr.ast(predicate) : valueOrExprToAstTyped(predicate, BooleanType);
         if (predicateAst.type.type !== "Boolean") {
@@ -1655,38 +1655,38 @@ export const BlockBuilder = (return_type) => {
         }
         let true_ast;
         if (true_stmts.length === 0) {
-            true_ast = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+            true_ast = { ast_type: "Value", type: NullType, location: get_location(), value: null };
         }
         else if (true_stmts.length === 1 && isSubtype(true_stmts[0].type, NullType)) {
             true_ast = true_stmts[0];
         }
         else {
             if (!isSubtype(true_stmts[true_stmts.length - 1].type, NullType)) {
-                true_stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+                true_stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
             }
             true_ast = {
                 ast_type: "Block",
                 type: true_stmts[true_stmts.length - 1].type,
-                location: get_location(2),
+                location: get_location(),
                 statements: true_stmts,
             };
         }
         const if_else_ast = {
             ast_type: "IfElse",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             ifs: [{
                     predicate: Expr.ast(predicate),
                     body: true_ast,
                 }],
-            else_body: { ast_type: "Value", type: NullType, location: get_location(2), value: null },
+            else_body: { ast_type: "Value", type: NullType, location: get_location(), value: null },
         };
         statements.push(if_else_ast);
         return new IfElseExpr(if_else_ast, return_type);
     };
     $.match = (variant, cases) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         if (Expr.type(variant).type !== "Variant") {
             throw new Error(`match not defined over ${printType(Expr.type(variant))}`);
@@ -1698,11 +1698,11 @@ export const BlockBuilder = (return_type) => {
             const data_variable = {
                 ast_type: "Variable",
                 type: t,
-                location: get_location(2),
+                location: get_location(),
                 mutable: false,
             };
             if (f === undefined) {
-                cases_out[k] = { variable: data_variable, body: { ast_type: "Value", type: NullType, location: get_location(2), value: null } };
+                cases_out[k] = { variable: data_variable, body: { ast_type: "Value", type: NullType, location: get_location(), value: null } };
             }
             else {
                 const data = fromAst(data_variable);
@@ -1717,19 +1717,19 @@ export const BlockBuilder = (return_type) => {
                 }
                 let expr;
                 if (stmts.length === 0) {
-                    expr = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+                    expr = { ast_type: "Value", type: NullType, location: get_location(), value: null };
                 }
                 else if (stmts.length === 1 && isSubtype(stmts[0].type, NullType)) {
                     expr = stmts[0];
                 }
                 else {
                     if (!isSubtype(stmts[stmts.length - 1].type, NullType)) {
-                        stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+                        stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
                     }
                     expr = {
                         ast_type: "Block",
                         type: stmts[stmts.length - 1].type,
-                        location: get_location(2),
+                        location: get_location(),
                         statements: stmts,
                     };
                 }
@@ -1740,7 +1740,7 @@ export const BlockBuilder = (return_type) => {
         const ast = {
             ast_type: "Match",
             type: out_type,
-            location: get_location(2),
+            location: get_location(),
             variant: Expr.ast(variant),
             cases: cases_out,
         };
@@ -1749,13 +1749,13 @@ export const BlockBuilder = (return_type) => {
     };
     $.while = (predicate, body) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         const predicateAst = predicate instanceof Expr ? Expr.ast(predicate) : valueOrExprToAstTyped(predicate, BooleanType);
         if (predicateAst.type.type !== "Boolean") {
             throw new Error(`while predicate expected to have type Boolean, got ${printType(predicateAst.type)}`);
         }
-        const label = { location: get_location(2) };
+        const label = { location: get_location() };
         const $_body = BlockBuilder(return_type);
         const ret = body($_body, label);
         const stmts = $_body.statements;
@@ -1767,19 +1767,19 @@ export const BlockBuilder = (return_type) => {
         }
         let expr;
         if (stmts.length === 0) {
-            expr = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+            expr = { ast_type: "Value", type: NullType, location: get_location(), value: null };
         }
         else if (stmts.length === 1 && isSubtype(stmts[0].type, NullType)) {
             expr = stmts[0];
         }
         else {
             if (!isSubtype(stmts[stmts.length - 1].type, NullType)) {
-                stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+                stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
             }
             expr = {
                 ast_type: "Block",
                 type: stmts[stmts.length - 1].type,
-                location: get_location(2),
+                location: get_location(),
                 statements: stmts,
             };
         }
@@ -1789,7 +1789,7 @@ export const BlockBuilder = (return_type) => {
         const ast = {
             ast_type: "While",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             predicate: predicateAst,
             label,
             body: expr,
@@ -1799,24 +1799,24 @@ export const BlockBuilder = (return_type) => {
     };
     $.for = ((collection, body) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         if (collection instanceof ArrayExpr) {
             const value_variable = {
                 ast_type: "Variable",
                 type: Expr.type(collection).value,
-                location: get_location(2),
+                location: get_location(),
                 mutable: false,
             };
             const value = fromAst(value_variable);
             const key_variable = {
                 ast_type: "Variable",
                 type: IntegerType,
-                location: get_location(2),
+                location: get_location(),
                 mutable: false,
             };
             const key = fromAst(key_variable);
-            const label = { location: get_location(2) };
+            const label = { location: get_location() };
             const $ = BlockBuilder(return_type);
             const ret = body($, value, key, label);
             const stmts = $.statements;
@@ -1828,26 +1828,26 @@ export const BlockBuilder = (return_type) => {
             }
             let expr;
             if (stmts.length === 0) {
-                expr = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+                expr = { ast_type: "Value", type: NullType, location: get_location(), value: null };
             }
             else if (stmts.length === 1 && isSubtype(stmts[0].type, NullType)) {
                 expr = stmts[0];
             }
             else {
                 if (!isSubtype(stmts[stmts.length - 1].type, NullType)) {
-                    stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+                    stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
                 }
                 expr = {
                     ast_type: "Block",
                     type: stmts[stmts.length - 1].type,
-                    location: get_location(2),
+                    location: get_location(),
                     statements: stmts,
                 };
             }
             const ast = {
                 ast_type: "ForArray",
                 type: NullType,
-                location: get_location(2),
+                location: get_location(),
                 label,
                 array: Expr.ast(collection),
                 key: key_variable,
@@ -1861,11 +1861,11 @@ export const BlockBuilder = (return_type) => {
             const key_variable = {
                 ast_type: "Variable",
                 type: Expr.type(collection).key,
-                location: get_location(2),
+                location: get_location(),
                 mutable: false,
             };
             const key = fromAst(key_variable);
-            const label = { location: get_location(2) };
+            const label = { location: get_location() };
             const $ = BlockBuilder(return_type);
             const ret = body($, key, label);
             const stmts = $.statements;
@@ -1877,26 +1877,26 @@ export const BlockBuilder = (return_type) => {
             }
             let expr;
             if (stmts.length === 0) {
-                expr = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+                expr = { ast_type: "Value", type: NullType, location: get_location(), value: null };
             }
             else if (stmts.length === 1 && isSubtype(stmts[0].type, NullType)) {
                 expr = stmts[0];
             }
             else {
                 if (!isSubtype(stmts[stmts.length - 1].type, NullType)) {
-                    stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+                    stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
                 }
                 expr = {
                     ast_type: "Block",
                     type: stmts[stmts.length - 1].type,
-                    location: get_location(2),
+                    location: get_location(),
                     statements: stmts,
                 };
             }
             const ast = {
                 ast_type: "ForSet",
                 type: NullType,
-                location: get_location(2),
+                location: get_location(),
                 label,
                 set: Expr.ast(collection),
                 key: key_variable,
@@ -1909,18 +1909,18 @@ export const BlockBuilder = (return_type) => {
             const value_variable = {
                 ast_type: "Variable",
                 type: Expr.type(collection).value,
-                location: get_location(2),
+                location: get_location(),
                 mutable: false,
             };
             const value = fromAst(value_variable);
             const key_variable = {
                 ast_type: "Variable",
                 type: Expr.type(collection).key,
-                location: get_location(2),
+                location: get_location(),
                 mutable: false,
             };
             const key = fromAst(key_variable);
-            const label = { location: get_location(2) };
+            const label = { location: get_location() };
             const $ = BlockBuilder(return_type);
             const ret = body($, value, key, label);
             const stmts = $.statements;
@@ -1932,26 +1932,26 @@ export const BlockBuilder = (return_type) => {
             }
             let expr;
             if (stmts.length === 0) {
-                expr = { ast_type: "Value", type: NullType, location: get_location(2), value: null };
+                expr = { ast_type: "Value", type: NullType, location: get_location(), value: null };
             }
             else if (stmts.length === 1 && isSubtype(stmts[0].type, NullType)) {
                 expr = stmts[0];
             }
             else {
                 if (!isSubtype(stmts[stmts.length - 1].type, NullType)) {
-                    stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+                    stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
                 }
                 expr = {
                     ast_type: "Block",
                     type: stmts[stmts.length - 1].type,
-                    location: get_location(2),
+                    location: get_location(),
                     statements: stmts,
                 };
             }
             const ast = {
                 ast_type: "ForDict",
                 type: NullType,
-                location: get_location(2),
+                location: get_location(),
                 label,
                 dict: Expr.ast(collection),
                 key: key_variable,
@@ -1967,10 +1967,10 @@ export const BlockBuilder = (return_type) => {
     });
     $.error = (message, location) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         if (location === undefined) {
-            location = get_location(2);
+            location = get_location();
         }
         const ast = {
             ast_type: "Error",
@@ -1983,7 +1983,7 @@ export const BlockBuilder = (return_type) => {
     };
     $.try = (body) => {
         if (isTypeEqual($.type(), NeverType)) {
-            throw new Error(`Unreachable statement detected at ${printLocation(get_location(2))}`);
+            throw new Error(`Unreachable statement detected at ${printLocations(get_location())}`);
         }
         const $try = BlockBuilder(return_type);
         const ret = body($try);
@@ -1995,7 +1995,7 @@ export const BlockBuilder = (return_type) => {
             }
         }
         if (try_stmts.length === 0 || !isSubtype(try_stmts[try_stmts.length - 1].type, NullType)) {
-            try_stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+            try_stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
         }
         let try_expr;
         if (try_stmts.length === 1) {
@@ -2005,7 +2005,7 @@ export const BlockBuilder = (return_type) => {
             try_expr = {
                 ast_type: "Block",
                 type: try_stmts[try_stmts.length - 1].type,
-                location: get_location(2),
+                location: get_location(),
                 statements: try_stmts,
             };
         }
@@ -2013,21 +2013,21 @@ export const BlockBuilder = (return_type) => {
         const message_variable = {
             ast_type: "Variable",
             type: StringType,
-            location: get_location(2),
+            location: get_location(),
             mutable: false,
         };
         const stack_variable = {
             ast_type: "Variable",
             type: ArrayType(StructType({ filename: StringType, line: IntegerType, column: IntegerType })),
-            location: get_location(2),
+            location: get_location(),
             mutable: false,
         };
         const try_catch_ast = {
             ast_type: "TryCatch",
             type: NullType,
-            location: get_location(2),
+            location: get_location(),
             try_body: try_expr,
-            catch_body: { ast_type: "Value", type: NullType, location: get_location(2), value: null }, // will be updated later
+            catch_body: { ast_type: "Value", type: NullType, location: get_location(), value: null }, // will be updated later
             message: message_variable,
             stack: stack_variable,
         };
@@ -2058,12 +2058,12 @@ class IfElseExpr extends NullExpr {
             }
         }
         if (stmts.length === 0 || !isSubtype(stmts[stmts.length - 1].type, NullType)) {
-            stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+            stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
         }
         this[AstSymbol].else_body = stmts.length === 1 ? stmts[0] : {
             ast_type: "Block",
             type: stmts[stmts.length - 1].type,
-            location: get_location(2),
+            location: get_location(),
             statements: stmts,
         };
         // propagate unreachable information
@@ -2104,14 +2104,14 @@ class IfElseExpr extends NullExpr {
             }
         }
         if (stmts.length === 0 || !isSubtype(stmts[stmts.length - 1].type, NullType)) {
-            stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+            stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
         }
         this[AstSymbol].ifs.push({
             predicate: Expr.ast(predicate),
             body: stmts.length === 1 ? stmts[0] : {
                 ast_type: "Block",
                 type: stmts[stmts.length - 1].type,
-                location: get_location(2),
+                location: get_location(),
                 statements: stmts,
             },
         });
@@ -2136,7 +2136,7 @@ class TryCatchExpr extends NullExpr {
     /** Define the logic to follow when an error is caught. The error message and stack trace is provided. */
     catch(body) {
         if (this.catchCalled) {
-            throw new Error(`Cannot call .catch() more than once on the same try block at ${printLocation(get_location(2))}`);
+            throw new Error(`Cannot call .catch() more than once on the same try block at ${printLocations(get_location())}`);
         }
         this.catchCalled = true;
         const $ = BlockBuilder(this.return_type);
@@ -2149,12 +2149,12 @@ class TryCatchExpr extends NullExpr {
             }
         }
         if (stmts.length === 0 || !isSubtype(stmts[stmts.length - 1].type, NullType)) {
-            stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+            stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
         }
         this[AstSymbol].catch_body = stmts.length === 1 ? stmts[0] : {
             ast_type: "Block",
             type: stmts[stmts.length - 1].type,
-            location: get_location(2),
+            location: get_location(),
             statements: stmts,
         };
         // Propagate unreachable information
@@ -2175,12 +2175,12 @@ class TryCatchExpr extends NullExpr {
             }
         }
         if (stmts.length === 0 || !isSubtype(stmts[stmts.length - 1].type, NullType)) {
-            stmts.push({ ast_type: "Value", type: NullType, location: get_location(2), value: null });
+            stmts.push({ ast_type: "Value", type: NullType, location: get_location(), value: null });
         }
         this[AstSymbol].finally_body = stmts.length === 1 ? stmts[0] : {
             ast_type: "Block",
             type: stmts[stmts.length - 1].type,
-            location: get_location(2),
+            location: get_location(),
             statements: stmts,
         };
     }