firefly-compiler 0.4.21 → 0.4.22

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

@@ -994,7 +994,11 @@ return term_
 const call_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
+return {
+function_: call_.function_,
+tailCall_: call_.tailCall_
+}
+return
 }
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in the Inference phase")
@@ -1230,19 +1234,14 @@ return newValue_
 }
 
 export function Inference_inferMethodCall(self_, environment_, expected_, signature_, instantiation_, term_, record_, recordType_, name_) {
-const e_ = (((_1) => {
+{
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-}
-}))(term_);
-const call_ = (((_1) => {
+const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
+return call_.tailCall_
 }
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferMethodCall")
@@ -1258,28 +1257,29 @@ ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signat
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, call_.tailCall_, false), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, false), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), [selfArgument_, ...arguments_], _c.dictionaries_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export function Inference_inferFunctionCall(self_, environment_, expected_, signature_, instanceCall_, instantiation_, term_, name_) {
-const e_ = (((_1) => {
+{
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-}
-}))(term_);
-const call_ = (((_1) => {
+const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
+return call_.tailCall_
 }
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferFunctionCall")
@@ -1292,29 +1292,34 @@ ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signat
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, call_.tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), arguments_, _c.dictionaries_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export function Inference_inferLambdaCall(self_, environment_, expected_, term_) {
-const e_ = (((_1) => {
+{
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-}
-}))(term_);
 const call_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
 if((!call_.tailCall_)) {
-return call_
+return {
+function_: call_.function_,
+tailCall_: call_.tailCall_
+}
+return
 }
 }
 if(_1.DynamicCall) {
@@ -1361,18 +1366,19 @@ return ff_compiler_Syntax.DynamicCall(function_, _c.tailCall_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export function Inference_inferOperator(self_, environment_, expected_, operator_, term_) {
-const e_ = (((_1) => {
+{
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-}
-}))(term_);
 const target_ = ff_compiler_Syntax.StaticCall(operator_, false, false);
 {
 const _1 = e_.arguments_;
@@ -1586,6 +1592,12 @@ return term_
 return ff_compiler_Inference.fail_(e_.at_, ("Unknown operator: " + operator_))
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export function Inference_inferEtaExpansion(self_, environment_, expected_, at_, signature_, term_) {
@@ -2622,7 +2634,11 @@ return term_
 const call_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
+return {
+function_: call_.function_,
+tailCall_: call_.tailCall_
+}
+return
 }
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in the Inference phase")
@@ -2858,19 +2874,14 @@ return newValue_
 }
 
 export async function Inference_inferMethodCall$(self_, environment_, expected_, signature_, instantiation_, term_, record_, recordType_, name_, $task) {
-const e_ = (((_1) => {
+{
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-}
-}))(term_);
-const call_ = (((_1) => {
+const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
+return call_.tailCall_
 }
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferMethodCall")
@@ -2886,28 +2897,29 @@ ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signat
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, call_.tailCall_, false), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, false), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), [selfArgument_, ...arguments_], _c.dictionaries_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export async function Inference_inferFunctionCall$(self_, environment_, expected_, signature_, instanceCall_, instantiation_, term_, name_, $task) {
-const e_ = (((_1) => {
+{
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-}
-}))(term_);
-const call_ = (((_1) => {
+const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
+return call_.tailCall_
 }
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferFunctionCall")
@@ -2920,29 +2932,34 @@ ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signat
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, call_.tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), arguments_, _c.dictionaries_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export async function Inference_inferLambdaCall$(self_, environment_, expected_, term_, $task) {
-const e_ = (((_1) => {
+{
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-}
-}))(term_);
 const call_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
 if((!call_.tailCall_)) {
-return call_
+return {
+function_: call_.function_,
+tailCall_: call_.tailCall_
+}
+return
 }
 }
 if(_1.DynamicCall) {
@@ -2989,18 +3006,19 @@ return ff_compiler_Syntax.DynamicCall(function_, _c.tailCall_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export async function Inference_inferOperator$(self_, environment_, expected_, operator_, term_, $task) {
-const e_ = (((_1) => {
+{
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-}
-}))(term_);
 const target_ = ff_compiler_Syntax.StaticCall(operator_, false, false);
 {
 const _1 = e_.arguments_;
@@ -3214,6 +3232,12 @@ return term_
 return ff_compiler_Inference.fail_(e_.at_, ("Unknown operator: " + operator_))
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export async function Inference_inferEtaExpansion$(self_, environment_, expected_, at_, signature_, term_, $task) {

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

@@ -204,16 +204,17 @@ return t_.name_
 }
 
 export function firstTypeName_(types_) {
-return (((_1) => {
+{
+const _1 = ff_core_List.List_grabFirst(types_);
 if(_1.TConstructor) {
 const t_ = _1;
-return t_
+return t_.name_
 }
 if(_1.TVariable) {
 const t_ = _1;
 return ff_compiler_JsEmitter.fail_(t_.at_, " is still a unification variable")
 }
-}))(ff_core_List.List_grabFirst(types_)).name_
+}
 }
 
 export function makeDictionaryName_(traitName_, typeName_) {
@@ -347,16 +348,17 @@ return t_.name_
 }
 
 export async function firstTypeName_$(types_, $task) {
-return (((_1) => {
+{
+const _1 = ff_core_List.List_grabFirst(types_);
 if(_1.TConstructor) {
 const t_ = _1;
-return t_
+return t_.name_
 }
 if(_1.TVariable) {
 const t_ = _1;
 return ff_compiler_JsEmitter.fail_(t_.at_, " is still a unification variable")
 }
-}))(ff_core_List.List_grabFirst(types_)).name_
+}
 }
 
 export async function makeDictionaryName_$(traitName_, typeName_, $task) {

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

@@ -184,7 +184,10 @@ const resolvedDependencies_ = ff_compiler_Dependencies.process_(ff_core_NodeSyst
 ff_compiler_Main.prepareFireflyDirectory_(ff_core_NodeSystem.NodeSystem_path(system_, "."));
 const localMainFile_ = ff_core_Path.Path_base(ff_core_NodeSystem.NodeSystem_path(system_, mainFile_));
 buildScript_(localMainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitNode(), resolvedDependencies_);
-ff_compiler_Main.importAndRun_(fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_)
+if((!ff_compiler_Main.importAndRun_(fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_))) {
+const at_ = ff_compiler_Syntax.Location(ff_core_Path.Path_absolute(ff_core_NodeSystem.NodeSystem_path(system_, (mainFile_ + ".ff"))), 1, 1);
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "This module does not contain a 'nodeMain' function"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+}
 return
 }
 if(command_a.BrowserCommand) {
@@ -211,7 +214,7 @@ if(command_a.CheckCommand) {
 const filePath_ = command_a.filePath_;
 const errors_ = ff_compiler_Builder.check_(system_, fireflyPath_, ff_core_NodeSystem.NodeSystem_path(system_, filePath_), ff_core_Option.None(), ff_core_Map.empty_(), ff_compiler_LspHook.disabled_(), true);
 if((!ff_core_List.List_isEmpty(errors_))) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileErrors(errors_), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)})
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileErrors(ff_core_List.List_distinct(errors_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_CompileError)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)})
 }
 return
 }
@@ -428,7 +431,10 @@ const resolvedDependencies_ = (await ff_compiler_Dependencies.process_$((await f
 (await ff_compiler_Main.prepareFireflyDirectory_$((await ff_core_NodeSystem.NodeSystem_path$(system_, ".", $task)), $task));
 const localMainFile_ = (await ff_core_Path.Path_base$((await ff_core_NodeSystem.NodeSystem_path$(system_, mainFile_, $task)), $task));
 (await buildScript_$(localMainFile_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitNode(), resolvedDependencies_, $task));
-(await ff_compiler_Main.importAndRun_$(fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_, $task))
+if((!(await ff_compiler_Main.importAndRun_$(fireflyPath_, "node", resolvedDependencies_.mainPackagePair_, localMainFile_, arguments_, $task)))) {
+const at_ = ff_compiler_Syntax.Location((await ff_core_Path.Path_absolute$((await ff_core_NodeSystem.NodeSystem_path$(system_, (mainFile_ + ".ff"), $task)), $task)), 1, 1);
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, "This module does not contain a 'nodeMain' function"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
+}
 return
 }
 if(command_a.BrowserCommand) {
@@ -455,7 +461,7 @@ if(command_a.CheckCommand) {
 const filePath_ = command_a.filePath_;
 const errors_ = (await ff_compiler_Builder.check_$(system_, fireflyPath_, (await ff_core_NodeSystem.NodeSystem_path$(system_, filePath_, $task)), ff_core_Option.None(), ff_core_Map.empty_(), ff_compiler_LspHook.disabled_(), true, $task));
 if((!ff_core_List.List_isEmpty(errors_))) {
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileErrors(errors_), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)})
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileErrors(ff_core_List.List_distinct(errors_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_CompileError)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileErrors)})
 }
 return
 }
@@ -626,7 +632,12 @@ export async function importAndRun_$(fireflyPath_, target_, packagePair_, mainFi
         const workingDirectory = cwd.indexOf(':') == 1 ? 'file:///' + cwd : cwd;
         const packagePath = packagePair_.group_ + "/" + packagePair_.name_
         const main = await import(workingDirectory + "/.firefly/output/" + target_ + "/" + packagePath + "/" + mainFile_ + ".mjs");
-        await main.$run$(fireflyPath_, arguments_)
+        if(typeof main.$run$ !== 'undefined') {
+            await main.$run$(fireflyPath_, arguments_);
+            return true;
+        } else {
+            return false;
+        }
     
 }
 

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

@@ -215,8 +215,8 @@ return convertPattern_(pattern_)
 }))), ((_1) => {
 if(_1.second_.Some) {
 const i_ = _1.first_;
-const p_ = _1.second_.value_;
-return ff_core_Option.Some(ff_core_Pair.Pair(("" + i_), p_))
+const info_ = _1.second_.value_;
+return ff_core_Option.Some(ff_core_Pair.Pair(("" + i_), info_))
 }
 {
 return ff_core_Option.None()
@@ -385,8 +385,8 @@ return convertPattern_(pattern_)
 }))), ((_1) => {
 if(_1.second_.Some) {
 const i_ = _1.first_;
-const p_ = _1.second_.value_;
-return ff_core_Option.Some(ff_core_Pair.Pair(("" + i_), p_))
+const info_ = _1.second_.value_;
+return ff_core_Option.Some(ff_core_Pair.Pair(("" + i_), info_))
 }
 {
 return ff_core_Option.None()