firefly-compiler 0.4.19 → 0.4.21

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

@@ -102,37 +102,21 @@ import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
 export const ff_core_Show_Show$ff_core_Bool_Bool = {
 show_(value_) {
-{
 const value_a = value_;
-{
 if(!value_a) {
 return "False"
-return
 }
-}
-{
 if(value_a) {
 return "True"
-return
-}
-}
 }
 },
 async show_$(value_, $task) {
-{
 const value_a = value_;
-{
 if(!value_a) {
 return "False"
-return
 }
-}
-{
 if(value_a) {
 return "True"
-return
-}
-}
 }
 }
 };

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

@@ -190,35 +190,27 @@ let result_ = ff_core_Option.None();
 while(ff_core_Option.Option_isEmpty(result_)) {
 do {
 const _1 = inner_.next_();
-{
-const i_ = _1;
 if(_1.Some) {
+const i_ = _1;
 result_ = ff_core_Option.Some(i_)
 break
 }
-}
-{
 if(_1.None) {
 do {
 const _1 = self_.next_();
-{
 if(_1.None) {
 result_ = ff_core_Option.Some(ff_core_Option.None())
 break
 }
-}
-{
 if(_1.Some) {
 const o_ = _1.value_;
 inner_.close_();
 inner_ = body_(o_)
 break
 }
-}
 } while(false)
 break
 }
-}
 } while(false)
 };
 return ff_core_Option.Option_grab(result_)
@@ -243,28 +235,21 @@ let result_ = ff_core_Option.None();
 while(ff_core_Option.Option_isEmpty(result_)) {
 do {
 const _1 = self_.next_();
-{
 if(_1.Some) {
 const x_ = _1.value_;
-const _guard1 = body_(x_);
-if(_guard1) {
+if(body_(x_)) {
 result_ = ff_core_Option.Some(ff_core_Option.Some(x_))
 break
 }
 }
-}
-{
 if(_1.Some) {
 
 break
 }
-}
-{
 if(_1.None) {
 result_ = ff_core_Option.Some(ff_core_Option.None())
 break
 }
-}
 } while(false)
 };
 return ff_core_Option.Option_grab(result_)
@@ -277,19 +262,13 @@ export function Stream_zip(self_, that_) {
 return ff_core_Stream.Stream((() => {
 {
 const _1 = ff_core_Pair.Pair(self_.next_(), that_.next_());
-{
-if(_1.first_.Some) {
+if(_1.first_.Some && _1.second_.Some) {
 const x_ = _1.first_.value_;
-if(_1.second_.Some) {
 const y_ = _1.second_.value_;
 return ff_core_Option.Some(ff_core_Pair.Pair(x_, y_))
-return
-}
-}
 }
 {
 return ff_core_Option.None()
-return
 }
 }
 }), (() => {
@@ -319,18 +298,14 @@ return ff_core_Stream.Stream((() => {
 while((remaining_ >= 1)) {
 do {
 const _1 = self_.next_();
-{
 if(_1.None) {
 remaining_ = 0
 break
 }
-}
-{
 if(_1.Some) {
 remaining_ -= 1
 break
 }
-}
 } while(false)
 };
 return self_.next_()
@@ -347,16 +322,12 @@ return ff_core_Option.None()
 } else {
 {
 const _1 = self_.next_();
-{
 if(_1.None) {
 done_ = true;
 return ff_core_Option.None()
-return
 }
-}
-{
-const o_ = _1;
 if(_1.Some) {
+const o_ = _1;
 const x_ = _1.value_;
 done_ = (!body_(x_));
 if(done_) {
@@ -368,7 +339,6 @@ return
 }
 }
 }
-}
 }), (() => {
 self_.close_()
 }))
@@ -382,31 +352,24 @@ let result_ = ff_core_Option.None();
 while((!done_)) {
 do {
 const _1 = self_.next_();
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
-const _guard1 = body_(x_);
-if(_guard1) {
+if(body_(x_)) {
 
 break
 }
 }
-}
-{
-const o_ = _1;
 if(_1.Some) {
+const o_ = _1;
 const x_ = _1.value_;
 result_ = o_;
 done_ = true
 break
 }
-}
 } while(false)
 };
 return result_
@@ -435,14 +398,10 @@ return ff_core_Option.None()
 } else {
 {
 const _1 = self_.next_();
-{
 if(_1.None) {
 remaining_ = (-1);
 return ff_core_Option.None()
-return
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 let list_ = [x_];
@@ -451,27 +410,21 @@ while((remaining_ > 0)) {
 remaining_ -= 1;
 do {
 const _1 = self_.next_();
-{
 if(_1.None) {
 remaining_ = (-1)
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 list_ = [x_, ...list_]
 break
 }
-}
 } while(false)
 };
 if((remaining_ !== (-1))) {
 remaining_ = size_
 };
 return ff_core_Option.Some(ff_core_List.List_reverse(list_))
-return
-}
 }
 }
 }
@@ -494,19 +447,15 @@ let done_ = false;
 while((!done_)) {
 do {
 const _1 = self_.next_();
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 body_(x_)
 break
 }
-}
 } while(false)
 }
 } finally {
@@ -520,19 +469,15 @@ let done_ = false;
 while((!done_)) {
 do {
 const _1 = self_.next_();
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 done_ = (!body_(x_))
 break
 }
-}
 } while(false)
 }
 } finally {
@@ -573,20 +518,16 @@ let result_ = ff_core_Option.None();
 while((!done_)) {
 do {
 const _1 = self_.next_();
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
-const o_ = _1;
 if(_1.Some) {
+const o_ = _1;
 const x_ = _1.value_;
 result_ = o_
 break
 }
-}
 } while(false)
 };
 return result_
@@ -614,23 +555,18 @@ let result_ = ff_core_Option.None();
 while((!done_)) {
 do {
 const _1 = self_.next_();
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 do {
 const _1 = body_(x_);
-{
 if(_1.None) {
 
 break
 }
-}
 {
 const o_ = _1;
 done_ = true;
@@ -640,7 +576,6 @@ break
 } while(false)
 break
 }
-}
 } while(false)
 };
 return result_
@@ -712,35 +647,27 @@ let result_ = ff_core_Option.None();
 while(ff_core_Option.Option_isEmpty(result_)) {
 do {
 const _1 = (await inner_.next_($task));
-{
-const i_ = _1;
 if(_1.Some) {
+const i_ = _1;
 result_ = ff_core_Option.Some(i_)
 break
 }
-}
-{
 if(_1.None) {
 do {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 result_ = ff_core_Option.Some(ff_core_Option.None())
 break
 }
-}
-{
 if(_1.Some) {
 const o_ = _1.value_;
 (await inner_.close_($task));
 inner_ = (await body_(o_, $task))
 break
 }
-}
 } while(false)
 break
 }
-}
 } while(false)
 };
 return ff_core_Option.Option_grab(result_)
@@ -765,28 +692,21 @@ let result_ = ff_core_Option.None();
 while(ff_core_Option.Option_isEmpty(result_)) {
 do {
 const _1 = (await self_.next_($task));
-{
 if(_1.Some) {
 const x_ = _1.value_;
-const _guard1 = (await body_(x_, $task));
-if(_guard1) {
+if((await body_(x_, $task))) {
 result_ = ff_core_Option.Some(ff_core_Option.Some(x_))
 break
 }
 }
-}
-{
 if(_1.Some) {
 
 break
 }
-}
-{
 if(_1.None) {
 result_ = ff_core_Option.Some(ff_core_Option.None())
 break
 }
-}
 } while(false)
 };
 return ff_core_Option.Option_grab(result_)
@@ -799,19 +719,13 @@ export async function Stream_zip$(self_, that_, $task) {
 return ff_core_Stream.Stream((async ($task) => {
 {
 const _1 = ff_core_Pair.Pair((await self_.next_($task)), (await that_.next_($task)));
-{
-if(_1.first_.Some) {
+if(_1.first_.Some && _1.second_.Some) {
 const x_ = _1.first_.value_;
-if(_1.second_.Some) {
 const y_ = _1.second_.value_;
 return ff_core_Option.Some(ff_core_Pair.Pair(x_, y_))
-return
-}
-}
 }
 {
 return ff_core_Option.None()
-return
 }
 }
 }), (async ($task) => {
@@ -841,18 +755,14 @@ return ff_core_Stream.Stream((async ($task) => {
 while((remaining_ >= 1)) {
 do {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 remaining_ = 0
 break
 }
-}
-{
 if(_1.Some) {
 remaining_ -= 1
 break
 }
-}
 } while(false)
 };
 return (await self_.next_($task))
@@ -869,16 +779,12 @@ return ff_core_Option.None()
 } else {
 {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 done_ = true;
 return ff_core_Option.None()
-return
 }
-}
-{
-const o_ = _1;
 if(_1.Some) {
+const o_ = _1;
 const x_ = _1.value_;
 done_ = (!(await body_(x_, $task)));
 if(done_) {
@@ -890,7 +796,6 @@ return
 }
 }
 }
-}
 }), (async ($task) => {
 (await self_.close_($task))
 }))
@@ -904,31 +809,24 @@ let result_ = ff_core_Option.None();
 while((!done_)) {
 do {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
-const _guard1 = (await body_(x_, $task));
-if(_guard1) {
+if((await body_(x_, $task))) {
 
 break
 }
 }
-}
-{
-const o_ = _1;
 if(_1.Some) {
+const o_ = _1;
 const x_ = _1.value_;
 result_ = o_;
 done_ = true
 break
 }
-}
 } while(false)
 };
 return result_
@@ -957,14 +855,10 @@ return ff_core_Option.None()
 } else {
 {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 remaining_ = (-1);
 return ff_core_Option.None()
-return
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 let list_ = [x_];
@@ -973,27 +867,21 @@ while((remaining_ > 0)) {
 remaining_ -= 1;
 do {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 remaining_ = (-1)
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 list_ = [x_, ...list_]
 break
 }
-}
 } while(false)
 };
 if((remaining_ !== (-1))) {
 remaining_ = size_
 };
 return ff_core_Option.Some(ff_core_List.List_reverse(list_))
-return
-}
 }
 }
 }
@@ -1016,19 +904,15 @@ let done_ = false;
 while((!done_)) {
 do {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 (await body_(x_, $task))
 break
 }
-}
 } while(false)
 }
 } finally {
@@ -1042,19 +926,15 @@ let done_ = false;
 while((!done_)) {
 do {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 done_ = (!(await body_(x_, $task)))
 break
 }
-}
 } while(false)
 }
 } finally {
@@ -1095,20 +975,16 @@ let result_ = ff_core_Option.None();
 while((!done_)) {
 do {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
-const o_ = _1;
 if(_1.Some) {
+const o_ = _1;
 const x_ = _1.value_;
 result_ = o_
 break
 }
-}
 } while(false)
 };
 return result_
@@ -1136,23 +1012,18 @@ let result_ = ff_core_Option.None();
 while((!done_)) {
 do {
 const _1 = (await self_.next_($task));
-{
 if(_1.None) {
 done_ = true
 break
 }
-}
-{
 if(_1.Some) {
 const x_ = _1.value_;
 do {
 const _1 = (await body_(x_, $task));
-{
 if(_1.None) {
 
 break
 }
-}
 {
 const o_ = _1;
 done_ = true;
@@ -1162,7 +1033,6 @@ break
 } while(false)
 break
 }
-}
 } while(false)
 };
 return result_

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

@@ -278,13 +278,10 @@ return ff_core_StringMap.StringMap_grab(self_, key_)
 export function StringMap_push(self_, key_, value_) {
 {
 const _1 = ff_core_StringMap.StringMap_get(self_, key_);
-{
 if(_1.None) {
 ff_core_StringMap.StringMap_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 StringMap_push$(self_, key_, value_, $task) {
 {
 const _1 = ff_core_StringMap.StringMap_get(self_, key_);
-{
 if(_1.None) {
 ff_core_StringMap.StringMap_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
 }
 }
 }
-}