firefly-compiler 0.5.10 → 0.5.12

package/compiler/JsEmitter.ff

@@ -386,13 +386,13 @@ extend self: JsEmitter {
                     if(await) {"(await " + call + ")"} else {call}
                 | [Pair(EVariant(_, "ff:core/Bool.True", _, _), elseBody), ...list] =>
                     "(" + list.foldLeft(self.emitTerm(elseBody, async)) {| otherwise, Pair(condition, body) =>
-                        self.emitTerm(condition, async) +
-                        "\n? " + self.emitTerm(body, async) + "\n: " + otherwise
+                        self.emitComma(condition, async) +
+                        "\n? " + self.emitComma(body, async) + "\n: " + otherwise
                     } + ")"
                 | list =>
                     "(" + list.foldLeft("ff_core_Option.None()") {| otherwise, Pair(condition, body) =>
-                        self.emitTerm(condition, async) +
-                        "\n? ff_core_Option.Some(" + self.emitTerm(body, async) + ")\n: " + otherwise
+                        self.emitComma(condition, async) +
+                        "\n? ff_core_Option.Some(" + self.emitComma(body, async) + ")\n: " + otherwise
                     } + ")"
             }
         | ECall(at, DynamicCall(function, _), effect, typeArguments, arguments, dictionaries) =>
@@ -697,26 +697,10 @@ extend self: JsEmitter {
             | "ff:core/List.List_each" {arguments | [list, ELambda(_, Lambda(_, _, [
                 MatchCase(_, [PVariable(_, name)], [], body)
             ]))]} =>
-                mutable start = "0"
-                mutable end = "for_a.length"
-                let listCode = list.{
-                    | ECall(_, StaticCall("ff:core/List.List_dropFirst", _, _), _, _, [a1, a2], _) =>
-                        start = self.emitTerm(a2.value, async)
-                        if(!start.all {_.isAsciiDigit()}) {
-                            start = "Math.max(" + start + ", 0)"
-                        }
-                        self.emitTerm(a1.value, async)
-                    | ECall(_, StaticCall("ff:core/List.List_dropLast", _, _), _, _, [a1, a2], _) =>
-                        let count = self.emitTerm(a2.value, async)
-                        if(!count.all {_.isAsciiDigit()}) {
-                            end = end + " - Math.max(" + count + ", 0)"
-                        } else {
-                            end = end + " - " + count
-                        }
-                        self.emitTerm(a1.value, async)
-                    | _ => 
-                        self.emitTerm(list, async)
-                } 
+                let fusion = self.emitLightFusion(list, async)
+                let start = fusion.second.first
+                let end = fusion.second.second
+                let listCode = fusion.first
                 Some(
                     "for(let for_i = " + start + ", for_a = " + listCode + ", for_l = " + end + 
                     "; for_i < for_l; for_i++) {\n" +
@@ -727,26 +711,10 @@ extend self: JsEmitter {
             | "ff:core/List.List_eachWhile" {arguments | [list, ELambda(_, Lambda(_, _, [
                 MatchCase(_, [PVariable(_, name)], [], ESequential(_, body, condition))
             ]))]} =>
-                mutable start = "0"
-                mutable end = "for_a.length"
-                let listCode = list.{
-                    | ECall(_, StaticCall("ff:core/List.List_dropFirst", _, _), _, _, [a1, a2], _) =>
-                        start = self.emitTerm(a2.value, async)
-                        if(!start.all {_.isAsciiDigit()}) {
-                            start = "Math.max(" + start + ", 0)"
-                        }
-                        self.emitTerm(a1.value, async)
-                    | ECall(_, StaticCall("ff:core/List.List_dropLast", _, _), _, _, [a1, a2], _) =>
-                        let count = self.emitTerm(a2.value, async)
-                        if(!count.all {_.isAsciiDigit()}) {
-                            end = end + " - Math.max(" + count + ", 0)"
-                        } else {
-                            end = end + " - " + count
-                        }
-                        self.emitTerm(a1.value, async)
-                    | _ => 
-                        self.emitTerm(list, async)
-                } 
+                let fusion = self.emitLightFusion(list, async)
+                let start = fusion.second.first
+                let end = fusion.second.second
+                let listCode = fusion.first
                 Some(
                     "for(let for_i = " + start + ", for_a = " + listCode + ", for_l = " + end + 
                     "; for_i < for_l; for_i++) {\n" +
@@ -806,6 +774,45 @@ extend self: JsEmitter {
                 None
         }
     }
+    
+    emitLightFusion(list: Term, async: Bool): Pair[String, Pair[String, String]] {
+        mutable start = "0"
+        mutable end = "for_a.length"
+        let listCode = list.{
+            | ECall(_, StaticCall("ff:core/List.List_dropFirst", _, _), _, _, [a1, a2], _) =>
+                start = self.emitTerm(a2.value, async)
+                if(!start.all {_.isAsciiDigit()}) {
+                    start = "Math.max(" + start + ", 0)"
+                }
+                self.emitTerm(a1.value, async)
+            | ECall(_, StaticCall("ff:core/List.List_dropLast", _, _), _, _, [a1, a2], _) =>
+                let count = self.emitTerm(a2.value, async)
+                if(!count.all {_.isAsciiDigit()}) {
+                    end = end + " - Math.max(" + count + ", 0)"
+                } else {
+                    end = end + " - " + count
+                }
+                self.emitTerm(a1.value, async)
+            | ECall(_, StaticCall("ff:core/List.List_takeFirst", _, _), _, _, [a1, a2], _) =>
+                end = self.emitTerm(a2.value, async)
+                if(!end.all {_.isAsciiDigit()}) {
+                    end = "Math.max(" + end + ", 0)"
+                }
+                end = "Math.min(" + end + ", for_a.length)"
+                self.emitTerm(a1.value, async)
+            | ECall(_, StaticCall("ff:core/List.List_takeLast", _, _), _, _, [a1, a2], _) =>
+                let count = self.emitTerm(a2.value, async)
+                if(!count.all {_.isAsciiDigit()}) {
+                    start = "Math.max(for_a.length - Math.max(" + count + ", 0), 0)"
+                } else {
+                    start = "Math.max(for_a.length - " + count + ", 0)"
+                }
+                self.emitTerm(a1.value, async)
+            | _ => 
+                self.emitTerm(list, async)
+        } 
+        Pair(listCode, Pair(start, end))
+    }
 
     emitTryCatchFinally(term: Term, last: Bool, async: Bool): Option[String] {
         function emitCatch(catchEffect: Type, cases: List[MatchCase]): String {
@@ -1074,13 +1081,22 @@ extend self: JsEmitter {
     
     emitComma(term: Term, async: Bool): String {
         term.{
+            | ESequential(_, ESequential(_, ESequential(_, before1, before2), before3), after) {
+                safeCommable(before1) && safeCommable(before2) && safeCommable(before3) && safeCommable(after)
+            } =>
+                "(" + self.emitStatements(before1, False, async) + ", " + 
+                self.emitStatements(before2, False, async) + ", " + 
+                self.emitStatements(before3, False, async) + ", " + 
+                self.emitTerm(after, async) + ")"
             | ESequential(_, ESequential(_, before1, before2), after) {
-                safeCommable(before1) && safeCommable(before2)
+                safeCommable(before1) && safeCommable(before2) && safeCommable(after)
             } =>
                 "(" + self.emitStatements(before1, False, async) + ", " + 
                 self.emitStatements(before2, False, async) + ", " + 
                 self.emitTerm(after, async) + ")"
-            | ESequential(_, before, after) {safeCommable(before)} =>
+            | ESequential(_, before, after) {
+                safeCommable(before) && safeCommable(after)
+            } =>
                 "(" + self.emitStatements(before, False, async) + ", " + 
                 self.emitTerm(after, async) + ")"
             | _ =>
@@ -1127,10 +1143,16 @@ safeCommable(term: Term): Bool {
         | EAssign _ => True
         | EAssignField _ => True
         | ECall _ => True
+        | ECopy _ => True
+        | EVariant _ => True
         | EString(_, _) => True
         | EInt(_, _) => True
         | EChar(_, _) => True
         | EFloat(_, _) => True
+        | EList _ => True
+        | EPipe _ => True
+        | ERecord _ => True
+        | EWildcard _ => True 
         | _ => False
     }
 }

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

@@ -210,6 +210,12 @@ return true
 if(_1.ECall) {
 return true
 }
+if(_1.ECopy) {
+return true
+}
+if(_1.EVariant) {
+return true
+}
 if(_1.EString) {
 return true
 }
@@ -222,6 +228,18 @@ return true
 if(_1.EFloat) {
 return true
 }
+if(_1.EList) {
+return true
+}
+if(_1.EPipe) {
+return true
+}
+if(_1.ERecord) {
+return true
+}
+if(_1.EWildcard) {
+return true
+}
 {
 return false
 }
@@ -445,6 +463,12 @@ return true
 if(_1.ECall) {
 return true
 }
+if(_1.ECopy) {
+return true
+}
+if(_1.EVariant) {
+return true
+}
 if(_1.EString) {
 return true
 }
@@ -457,6 +481,18 @@ return true
 if(_1.EFloat) {
 return true
 }
+if(_1.EList) {
+return true
+}
+if(_1.EPipe) {
+return true
+}
+if(_1.ERecord) {
+return true
+}
+if(_1.EWildcard) {
+return true
+}
 {
 return false
 }
@@ -1182,7 +1218,7 @@ return (("(" + ff_core_List.List_foldLeft(list_, ff_compiler_JsEmitter.JsEmitter
 const otherwise_ = _1;
 const condition_ = _2.first_;
 const body_ = _2.second_;
-return ((((ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, condition_, async_) + "\n? ") + ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, body_, async_)) + "\n: ") + otherwise_)
+return ((((ff_compiler_JsEmitter.JsEmitter_emitComma(self_, condition_, async_) + "\n? ") + ff_compiler_JsEmitter.JsEmitter_emitComma(self_, body_, async_)) + "\n: ") + otherwise_)
 }
 }))) + ")")
 return
@@ -1194,7 +1230,7 @@ return (("(" + ff_core_List.List_foldLeft(list_, "ff_core_Option.None()", ((_1,
 const otherwise_ = _1;
 const condition_ = _2.first_;
 const body_ = _2.second_;
-return ((((ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, condition_, async_) + "\n? ff_core_Option.Some(") + ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, body_, async_)) + ")\n: ") + otherwise_)
+return ((((ff_compiler_JsEmitter.JsEmitter_emitComma(self_, condition_, async_) + "\n? ff_core_Option.Some(") + ff_compiler_JsEmitter.JsEmitter_emitComma(self_, body_, async_)) + ")\n: ") + otherwise_)
 }
 }))) + ")")
 return
@@ -1944,37 +1980,10 @@ if(_guard1.length === 2 && _guard1[1].ELambda && _guard1[1].lambda_.cases_.lengt
 const list_ = _guard1[0];
 const name_ = _guard1[1].lambda_.cases_[0].patterns_[0].name_;
 const body_ = _guard1[1].lambda_.cases_[0].body_;
-let start_ = "0";
-let end_ = "for_a.length";
-const listCode_ = (((_1) => {
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropFirst" && _1.arguments_.length === 2) {
-const a1_ = _1.arguments_[0];
-const a2_ = _1.arguments_[1];
-start_ = ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a2_.value_, async_);
-if((!ff_core_String.String_all(start_, ((_w1) => {
-return ff_core_Char.Char_isAsciiDigit(_w1)
-})))) {
-start_ = (("Math.max(" + start_) + ", 0)")
-};
-return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a1_.value_, async_)
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropLast" && _1.arguments_.length === 2) {
-const a1_ = _1.arguments_[0];
-const a2_ = _1.arguments_[1];
-const count_ = ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a2_.value_, async_);
-if((!ff_core_String.String_all(count_, ((_w1) => {
-return ff_core_Char.Char_isAsciiDigit(_w1)
-})))) {
-end_ = (((end_ + " - Math.max(") + count_) + ", 0)")
-} else {
-end_ = ((end_ + " - ") + count_)
-};
-return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a1_.value_, async_)
-}
-{
-return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, list_, async_)
-}
-}))(list_);
+const fusion_ = ff_compiler_JsEmitter.JsEmitter_emitLightFusion(self_, list_, async_);
+const start_ = fusion_.second_.first_;
+const end_ = fusion_.second_.second_;
+const listCode_ = fusion_.first_;
 return ff_core_Option.Some(((((((((("for(let for_i = " + start_) + ", for_a = ") + listCode_) + ", for_l = ") + end_) + "; for_i < for_l; for_i++) {\n") + ff_core_Option.Option_else(ff_core_Option.Option_map(name_, ((_w1) => {
 return (("const " + ff_compiler_JsEmitter.escapeKeyword_(_w1)) + " = for_a[for_i];\n")
 })), (() => {
@@ -1990,37 +1999,10 @@ const list_ = _guard1[0];
 const name_ = _guard1[1].lambda_.cases_[0].patterns_[0].name_;
 const body_ = _guard1[1].lambda_.cases_[0].body_.before_;
 const condition_ = _guard1[1].lambda_.cases_[0].body_.after_;
-let start_ = "0";
-let end_ = "for_a.length";
-const listCode_ = (((_1) => {
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropFirst" && _1.arguments_.length === 2) {
-const a1_ = _1.arguments_[0];
-const a2_ = _1.arguments_[1];
-start_ = ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a2_.value_, async_);
-if((!ff_core_String.String_all(start_, ((_w1) => {
-return ff_core_Char.Char_isAsciiDigit(_w1)
-})))) {
-start_ = (("Math.max(" + start_) + ", 0)")
-};
-return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a1_.value_, async_)
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropLast" && _1.arguments_.length === 2) {
-const a1_ = _1.arguments_[0];
-const a2_ = _1.arguments_[1];
-const count_ = ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a2_.value_, async_);
-if((!ff_core_String.String_all(count_, ((_w1) => {
-return ff_core_Char.Char_isAsciiDigit(_w1)
-})))) {
-end_ = (((end_ + " - Math.max(") + count_) + ", 0)")
-} else {
-end_ = ((end_ + " - ") + count_)
-};
-return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a1_.value_, async_)
-}
-{
-return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, list_, async_)
-}
-}))(list_);
+const fusion_ = ff_compiler_JsEmitter.JsEmitter_emitLightFusion(self_, list_, async_);
+const start_ = fusion_.second_.first_;
+const end_ = fusion_.second_.second_;
+const listCode_ = fusion_.first_;
 return ff_core_Option.Some(((((((((((((("for(let for_i = " + start_) + ", for_a = ") + listCode_) + ", for_l = ") + end_) + "; for_i < for_l; for_i++) {\n") + ff_core_Option.Option_else(ff_core_Option.Option_map(name_, ((_w1) => {
 return (("const " + ff_compiler_JsEmitter.escapeKeyword_(_w1)) + " = for_a[for_i];\n")
 })), (() => {
@@ -2188,6 +2170,66 @@ return ff_core_Option.None()
 }
 }
 
+export function JsEmitter_emitLightFusion(self_, list_, async_) {
+let start_ = "0";
+let end_ = "for_a.length";
+const listCode_ = (((_1) => {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropFirst" && _1.arguments_.length === 2) {
+const a1_ = _1.arguments_[0];
+const a2_ = _1.arguments_[1];
+start_ = ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a2_.value_, async_);
+if((!ff_core_String.String_all(start_, ((_w1) => {
+return ff_core_Char.Char_isAsciiDigit(_w1)
+})))) {
+start_ = (("Math.max(" + start_) + ", 0)")
+};
+return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a1_.value_, async_)
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropLast" && _1.arguments_.length === 2) {
+const a1_ = _1.arguments_[0];
+const a2_ = _1.arguments_[1];
+const count_ = ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a2_.value_, async_);
+if((!ff_core_String.String_all(count_, ((_w1) => {
+return ff_core_Char.Char_isAsciiDigit(_w1)
+})))) {
+end_ = (((end_ + " - Math.max(") + count_) + ", 0)")
+} else {
+end_ = ((end_ + " - ") + count_)
+};
+return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a1_.value_, async_)
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_takeFirst" && _1.arguments_.length === 2) {
+const a1_ = _1.arguments_[0];
+const a2_ = _1.arguments_[1];
+end_ = ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a2_.value_, async_);
+if((!ff_core_String.String_all(end_, ((_w1) => {
+return ff_core_Char.Char_isAsciiDigit(_w1)
+})))) {
+end_ = (("Math.max(" + end_) + ", 0)")
+};
+end_ = (("Math.min(" + end_) + ", for_a.length)");
+return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a1_.value_, async_)
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_takeLast" && _1.arguments_.length === 2) {
+const a1_ = _1.arguments_[0];
+const a2_ = _1.arguments_[1];
+const count_ = ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a2_.value_, async_);
+if((!ff_core_String.String_all(count_, ((_w1) => {
+return ff_core_Char.Char_isAsciiDigit(_w1)
+})))) {
+start_ = (("Math.max(for_a.length - Math.max(" + count_) + ", 0), 0)")
+} else {
+start_ = (("Math.max(for_a.length - " + count_) + ", 0)")
+};
+return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, a1_.value_, async_)
+}
+{
+return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, list_, async_)
+}
+}))(list_);
+return ff_core_Pair.Pair(listCode_, ff_core_Pair.Pair(start_, end_))
+}
+
 export function JsEmitter_emitTryCatchFinally(self_, term_, last_, async_) {
 function emitCatch_(catchEffect_, cases_) {
 const catchAsync_ = (self_.emittingAsync_ && ff_compiler_JsEmitter.effectTypeIsAsync_(catchEffect_));
@@ -2517,18 +2559,27 @@ return ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, value_, async_)
 export function JsEmitter_emitComma(self_, term_, async_) {
 {
 const _1 = term_;
+if(_1.ESequential && _1.before_.ESequential && _1.before_.before_.ESequential) {
+const before1_ = _1.before_.before_.before_;
+const before2_ = _1.before_.before_.after_;
+const before3_ = _1.before_.after_;
+const after_ = _1.after_;
+if((((ff_compiler_JsEmitter.safeCommable_(before1_) && ff_compiler_JsEmitter.safeCommable_(before2_)) && ff_compiler_JsEmitter.safeCommable_(before3_)) && ff_compiler_JsEmitter.safeCommable_(after_))) {
+return (((((((("(" + ff_compiler_JsEmitter.JsEmitter_emitStatements(self_, before1_, false, async_)) + ", ") + ff_compiler_JsEmitter.JsEmitter_emitStatements(self_, before2_, false, async_)) + ", ") + ff_compiler_JsEmitter.JsEmitter_emitStatements(self_, before3_, false, async_)) + ", ") + ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, after_, async_)) + ")")
+}
+}
 if(_1.ESequential && _1.before_.ESequential) {
 const before1_ = _1.before_.before_;
 const before2_ = _1.before_.after_;
 const after_ = _1.after_;
-if((ff_compiler_JsEmitter.safeCommable_(before1_) && ff_compiler_JsEmitter.safeCommable_(before2_))) {
+if(((ff_compiler_JsEmitter.safeCommable_(before1_) && ff_compiler_JsEmitter.safeCommable_(before2_)) && ff_compiler_JsEmitter.safeCommable_(after_))) {
 return (((((("(" + ff_compiler_JsEmitter.JsEmitter_emitStatements(self_, before1_, false, async_)) + ", ") + ff_compiler_JsEmitter.JsEmitter_emitStatements(self_, before2_, false, async_)) + ", ") + ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, after_, async_)) + ")")
 }
 }
 if(_1.ESequential) {
 const before_ = _1.before_;
 const after_ = _1.after_;
-if(ff_compiler_JsEmitter.safeCommable_(before_)) {
+if((ff_compiler_JsEmitter.safeCommable_(before_) && ff_compiler_JsEmitter.safeCommable_(after_))) {
 return (((("(" + ff_compiler_JsEmitter.JsEmitter_emitStatements(self_, before_, false, async_)) + ", ") + ff_compiler_JsEmitter.JsEmitter_emitTerm(self_, after_, async_)) + ")")
 }
 }
@@ -3120,7 +3171,7 @@ return (("(" + (await ff_core_List.List_foldLeft$(list_, (await ff_compiler_JsEm
 const otherwise_ = _1;
 const condition_ = _2.first_;
 const body_ = _2.second_;
-return (((((await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, condition_, async_, $task)) + "\n? ") + (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, body_, async_, $task))) + "\n: ") + otherwise_)
+return (((((await ff_compiler_JsEmitter.JsEmitter_emitComma$(self_, condition_, async_, $task)) + "\n? ") + (await ff_compiler_JsEmitter.JsEmitter_emitComma$(self_, body_, async_, $task))) + "\n: ") + otherwise_)
 }
 }), $task))) + ")")
 return
@@ -3132,7 +3183,7 @@ return (("(" + (await ff_core_List.List_foldLeft$(list_, "ff_core_Option.None()"
 const otherwise_ = _1;
 const condition_ = _2.first_;
 const body_ = _2.second_;
-return (((((await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, condition_, async_, $task)) + "\n? ff_core_Option.Some(") + (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, body_, async_, $task))) + ")\n: ") + otherwise_)
+return (((((await ff_compiler_JsEmitter.JsEmitter_emitComma$(self_, condition_, async_, $task)) + "\n? ff_core_Option.Some(") + (await ff_compiler_JsEmitter.JsEmitter_emitComma$(self_, body_, async_, $task))) + ")\n: ") + otherwise_)
 }
 }), $task))) + ")")
 return
@@ -3882,37 +3933,10 @@ if(_guard1.length === 2 && _guard1[1].ELambda && _guard1[1].lambda_.cases_.lengt
 const list_ = _guard1[0];
 const name_ = _guard1[1].lambda_.cases_[0].patterns_[0].name_;
 const body_ = _guard1[1].lambda_.cases_[0].body_;
-let start_ = "0";
-let end_ = "for_a.length";
-const listCode_ = (await ((async (_1, $task) => {
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropFirst" && _1.arguments_.length === 2) {
-const a1_ = _1.arguments_[0];
-const a2_ = _1.arguments_[1];
-start_ = (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a2_.value_, async_, $task));
-if((!ff_core_String.String_all(start_, ((_w1) => {
-return ff_core_Char.Char_isAsciiDigit(_w1)
-})))) {
-start_ = (("Math.max(" + start_) + ", 0)")
-};
-return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a1_.value_, async_, $task))
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropLast" && _1.arguments_.length === 2) {
-const a1_ = _1.arguments_[0];
-const a2_ = _1.arguments_[1];
-const count_ = (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a2_.value_, async_, $task));
-if((!ff_core_String.String_all(count_, ((_w1) => {
-return ff_core_Char.Char_isAsciiDigit(_w1)
-})))) {
-end_ = (((end_ + " - Math.max(") + count_) + ", 0)")
-} else {
-end_ = ((end_ + " - ") + count_)
-};
-return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a1_.value_, async_, $task))
-}
-{
-return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, list_, async_, $task))
-}
-}))(list_, $task));
+const fusion_ = (await ff_compiler_JsEmitter.JsEmitter_emitLightFusion$(self_, list_, async_, $task));
+const start_ = fusion_.second_.first_;
+const end_ = fusion_.second_.second_;
+const listCode_ = fusion_.first_;
 return ff_core_Option.Some(((((((((("for(let for_i = " + start_) + ", for_a = ") + listCode_) + ", for_l = ") + end_) + "; for_i < for_l; for_i++) {\n") + ff_core_Option.Option_else(ff_core_Option.Option_map(name_, ((_w1) => {
 return (("const " + ff_compiler_JsEmitter.escapeKeyword_(_w1)) + " = for_a[for_i];\n")
 })), (() => {
@@ -3928,37 +3952,10 @@ const list_ = _guard1[0];
 const name_ = _guard1[1].lambda_.cases_[0].patterns_[0].name_;
 const body_ = _guard1[1].lambda_.cases_[0].body_.before_;
 const condition_ = _guard1[1].lambda_.cases_[0].body_.after_;
-let start_ = "0";
-let end_ = "for_a.length";
-const listCode_ = (await ((async (_1, $task) => {
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropFirst" && _1.arguments_.length === 2) {
-const a1_ = _1.arguments_[0];
-const a2_ = _1.arguments_[1];
-start_ = (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a2_.value_, async_, $task));
-if((!ff_core_String.String_all(start_, ((_w1) => {
-return ff_core_Char.Char_isAsciiDigit(_w1)
-})))) {
-start_ = (("Math.max(" + start_) + ", 0)")
-};
-return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a1_.value_, async_, $task))
-}
-if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropLast" && _1.arguments_.length === 2) {
-const a1_ = _1.arguments_[0];
-const a2_ = _1.arguments_[1];
-const count_ = (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a2_.value_, async_, $task));
-if((!ff_core_String.String_all(count_, ((_w1) => {
-return ff_core_Char.Char_isAsciiDigit(_w1)
-})))) {
-end_ = (((end_ + " - Math.max(") + count_) + ", 0)")
-} else {
-end_ = ((end_ + " - ") + count_)
-};
-return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a1_.value_, async_, $task))
-}
-{
-return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, list_, async_, $task))
-}
-}))(list_, $task));
+const fusion_ = (await ff_compiler_JsEmitter.JsEmitter_emitLightFusion$(self_, list_, async_, $task));
+const start_ = fusion_.second_.first_;
+const end_ = fusion_.second_.second_;
+const listCode_ = fusion_.first_;
 return ff_core_Option.Some(((((((((((((("for(let for_i = " + start_) + ", for_a = ") + listCode_) + ", for_l = ") + end_) + "; for_i < for_l; for_i++) {\n") + ff_core_Option.Option_else(ff_core_Option.Option_map(name_, ((_w1) => {
 return (("const " + ff_compiler_JsEmitter.escapeKeyword_(_w1)) + " = for_a[for_i];\n")
 })), (() => {
@@ -4126,6 +4123,66 @@ return ff_core_Option.None()
 }
 }
 
+export async function JsEmitter_emitLightFusion$(self_, list_, async_, $task) {
+let start_ = "0";
+let end_ = "for_a.length";
+const listCode_ = (await ((async (_1, $task) => {
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropFirst" && _1.arguments_.length === 2) {
+const a1_ = _1.arguments_[0];
+const a2_ = _1.arguments_[1];
+start_ = (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a2_.value_, async_, $task));
+if((!ff_core_String.String_all(start_, ((_w1) => {
+return ff_core_Char.Char_isAsciiDigit(_w1)
+})))) {
+start_ = (("Math.max(" + start_) + ", 0)")
+};
+return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a1_.value_, async_, $task))
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_dropLast" && _1.arguments_.length === 2) {
+const a1_ = _1.arguments_[0];
+const a2_ = _1.arguments_[1];
+const count_ = (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a2_.value_, async_, $task));
+if((!ff_core_String.String_all(count_, ((_w1) => {
+return ff_core_Char.Char_isAsciiDigit(_w1)
+})))) {
+end_ = (((end_ + " - Math.max(") + count_) + ", 0)")
+} else {
+end_ = ((end_ + " - ") + count_)
+};
+return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a1_.value_, async_, $task))
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_takeFirst" && _1.arguments_.length === 2) {
+const a1_ = _1.arguments_[0];
+const a2_ = _1.arguments_[1];
+end_ = (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a2_.value_, async_, $task));
+if((!ff_core_String.String_all(end_, ((_w1) => {
+return ff_core_Char.Char_isAsciiDigit(_w1)
+})))) {
+end_ = (("Math.max(" + end_) + ", 0)")
+};
+end_ = (("Math.min(" + end_) + ", for_a.length)");
+return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a1_.value_, async_, $task))
+}
+if(_1.ECall && _1.target_.StaticCall && _1.target_.name_ === "ff:core/List.List_takeLast" && _1.arguments_.length === 2) {
+const a1_ = _1.arguments_[0];
+const a2_ = _1.arguments_[1];
+const count_ = (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a2_.value_, async_, $task));
+if((!ff_core_String.String_all(count_, ((_w1) => {
+return ff_core_Char.Char_isAsciiDigit(_w1)
+})))) {
+start_ = (("Math.max(for_a.length - Math.max(" + count_) + ", 0), 0)")
+} else {
+start_ = (("Math.max(for_a.length - " + count_) + ", 0)")
+};
+return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, a1_.value_, async_, $task))
+}
+{
+return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, list_, async_, $task))
+}
+}))(list_, $task));
+return ff_core_Pair.Pair(listCode_, ff_core_Pair.Pair(start_, end_))
+}
+
 export async function JsEmitter_emitTryCatchFinally$(self_, term_, last_, async_, $task) {
 async function emitCatch_$(catchEffect_, cases_, $task) {
 const catchAsync_ = (self_.emittingAsync_ && ff_compiler_JsEmitter.effectTypeIsAsync_(catchEffect_));
@@ -4455,18 +4512,27 @@ return (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, value_, async_, $
 export async function JsEmitter_emitComma$(self_, term_, async_, $task) {
 {
 const _1 = term_;
+if(_1.ESequential && _1.before_.ESequential && _1.before_.before_.ESequential) {
+const before1_ = _1.before_.before_.before_;
+const before2_ = _1.before_.before_.after_;
+const before3_ = _1.before_.after_;
+const after_ = _1.after_;
+if((((ff_compiler_JsEmitter.safeCommable_(before1_) && ff_compiler_JsEmitter.safeCommable_(before2_)) && ff_compiler_JsEmitter.safeCommable_(before3_)) && ff_compiler_JsEmitter.safeCommable_(after_))) {
+return (((((((("(" + (await ff_compiler_JsEmitter.JsEmitter_emitStatements$(self_, before1_, false, async_, $task))) + ", ") + (await ff_compiler_JsEmitter.JsEmitter_emitStatements$(self_, before2_, false, async_, $task))) + ", ") + (await ff_compiler_JsEmitter.JsEmitter_emitStatements$(self_, before3_, false, async_, $task))) + ", ") + (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, after_, async_, $task))) + ")")
+}
+}
 if(_1.ESequential && _1.before_.ESequential) {
 const before1_ = _1.before_.before_;
 const before2_ = _1.before_.after_;
 const after_ = _1.after_;
-if((ff_compiler_JsEmitter.safeCommable_(before1_) && ff_compiler_JsEmitter.safeCommable_(before2_))) {
+if(((ff_compiler_JsEmitter.safeCommable_(before1_) && ff_compiler_JsEmitter.safeCommable_(before2_)) && ff_compiler_JsEmitter.safeCommable_(after_))) {
 return (((((("(" + (await ff_compiler_JsEmitter.JsEmitter_emitStatements$(self_, before1_, false, async_, $task))) + ", ") + (await ff_compiler_JsEmitter.JsEmitter_emitStatements$(self_, before2_, false, async_, $task))) + ", ") + (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, after_, async_, $task))) + ")")
 }
 }
 if(_1.ESequential) {
 const before_ = _1.before_;
 const after_ = _1.after_;
-if(ff_compiler_JsEmitter.safeCommable_(before_)) {
+if((ff_compiler_JsEmitter.safeCommable_(before_) && ff_compiler_JsEmitter.safeCommable_(after_))) {
 return (((("(" + (await ff_compiler_JsEmitter.JsEmitter_emitStatements$(self_, before_, false, async_, $task))) + ", ") + (await ff_compiler_JsEmitter.JsEmitter_emitTerm$(self_, after_, async_, $task))) + ")")
 }
 }

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

@@ -414,10 +414,7 @@ ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ParseSymbol
 };
 const nameToken_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LLower());
 const variableType_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LColon())
-? (function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LColon());
-return ff_compiler_Parser.Parser_parseType(self_)
-})()
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LColon()), ff_compiler_Parser.Parser_parseType(self_))
 : ff_compiler_Parser.Parser_freshUnificationVariable(self_, ff_compiler_Token.Token_at(nameToken_)));
 ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign());
 const value_ = ff_compiler_Parser.Parser_parseTerm(self_);
@@ -573,10 +570,7 @@ const parameters_ = ((ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_) && (
 ? []
 : ff_compiler_Parser.Parser_parseFunctionParameters(self_, false));
 const returnType_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LColon())
-? (function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LColon());
-return ff_compiler_Parser.Parser_parseType(self_)
-})()
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LColon()), ff_compiler_Parser.Parser_parseType(self_))
 : ff_compiler_Syntax.TConstructor(ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_)), "ff:core/Unit.Unit", []));
 const temporaryEffect_ = ff_compiler_Syntax.TConstructor(ff_compiler_Token.Token_at(nameToken_), "TemporaryEffect$", []);
 return ff_compiler_Syntax.Signature(ff_compiler_Token.Token_at(nameToken_), ff_compiler_Token.Token_raw(nameToken_), member_, poly_.generics_, poly_.constraints_, parameters_, returnType_, temporaryEffect_)
@@ -814,10 +808,7 @@ ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot())
 };
 const fileToken_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUpper());
 const alias_ = (ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "as")
-? (function() {
-ff_compiler_Parser.Parser_rawSkip(self_, ff_compiler_Token.LKeyword(), "as");
-return ff_compiler_Token.Token_raw(ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUpper()))
-})()
+? (ff_compiler_Parser.Parser_rawSkip(self_, ff_compiler_Token.LKeyword(), "as"), ff_compiler_Token.Token_raw(ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUpper())))
 : ff_compiler_Token.Token_raw(fileToken_));
 const packagePair_ = (ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "from")
 ? (function() {
@@ -908,10 +899,7 @@ if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compi
 const majorMinor_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LFloat());
 const parts_ = ff_core_String.String_split(ff_compiler_Token.Token_raw(majorMinor_), 46);
 const patch_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LDot())
-? (function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot());
-return ff_core_String.String_grabInt(ff_compiler_Token.Token_raw(ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LInt())))
-})()
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot()), ff_core_String.String_grabInt(ff_compiler_Token.Token_raw(ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LInt()))))
 : 0);
 return ff_compiler_Syntax.Version(ff_compiler_Token.Token_at(majorMinor_), ff_core_String.String_grabInt(ff_core_List.List_grab(parts_, 0)), ff_core_String.String_grabInt(ff_core_List.List_grab(parts_, 1)), patch_)
 } else {
@@ -1398,10 +1386,7 @@ if(self_.lspHook_.trackSymbols_) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ParseSymbolEnd(ff_compiler_Token.Token_raw(nameToken_), ff_compiler_LspHook.SLet(mutable_), ff_compiler_Token.Token_at(nameToken_), ff_compiler_Token.Token_end(nameToken_), ff_compiler_Token.Token_at(mutableToken_), ff_compiler_Token.Token_end(ff_compiler_Parser.Parser_behind(self_))))
 };
 const body_ = (ff_compiler_Parser.Parser_currentIsSeparator(self_, ff_compiler_Token.LSemicolon())
-? (function() {
-ff_compiler_Parser.Parser_skipSeparator(self_, ff_compiler_Token.LSemicolon());
-return ff_compiler_Parser.Parser_parseStatements(self_)
-})()
+? (ff_compiler_Parser.Parser_skipSeparator(self_, ff_compiler_Token.LSemicolon()), ff_compiler_Parser.Parser_parseStatements(self_))
 : ff_compiler_Syntax.EVariant(ff_compiler_Token.Token_at(keywordToken_), "Unit", [], ff_core_Option.None()));
 return ff_compiler_Syntax.ELet(ff_compiler_Token.Token_at(nameToken_), mutable_, ff_compiler_Token.Token_raw(nameToken_), valueType_, value_, body_)
 }
@@ -1503,10 +1488,7 @@ return ff_compiler_Parser.Parser_parseFieldsAndCalls(self_)
 
 export function Parser_parseFieldsAndCalls(self_) {
 const tailCall_ = ((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "tailcall"))
-? (function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LKeyword());
-return true
-})()
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LKeyword()), true)
 : false);
 let result_ = ff_compiler_Parser.Parser_parseAtom(self_);
 while(ff_compiler_Token.Token_is5(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin(), ff_compiler_Token.LUnary())) {
@@ -1608,15 +1590,9 @@ const target_ = ff_compiler_Syntax.DynamicCall(ff_compiler_Syntax.EField(ff_comp
 return ff_compiler_Syntax.ECall(record_.at_, target_, effect_, [], [ff_compiler_Syntax.Argument(member_.at_, ff_core_Option.None(), member_), ...arguments_.first_], [])
 } else if(ff_compiler_Token.Token_is3(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LAssign(), ff_compiler_Token.LAssignPlus(), ff_compiler_Token.LAssignMinus())) {
 const method_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LAssign())
-? (function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign());
-return "set"
-})()
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign()), "set")
 : ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LAssignPlus())
-? (function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssignPlus());
-return "increment"
-})()
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssignPlus()), "increment")
 : (function() {
 ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssignMinus());
 return "decrement"
@@ -1733,10 +1709,7 @@ return startBracketAt_
 while((!ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketRight()))) {
 const fieldToken_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LLower());
 const field_ = (((!ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) || ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LAssign()))
-? (function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign());
-return ff_compiler_Syntax.Field(ff_compiler_Token.Token_at(fieldToken_), ff_compiler_Token.Token_raw(fieldToken_), ff_compiler_Parser.Parser_parseTerm(self_))
-})()
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign()), ff_compiler_Syntax.Field(ff_compiler_Token.Token_at(fieldToken_), ff_compiler_Token.Token_raw(fieldToken_), ff_compiler_Parser.Parser_parseTerm(self_)))
 : ff_compiler_Syntax.Field(ff_compiler_Token.Token_at(fieldToken_), ff_compiler_Token.Token_raw(fieldToken_), ff_compiler_Syntax.EVariable(ff_compiler_Token.Token_at(fieldToken_), ff_compiler_Token.Token_raw(fieldToken_))));
 if((ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_) && (!self_.lspEmittedArgumentHook_))) {
 if(ff_compiler_LspHook.strictlyBetween_(startAt_, ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_)), self_.lspHook_.at_, 1)) {
@@ -2035,10 +2008,7 @@ ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ParseSymbol
 };
 const nameToken_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LLower());
 const variableType_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LColon())
-? (await (async function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LColon());
-return ff_compiler_Parser.Parser_parseType(self_)
-})())
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LColon()), ff_compiler_Parser.Parser_parseType(self_))
 : ff_compiler_Parser.Parser_freshUnificationVariable(self_, ff_compiler_Token.Token_at(nameToken_)));
 ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign());
 const value_ = ff_compiler_Parser.Parser_parseTerm(self_);
@@ -2194,10 +2164,7 @@ const parameters_ = ((ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_) && (
 ? []
 : ff_compiler_Parser.Parser_parseFunctionParameters(self_, false));
 const returnType_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LColon())
-? (await (async function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LColon());
-return ff_compiler_Parser.Parser_parseType(self_)
-})())
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LColon()), ff_compiler_Parser.Parser_parseType(self_))
 : ff_compiler_Syntax.TConstructor(ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_)), "ff:core/Unit.Unit", []));
 const temporaryEffect_ = ff_compiler_Syntax.TConstructor(ff_compiler_Token.Token_at(nameToken_), "TemporaryEffect$", []);
 return ff_compiler_Syntax.Signature(ff_compiler_Token.Token_at(nameToken_), ff_compiler_Token.Token_raw(nameToken_), member_, poly_.generics_, poly_.constraints_, parameters_, returnType_, temporaryEffect_)
@@ -2435,10 +2402,7 @@ ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot())
 };
 const fileToken_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUpper());
 const alias_ = (ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "as")
-? (await (async function() {
-ff_compiler_Parser.Parser_rawSkip(self_, ff_compiler_Token.LKeyword(), "as");
-return ff_compiler_Token.Token_raw(ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUpper()))
-})())
+? (ff_compiler_Parser.Parser_rawSkip(self_, ff_compiler_Token.LKeyword(), "as"), ff_compiler_Token.Token_raw(ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUpper())))
 : ff_compiler_Token.Token_raw(fileToken_));
 const packagePair_ = (ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "from")
 ? (await (async function() {
@@ -2529,10 +2493,7 @@ if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compi
 const majorMinor_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LFloat());
 const parts_ = ff_core_String.String_split(ff_compiler_Token.Token_raw(majorMinor_), 46);
 const patch_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LDot())
-? (await (async function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot());
-return ff_core_String.String_grabInt(ff_compiler_Token.Token_raw(ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LInt())))
-})())
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot()), ff_core_String.String_grabInt(ff_compiler_Token.Token_raw(ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LInt()))))
 : 0);
 return ff_compiler_Syntax.Version(ff_compiler_Token.Token_at(majorMinor_), ff_core_String.String_grabInt(ff_core_List.List_grab(parts_, 0)), ff_core_String.String_grabInt(ff_core_List.List_grab(parts_, 1)), patch_)
 } else {
@@ -3019,10 +2980,7 @@ if(self_.lspHook_.trackSymbols_) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.ParseSymbolEnd(ff_compiler_Token.Token_raw(nameToken_), ff_compiler_LspHook.SLet(mutable_), ff_compiler_Token.Token_at(nameToken_), ff_compiler_Token.Token_end(nameToken_), ff_compiler_Token.Token_at(mutableToken_), ff_compiler_Token.Token_end(ff_compiler_Parser.Parser_behind(self_))))
 };
 const body_ = (ff_compiler_Parser.Parser_currentIsSeparator(self_, ff_compiler_Token.LSemicolon())
-? (await (async function() {
-ff_compiler_Parser.Parser_skipSeparator(self_, ff_compiler_Token.LSemicolon());
-return ff_compiler_Parser.Parser_parseStatements(self_)
-})())
+? (ff_compiler_Parser.Parser_skipSeparator(self_, ff_compiler_Token.LSemicolon()), ff_compiler_Parser.Parser_parseStatements(self_))
 : ff_compiler_Syntax.EVariant(ff_compiler_Token.Token_at(keywordToken_), "Unit", [], ff_core_Option.None()));
 return ff_compiler_Syntax.ELet(ff_compiler_Token.Token_at(nameToken_), mutable_, ff_compiler_Token.Token_raw(nameToken_), valueType_, value_, body_)
 }
@@ -3124,10 +3082,7 @@ return ff_compiler_Parser.Parser_parseFieldsAndCalls(self_)
 
 export async function Parser_parseFieldsAndCalls$(self_, $task) {
 const tailCall_ = ((ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LKeyword()) && ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "tailcall"))
-? (await (async function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LKeyword());
-return true
-})())
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LKeyword()), true)
 : false);
 let result_ = ff_compiler_Parser.Parser_parseAtom(self_);
 while(ff_compiler_Token.Token_is5(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin(), ff_compiler_Token.LUnary())) {
@@ -3229,15 +3184,9 @@ const target_ = ff_compiler_Syntax.DynamicCall(ff_compiler_Syntax.EField(ff_comp
 return ff_compiler_Syntax.ECall(record_.at_, target_, effect_, [], [ff_compiler_Syntax.Argument(member_.at_, ff_core_Option.None(), member_), ...arguments_.first_], [])
 } else if(ff_compiler_Token.Token_is3(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LAssign(), ff_compiler_Token.LAssignPlus(), ff_compiler_Token.LAssignMinus())) {
 const method_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LAssign())
-? (await (async function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign());
-return "set"
-})())
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign()), "set")
 : ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LAssignPlus())
-? (await (async function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssignPlus());
-return "increment"
-})())
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssignPlus()), "increment")
 : (await (async function() {
 ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssignMinus());
 return "decrement"
@@ -3354,10 +3303,7 @@ return startBracketAt_
 while((!ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketRight()))) {
 const fieldToken_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LLower());
 const field_ = (((!ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) || ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LAssign()))
-? (await (async function() {
-ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign());
-return ff_compiler_Syntax.Field(ff_compiler_Token.Token_at(fieldToken_), ff_compiler_Token.Token_raw(fieldToken_), ff_compiler_Parser.Parser_parseTerm(self_))
-})())
+? (ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LAssign()), ff_compiler_Syntax.Field(ff_compiler_Token.Token_at(fieldToken_), ff_compiler_Token.Token_raw(fieldToken_), ff_compiler_Parser.Parser_parseTerm(self_)))
 : ff_compiler_Syntax.Field(ff_compiler_Token.Token_at(fieldToken_), ff_compiler_Token.Token_raw(fieldToken_), ff_compiler_Syntax.EVariable(ff_compiler_Token.Token_at(fieldToken_), ff_compiler_Token.Token_raw(fieldToken_))));
 if((ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_) && (!self_.lspEmittedArgumentHook_))) {
 if(ff_compiler_LspHook.strictlyBetween_(startAt_, ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_)), self_.lspHook_.at_, 1)) {

package/output/js/ff/core/List.mjs

@@ -413,10 +413,7 @@ let i_ = 0;
 for(let for_i = 0, for_a = self_, for_l = for_a.length; for_i < for_l; for_i++) {
 const x_ = for_a[for_i];
 if(!(body_(x_)
-? (function() {
-result_ = ff_core_Option.Some(i_);
-return false
-})()
+? (result_ = ff_core_Option.Some(i_), false)
 : (function() {
 i_ += 1;
 return true
@@ -430,10 +427,7 @@ let result_ = ff_core_Option.None();
 for(let for_i = 0, for_a = self_, for_l = for_a.length; for_i < for_l; for_i++) {
 const x_ = for_a[for_i];
 if(!(body_(x_)
-? (function() {
-result_ = ff_core_Option.Some(x_);
-return false
-})()
+? (result_ = ff_core_Option.Some(x_), false)
 : true)) break
 };
 return result_
@@ -782,10 +776,7 @@ let i_ = 0;
 for(let for_i = 0, for_a = self_, for_l = for_a.length; for_i < for_l; for_i++) {
 const x_ = for_a[for_i];
 if(!((await body_(x_, $task))
-? (await (async function() {
-result_ = ff_core_Option.Some(i_);
-return false
-})())
+? (result_ = ff_core_Option.Some(i_), false)
 : (await (async function() {
 i_ += 1;
 return true
@@ -799,10 +790,7 @@ let result_ = ff_core_Option.None();
 for(let for_i = 0, for_a = self_, for_l = for_a.length; for_i < for_l; for_i++) {
 const x_ = for_a[for_i];
 if(!((await body_(x_, $task))
-? (await (async function() {
-result_ = ff_core_Option.Some(x_);
-return false
-})())
+? (result_ = ff_core_Option.Some(x_), false)
 : true)) break
 };
 return result_

package/output/js/ff/core/Random.mjs

@@ -233,7 +233,7 @@ return ff_core_Array.Array_drain(array_)
 }
 
 export function Random_sampleArray(self_, count_, array_, body_) {
-for(let for_i = 0, for_a = ff_core_List.List_takeFirst(ff_core_Random.Random_shuffleList(self_, ff_core_Array.Array_toList(array_, 0, 9007199254740991)), count_), for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_i = 0, for_a = ff_core_Random.Random_shuffleList(self_, ff_core_Array.Array_toList(array_, 0, 9007199254740991)), for_l = Math.min(Math.max(count_, 0), for_a.length); for_i < for_l; for_i++) {
 const _w1 = for_a[for_i];
 body_(_w1)
 }
@@ -295,7 +295,7 @@ return ff_core_Array.Array_drain(array_)
 }
 
 export async function Random_sampleArray$(self_, count_, array_, body_, $task) {
-for(let for_i = 0, for_a = ff_core_List.List_takeFirst(ff_core_Random.Random_shuffleList(self_, ff_core_Array.Array_toList(array_, 0, 9007199254740991)), count_), for_l = for_a.length; for_i < for_l; for_i++) {
+for(let for_i = 0, for_a = ff_core_Random.Random_shuffleList(self_, ff_core_Array.Array_toList(array_, 0, 9007199254740991)), for_l = Math.min(Math.max(count_, 0), for_a.length); for_i < for_l; for_i++) {
 const _w1 = for_a[for_i];
 (await body_(_w1, $task))
 }

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.10",
+    "version": "0.5.12",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"

package/vscode/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly language support",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.10",
+    "version": "0.5.12",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"