firefly-compiler 0.4.20 → 0.4.21

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

@@ -278,13 +278,10 @@ return ff_core_IntMap.IntMap_grab(self_, key_)
 export function IntMap_push(self_, key_, value_) {
 {
 const _1 = ff_core_IntMap.IntMap_get(self_, key_);
-{
 if(_1.None) {
 ff_core_IntMap.IntMap_set(self_, key_, ff_core_List.List_toArray([value_]))
 return
 }
-}
-{
 if(_1.Some) {
 const array_ = _1.value_;
 ff_core_Array.Array_push(array_, value_)
@@ -292,18 +289,14 @@ return
 }
 }
 }
-}
 
 export async function IntMap_push$(self_, key_, value_, $task) {
 {
 const _1 = ff_core_IntMap.IntMap_get(self_, key_);
-{
 if(_1.None) {
 ff_core_IntMap.IntMap_set(self_, key_, ff_core_List.List_toArray([value_]))
 return
 }
-}
-{
 if(_1.Some) {
 const array_ = _1.value_;
 ff_core_Array.Array_push(array_, value_)
@@ -311,7 +304,6 @@ return
 }
 }
 }
-}
 
 
 

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

@@ -726,26 +726,20 @@ toJson_(value_) {
 return ff_core_Json.string_(value_)
 },
 fromJson_(json_) {
-{
 const json_a = json_;
 {
 const _w1 = json_a;
 return ff_core_Json.Json_getString(_w1)
-return
-}
 }
 },
 async toJson_$(value_, $task) {
 return ff_core_Json.string_(value_)
 },
 async fromJson_$(json_, $task) {
-{
 const json_a = json_;
 {
 const _w1 = json_a;
 return ff_core_Json.Json_getString(_w1)
-return
-}
 }
 }
 };
@@ -755,26 +749,20 @@ toJson_(value_) {
 return ff_core_Json.int_(value_)
 },
 fromJson_(json_) {
-{
 const json_a = json_;
 {
 const _w1 = json_a;
 return ff_core_Json.Json_getInt(_w1)
-return
-}
 }
 },
 async toJson_$(value_, $task) {
 return ff_core_Json.int_(value_)
 },
 async fromJson_$(json_, $task) {
-{
 const json_a = json_;
 {
 const _w1 = json_a;
 return ff_core_Json.Json_getInt(_w1)
-return
-}
 }
 }
 };
@@ -784,26 +772,20 @@ toJson_(value_) {
 return ff_core_Json.float_(value_)
 },
 fromJson_(json_) {
-{
 const json_a = json_;
 {
 const _w1 = json_a;
 return ff_core_Json.Json_getFloat(_w1)
-return
-}
 }
 },
 async toJson_$(value_, $task) {
 return ff_core_Json.float_(value_)
 },
 async fromJson_$(json_, $task) {
-{
 const json_a = json_;
 {
 const _w1 = json_a;
 return ff_core_Json.Json_getFloat(_w1)
-return
-}
 }
 }
 };
@@ -813,26 +795,20 @@ toJson_(value_) {
 return ff_core_Json.bool_(value_)
 },
 fromJson_(json_) {
-{
 const json_a = json_;
 {
 const _w1 = json_a;
 return ff_core_Json.Json_getBool(_w1)
-return
-}
 }
 },
 async toJson_$(value_, $task) {
 return ff_core_Json.bool_(value_)
 },
 async fromJson_$(json_, $task) {
-{
 const json_a = json_;
 {
 const _w1 = json_a;
 return ff_core_Json.Json_getBool(_w1)
-return
-}
 }
 }
 };
@@ -850,19 +826,15 @@ const result_ = ff_core_Array.make_();
 ff_core_List.List_eachWhile(array_, ((item_) => {
 do {
 const _1 = ff_core_Json_JsonLike$T.fromJson_(item_);
-{
 if(_1.None) {
 convertible_ = false
 break
 }
-}
-{
 if(_1.Some) {
 const value_ = _1.value_;
 ff_core_Array.Array_push(result_, value_)
 break
 }
-}
 } while(false);
 return convertible_
 }));
@@ -883,19 +855,15 @@ const result_ = ff_core_Array.make_();
 ff_core_List.List_eachWhile(array_, ((item_) => {
 do {
 const _1 = ff_core_Json_JsonLike$T.fromJson_(item_);
-{
 if(_1.None) {
 convertible_ = false
 break
 }
-}
-{
 if(_1.Some) {
 const value_ = _1.value_;
 ff_core_Array.Array_push(result_, value_)
 break
 }
-}
 } while(false);
 return convertible_
 }));
@@ -922,19 +890,15 @@ let convertible_ = true;
 ff_core_Json.Json_eachWhile(json_, ((key_, value_) => {
 do {
 const _1 = ff_core_Json_JsonLike$T.fromJson_(value_);
-{
 if(_1.None) {
 convertible_ = false
 break
 }
-}
-{
 if(_1.Some) {
 const v_ = _1.value_;
 ff_core_StringMap.StringMap_set(map_, key_, v_)
 break
 }
-}
 } while(false);
 return convertible_
 }));
@@ -959,19 +923,15 @@ let convertible_ = true;
 ff_core_Json.Json_eachWhile(json_, ((key_, value_) => {
 do {
 const _1 = ff_core_Json_JsonLike$T.fromJson_(value_);
-{
 if(_1.None) {
 convertible_ = false
 break
 }
-}
-{
 if(_1.Some) {
 const v_ = _1.value_;
 ff_core_StringMap.StringMap_set(map_, key_, v_)
 break
 }
-}
 } while(false);
 return convertible_
 }));

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

@@ -123,6 +123,12 @@ export function internalSame_(left_, right_) {
 return left_ === right_
 }
 
+export function internalGrab_(self_, index_) {
+
+        return index_ < 0 || index_ >= self_.length ? ff_core_Try.internalThrowGrabException_() : self_[index_];
+    
+}
+
 export async function empty_$($task) {
 throw new Error('Function empty is missing on this target in async context.');
 }
@@ -149,6 +155,10 @@ export async function internalSame_$(left_, right_, $task) {
 throw new Error('Function internalSame is missing on this target in async context.');
 }
 
+export async function internalGrab_$(self_, index_, $task) {
+throw new Error('Function internalGrab is missing on this target in async context.');
+}
+
 export function List_addAll(self_, that_) {
 return self_.concat(that_)
 }
@@ -171,10 +181,7 @@ export function List_get(self_, index_) {
 
 export function List_grab(self_, index_) {
 
-            if(index_ < 0 || index_ >= self_.length) {
-                ff_core_Try.internalThrowGrabException_()
-            }
-            return self_[index_]
+            return self_[index_] ?? internalGrab_(self_, index_);
         
 }
 
@@ -253,13 +260,13 @@ if((ff_core_List.List_size(self_) <= ff_core_List.List_size(that_))) {
 let i_ = (-1);
 return ff_core_List.List_map(self_, ((x_) => {
 i_ += 1;
-return ff_core_Pair.Pair(x_, ff_core_List.List_grab(that_, i_))
+return ff_core_Pair.Pair(x_, (that_[i_] ?? ff_core_List.internalGrab_(that_, i_)))
 }))
 } else {
 let i_ = (-1);
 return ff_core_List.List_map(that_, ((y_) => {
 i_ += 1;
-return ff_core_Pair.Pair(ff_core_List.List_grab(self_, i_), y_)
+return ff_core_Pair.Pair((self_[i_] ?? ff_core_List.internalGrab_(self_, i_)), y_)
 }))
 }
 }
@@ -288,7 +295,7 @@ let index_ = 0;
 return ff_core_Stream.make_((() => {
 if((index_ < ff_core_List.List_size(self_))) {
 return ff_core_Option.Some((function() {
-const result_ = ff_core_List.List_grab(self_, index_);
+const result_ = (self_[index_] ?? ff_core_List.internalGrab_(self_, index_));
 index_ += 1;
 return result_
 })())
@@ -394,17 +401,13 @@ let result_ = ff_core_Option.None();
 ff_core_List.List_eachWhile(self_, ((x_) => {
 {
 const _1 = body_(x_);
-{
 if(_1.None) {
 return true
-return
-}
 }
 {
 const o_ = _1;
 result_ = o_;
 return false
-return
 }
 }
 }));
@@ -540,13 +543,13 @@ if((ff_core_List.List_size(self_) <= ff_core_List.List_size(that_))) {
 let i_ = (-1);
 return ff_core_List.List_map(self_, ((x_) => {
 i_ += 1;
-return ff_core_Pair.Pair(x_, ff_core_List.List_grab(that_, i_))
+return ff_core_Pair.Pair(x_, (that_[i_] ?? ff_core_List.internalGrab_(that_, i_)))
 }))
 } else {
 let i_ = (-1);
 return ff_core_List.List_map(that_, ((y_) => {
 i_ += 1;
-return ff_core_Pair.Pair(ff_core_List.List_grab(self_, i_), y_)
+return ff_core_Pair.Pair((self_[i_] ?? ff_core_List.internalGrab_(self_, i_)), y_)
 }))
 }
 }
@@ -575,7 +578,7 @@ let index_ = 0;
 return (await ff_core_Stream.make_$((async ($task) => {
 if((index_ < ff_core_List.List_size(self_))) {
 return ff_core_Option.Some((await (async function() {
-const result_ = ff_core_List.List_grab(self_, index_);
+const result_ = (self_[index_] ?? ff_core_List.internalGrab_(self_, index_));
 index_ += 1;
 return result_
 })()))
@@ -687,17 +690,13 @@ let result_ = ff_core_Option.None();
 (await ff_core_List.List_eachWhile$(self_, (async (x_, $task) => {
 {
 const _1 = (await body_(x_, $task));
-{
 if(_1.None) {
 return true
-return
-}
 }
 {
 const o_ = _1;
 result_ = o_;
 return false
-return
 }
 }
 }), $task));
@@ -755,16 +754,13 @@ let seen_ = ff_core_List.List_toSet([], ff_core_Ordering_Order$T);
 return ff_core_List.List_filter(self_, ((_1) => {
 {
 const item_ = _1;
-const _guard1 = (!ff_core_Set.Set_contains(seen_, item_, ff_core_Ordering_Order$T));
-if(_guard1) {
+if((!ff_core_Set.Set_contains(seen_, item_, ff_core_Ordering_Order$T))) {
 seen_ = ff_core_Set.Set_add(seen_, item_, ff_core_Ordering_Order$T);
 return true
-return
 }
 }
 {
 return false
-return
 }
 }))
 }
@@ -786,16 +782,13 @@ let seen_ = ff_core_List.List_toSet([], ff_core_Ordering_Order$T);
 return ff_core_List.List_filter(self_, ((_1) => {
 {
 const item_ = _1;
-const _guard1 = (!ff_core_Set.Set_contains(seen_, item_, ff_core_Ordering_Order$T));
-if(_guard1) {
+if((!ff_core_Set.Set_contains(seen_, item_, ff_core_Ordering_Order$T))) {
 seen_ = ff_core_Set.Set_add(seen_, item_, ff_core_Ordering_Order$T);
 return true
-return
 }
 }
 {
 return false
-return
 }
 }))
 }
@@ -823,7 +816,6 @@ const map_ = _1;
 const key_ = _2.first_;
 const value_ = _2.second_;
 return ff_core_Map.Map_add(map_, key_, value_, ff_core_Ordering_Order$K)
-return
 }
 }))
 }
@@ -850,7 +842,6 @@ const map_ = _1;
 const key_ = _2.first_;
 const value_ = _2.second_;
 return ff_core_Map.Map_add(map_, key_, value_, ff_core_Ordering_Order$K)
-return
 }
 }))
 }
@@ -946,7 +937,7 @@ return false
 let i_ = (-1);
 return ff_core_List.List_all(x_, ((l_) => {
 i_ += 1;
-return ff_core_Equal_Equal$T.equals_(l_, ff_core_List.List_grab(y_, i_))
+return ff_core_Equal_Equal$T.equals_(l_, (y_[i_] ?? ff_core_List.internalGrab_(y_, i_)))
 }))
 }
 }
@@ -961,7 +952,7 @@ return false
 let i_ = (-1);
 return ff_core_List.List_all(x_, ((l_) => {
 i_ += 1;
-return ff_core_Equal_Equal$T.equals_(l_, ff_core_List.List_grab(y_, i_))
+return ff_core_Equal_Equal$T.equals_(l_, (y_[i_] ?? ff_core_List.internalGrab_(y_, i_)))
 }))
 }
 }
@@ -977,7 +968,7 @@ const size_ = ff_core_Int.Int_min(ff_core_List.List_size(x_), ff_core_List.List_
 let i_ = 0;
 let ordering_ = ff_core_Ordering.OrderingSame();
 while(((ordering_ === ff_core_Ordering.OrderingSame()) && (i_ < size_))) {
-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())) {
@@ -995,7 +986,7 @@ const size_ = ff_core_Int.Int_min(ff_core_List.List_size(x_), ff_core_List.List_
 let i_ = 0;
 let ordering_ = ff_core_Ordering.OrderingSame();
 while(((ordering_ === ff_core_Ordering.OrderingSame()) && (i_ < size_))) {
-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())) {

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

@@ -196,14 +196,10 @@ export function LockCondition_sleepUntil(self_, body_) {
 _tailcall: for(;;) {
 {
 const _1 = body_();
-{
 if(_1.Some) {
 const value_ = _1.value_;
 return value_
-return
-}
 }
-{
 if(_1.None) {
 ff_core_Lock.LockCondition_sleep(self_);
 {
@@ -216,7 +212,6 @@ continue _tailcall
 return
 }
 }
-}
 return
 }
 }
@@ -268,14 +263,10 @@ export async function LockCondition_sleepUntil$(self_, body_, $task) {
 _tailcall: for(;;) {
 {
 const _1 = (await body_($task));
-{
 if(_1.Some) {
 const value_ = _1.value_;
 return value_
-return
-}
 }
-{
 if(_1.None) {
 (await ff_core_Lock.LockCondition_sleep$(self_, $task));
 {
@@ -288,7 +279,6 @@ continue _tailcall
 return
 }
 }
-}
 return
 }
 }

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

@@ -179,18 +179,12 @@ return ff_core_Option.Option_grab(ff_core_Map.Map_get(self_, key_, ff_core_Order
 export function Map_updateOrInsert(self_, key_, update_, default_, ff_core_Ordering_Order$K) {
 {
 const _1 = ff_core_Map.Map_get(self_, key_, ff_core_Ordering_Order$K);
-{
 if(_1.None) {
 return ff_core_Map.Map_add(self_, key_, default_(), ff_core_Ordering_Order$K)
-return
-}
 }
-{
 if(_1.Some) {
 const v_ = _1.value_;
 return ff_core_Map.Map_add(self_, key_, update_(v_), ff_core_Ordering_Order$K)
-return
-}
 }
 }
 }
@@ -282,18 +276,12 @@ return ff_core_Option.Option_grab(ff_core_Map.Map_get(self_, key_, ff_core_Order
 export async function Map_updateOrInsert$(self_, key_, update_, default_, ff_core_Ordering_Order$K, $task) {
 {
 const _1 = ff_core_Map.Map_get(self_, key_, ff_core_Ordering_Order$K);
-{
 if(_1.None) {
 return ff_core_Map.Map_add(self_, key_, (await default_($task)), ff_core_Ordering_Order$K)
-return
-}
 }
-{
 if(_1.Some) {
 const v_ = _1.value_;
 return ff_core_Map.Map_add(self_, key_, (await update_(v_, $task)), ff_core_Ordering_Order$K)
-return
-}
 }
 }
 }
@@ -329,19 +317,13 @@ return [value_]
 export function Map_push(self_, key_, value_, ff_core_Ordering_Order$K) {
 {
 const _1 = ff_core_Map.Map_get(self_, key_, ff_core_Ordering_Order$K);
-{
 if(_1.None) {
 return ff_core_Map.Map_add(self_, key_, ff_core_List.List_toArray([value_]), ff_core_Ordering_Order$K)
-return
-}
 }
-{
 if(_1.Some) {
 const array_ = _1.value_;
 ff_core_Array.Array_push(array_, value_);
 return self_
-return
-}
 }
 }
 }
@@ -349,19 +331,13 @@ return
 export async function Map_push$(self_, key_, value_, ff_core_Ordering_Order$K, $task) {
 {
 const _1 = ff_core_Map.Map_get(self_, key_, ff_core_Ordering_Order$K);
-{
 if(_1.None) {
 return ff_core_Map.Map_add(self_, key_, ff_core_List.List_toArray([value_]), ff_core_Ordering_Order$K)
-return
-}
 }
-{
 if(_1.Some) {
 const array_ = _1.value_;
 ff_core_Array.Array_push(array_, value_);
 return self_
-return
-}
 }
 }
 }