firefly-compiler 0.5.35 → 0.5.36

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

@@ -44,6 +44,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"
@@ -70,6 +72,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"
@@ -92,8 +96,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 Location
 export function Location(file_, line_, column_) {
 return {file_, line_, column_};
@@ -327,14 +329,6 @@ export function Constraint(at_, name_, generics_) {
 return {at_, name_, generics_};
 }
 
-// type Target
-export function FireflyTarget(lambda_) {
-return {FireflyTarget: true, lambda_};
-}
-export function ForeignTarget(syncCode_, asyncCode_) {
-return {ForeignTarget: true, syncCode_, asyncCode_};
-}
-
 // type Type
 export function TConstructor(at_, name_, generics_) {
 return {TConstructor: true, at_, name_, generics_};
@@ -406,18 +400,17 @@ if(_1.None) {
 seenTypes_ = ff_core_Map.Map_add(seenTypes_, shortenedName_, name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 break
 }
-if(_1.Some) {
+{
 const qualified_ = _1.value_;
 if((name_ !== qualified_)) {
 seenTypes_ = ff_core_Map.Map_add(seenTypes_, shortenedName_, "", ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 }
-break
 }
 } while(false);
 shortenTypes_(typeArguments_)
 return
 }
-if(_1.TVariable) {
+{
 const index_ = _1.index_;
 if((!ff_core_Map.Map_contains(seenTypes_, ("$" + index_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String))) {
 seenTypes_ = ff_core_Map.Map_add(seenTypes_, ("$" + index_), ff_core_Option.Option_else(typeNames_.next_(), (() => {
@@ -506,7 +499,7 @@ return go_(_w1)
 }
 return
 }
-if(_1.TVariable) {
+{
 const at_ = _1.at_;
 const index_ = _1.index_;
 return ff_core_Map.Map_grab(seenTypes_, ("$" + index_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
@@ -538,18 +531,17 @@ if(_1.None) {
 seenTypes_ = ff_core_Map.Map_add(seenTypes_, shortenedName_, name_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 break
 }
-if(_1.Some) {
+{
 const qualified_ = _1.value_;
 if((name_ !== qualified_)) {
 seenTypes_ = ff_core_Map.Map_add(seenTypes_, shortenedName_, "", ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 }
-break
 }
 } while(false);
 shortenTypes_(typeArguments_)
 return
 }
-if(_1.TVariable) {
+{
 const index_ = _1.index_;
 if((!ff_core_Map.Map_contains(seenTypes_, ("$" + index_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String))) {
 seenTypes_ = ff_core_Map.Map_add(seenTypes_, ("$" + index_), ff_core_Option.Option_else(typeNames_.next_(), (() => {
@@ -638,7 +630,7 @@ return go_(_w1)
 }
 return
 }
-if(_1.TVariable) {
+{
 const at_ = _1.at_;
 const index_ = _1.index_;
 return ff_core_Map.Map_grab(seenTypes_, ("$" + index_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
@@ -648,32 +640,6 @@ return ff_core_Map.Map_grab(seenTypes_, ("$" + index_), ff_core_Ordering.ff_core
 return go_(self_)
 }
 
-export function Target_mapFirefly(self_, body_) {
-{
-const _1 = self_;
-if(_1.FireflyTarget) {
-const lambda_ = _1.lambda_;
-return ff_compiler_Syntax.FireflyTarget(body_(lambda_))
-}
-if(_1.ForeignTarget) {
-return self_
-}
-}
-}
-
-export async function Target_mapFirefly$(self_, body_, $task) {
-{
-const _1 = self_;
-if(_1.FireflyTarget) {
-const lambda_ = _1.lambda_;
-return ff_compiler_Syntax.FireflyTarget((await body_(lambda_, $task)))
-}
-if(_1.ForeignTarget) {
-return self_
-}
-}
-}
-
 export const ff_core_Any_HasAnyTag$ff_compiler_Syntax_Location = {
 anyTag_() {
 return ff_core_Any.internalAnyTag_((("ff:compiler/Syntax.Location" + "[") + "]"))
@@ -953,15 +919,6 @@ return ff_core_Any.internalAnyTag_((("ff:compiler/Syntax.Constraint" + "[") + "]
 }
 };
 
-export const ff_core_Any_HasAnyTag$ff_compiler_Syntax_Target = {
-anyTag_() {
-return ff_core_Any.internalAnyTag_((("ff:compiler/Syntax.Target" + "[") + "]"))
-},
-async anyTag_$($task) {
-return ff_core_Any.internalAnyTag_((("ff:compiler/Syntax.Target" + "[") + "]"))
-}
-};
-
 export const ff_core_Any_HasAnyTag$ff_compiler_Syntax_Type = {
 anyTag_() {
 return ff_core_Any.internalAnyTag_((("ff:compiler/Syntax.Type" + "[") + "]"))
@@ -1198,14 +1155,14 @@ show_(value_) {
 const value_a = value_;
 {
 const z_ = value_a;
-return ((((((("DFunction" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Signature.show_(z_.signature_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Target.show_(z_.body_)) + ")")
+return ((((((("DFunction" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Signature.show_(z_.signature_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Lambda.show_(z_.body_)) + ")")
 }
 },
 async show_$(value_, $task) {
 const value_a = value_;
 {
 const z_ = value_a;
-return ((((((("DFunction" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Signature.show_(z_.signature_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Target.show_(z_.body_)) + ")")
+return ((((((("DFunction" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Signature.show_(z_.signature_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Lambda.show_(z_.body_)) + ")")
 }
 }
 };
@@ -1374,7 +1331,7 @@ if(value_a.EField) {
 const z_ = value_a;
 return ((((((((("EField" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Bool_Bool.show_(z_.newtype_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Term.show_(z_.record_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.field_)) + ")")
 }
-if(value_a.EWildcard) {
+{
 const z_ = value_a;
 return ((((("EWildcard" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Int_Int.show_(z_.index_)) + ")")
 }
@@ -1457,7 +1414,7 @@ if(value_a.EField) {
 const z_ = value_a;
 return ((((((((("EField" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Bool_Bool.show_(z_.newtype_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Term.show_(z_.record_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.field_)) + ")")
 }
-if(value_a.EWildcard) {
+{
 const z_ = value_a;
 return ((((("EWildcard" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Int_Int.show_(z_.index_)) + ")")
 }
@@ -1471,7 +1428,7 @@ if(value_a.DynamicCall) {
 const z_ = value_a;
 return ((((("DynamicCall" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Term.show_(z_.function_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Bool_Bool.show_(z_.tailCall_)) + ")")
 }
-if(value_a.StaticCall) {
+{
 const z_ = value_a;
 return ((((((("StaticCall" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.name_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Bool_Bool.show_(z_.tailCall_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Bool_Bool.show_(z_.instanceCall_)) + ")")
 }
@@ -1482,7 +1439,7 @@ if(value_a.DynamicCall) {
 const z_ = value_a;
 return ((((("DynamicCall" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Term.show_(z_.function_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Bool_Bool.show_(z_.tailCall_)) + ")")
 }
-if(value_a.StaticCall) {
+{
 const z_ = value_a;
 return ((((((("StaticCall" + "(") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.name_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Bool_Bool.show_(z_.tailCall_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Bool_Bool.show_(z_.instanceCall_)) + ")")
 }
@@ -1533,7 +1490,7 @@ if(value_a.PVariantAs) {
 const z_ = value_a;
 return ((((((((("PVariantAs" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.name_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.variableAt_)) + ", ") + ff_core_Option.ff_core_Show_Show$ff_core_Option_Option(ff_core_Show.ff_core_Show_Show$ff_core_String_String).show_(z_.variable_)) + ")")
 }
-if(value_a.PAlias) {
+{
 const z_ = value_a;
 return ((((((("PAlias" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_MatchPattern.show_(z_.pattern_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.variable_)) + ")")
 }
@@ -1564,7 +1521,7 @@ if(value_a.PVariantAs) {
 const z_ = value_a;
 return ((((((((("PVariantAs" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.name_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.variableAt_)) + ", ") + ff_core_Option.ff_core_Show_Show$ff_core_Option_Option(ff_core_Show.ff_core_Show_Show$ff_core_String_String).show_(z_.variable_)) + ")")
 }
-if(value_a.PAlias) {
+{
 const z_ = value_a;
 return ((((((("PAlias" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_MatchPattern.show_(z_.pattern_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.variable_)) + ")")
 }
@@ -1724,31 +1681,6 @@ return ((((((("Constraint" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_comp
 }
 };
 
-export const ff_core_Show_Show$ff_compiler_Syntax_Target = {
-show_(value_) {
-const value_a = value_;
-if(value_a.FireflyTarget) {
-const z_ = value_a;
-return ((("FireflyTarget" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Lambda.show_(z_.lambda_)) + ")")
-}
-if(value_a.ForeignTarget) {
-const z_ = value_a;
-return ((((("ForeignTarget" + "(") + ff_core_Option.ff_core_Show_Show$ff_core_Option_Option(ff_core_Show.ff_core_Show_Show$ff_core_String_String).show_(z_.syncCode_)) + ", ") + ff_core_Option.ff_core_Show_Show$ff_core_Option_Option(ff_core_Show.ff_core_Show_Show$ff_core_String_String).show_(z_.asyncCode_)) + ")")
-}
-},
-async show_$(value_, $task) {
-const value_a = value_;
-if(value_a.FireflyTarget) {
-const z_ = value_a;
-return ((("FireflyTarget" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Lambda.show_(z_.lambda_)) + ")")
-}
-if(value_a.ForeignTarget) {
-const z_ = value_a;
-return ((((("ForeignTarget" + "(") + ff_core_Option.ff_core_Show_Show$ff_core_Option_Option(ff_core_Show.ff_core_Show_Show$ff_core_String_String).show_(z_.syncCode_)) + ", ") + ff_core_Option.ff_core_Show_Show$ff_core_Option_Option(ff_core_Show.ff_core_Show_Show$ff_core_String_String).show_(z_.asyncCode_)) + ")")
-}
-}
-};
-
 export const ff_core_Show_Show$ff_compiler_Syntax_Type = {
 show_(value_) {
 const value_a = value_;
@@ -1756,7 +1688,7 @@ if(value_a.TConstructor) {
 const z_ = value_a;
 return ((((((("TConstructor" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.name_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_List_List(ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Type).show_(z_.generics_)) + ")")
 }
-if(value_a.TVariable) {
+{
 const z_ = value_a;
 return ((((("TVariable" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Int_Int.show_(z_.index_)) + ")")
 }
@@ -1767,7 +1699,7 @@ if(value_a.TConstructor) {
 const z_ = value_a;
 return ((((((("TConstructor" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_String_String.show_(z_.name_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_List_List(ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Type).show_(z_.generics_)) + ")")
 }
-if(value_a.TVariable) {
+{
 const z_ = value_a;
 return ((((("TVariable" + "(") + ff_compiler_Syntax.ff_core_Show_Show$ff_compiler_Syntax_Location.show_(z_.at_)) + ", ") + ff_core_Show.ff_core_Show_Show$ff_core_Int_Int.show_(z_.index_)) + ")")
 }
@@ -1785,7 +1717,7 @@ if(value_a.Unsafe) {
 const z_ = value_a;
 return "Unsafe"
 }
-if(value_a.Trusted) {
+{
 const z_ = value_a;
 return "Trusted"
 }
@@ -1800,7 +1732,7 @@ if(value_a.Unsafe) {
 const z_ = value_a;
 return "Unsafe"
 }
-if(value_a.Trusted) {
+{
 const z_ = value_a;
 return "Trusted"
 }
@@ -2108,7 +2040,7 @@ if((x_ === y_)) {
 return true
 }
 {
-return (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Location.equals_(x_.at_, y_.at_) && (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Signature.equals_(x_.signature_, y_.signature_) && ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Target.equals_(x_.body_, y_.body_)))
+return (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Location.equals_(x_.at_, y_.at_) && (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Signature.equals_(x_.signature_, y_.signature_) && ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Lambda.equals_(x_.body_, y_.body_)))
 }
 },
 async equals_$(x_, y_, $task) {
@@ -2118,7 +2050,7 @@ if((x_ === y_)) {
 return true
 }
 {
-return (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Location.equals_(x_.at_, y_.at_) && (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Signature.equals_(x_.signature_, y_.signature_) && ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Target.equals_(x_.body_, y_.body_)))
+return (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Location.equals_(x_.at_, y_.at_) && (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Signature.equals_(x_.signature_, y_.signature_) && ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Lambda.equals_(x_.body_, y_.body_)))
 }
 }
 };
@@ -2827,49 +2759,6 @@ return (ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Location.equal
 }
 };
 
-export const ff_core_Equal_Equal$ff_compiler_Syntax_Target = {
-equals_(x_, y_) {
-const x_a = x_;
-const y_a = y_;
-if((x_ === y_)) {
-return true
-}
-if(x_a.FireflyTarget && y_a.FireflyTarget) {
-const x_ = x_a;
-const y_ = y_a;
-return ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Lambda.equals_(x_.lambda_, y_.lambda_)
-}
-if(x_a.ForeignTarget && y_a.ForeignTarget) {
-const x_ = x_a;
-const y_ = y_a;
-return (ff_core_Option.ff_core_Equal_Equal$ff_core_Option_Option(ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String).equals_(x_.syncCode_, y_.syncCode_) && ff_core_Option.ff_core_Equal_Equal$ff_core_Option_Option(ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String).equals_(x_.asyncCode_, y_.asyncCode_))
-}
-{
-return false
-}
-},
-async equals_$(x_, y_, $task) {
-const x_a = x_;
-const y_a = y_;
-if((x_ === y_)) {
-return true
-}
-if(x_a.FireflyTarget && y_a.FireflyTarget) {
-const x_ = x_a;
-const y_ = y_a;
-return ff_compiler_Syntax.ff_core_Equal_Equal$ff_compiler_Syntax_Lambda.equals_(x_.lambda_, y_.lambda_)
-}
-if(x_a.ForeignTarget && y_a.ForeignTarget) {
-const x_ = x_a;
-const y_ = y_a;
-return (ff_core_Option.ff_core_Equal_Equal$ff_core_Option_Option(ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String).equals_(x_.syncCode_, y_.syncCode_) && ff_core_Option.ff_core_Equal_Equal$ff_core_Option_Option(ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String).equals_(x_.asyncCode_, y_.asyncCode_))
-}
-{
-return false
-}
-}
-};
-
 export const ff_core_Equal_Equal$ff_compiler_Syntax_Type = {
 equals_(x_, y_) {
 const x_a = x_;
@@ -3675,7 +3564,7 @@ const signatureOrdering_ = ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler
 if((signatureOrdering_ !== ff_core_Ordering.OrderingSame())) {
 return signatureOrdering_
 } else {
-const bodyOrdering_ = ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_Target.compare_(x_.body_, y_.body_);
+const bodyOrdering_ = ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_Lambda.compare_(x_.body_, y_.body_);
 if((bodyOrdering_ !== ff_core_Ordering.OrderingSame())) {
 return bodyOrdering_
 } else {
@@ -3701,7 +3590,7 @@ const signatureOrdering_ = ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler
 if((signatureOrdering_ !== ff_core_Ordering.OrderingSame())) {
 return signatureOrdering_
 } else {
-const bodyOrdering_ = ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_Target.compare_(x_.body_, y_.body_);
+const bodyOrdering_ = ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_Lambda.compare_(x_.body_, y_.body_);
 if((bodyOrdering_ !== ff_core_Ordering.OrderingSame())) {
 return bodyOrdering_
 } else {
@@ -4691,7 +4580,7 @@ return 17
 if(z_a.EField) {
 return 18
 }
-if(z_a.EWildcard) {
+{
 return 19
 }
 }
@@ -5209,7 +5098,7 @@ return 17
 if(z_a.EField) {
 return 18
 }
-if(z_a.EWildcard) {
+{
 return 19
 }
 }
@@ -5268,7 +5157,7 @@ const z_a = z_;
 if(z_a.DynamicCall) {
 return 0
 }
-if(z_a.StaticCall) {
+{
 return 1
 }
 }
@@ -5324,7 +5213,7 @@ const z_a = z_;
 if(z_a.DynamicCall) {
 return 0
 }
-if(z_a.StaticCall) {
+{
 return 1
 }
 }
@@ -5558,7 +5447,7 @@ return 4
 if(z_a.PVariantAs) {
 return 5
 }
-if(z_a.PAlias) {
+{
 return 6
 }
 }
@@ -5724,7 +5613,7 @@ return 4
 if(z_a.PVariantAs) {
 return 5
 }
-if(z_a.PAlias) {
+{
 return 6
 }
 }
@@ -6318,101 +6207,6 @@ return
 }
 };
 
-export const ff_core_Ordering_Order$ff_compiler_Syntax_Target = {
-compare_(x_, y_) {
-const x_a = x_;
-const y_a = y_;
-if((x_ === y_)) {
-return ff_core_Ordering.OrderingSame()
-}
-if(x_a.FireflyTarget && y_a.FireflyTarget) {
-const x_ = x_a;
-const y_ = y_a;
-const lambdaOrdering_ = ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_Lambda.compare_(x_.lambda_, y_.lambda_);
-if((lambdaOrdering_ !== ff_core_Ordering.OrderingSame())) {
-return lambdaOrdering_
-} else {
-return ff_core_Ordering.OrderingSame()
-}
-return
-}
-if(x_a.ForeignTarget && y_a.ForeignTarget) {
-const x_ = x_a;
-const y_ = y_a;
-const syncCodeOrdering_ = ff_core_Option.ff_core_Ordering_Order$ff_core_Option_Option(ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String).compare_(x_.syncCode_, y_.syncCode_);
-if((syncCodeOrdering_ !== ff_core_Ordering.OrderingSame())) {
-return syncCodeOrdering_
-} else {
-const asyncCodeOrdering_ = ff_core_Option.ff_core_Ordering_Order$ff_core_Option_Option(ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String).compare_(x_.asyncCode_, y_.asyncCode_);
-if((asyncCodeOrdering_ !== ff_core_Ordering.OrderingSame())) {
-return asyncCodeOrdering_
-} else {
-return ff_core_Ordering.OrderingSame()
-}
-}
-return
-}
-{
-function number_(z_) {
-const z_a = z_;
-if(z_a.FireflyTarget) {
-return 0
-}
-if(z_a.ForeignTarget) {
-return 1
-}
-}
-return ff_core_Ordering.ff_core_Ordering_Order$ff_core_Int_Int.compare_(number_(x_), number_(y_))
-}
-},
-async compare_$(x_, y_, $task) {
-const x_a = x_;
-const y_a = y_;
-if((x_ === y_)) {
-return ff_core_Ordering.OrderingSame()
-}
-if(x_a.FireflyTarget && y_a.FireflyTarget) {
-const x_ = x_a;
-const y_ = y_a;
-const lambdaOrdering_ = ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_Lambda.compare_(x_.lambda_, y_.lambda_);
-if((lambdaOrdering_ !== ff_core_Ordering.OrderingSame())) {
-return lambdaOrdering_
-} else {
-return ff_core_Ordering.OrderingSame()
-}
-return
-}
-if(x_a.ForeignTarget && y_a.ForeignTarget) {
-const x_ = x_a;
-const y_ = y_a;
-const syncCodeOrdering_ = ff_core_Option.ff_core_Ordering_Order$ff_core_Option_Option(ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String).compare_(x_.syncCode_, y_.syncCode_);
-if((syncCodeOrdering_ !== ff_core_Ordering.OrderingSame())) {
-return syncCodeOrdering_
-} else {
-const asyncCodeOrdering_ = ff_core_Option.ff_core_Ordering_Order$ff_core_Option_Option(ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String).compare_(x_.asyncCode_, y_.asyncCode_);
-if((asyncCodeOrdering_ !== ff_core_Ordering.OrderingSame())) {
-return asyncCodeOrdering_
-} else {
-return ff_core_Ordering.OrderingSame()
-}
-}
-return
-}
-{
-function number_(z_) {
-const z_a = z_;
-if(z_a.FireflyTarget) {
-return 0
-}
-if(z_a.ForeignTarget) {
-return 1
-}
-}
-return ff_core_Ordering.ff_core_Ordering_Order$ff_core_Int_Int.compare_(number_(x_), number_(y_))
-}
-}
-};
-
 export const ff_core_Ordering_Order$ff_compiler_Syntax_Type = {
 compare_(x_, y_) {
 const x_a = x_;
@@ -6463,7 +6257,7 @@ const z_a = z_;
 if(z_a.TConstructor) {
 return 0
 }
-if(z_a.TVariable) {
+{
 return 1
 }
 }
@@ -6519,7 +6313,7 @@ const z_a = z_;
 if(z_a.TConstructor) {
 return 0
 }
-if(z_a.TVariable) {
+{
 return 1
 }
 }
@@ -6544,7 +6338,7 @@ return 0
 if(z_a.Unsafe) {
 return 1
 }
-if(z_a.Trusted) {
+{
 return 2
 }
 }
@@ -6566,7 +6360,7 @@ return 0
 if(z_a.Unsafe) {
 return 1
 }
-if(z_a.Trusted) {
+{
 return 2
 }
 }
@@ -7392,7 +7186,7 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 0
 serialization_.offset_ += 1;
 ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Location.serializeUsing_(serialization_, v_.at_);
 ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Signature.serializeUsing_(serialization_, v_.signature_);
-ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Target.serializeUsing_(serialization_, v_.body_)
+ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Lambda.serializeUsing_(serialization_, v_.body_)
 return
 }
 },
@@ -7403,7 +7197,7 @@ serialization_.offset_ += 1;
 const _1 = variantIndex_;
 if(_1 === 0) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
-return ff_compiler_Syntax.DFunction(ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Location.deserializeUsing_(serialization_), ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Signature.deserializeUsing_(serialization_), ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Target.deserializeUsing_(serialization_))
+return ff_compiler_Syntax.DFunction(ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Location.deserializeUsing_(serialization_), ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Signature.deserializeUsing_(serialization_), ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Lambda.deserializeUsing_(serialization_))
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serializable.DeserializationChecksumException(), ff_core_Serializable.ff_core_Any_HasAnyTag$ff_core_Serializable_DeserializationChecksumException)})
@@ -7421,7 +7215,7 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 0
 serialization_.offset_ += 1;
 ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Location.serializeUsing_(serialization_, v_.at_);
 ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Signature.serializeUsing_(serialization_, v_.signature_);
-ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Target.serializeUsing_(serialization_, v_.body_)
+ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Lambda.serializeUsing_(serialization_, v_.body_)
 return
 }
 },
@@ -7432,7 +7226,7 @@ serialization_.offset_ += 1;
 const _1 = variantIndex_;
 if(_1 === 0) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
-return ff_compiler_Syntax.DFunction(ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Location.deserializeUsing_(serialization_), ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Signature.deserializeUsing_(serialization_), ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Target.deserializeUsing_(serialization_))
+return ff_compiler_Syntax.DFunction(ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Location.deserializeUsing_(serialization_), ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Signature.deserializeUsing_(serialization_), ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Lambda.deserializeUsing_(serialization_))
 }
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serializable.DeserializationChecksumException(), ff_core_Serializable.ff_core_Any_HasAnyTag$ff_core_Serializable_DeserializationChecksumException)})
@@ -8003,7 +7797,7 @@ ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Term.ser
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.field_)
 return
 }
-if(value_a.EWildcard) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -8322,7 +8116,7 @@ ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Term.ser
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.serializeUsing_(serialization_, v_.field_)
 return
 }
-if(value_a.EWildcard) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -8439,7 +8233,7 @@ ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Term.ser
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_Bool_Bool.serializeUsing_(serialization_, v_.tailCall_)
 return
 }
-if(value_a.StaticCall) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -8482,7 +8276,7 @@ ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Term.ser
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_Bool_Bool.serializeUsing_(serialization_, v_.tailCall_)
 return
 }
-if(value_a.StaticCall) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -8644,7 +8438,7 @@ ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Location
 ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).serializeUsing_(serialization_, v_.variable_)
 return
 }
-if(value_a.PAlias) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 25), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -8760,7 +8554,7 @@ ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Location
 ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).serializeUsing_(serialization_, v_.variable_)
 return
 }
-if(value_a.PAlias) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 25), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -9379,91 +9173,6 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serial
 }
 };
 
-export const ff_core_Serializable_Serializable$ff_compiler_Syntax_Target = {
-serializeUsing_(serialization_, value_) {
-const serialization_a = serialization_;
-const value_a = value_;
-if(value_a.FireflyTarget) {
-const v_ = value_a;
-serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 32), 0);
-ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 0);
-serialization_.offset_ += 1;
-ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Lambda.serializeUsing_(serialization_, v_.lambda_)
-return
-}
-if(value_a.ForeignTarget) {
-const v_ = value_a;
-serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 32), 0);
-ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 1);
-serialization_.offset_ += 1;
-ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).serializeUsing_(serialization_, v_.syncCode_);
-ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).serializeUsing_(serialization_, v_.asyncCode_)
-return
-}
-},
-deserializeUsing_(serialization_) {
-const variantIndex_ = ff_core_Buffer.Buffer_grabUint8(serialization_.buffer_, serialization_.offset_);
-serialization_.offset_ += 1;
-{
-const _1 = variantIndex_;
-if(_1 === 0) {
-serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 32), 0);
-return ff_compiler_Syntax.FireflyTarget(ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Lambda.deserializeUsing_(serialization_))
-}
-if(_1 === 1) {
-serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 32), 0);
-return ff_compiler_Syntax.ForeignTarget(ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).deserializeUsing_(serialization_), ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).deserializeUsing_(serialization_))
-}
-{
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serializable.DeserializationChecksumException(), ff_core_Serializable.ff_core_Any_HasAnyTag$ff_core_Serializable_DeserializationChecksumException)})
-}
-}
-},
-async serializeUsing_$(serialization_, value_, $task) {
-const serialization_a = serialization_;
-const value_a = value_;
-if(value_a.FireflyTarget) {
-const v_ = value_a;
-serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 32), 0);
-ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 0);
-serialization_.offset_ += 1;
-ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Lambda.serializeUsing_(serialization_, v_.lambda_)
-return
-}
-if(value_a.ForeignTarget) {
-const v_ = value_a;
-serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 32), 0);
-ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 1);
-serialization_.offset_ += 1;
-ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).serializeUsing_(serialization_, v_.syncCode_);
-ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).serializeUsing_(serialization_, v_.asyncCode_)
-return
-}
-},
-async deserializeUsing_$(serialization_, $task) {
-const variantIndex_ = ff_core_Buffer.Buffer_grabUint8(serialization_.buffer_, serialization_.offset_);
-serialization_.offset_ += 1;
-{
-const _1 = variantIndex_;
-if(_1 === 0) {
-serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 32), 0);
-return ff_compiler_Syntax.FireflyTarget(ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Lambda.deserializeUsing_(serialization_))
-}
-if(_1 === 1) {
-serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 32), 0);
-return ff_compiler_Syntax.ForeignTarget(ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).deserializeUsing_(serialization_), ff_core_Option.ff_core_Serializable_Serializable$ff_core_Option_Option(ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String).deserializeUsing_(serialization_))
-}
-{
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_core_Serializable.DeserializationChecksumException(), ff_core_Serializable.ff_core_Any_HasAnyTag$ff_core_Serializable_DeserializationChecksumException)})
-}
-}
-}
-};
-
 export const ff_core_Serializable_Serializable$ff_compiler_Syntax_Type = {
 serializeUsing_(serialization_, value_) {
 const serialization_a = serialization_;
@@ -9479,7 +9188,7 @@ ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.ser
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_List_List(ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Type).serializeUsing_(serialization_, v_.generics_)
 return
 }
-if(value_a.TVariable) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -9522,7 +9231,7 @@ ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_String_String.ser
 ff_core_Serializable.ff_core_Serializable_Serializable$ff_core_List_List(ff_compiler_Syntax.ff_core_Serializable_Serializable$ff_compiler_Syntax_Type).serializeUsing_(serialization_, v_.generics_)
 return
 }
-if(value_a.TVariable) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -9573,7 +9282,7 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 1
 serialization_.offset_ += 1
 return
 }
-if(value_a.Trusted) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 26), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -9623,7 +9332,7 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 1
 serialization_.offset_ += 1
 return
 }
-if(value_a.Trusted) {
+{
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 26), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);