firefly-compiler 0.5.35 → 0.5.37

package/output/js/ff/compiler/Patterns.mjs

@@ -46,6 +46,8 @@ import * as ff_core_Int from "../../ff/core/Int.mjs"
 
 import * as ff_core_IntMap from "../../ff/core/IntMap.mjs"
 
+import * as ff_core_Js from "../../ff/core/Js.mjs"
+
 import * as ff_core_JsSystem from "../../ff/core/JsSystem.mjs"
 
 import * as ff_core_JsValue from "../../ff/core/JsValue.mjs"
@@ -72,6 +74,8 @@ import * as ff_core_Pair from "../../ff/core/Pair.mjs"
 
 import * as ff_core_Path from "../../ff/core/Path.mjs"
 
+import * as ff_core_Queue from "../../ff/core/Queue.mjs"
+
 import * as ff_core_Random from "../../ff/core/Random.mjs"
 
 import * as ff_core_Serializable from "../../ff/core/Serializable.mjs"
@@ -94,8 +98,6 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
-import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
-
 // type PatternInfo
 export function PatternInfo(variant_, otherVariants_, fields_) {
 return {variant_, otherVariants_, fields_};
@@ -147,7 +149,7 @@ const cs_ = _1.second_.slice(1);
 ff_compiler_Patterns.check_(variants_, fs_, cs_, true, g_)
 return
 }
-if(_1.first_.length === 0 && _1.second_.length === 0) {
+{
 const remaining_ = ff_core_List.List_map(ff_core_List.List_filter(ff_core_Map.Map_pairs(variants_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return (ff_core_Set.Set_size(_w1.second_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String) !== 0)
 })), ((_1) => {
@@ -179,7 +181,7 @@ if((name_ === "List$Link")) {
 return ff_core_List.List_toSet(["List$Empty"], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 } else {
 const variantName_ = unqualifiedName_(name_);
-const moduleName_ = ff_core_String.String_dropLast(name_, (ff_core_String.String_size(variantName_) + 1));
+const moduleName_ = ff_core_String.String_dropLast(name_, (variantName_.length + 1));
 const variantModule_ = ff_core_Map.Map_grab(modules_, moduleName_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 return ff_core_Option.Option_grab(ff_core_List.List_collectFirst(variantModule_.types_, ((definition_) => {
 return ff_core_Option.Option_map(ff_core_List.List_find(definition_.variants_, ((_w1) => {
@@ -230,7 +232,7 @@ if(pattern_a.PVariantAs) {
 const p_ = pattern_a;
 return ff_core_Option.Some(ff_compiler_Patterns.PatternInfo(unqualifiedName_(p_.name_), otherVariants_(p_.name_), []))
 }
-if(pattern_a.PAlias) {
+{
 const p_ = pattern_a;
 return convertPattern_(p_.pattern_)
 }
@@ -270,7 +272,7 @@ const converted_ = ff_compiler_Patterns.convert_(modules_, cases_);
 ff_core_Try.Try_else(ff_core_Core.try_((() => {
 ff_compiler_Patterns.check_(ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), [], converted_, false, false)
 })), (() => {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError((cases_[0] ?? ff_core_List.internalGrab_(cases_, 0)).at_, "Unexhaustive match"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError((cases_[0] ?? ff_core_List.List_grab(cases_, 0)).at_, "Unexhaustive match"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }))
 }
 
@@ -317,7 +319,7 @@ const cs_ = _1.second_.slice(1);
 ff_compiler_Patterns.check_(variants_, fs_, cs_, true, g_)
 return
 }
-if(_1.first_.length === 0 && _1.second_.length === 0) {
+{
 const remaining_ = ff_core_List.List_map(ff_core_List.List_filter(ff_core_Map.Map_pairs(variants_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), ((_w1) => {
 return (ff_core_Set.Set_size(_w1.second_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String) !== 0)
 })), ((_1) => {
@@ -349,7 +351,7 @@ if((name_ === "List$Link")) {
 return ff_core_List.List_toSet(["List$Empty"], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 } else {
 const variantName_ = unqualifiedName_(name_);
-const moduleName_ = ff_core_String.String_dropLast(name_, (ff_core_String.String_size(variantName_) + 1));
+const moduleName_ = ff_core_String.String_dropLast(name_, (variantName_.length + 1));
 const variantModule_ = ff_core_Map.Map_grab(modules_, moduleName_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 return ff_core_Option.Option_grab(ff_core_List.List_collectFirst(variantModule_.types_, ((definition_) => {
 return ff_core_Option.Option_map(ff_core_List.List_find(definition_.variants_, ((_w1) => {
@@ -400,7 +402,7 @@ if(pattern_a.PVariantAs) {
 const p_ = pattern_a;
 return ff_core_Option.Some(ff_compiler_Patterns.PatternInfo(unqualifiedName_(p_.name_), otherVariants_(p_.name_), []))
 }
-if(pattern_a.PAlias) {
+{
 const p_ = pattern_a;
 return convertPattern_(p_.pattern_)
 }
@@ -440,7 +442,7 @@ const converted_ = ff_compiler_Patterns.convert_(modules_, cases_);
 ff_core_Try.Try_else(ff_core_Core.try_((() => {
 ff_compiler_Patterns.check_(ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), [], converted_, false, false)
 })), (() => {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError((cases_[0] ?? ff_core_List.internalGrab_(cases_, 0)).at_, "Unexhaustive match"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError((cases_[0] ?? ff_core_List.List_grab(cases_, 0)).at_, "Unexhaustive match"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }))
 }
 

package/output/js/ff/compiler/Resolver.mjs

@@ -48,6 +48,8 @@ import * as ff_core_Int from "../../ff/core/Int.mjs"
 
 import * as ff_core_IntMap from "../../ff/core/IntMap.mjs"
 
+import * as ff_core_Js from "../../ff/core/Js.mjs"
+
 import * as ff_core_JsSystem from "../../ff/core/JsSystem.mjs"
 
 import * as ff_core_JsValue from "../../ff/core/JsValue.mjs"
@@ -74,6 +76,8 @@ import * as ff_core_Pair from "../../ff/core/Pair.mjs"
 
 import * as ff_core_Path from "../../ff/core/Path.mjs"
 
+import * as ff_core_Queue from "../../ff/core/Queue.mjs"
+
 import * as ff_core_Random from "../../ff/core/Random.mjs"
 
 import * as ff_core_Serializable from "../../ff/core/Serializable.mjs"
@@ -96,8 +100,6 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
-import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
-
 // type Resolver
 export function Resolver(variables_, variableLocations_, variants_, types_, typeGenerics_, typeLocations_, asyncTypes_, typeParameters_, traits_, traitLocations_, state_, lspHook_) {
 return {variables_, variableLocations_, variants_, types_, typeGenerics_, typeLocations_, asyncTypes_, typeParameters_, traits_, traitLocations_, state_, lspHook_};
@@ -152,9 +154,9 @@ return ff_compiler_Resolver.Resolver_resolveLetDefinition(self3_, _w1, true)
 return ff_compiler_Resolver.Resolver_resolveFunctionDefinition(self3_, _w1, true, false)
 })))
 }))(module_);
-for(let for_i = 0, for_a = module2_.instances_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = module2_.instances_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const _w1 = for_a[for_i];
-for(let for_i = 0, for_a = _w1.typeArguments_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = _w1.typeArguments_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const _w1 = for_a[for_i];
 ff_compiler_Resolver.Resolver_checkInstanceType(self3_, _w1)
 }
@@ -171,7 +173,7 @@ const typeArguments_ = _1.generics_;
 if(ff_core_Set.Set_contains(self_.asyncTypes_, name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(type_.at_, "Traits must not be instantiated for capability types"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-for(let for_i = 0, for_a = typeArguments_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = typeArguments_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const _w1 = for_a[for_i];
 ff_compiler_Resolver.Resolver_checkInstanceType(self_, _w1)
 }
@@ -186,7 +188,7 @@ return
 
 export function Resolver_processImports(self_, imports_, modules_) {
 let resolver_ = self_;
-for(let for_i = 0, for_a = imports_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = imports_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const import_ = for_a[for_i];
 do {
 const _1 = ff_core_List.List_find(modules_, ((_w1) => {
@@ -197,7 +199,7 @@ const module_ = _1.value_;
 resolver_ = ff_compiler_Resolver.Resolver_processDefinitions(resolver_, module_, ff_core_Option.Some(import_.alias_))
 break
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(import_.at_, ("No such module: " + import_.file_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 } while(false)
@@ -219,7 +221,7 @@ if(unqualified_) {
 return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(name_, full_), ff_core_Pair.Pair(full_, full_)]
 }
 }
-if(_1.Some) {
+{
 const alias_ = _1.value_;
 return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(full_, full_)]
 }
@@ -321,9 +323,9 @@ return ff_compiler_Resolver.Resolver(_c.variables_, _c.variableLocations_, _c.va
 if((!ff_core_Option.Option_any(ff_core_List.List_first(definition_.generics_), ((_w1) => {
 return (_w1 === "Q$")
 })))) {
-for(let for_i = 0, for_a = [...definition_.commonFields_, ...ff_core_List.List_flatMap(definition_.variants_, ((_w1) => {
+for(let for_a = [...definition_.commonFields_, ...ff_core_List.List_flatMap(definition_.variants_, ((_w1) => {
 return _w1.fields_
-}))], for_l = for_a.length; for_i < for_l; for_i++) {
+}))], for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const f_ = for_a[for_i];
 if(ff_compiler_Resolver.Resolver_containsAsyncType(self2_, f_.valueType_)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, "Only capabilities can contain fields of concrete capability types"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
@@ -409,18 +411,9 @@ const lambda_ = _1.second_;
 const signature_ = ff_core_Option.Option_grab(ff_core_List.List_find(definition_.methods_, ((_w1) => {
 return (_w1.name_ === name_)
 })));
-const function1_ = ff_compiler_Syntax.DFunction(signature_.at_, signature_, ff_compiler_Syntax.FireflyTarget(lambda_));
+const function1_ = ff_compiler_Syntax.DFunction(signature_.at_, signature_, lambda_);
 const function2_ = ff_compiler_Resolver.Resolver_resolveFunctionDefinition(self2_, function1_, true, false);
-return ff_core_Pair.Pair(name_, (((_1) => {
-if(_1.FireflyTarget) {
-const lambda_ = _1.lambda_;
-return lambda_
-}
-{
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(signature_.at_, "Internal error: Expected method default to be a lambda"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}))(function2_.body_))
-return
+return ff_core_Pair.Pair(name_, function2_.body_)
 }
 })), _c.methodGenerators_)
 return
@@ -737,7 +730,7 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 })), ff_compiler_Resolver.Resolver_resolveTerm(self_, value_, topLevel_, false))
 return
 }
-if(_1.EAssignField) {
+{
 const at_ = _1.at_;
 const operator_ = _1.operator_;
 const record_ = _1.record_;
@@ -755,7 +748,7 @@ const topLevel_a = topLevel_;
 if(type_a.TVariable) {
 return type_
 }
-if(type_a.TConstructor) {
+{
 const constructor_ = type_a;
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 const at_ = ff_core_Option.Option_else(ff_core_Map.Map_get(self_.typeLocations_, constructor_.name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), (() => {
@@ -841,18 +834,11 @@ return
 export function Resolver_resolveFunctionDefinition(self_, definition_, topLevel_, isInstanceMethod_) {
 const signature_ = ff_compiler_Resolver.Resolver_resolveSignature(self_, definition_.signature_, topLevel_, isInstanceMethod_);
 const self2_ = ff_compiler_Resolver.Resolver_withSignature(self_, signature_);
-const body_ = ff_compiler_Syntax.Target_mapFirefly(definition_.body_, ((lambda_) => {
-{
-const _1 = lambda_;
-{
-const _c = _1;
-return ff_compiler_Syntax.Lambda(_c.at_, signature_.effect_, ff_core_List.List_map(lambda_.cases_, ((_w1) => {
+const body_ = (((_c) => {
+return ff_compiler_Syntax.Lambda(_c.at_, signature_.effect_, ff_core_List.List_map(definition_.body_.cases_, ((_w1) => {
 return ff_compiler_Resolver.Resolver_resolveCase(self2_, _w1, false)
 })))
-return
-}
-}
-}));
+}))(definition_.body_);
 return ff_compiler_Syntax.DFunction(definition_.at_, signature_, body_)
 }
 
@@ -867,12 +853,14 @@ return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, ["Q$", ...sign
 : (((_c) => {
 return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, _c.generics_, _c.constraints_, _c.parameters_, _c.returnType_, ff_compiler_Resolver.Resolver_freshUnificationVariable(self_, signature_.at_))
 }))(signature_));
-for(const for_o = ff_core_List.List_find(newSignature_.generics_, ((name_) => {
+{
+const if_o = ff_core_List.List_find(newSignature_.generics_, ((name_) => {
 return ff_core_Set.Set_contains(self_.typeParameters_, name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-})); for_o.Some;) {
-const name_ = for_o.value_;
+}))
+if(if_o.Some) {
+const name_ = if_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(signature_.at_, (("Type parameter " + name_) + " is already in scope")), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-break
+}
 };
 const self2_ = ff_compiler_Resolver.Resolver_withSignature(self_, newSignature_);
 {
@@ -958,7 +946,7 @@ return ff_core_Pair.Pair(x_, ff_compiler_Resolver.CaseVariable(variableAt_, x_,
 })), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 return
 }
-if(pattern_a.PAlias) {
+{
 const at_ = pattern_a.at_;
 const pattern_ = pattern_a.pattern_;
 const variable_ = pattern_a.variable_;
@@ -1034,7 +1022,7 @@ return name_
 }));
 return ff_compiler_Syntax.PVariantAs(at_, newName_, variableAt_, variable_)
 }
-if(pattern_a.PAlias) {
+{
 const at_ = pattern_a.at_;
 const pattern_ = pattern_a.pattern_;
 const variable_ = pattern_a.variable_;
@@ -1049,7 +1037,7 @@ const type_a = type_;
 if(type_a.TVariable) {
 return false
 }
-if(type_a.TConstructor) {
+{
 const constructor_ = type_a;
 const name_ = (ff_core_String.String_contains(constructor_.name_, "$")
 ? constructor_.name_
@@ -1097,9 +1085,9 @@ return ff_compiler_Resolver.Resolver_resolveLetDefinition(self3_, _w1, true)
 return ff_compiler_Resolver.Resolver_resolveFunctionDefinition(self3_, _w1, true, false)
 })))
 }))(module_);
-for(let for_i = 0, for_a = module2_.instances_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = module2_.instances_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const _w1 = for_a[for_i];
-for(let for_i = 0, for_a = _w1.typeArguments_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = _w1.typeArguments_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const _w1 = for_a[for_i];
 ff_compiler_Resolver.Resolver_checkInstanceType(self3_, _w1)
 }
@@ -1116,7 +1104,7 @@ const typeArguments_ = _1.generics_;
 if(ff_core_Set.Set_contains(self_.asyncTypes_, name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(type_.at_, "Traits must not be instantiated for capability types"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 };
-for(let for_i = 0, for_a = typeArguments_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = typeArguments_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const _w1 = for_a[for_i];
 ff_compiler_Resolver.Resolver_checkInstanceType(self_, _w1)
 }
@@ -1131,7 +1119,7 @@ return
 
 export async function Resolver_processImports$(self_, imports_, modules_, $task) {
 let resolver_ = self_;
-for(let for_i = 0, for_a = imports_, for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_a = imports_, for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const import_ = for_a[for_i];
 do {
 const _1 = ff_core_List.List_find(modules_, ((_w1) => {
@@ -1142,7 +1130,7 @@ const module_ = _1.value_;
 resolver_ = ff_compiler_Resolver.Resolver_processDefinitions(resolver_, module_, ff_core_Option.Some(import_.alias_))
 break
 }
-if(_1.None) {
+{
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(import_.at_, ("No such module: " + import_.file_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 } while(false)
@@ -1164,7 +1152,7 @@ if(unqualified_) {
 return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(name_, full_), ff_core_Pair.Pair(full_, full_)]
 }
 }
-if(_1.Some) {
+{
 const alias_ = _1.value_;
 return [ff_core_Pair.Pair(((alias_ + ".") + name_), full_), ff_core_Pair.Pair(full_, full_)]
 }
@@ -1266,9 +1254,9 @@ return ff_compiler_Resolver.Resolver(_c.variables_, _c.variableLocations_, _c.va
 if((!ff_core_Option.Option_any(ff_core_List.List_first(definition_.generics_), ((_w1) => {
 return (_w1 === "Q$")
 })))) {
-for(let for_i = 0, for_a = [...definition_.commonFields_, ...ff_core_List.List_flatMap(definition_.variants_, ((_w1) => {
+for(let for_a = [...definition_.commonFields_, ...ff_core_List.List_flatMap(definition_.variants_, ((_w1) => {
 return _w1.fields_
-}))], for_l = for_a.length; for_i < for_l; for_i++) {
+}))], for_i = 0, for_l = for_a.length; for_i < for_l; for_i++) {
 const f_ = for_a[for_i];
 if(ff_compiler_Resolver.Resolver_containsAsyncType(self2_, f_.valueType_)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, "Only capabilities can contain fields of concrete capability types"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
@@ -1354,18 +1342,9 @@ const lambda_ = _1.second_;
 const signature_ = ff_core_Option.Option_grab(ff_core_List.List_find(definition_.methods_, ((_w1) => {
 return (_w1.name_ === name_)
 })));
-const function1_ = ff_compiler_Syntax.DFunction(signature_.at_, signature_, ff_compiler_Syntax.FireflyTarget(lambda_));
+const function1_ = ff_compiler_Syntax.DFunction(signature_.at_, signature_, lambda_);
 const function2_ = ff_compiler_Resolver.Resolver_resolveFunctionDefinition(self2_, function1_, true, false);
-return ff_core_Pair.Pair(name_, (((_1) => {
-if(_1.FireflyTarget) {
-const lambda_ = _1.lambda_;
-return lambda_
-}
-{
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(signature_.at_, "Internal error: Expected method default to be a lambda"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-}
-}))(function2_.body_))
-return
+return ff_core_Pair.Pair(name_, function2_.body_)
 }
 })), _c.methodGenerators_)
 return
@@ -1682,7 +1661,7 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 })), ff_compiler_Resolver.Resolver_resolveTerm(self_, value_, topLevel_, false))
 return
 }
-if(_1.EAssignField) {
+{
 const at_ = _1.at_;
 const operator_ = _1.operator_;
 const record_ = _1.record_;
@@ -1700,7 +1679,7 @@ const topLevel_a = topLevel_;
 if(type_a.TVariable) {
 return type_
 }
-if(type_a.TConstructor) {
+{
 const constructor_ = type_a;
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 const at_ = ff_core_Option.Option_else(ff_core_Map.Map_get(self_.typeLocations_, constructor_.name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), (() => {
@@ -1786,18 +1765,11 @@ return
 export async function Resolver_resolveFunctionDefinition$(self_, definition_, topLevel_, isInstanceMethod_, $task) {
 const signature_ = ff_compiler_Resolver.Resolver_resolveSignature(self_, definition_.signature_, topLevel_, isInstanceMethod_);
 const self2_ = ff_compiler_Resolver.Resolver_withSignature(self_, signature_);
-const body_ = ff_compiler_Syntax.Target_mapFirefly(definition_.body_, ((lambda_) => {
-{
-const _1 = lambda_;
-{
-const _c = _1;
-return ff_compiler_Syntax.Lambda(_c.at_, signature_.effect_, ff_core_List.List_map(lambda_.cases_, ((_w1) => {
+const body_ = (((_c) => {
+return ff_compiler_Syntax.Lambda(_c.at_, signature_.effect_, ff_core_List.List_map(definition_.body_.cases_, ((_w1) => {
 return ff_compiler_Resolver.Resolver_resolveCase(self2_, _w1, false)
 })))
-return
-}
-}
-}));
+}))(definition_.body_);
 return ff_compiler_Syntax.DFunction(definition_.at_, signature_, body_)
 }
 
@@ -1812,12 +1784,14 @@ return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, ["Q$", ...sign
 : (((_c) => {
 return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, _c.generics_, _c.constraints_, _c.parameters_, _c.returnType_, ff_compiler_Resolver.Resolver_freshUnificationVariable(self_, signature_.at_))
 }))(signature_));
-for(const for_o = ff_core_List.List_find(newSignature_.generics_, ((name_) => {
+{
+const if_o = ff_core_List.List_find(newSignature_.generics_, ((name_) => {
 return ff_core_Set.Set_contains(self_.typeParameters_, name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-})); for_o.Some;) {
-const name_ = for_o.value_;
+}))
+if(if_o.Some) {
+const name_ = if_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(signature_.at_, (("Type parameter " + name_) + " is already in scope")), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-break
+}
 };
 const self2_ = ff_compiler_Resolver.Resolver_withSignature(self_, newSignature_);
 {
@@ -1903,7 +1877,7 @@ return ff_core_Pair.Pair(x_, ff_compiler_Resolver.CaseVariable(variableAt_, x_,
 })), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 return
 }
-if(pattern_a.PAlias) {
+{
 const at_ = pattern_a.at_;
 const pattern_ = pattern_a.pattern_;
 const variable_ = pattern_a.variable_;
@@ -1979,7 +1953,7 @@ return name_
 }));
 return ff_compiler_Syntax.PVariantAs(at_, newName_, variableAt_, variable_)
 }
-if(pattern_a.PAlias) {
+{
 const at_ = pattern_a.at_;
 const pattern_ = pattern_a.pattern_;
 const variable_ = pattern_a.variable_;
@@ -1994,7 +1968,7 @@ const type_a = type_;
 if(type_a.TVariable) {
 return false
 }
-if(type_a.TConstructor) {
+{
 const constructor_ = type_a;
 const name_ = (ff_core_String.String_contains(constructor_.name_, "$")
 ? constructor_.name_

package/output/js/ff/compiler/Substitution.mjs

@@ -46,6 +46,8 @@ import * as ff_core_Int from "../../ff/core/Int.mjs"
 
 import * as ff_core_IntMap from "../../ff/core/IntMap.mjs"
 
+import * as ff_core_Js from "../../ff/core/Js.mjs"
+
 import * as ff_core_JsSystem from "../../ff/core/JsSystem.mjs"
 
 import * as ff_core_JsValue from "../../ff/core/JsValue.mjs"
@@ -72,6 +74,8 @@ import * as ff_core_Pair from "../../ff/core/Pair.mjs"
 
 import * as ff_core_Path from "../../ff/core/Path.mjs"
 
+import * as ff_core_Queue from "../../ff/core/Queue.mjs"
+
 import * as ff_core_Random from "../../ff/core/Random.mjs"
 
 import * as ff_core_Serializable from "../../ff/core/Serializable.mjs"
@@ -94,8 +98,6 @@ import * as ff_core_Try from "../../ff/core/Try.mjs"
 
 import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
-import * as ff_core_UnsafeJs from "../../ff/core/UnsafeJs.mjs"
-
 // type Substitution
 export function Substitution(substitution_) {
 return {substitution_};
@@ -161,10 +163,7 @@ export function Substitution_substituteFunctionDefinition(self_, definition_) {
 const _1 = definition_;
 {
 const _c = _1;
-return ff_compiler_Syntax.DFunction(_c.at_, ff_compiler_Substitution.Substitution_substituteSignature(self_, definition_.signature_), ff_compiler_Syntax.Target_mapFirefly(definition_.body_, ((_w1) => {
-return ff_compiler_Substitution.Substitution_substituteLambda(self_, _w1)
-})))
-return
+return ff_compiler_Syntax.DFunction(_c.at_, ff_compiler_Substitution.Substitution_substituteSignature(self_, definition_.signature_), ff_compiler_Substitution.Substitution_substituteLambda(self_, definition_.body_))
 }
 }
 }
@@ -410,7 +409,7 @@ return ff_compiler_Syntax.DynamicCall(ff_compiler_Substitution.Substitution_subs
 }
 return
 }
-if(_1.StaticCall) {
+{
 return e_.target_
 }
 }))(e_.target_), ff_compiler_Substitution.Substitution_substituteType(self_, e_.effect_), ff_core_List.List_map(e_.typeArguments_, ((_w1) => {
@@ -462,7 +461,7 @@ return ff_compiler_Syntax.EAssign(_c.at_, _c.operator_, _c.variable_, ff_compile
 }
 return
 }
-if(_1.EAssignField) {
+{
 const e_ = _1;
 {
 const _1 = e_;
@@ -509,7 +508,7 @@ return ff_compiler_Syntax.TConstructor(at_, ff_compiler_Substitution.core_("Noth
 }
 return
 }
-if(type_a.TConstructor) {
+{
 const t_ = type_a;
 {
 const _1 = t_;
@@ -601,10 +600,7 @@ export async function Substitution_substituteFunctionDefinition$(self_, definiti
 const _1 = definition_;
 {
 const _c = _1;
-return ff_compiler_Syntax.DFunction(_c.at_, ff_compiler_Substitution.Substitution_substituteSignature(self_, definition_.signature_), ff_compiler_Syntax.Target_mapFirefly(definition_.body_, ((_w1) => {
-return ff_compiler_Substitution.Substitution_substituteLambda(self_, _w1)
-})))
-return
+return ff_compiler_Syntax.DFunction(_c.at_, ff_compiler_Substitution.Substitution_substituteSignature(self_, definition_.signature_), ff_compiler_Substitution.Substitution_substituteLambda(self_, definition_.body_))
 }
 }
 }
@@ -850,7 +846,7 @@ return ff_compiler_Syntax.DynamicCall(ff_compiler_Substitution.Substitution_subs
 }
 return
 }
-if(_1.StaticCall) {
+{
 return e_.target_
 }
 }))(e_.target_), ff_compiler_Substitution.Substitution_substituteType(self_, e_.effect_), ff_core_List.List_map(e_.typeArguments_, ((_w1) => {
@@ -902,7 +898,7 @@ return ff_compiler_Syntax.EAssign(_c.at_, _c.operator_, _c.variable_, ff_compile
 }
 return
 }
-if(_1.EAssignField) {
+{
 const e_ = _1;
 {
 const _1 = e_;
@@ -949,7 +945,7 @@ return ff_compiler_Syntax.TConstructor(at_, ff_compiler_Substitution.core_("Noth
 }
 return
 }
-if(type_a.TConstructor) {
+{
 const t_ = type_a;
 {
 const _1 = t_;