firefly-compiler 0.4.20 → 0.4.21

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

@@ -126,23 +126,14 @@ export function reverse_(compare_) {
 return ((x_, y_) => {
 {
 const _1 = compare_(x_, y_);
-{
 if(_1.OrderingBefore) {
 return ff_core_Ordering.OrderingAfter()
-return
-}
 }
-{
 if(_1.OrderingSame) {
 return ff_core_Ordering.OrderingSame()
-return
 }
-}
-{
 if(_1.OrderingAfter) {
 return ff_core_Ordering.OrderingBefore()
-return
-}
 }
 }
 })
@@ -152,16 +143,12 @@ export function pair_(compareFirst_, compareSecond_) {
 return ((x_, y_) => {
 {
 const _1 = compareFirst_(x_.first_, y_.first_);
-{
 if(_1.OrderingSame) {
 return compareSecond_(x_.second_, y_.second_)
-return
-}
 }
 {
 const ordering_ = _1;
 return ordering_
-return
 }
 }
 })
@@ -192,24 +179,19 @@ return ((_1, _2) => {
 {
 const x_ = _1;
 const y_ = _2;
-const _guard1 = lessThan_(x_, y_);
-if(_guard1) {
+if(lessThan_(x_, y_)) {
 return ff_core_Ordering.OrderingBefore()
-return
 }
 }
 {
 const x_ = _1;
 const y_ = _2;
-const _guard1 = lessThan_(y_, x_);
-if(_guard1) {
+if(lessThan_(y_, x_)) {
 return ff_core_Ordering.OrderingAfter()
-return
 }
 }
 {
 return ff_core_Ordering.OrderingSame()
-return
 }
 })
 }
@@ -234,23 +216,14 @@ export async function reverse_$(compare_, $task) {
 return (async (x_, y_, $task) => {
 {
 const _1 = (await compare_(x_, y_, $task));
-{
 if(_1.OrderingBefore) {
 return ff_core_Ordering.OrderingAfter()
-return
 }
-}
-{
 if(_1.OrderingSame) {
 return ff_core_Ordering.OrderingSame()
-return
 }
-}
-{
 if(_1.OrderingAfter) {
 return ff_core_Ordering.OrderingBefore()
-return
-}
 }
 }
 })
@@ -260,16 +233,12 @@ export async function pair_$(compareFirst_, compareSecond_, $task) {
 return (async (x_, y_, $task) => {
 {
 const _1 = (await compareFirst_(x_.first_, y_.first_, $task));
-{
 if(_1.OrderingSame) {
 return (await compareSecond_(x_.second_, y_.second_, $task))
-return
-}
 }
 {
 const ordering_ = _1;
 return ordering_
-return
 }
 }
 })
@@ -300,24 +269,19 @@ return (async (_1, _2, $task) => {
 {
 const x_ = _1;
 const y_ = _2;
-const _guard1 = (await lessThan_(x_, y_, $task));
-if(_guard1) {
+if((await lessThan_(x_, y_, $task))) {
 return ff_core_Ordering.OrderingBefore()
-return
 }
 }
 {
 const x_ = _1;
 const y_ = _2;
-const _guard1 = (await lessThan_(y_, x_, $task));
-if(_guard1) {
+if((await lessThan_(y_, x_, $task))) {
 return ff_core_Ordering.OrderingAfter()
-return
 }
 }
 {
 return ff_core_Ordering.OrderingSame()
-return
 }
 })
 }
@@ -325,23 +289,14 @@ return
 export function Ordering_toInt(self_) {
 {
 const _1 = self_;
-{
 if(_1.OrderingBefore) {
 return (-1)
-return
-}
 }
-{
 if(_1.OrderingSame) {
 return 0
-return
 }
-}
-{
 if(_1.OrderingAfter) {
 return 1
-return
-}
 }
 }
 }
@@ -349,23 +304,14 @@ return
 export function Ordering_reverse(self_) {
 {
 const _1 = self_;
-{
 if(_1.OrderingBefore) {
 return ff_core_Ordering.OrderingAfter()
-return
-}
 }
-{
 if(_1.OrderingSame) {
 return ff_core_Ordering.OrderingSame()
-return
-}
 }
-{
 if(_1.OrderingAfter) {
 return ff_core_Ordering.OrderingBefore()
-return
-}
 }
 }
 }
@@ -373,23 +319,14 @@ return
 export async function Ordering_toInt$(self_, $task) {
 {
 const _1 = self_;
-{
 if(_1.OrderingBefore) {
 return (-1)
-return
 }
-}
-{
 if(_1.OrderingSame) {
 return 0
-return
 }
-}
-{
 if(_1.OrderingAfter) {
 return 1
-return
-}
 }
 }
 }
@@ -397,23 +334,14 @@ return
 export async function Ordering_reverse$(self_, $task) {
 {
 const _1 = self_;
-{
 if(_1.OrderingBefore) {
 return ff_core_Ordering.OrderingAfter()
-return
-}
 }
-{
 if(_1.OrderingSame) {
 return ff_core_Ordering.OrderingSame()
-return
-}
 }
-{
 if(_1.OrderingAfter) {
 return ff_core_Ordering.OrderingBefore()
-return
-}
 }
 }
 }
@@ -429,55 +357,29 @@ return ff_core_Ordering.OrderingSame()
 
 export const ff_core_Ordering_Order$ff_core_Bool_Bool = {
 compare_(x_, y_) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-if(!x_a) {
-if(y_a) {
+if(!x_a && y_a) {
 return ff_core_Ordering.OrderingBefore()
-return
-}
-}
 }
-{
-if(x_a) {
-if(!y_a) {
+if(x_a && !y_a) {
 return ff_core_Ordering.OrderingAfter()
-return
-}
-}
 }
 {
 return ff_core_Ordering.OrderingSame()
-return
-}
 }
 },
 async compare_$(x_, y_, $task) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-if(!x_a) {
-if(y_a) {
+if(!x_a && y_a) {
 return ff_core_Ordering.OrderingBefore()
-return
-}
-}
 }
-{
-if(x_a) {
-if(!y_a) {
+if(x_a && !y_a) {
 return ff_core_Ordering.OrderingAfter()
-return
-}
-}
 }
 {
 return ff_core_Ordering.OrderingSame()
-return
-}
 }
 }
 };
@@ -530,32 +432,24 @@ export function ff_core_Ordering_Order$ff_core_Pair_Pair(ff_core_Ordering_Order$
 compare_(x_, y_) {
 {
 const _1 = ff_core_Ordering_Order$A.compare_(x_.first_, y_.first_);
-{
 if(_1.OrderingSame) {
 return ff_core_Ordering_Order$B.compare_(x_.second_, y_.second_)
-return
-}
 }
 {
 const o_ = _1;
 return o_
-return
 }
 }
 },
 async compare_$(x_, y_, $task) {
 {
 const _1 = ff_core_Ordering_Order$A.compare_(x_.first_, y_.first_);
-{
 if(_1.OrderingSame) {
 return ff_core_Ordering_Order$B.compare_(x_.second_, y_.second_)
-return
-}
 }
 {
 const o_ = _1;
 return o_
-return
 }
 }
 }
@@ -566,7 +460,7 @@ compare_(x_, y_) {
 let ordering_ = ff_core_Ordering.OrderingSame();
 let i_ = 0;
 while((((i_ < ff_core_List.List_size(x_)) && (i_ < ff_core_List.List_size(y_))) && (ordering_ === ff_core_Ordering.OrderingSame()))) {
-ordering_ = ff_core_Ordering_Order$T.compare_(ff_core_List.List_grab(x_, i_), ff_core_List.List_grab(y_, i_));
+ordering_ = ff_core_Ordering_Order$T.compare_((x_[i_] ?? ff_core_List.internalGrab_(x_, i_)), (y_[i_] ?? ff_core_List.internalGrab_(y_, i_)));
 i_ += 1
 };
 if((ordering_ !== ff_core_Ordering.OrderingSame())) {
@@ -579,7 +473,7 @@ async compare_$(x_, y_, $task) {
 let ordering_ = ff_core_Ordering.OrderingSame();
 let i_ = 0;
 while((((i_ < ff_core_List.List_size(x_)) && (i_ < ff_core_List.List_size(y_))) && (ordering_ === ff_core_Ordering.OrderingSame()))) {
-ordering_ = ff_core_Ordering_Order$T.compare_(ff_core_List.List_grab(x_, i_), ff_core_List.List_grab(y_, i_));
+ordering_ = ff_core_Ordering_Order$T.compare_((x_[i_] ?? ff_core_List.internalGrab_(x_, i_)), (y_[i_] ?? ff_core_List.internalGrab_(y_, i_)));
 i_ += 1
 };
 if((ordering_ !== ff_core_Ordering.OrderingSame())) {
@@ -592,71 +486,35 @@ return ordering_
 
 export const ff_core_Equal_Equal$ff_core_Ordering_Ordering = {
 equals_(x_, y_) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-if(x_a.OrderingBefore) {
-if(y_a.OrderingBefore) {
+if(x_a.OrderingBefore && y_a.OrderingBefore) {
 return true
-return
 }
-}
-}
-{
-if(x_a.OrderingSame) {
-if(y_a.OrderingSame) {
+if(x_a.OrderingSame && y_a.OrderingSame) {
 return true
-return
-}
-}
 }
-{
-if(x_a.OrderingAfter) {
-if(y_a.OrderingAfter) {
+if(x_a.OrderingAfter && y_a.OrderingAfter) {
 return true
-return
-}
-}
 }
 {
 return false
-return
-}
 }
 },
 async equals_$(x_, y_, $task) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-if(x_a.OrderingBefore) {
-if(y_a.OrderingBefore) {
+if(x_a.OrderingBefore && y_a.OrderingBefore) {
 return true
-return
-}
-}
 }
-{
-if(x_a.OrderingSame) {
-if(y_a.OrderingSame) {
+if(x_a.OrderingSame && y_a.OrderingSame) {
 return true
-return
-}
 }
-}
-{
-if(x_a.OrderingAfter) {
-if(y_a.OrderingAfter) {
+if(x_a.OrderingAfter && y_a.OrderingAfter) {
 return true
-return
-}
-}
 }
 {
 return false
-return
-}
 }
 }
 };

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

@@ -107,7 +107,6 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_core_Pair.Pair(body_(self_.first_), _c.second_)
-return
 }
 }
 }
@@ -118,7 +117,6 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_core_Pair.Pair(_c.first_, body_(self_.second_))
-return
 }
 }
 }
@@ -133,7 +131,6 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_core_Pair.Pair((await body_(self_.first_, $task)), _c.second_)
-return
 }
 }
 }
@@ -144,7 +141,6 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_core_Pair.Pair(_c.first_, (await body_(self_.second_, $task)))
-return
 }
 }
 }
@@ -159,7 +155,6 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_core_Pair.Pair(body_(self_.first_), body_(self_.second_))
-return
 }
 }
 }
@@ -178,7 +173,6 @@ const _1 = self_;
 {
 const _c = _1;
 return ff_core_Pair.Pair((await body_(self_.first_, $task)), (await body_(self_.second_, $task)))
-return
 }
 }
 }
@@ -218,44 +212,29 @@ return ff_core_Any.internalAnyTag_(((((("ff:core/Pair.Pair" + "[") + ff_core_Any
 
 export function ff_core_Equal_Equal$ff_core_Pair_Pair(ff_core_Equal_Equal$A, ff_core_Equal_Equal$B) { return {
 equals_(x_, y_) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return true
-return
-}
 }
 {
 return (ff_core_Equal_Equal$A.equals_(x_.first_, y_.first_) && ff_core_Equal_Equal$B.equals_(x_.second_, y_.second_))
-return
-}
 }
 },
 async equals_$(x_, y_, $task) {
-{
 const x_a = x_;
 const y_a = y_;
-{
-const _guard1 = (x_ === y_);
-if(_guard1) {
+if((x_ === y_)) {
 return true
-return
-}
 }
 {
 return (ff_core_Equal_Equal$A.equals_(x_.first_, y_.first_) && ff_core_Equal_Equal$B.equals_(x_.second_, y_.second_))
-return
-}
 }
 }
 }}
 
 export function ff_core_Serializable_Serializable$ff_core_Pair_Pair(ff_core_Serializable_Serializable$A, ff_core_Serializable_Serializable$B) { return {
 serializeUsing_(serialization_, value_) {
-{
 const serialization_a = serialization_;
 const value_a = value_;
 {
@@ -268,28 +247,22 @@ ff_core_Serializable_Serializable$A.serializeUsing_(serialization_, v_.first_);
 ff_core_Serializable_Serializable$B.serializeUsing_(serialization_, v_.second_)
 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_) + 17), 0);
 return ff_core_Pair.Pair(ff_core_Serializable_Serializable$A.deserializeUsing_(serialization_), ff_core_Serializable_Serializable$B.deserializeUsing_(serialization_))
-return
-}
 }
 {
 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)})
-return
 }
 }
 },
 async serializeUsing_$(serialization_, value_, $task) {
-{
 const serialization_a = serialization_;
 const value_a = value_;
 {
@@ -302,23 +275,18 @@ ff_core_Serializable_Serializable$A.serializeUsing_(serialization_, v_.first_);
 ff_core_Serializable_Serializable$B.serializeUsing_(serialization_, v_.second_)
 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_) + 17), 0);
 return ff_core_Pair.Pair(ff_core_Serializable_Serializable$A.deserializeUsing_(serialization_), ff_core_Serializable_Serializable$B.deserializeUsing_(serialization_))
-return
-}
 }
 {
 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)})
-return
 }
 }
 }

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

@@ -208,32 +208,19 @@ throw new Error('Function Path_relativeTo is missing on this target in sync cont
 
 export function Path_endsWith(self_, parts_) {
 function go_(pathOption_, reversed_) {
-{
 const pathOption_a = pathOption_;
 const reversed_a = reversed_;
-{
 if(reversed_a.length === 0) {
 return true
-return
 }
-}
-{
-if(pathOption_a.Some) {
+if(pathOption_a.Some && reversed_a.length >= 1) {
 const path_ = pathOption_a.value_;
-if(reversed_a.length > 0) {
 const p_ = reversed_a[0];
 const ps_ = reversed_a.slice(1);
 return ((ff_core_Path.Path_base(path_) === p_) && go_(ff_core_Path.Path_parent(path_), ps_))
-return
-}
-}
 }
-{
 if(pathOption_a.None) {
 return false
-return
-}
-}
 }
 }
 return go_(ff_core_Option.Some(self_), ff_core_List.List_reverse(parts_))
@@ -472,32 +459,19 @@ export async function Path_relativeTo$(self_, path_, $task) {
 
 export async function Path_endsWith$(self_, parts_, $task) {
 async function go_$(pathOption_, reversed_, $task) {
-{
 const pathOption_a = pathOption_;
 const reversed_a = reversed_;
-{
 if(reversed_a.length === 0) {
 return true
-return
 }
-}
-{
-if(pathOption_a.Some) {
+if(pathOption_a.Some && reversed_a.length >= 1) {
 const path_ = pathOption_a.value_;
-if(reversed_a.length > 0) {
 const p_ = reversed_a[0];
 const ps_ = reversed_a.slice(1);
 return (((await ff_core_Path.Path_base$(path_, $task)) === p_) && (await go_$((await ff_core_Path.Path_parent$(path_, $task)), ps_, $task)))
-return
-}
-}
 }
-{
 if(pathOption_a.None) {
 return false
-return
-}
-}
 }
 }
 return (await go_$(ff_core_Option.Some(self_), ff_core_List.List_reverse(parts_), $task))

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

@@ -216,8 +216,8 @@ export function Random_nextGauss(self_, mean_, standardDeviation_) {
 export function Random_shuffleArray(self_, array_) {
 ff_core_List.List_each(ff_core_Int.Int_until(0, (ff_core_Array.Array_size(array_) - 1)), ((i_) => {
 const j_ = (ff_core_Random.Random_nextInt(self_, 0, (ff_core_Array.Array_size(array_) - i_)) + i_);
-const value_ = ff_core_Array.Array_grab(array_, i_);
-ff_core_Array.Array_set(array_, i_, ff_core_Array.Array_grab(array_, j_));
+const value_ = (array_.array[i_] ?? ff_core_Array.internalGrab_(array_, i_));
+ff_core_Array.Array_set(array_, i_, (array_.array[j_] ?? ff_core_Array.internalGrab_(array_, j_)));
 ff_core_Array.Array_set(array_, j_, value_)
 }))
 }
@@ -275,8 +275,8 @@ throw new Error('Function Random_nextGauss is missing on this target in async co
 export async function Random_shuffleArray$(self_, array_, $task) {
 ff_core_List.List_each(ff_core_Int.Int_until(0, (ff_core_Array.Array_size(array_) - 1)), ((i_) => {
 const j_ = (ff_core_Random.Random_nextInt(self_, 0, (ff_core_Array.Array_size(array_) - i_)) + i_);
-const value_ = ff_core_Array.Array_grab(array_, i_);
-ff_core_Array.Array_set(array_, i_, ff_core_Array.Array_grab(array_, j_));
+const value_ = (array_.array[i_] ?? ff_core_Array.internalGrab_(array_, i_));
+ff_core_Array.Array_set(array_, i_, (array_.array[j_] ?? ff_core_Array.internalGrab_(array_, j_)));
 ff_core_Array.Array_set(array_, j_, value_)
 }))
 }