firefly-compiler 0.4.64 → 0.4.66

package/bin/Release.ff

@@ -70,8 +70,8 @@ releaseFireflyPackage(
     )
 }
 
-requireNpmLoggedIn(system: NodeSystem, workingDirectory: Path) {
-    let out = run(system, "npm", ["whoami"], workingDirectory)
+requireNpmLoggedIn(system: NodeSystem, directory: Path) {
+    let out = run(system, "npm", ["whoami"], directory)
     if(out.exitCode != 0) {
         system.writeErrorLine("")
         system.writeErrorLine("You are not logged into npm")
@@ -80,8 +80,8 @@ requireNpmLoggedIn(system: NodeSystem, workingDirectory: Path) {
     }
 }
 
-requireVsceLoggedIn(system: NodeSystem, workingDirectory: Path) {
-    let out = runSuccessful(system, "vsce", ["ls-publishers"], workingDirectory)
+requireVsceLoggedIn(system: NodeSystem, directory: Path) {
+    let out = runSuccessful(system, "vsce", ["ls-publishers"], directory)
     if(!out.toString().lines().any {_ == "firefly-team"}) {
         system.writeErrorLine("")
         system.writeErrorLine("You are not logged into vsce")
@@ -92,14 +92,14 @@ requireVsceLoggedIn(system: NodeSystem, workingDirectory: Path) {
     }
 }
 
-run(system: NodeSystem, command: String, arguments: List[String], workingDirectory: Path): ProcessResult {
+run(system: NodeSystem, command: String, arguments: List[String], directory: Path): ProcessResult {
     system.writeLine("")
     system.writeLine(command + " " + arguments.join(" "))
-    system.execute(command, arguments, workingDirectory = Some(workingDirectory))
+    system.execute(command, arguments, directory = Some(directory))
 }
 
-runSuccessful(system: NodeSystem, command: String, arguments: List[String], workingDirectory: Path): Buffer {
-    let out = run(system, command, arguments, workingDirectory)
+runSuccessful(system: NodeSystem, command: String, arguments: List[String], directory: Path): Buffer {
+    let out = run(system, command, arguments, directory)
     if(out.exitCode != 0) {
         system.writeBuffer(out.standardOut)
         system.writeErrorBuffer(out.standardError)

package/core/NodeSystem.ff

@@ -102,7 +102,7 @@ extend self: NodeSystem {
         command: String
         arguments: List[String]
         standardIn: Buffer = Buffer.new(0)
-        workingDirectory: Option[Path] = None
+        directory: Option[Path] = None
         environment: Option[Map[String, String]] = None
         maxBuffer: Int = 16777216
         killSignal: Int = 9
@@ -121,11 +121,11 @@ extend self: NodeSystem {
             if(windowsWhere_ && process.platform === 'win32') {
                 const cmd = process.env.ComSpec || "cmd.exe";
                 command_ = (
-                    await internalWindowsWhere_$(self_, cmd, command_, workingDirectory_, environment_, $task)
+                    await internalWindowsWhere_$(self_, cmd, command_, directory_, environment_, $task)
                 ).value_ || command_;
             }
             const newProcess = childProcess.spawn(command_, arguments_, {
-                cwd: workingDirectory_.value_,
+                cwd: directory_.value_,
                 windowsHide: true,
                 signal: $task.controller.signal,
                 killSignal: killSignal_,
@@ -195,25 +195,18 @@ internalProcessError(problem: String): Error {
     } grab()
 }
 
-internalFindCommand(out: String): String {
-    out.lines().find {line => 
-        let l = line.lower()
-        l.endsWith(".exe") || l.endsWith(".cmd") || l.endsWith(".bat") || l.endsWith(".com")
-    }.else {""}
-}
-
 internalWindowsWhere(
     system: NodeSystem
     cmd: String
     command: String
-    workingDirectory: Option[Path] = None
+    directory: Option[Path] = None
     environment: Option[Map[String, String]] = None
 ): Option[String] {
     if(!command.all {c => c.isAsciiLetterOrDigit() || c == '_' || c == '-'}) {None} else:
     let out = system.execute(
         cmd, 
         ["/c", "where", command], 
-        workingDirectory = workingDirectory
+        directory = directory
         environment = environment
         windowsWhere = False
     )

package/core/Random.ff

@@ -3,21 +3,21 @@ class Random {}
 // Using Alea PRNG by Johannes Baagøe <baagoe@baagoe.com>, 2010
 // Typical use: Random.seedInstant(system.task().now())
 
-seedInt(seed: Int): Random {
-    seedFloat(seed.toFloat())
+newFromInt(seed: Int): Random {
+    newFromFloat(seed.toFloat())
 }
 
-seedFloat(seed: Float): Random {
+newFromFloat(seed: Float): Random {
     let buffer = Buffer.new(8)
     buffer.setFloat64(0, seed)
-    seedBuffer(buffer)
+    newFromBuffer(buffer)
 }
 
-seedInstant(seed: Instant): Random {
-    seedFloat(seed.since1970.seconds)
+newFromInstant(seed: Instant): Random {
+    newFromFloat(seed.since1970.seconds)
 }
 
-seedBuffer(buffer: Buffer): Random
+newFromBuffer(buffer: Buffer): Random
     target js sync """
         var n = 0xefc8249d;
         function mash(data) {

package/lsp/CompletionHandler.ff

@@ -353,8 +353,8 @@ makeCompletion(
         let beforeAfter = memberScheme.signature.parameters.first().map {
             Pair(unification.substitute(_.valueType).show([]) + ".", "")
         }.else {Pair("", "")}
-        beforeAfter.first +
         if(memberScheme.isMutable) {"mutable "} else {""} +
+        beforeAfter.first +
         unqualifiedName + generics +
         ": " + returnType.show([]) +
         beforeAfter.second

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

@@ -127,22 +127,13 @@ return error_
 })))
 }
 
-export function internalFindCommand_(out_) {
-return ff_core_Option.Option_else(ff_core_List.List_find(ff_core_String.String_lines(out_), ((line_) => {
-const l_ = ff_core_String.String_lower(line_);
-return (((ff_core_String.String_endsWith(l_, ".exe") || ff_core_String.String_endsWith(l_, ".cmd")) || ff_core_String.String_endsWith(l_, ".bat")) || ff_core_String.String_endsWith(l_, ".com"))
-})), (() => {
-return ""
-}))
-}
-
-export function internalWindowsWhere_(system_, cmd_, command_, workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None()) {
+export function internalWindowsWhere_(system_, cmd_, command_, directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None()) {
 if((!ff_core_String.String_all(command_, ((c_) => {
 return ((ff_core_Char.Char_isAsciiLetterOrDigit(c_) || (c_ === 95)) || (c_ === 45))
 })))) {
 return ff_core_Option.None()
 } else {
-const out_ = ff_core_NodeSystem.NodeSystem_execute(system_, cmd_, ["/c", "where", command_], ff_core_Buffer.new_(0, false), workingDirectory_, environment_, 16777216, 9, false);
+const out_ = ff_core_NodeSystem.NodeSystem_execute(system_, cmd_, ["/c", "where", command_], ff_core_Buffer.new_(0, false), directory_, environment_, 16777216, 9, false);
 return ff_core_List.List_first(ff_core_List.List_filter(ff_core_String.String_lines(ff_core_Buffer.Buffer_toString(out_.standardOut_, "utf8")), ((line_) => {
 return ((out_.exitCode_ === 0) && ff_core_Option.Option_any(ff_core_List.List_last(ff_core_String.String_split(line_, 92)), ((_w1) => {
 return ff_core_String.String_contains(_w1, ".")
@@ -172,22 +163,13 @@ return error_
 })))
 }
 
-export async function internalFindCommand_$(out_, $task) {
-return ff_core_Option.Option_else(ff_core_List.List_find(ff_core_String.String_lines(out_), ((line_) => {
-const l_ = ff_core_String.String_lower(line_);
-return (((ff_core_String.String_endsWith(l_, ".exe") || ff_core_String.String_endsWith(l_, ".cmd")) || ff_core_String.String_endsWith(l_, ".bat")) || ff_core_String.String_endsWith(l_, ".com"))
-})), (() => {
-return ""
-}))
-}
-
-export async function internalWindowsWhere_$(system_, cmd_, command_, workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), $task) {
+export async function internalWindowsWhere_$(system_, cmd_, command_, directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), $task) {
 if((!ff_core_String.String_all(command_, ((c_) => {
 return ((ff_core_Char.Char_isAsciiLetterOrDigit(c_) || (c_ === 95)) || (c_ === 45))
 })))) {
 return ff_core_Option.None()
 } else {
-const out_ = (await ff_core_NodeSystem.NodeSystem_execute$(system_, cmd_, ["/c", "where", command_], ff_core_Buffer.new_(0, false), workingDirectory_, environment_, 16777216, 9, false, $task));
+const out_ = (await ff_core_NodeSystem.NodeSystem_execute$(system_, cmd_, ["/c", "where", command_], ff_core_Buffer.new_(0, false), directory_, environment_, 16777216, 9, false, $task));
 return ff_core_List.List_first(ff_core_List.List_filter(ff_core_String.String_lines(ff_core_Buffer.Buffer_toString(out_.standardOut_, "utf8")), ((line_) => {
 return ((out_.exitCode_ === 0) && ff_core_Option.Option_any(ff_core_List.List_last(ff_core_String.String_split(line_, 92)), ((_w1) => {
 return ff_core_String.String_contains(_w1, ".")
@@ -292,7 +274,7 @@ export function NodeSystem_environment(self_) {
 throw new Error('Function NodeSystem_environment is missing on this target in sync context.');
 }
 
-export function NodeSystem_execute(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsWhere_ = true) {
+export function NodeSystem_execute(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsWhere_ = true) {
 throw new Error('Function NodeSystem_execute is missing on this target in sync context.');
 }
 
@@ -406,7 +388,7 @@ export async function NodeSystem_environment$(self_, $task) {
         
 }
 
-export async function NodeSystem_execute$(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsWhere_ = true, $task) {
+export async function NodeSystem_execute$(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsWhere_ = true, $task) {
 
             const childProcess = import$3;
             const environment = environment_.value_ !== void 0 ? {} : process.env;
@@ -420,11 +402,11 @@ export async function NodeSystem_execute$(self_, command_, arguments_, standardI
             if(windowsWhere_ && process.platform === 'win32') {
                 const cmd = process.env.ComSpec || "cmd.exe";
                 command_ = (
-                    await internalWindowsWhere_$(self_, cmd, command_, workingDirectory_, environment_, $task)
+                    await internalWindowsWhere_$(self_, cmd, command_, directory_, environment_, $task)
                 ).value_ || command_;
             }
             const newProcess = childProcess.spawn(command_, arguments_, {
-                cwd: workingDirectory_.value_,
+                cwd: directory_.value_,
                 windowsHide: true,
                 signal: $task.controller.signal,
                 killSignal: killSignal_,

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

@@ -95,21 +95,21 @@ import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
 
 
-export function seedInt_(seed_) {
-return ff_core_Random.seedFloat_(ff_core_Int.Int_toFloat(seed_))
+export function newFromInt_(seed_) {
+return ff_core_Random.newFromFloat_(ff_core_Int.Int_toFloat(seed_))
 }
 
-export function seedFloat_(seed_) {
+export function newFromFloat_(seed_) {
 const buffer_ = ff_core_Buffer.new_(8, false);
 ff_core_Buffer.Buffer_setFloat64(buffer_, 0, seed_, true);
-return ff_core_Random.seedBuffer_(buffer_)
+return ff_core_Random.newFromBuffer_(buffer_)
 }
 
-export function seedInstant_(seed_) {
-return ff_core_Random.seedFloat_(seed_)
+export function newFromInstant_(seed_) {
+return ff_core_Random.newFromFloat_(seed_)
 }
 
-export function seedBuffer_(buffer_) {
+export function newFromBuffer_(buffer_) {
 
         var n = 0xefc8249d;
         function mash(data) {
@@ -143,22 +143,22 @@ export function seedBuffer_(buffer_) {
     
 }
 
-export async function seedInt_$(seed_, $task) {
-return ff_core_Random.seedFloat_(ff_core_Int.Int_toFloat(seed_))
+export async function newFromInt_$(seed_, $task) {
+return ff_core_Random.newFromFloat_(ff_core_Int.Int_toFloat(seed_))
 }
 
-export async function seedFloat_$(seed_, $task) {
+export async function newFromFloat_$(seed_, $task) {
 const buffer_ = ff_core_Buffer.new_(8, false);
 ff_core_Buffer.Buffer_setFloat64(buffer_, 0, seed_, true);
-return ff_core_Random.seedBuffer_(buffer_)
+return ff_core_Random.newFromBuffer_(buffer_)
 }
 
-export async function seedInstant_$(seed_, $task) {
-return ff_core_Random.seedFloat_(seed_)
+export async function newFromInstant_$(seed_, $task) {
+return ff_core_Random.newFromFloat_(seed_)
 }
 
-export async function seedBuffer_$(buffer_, $task) {
-throw new Error('Function seedBuffer is missing on this target in async context.');
+export async function newFromBuffer_$(buffer_, $task) {
+throw new Error('Function newFromBuffer is missing on this target in async context.');
 }
 
 export function Random_copy(self_) {

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.4.64",
+    "version": "0.4.66",
     "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.4.64",
+    "version": "0.4.66",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"