firefly-compiler 0.5.34 → 0.5.36

package/compiler/Syntax.ff

@@ -76,7 +76,7 @@ data DImport(
 data DFunction(
     at: Location
     signature: Signature
-    body: Target
+    body: Lambda
 )
 data DLet(
     at: Location
@@ -211,11 +211,6 @@ data Field(at: Location, name: String, value: Term)
 
 data Constraint(at: Location, name: String, generics: List[Type])
 
-data Target {
-    FireflyTarget(lambda: Lambda)
-    ForeignTarget(syncCode: Option[String], asyncCode: Option[String])
-}
-
 data Type(at: Location) {
     TConstructor(name: String, generics: List[Type])
     TVariable(index: Int)
@@ -288,13 +283,3 @@ extend self: Type {
         go(self)
     }
 }
-
-extend self: Target {
-    mapFirefly(body: Lambda => Lambda): Target {
-        self.{
-             | FireflyTarget(lambda) => FireflyTarget(body(lambda))
-             | ForeignTarget(_, _) => self
-        }
-    }
-}
-

package/compiler/Token.ff

@@ -92,6 +92,8 @@ data TokenKind {
     LAssign
     LAssignPlus
     LAssignMinus
+    LAssignMultiplication
+    LAssignDivision
 }
 
 extend self: TokenKind {
@@ -124,6 +126,9 @@ extend self: TokenKind {
             | LAssign => False
             | LAssignPlus => False
             | LAssignMinus => False
+            | LAssignMultiplication => False
+            | LAssignDivision => False
+                            
         }
     }
 
@@ -155,6 +160,8 @@ extend self: TokenKind {
             | LAssign => False
             | LAssignPlus => False
             | LAssignMinus => False
+            | LAssignMultiplication => False
+            | LAssignDivision => False
         }
     }
 
@@ -186,6 +193,8 @@ extend self: TokenKind {
             | LAssign => False
             | LAssignPlus => False
             | LAssignMinus => False
+            | LAssignMultiplication => False
+            | LAssignDivision => False
         }
     }
 

package/compiler/Tokenizer.ff

@@ -263,6 +263,10 @@ tokenize(file: String, code: String, completionAt: Option[Location], attemptFixe
                         LAssignPlus
                     } elseIf {i - start == 2 && code.grab(i - 2) == '-' && code.grab(i - 1) == '='} {
                         LAssignMinus
+                    } elseIf {i - start == 2 && code.grab(i - 2) == '*' && code.grab(i - 1) == '='} {
+                        LAssignMultiplication
+                    } elseIf {i - start == 2 && code.grab(i - 2) == '/' && code.grab(i - 1) == '='} {
+                        LAssignDivision
                     } else {
                         LOperator
                     }

package/compiler/Workspace.ff

@@ -1,88 +1,88 @@
-import Syntax
-
-data Workspace(
-    rules: List[WorkspaceRule]
-    defaultLocation: String
-    packageDirectory: String
-)
-
-data WorkspaceRule(
-    packageGroup: String
-    packageName: Option[String]
-    location: String
-)
-
-centralLocation = "https://www.firefly-lang.org/packages/"
-
-loadWorkspace(path: Path): Workspace {
-    let packageDirectory = if(path.extension() == ".ff") {path.parent().grab()} else {path}
-    let workspaceFile = packageDirectory.slash(".firefly-workspace")
-    if(workspaceFile.exists()) {
-        parseWorkspaceFile(workspaceFile, packageDirectory)
-    } elseIf {!packageDirectory.parent().isEmpty()} {
-        loadWorkspace(packageDirectory.parent().grab())
-    } else {
-        Workspace([], centralLocation, ".")
-    }
-}
-
-parseWorkspaceFile(path: Path, packageDirectory: Path): Workspace {
-    let text = path.readText()
-    mutable defaultLocation = None
-    let lines = text.split('\n').map {_.replace("\r", "").takeWhile {_ != '#'}}.filter {_.size() != 0}
-    let rules = lines.collect {line =>
-        let columns = line.replace("\t", " ").split(' ').filter {_.size() != 0}
-        defaultLocation.each {_ =>
-            panic("Unexpected rule after the * rule: " + line)
-        }
-        if(columns.size() != 2) {
-            panic("Could not parse workspace rule: " + line)
-        }
-        let package = columns.grab(0)
-        let location = columns.grab(1)
-        let fixedLocation = if(location.endsWith("/")) {location} else {location + "/"}
-        if(package == "*") {
-            defaultLocation = Some(fixedLocation)
-            None
-        } else {
-            let packageParts = package.split(':')
-            if(packageParts.size() != 2) {
-                panic("Could not parse workspace package: " + package)
-            }
-            if(packageParts.grab(0) == "*") {
-                panic("Unexpected wildcard: " + package)
-            }
-            Some(WorkspaceRule(
-                packageGroup = packageParts.grab(0)
-                packageName = if(packageParts.grab(1) != "*") {packageParts.grab(1)}
-                location = fixedLocation
-            ))
-        }
-    }
-    Workspace(rules, defaultLocation.else {centralLocation}, packageDirectory.absolute())
-}
-
-extend self: Workspace {
-
-    findPackageLocation(packagePair: PackagePair, version: Version): String {
-        self.rules.find {rule =>
-            rule.packageGroup == packagePair.group && rule.packageName.all {_ == packagePair.name}
-        }.map {rule =>
-            let prefix = if(rule.packageName == None) {packagePair.name + "/"} else {""}
-            if(rule.location.contains(":")) {
-                rule.location + prefix + tarGzName(packagePair, version)
-            } else {
-                self.packageDirectory + "/" + rule.location + prefix
-            }
-        }.else {
-            self.defaultLocation + packagePair.group + "/" + packagePair.name + "/" +
-            tarGzName(packagePair, version)
-        }
-    }
-
-}
-
-tarGzName(packagePair: PackagePair, version: Version): String {
-    packagePair.group + "_" + packagePair.name + "_" +
-    version.major + "_" + version.minor + "_" + version.patch + ".tar.gz"
-}
+import Syntax
+
+data Workspace(
+    rules: List[WorkspaceRule]
+    defaultLocation: String
+    packageDirectory: String
+)
+
+data WorkspaceRule(
+    packageGroup: String
+    packageName: Option[String]
+    location: String
+)
+
+centralLocation = "https://www.firefly-lang.org/packages/"
+
+loadWorkspace(path: Path): Workspace {
+    let packageDirectory = if(path.extension() == ".ff") {path.parent().grab()} else {path}
+    let workspaceFile = packageDirectory.slash(".firefly-workspace")
+    if(workspaceFile.exists()) {
+        parseWorkspaceFile(workspaceFile, packageDirectory)
+    } elseIf {!packageDirectory.parent().isEmpty()} {
+        loadWorkspace(packageDirectory.parent().grab())
+    } else {
+        Workspace([], centralLocation, ".")
+    }
+}
+
+parseWorkspaceFile(path: Path, packageDirectory: Path): Workspace {
+    let text = path.readText()
+    mutable defaultLocation = None
+    let lines = text.split('\n').map {_.replace("\r", "").takeWhile {_ != '#'}}.filter {_.size() != 0}
+    let rules = lines.collect {line =>
+        let columns = line.replace("\t", " ").split(' ').filter {_.size() != 0}
+        defaultLocation.each {_ =>
+            panic("Unexpected rule after the * rule: " + line)
+        }
+        if(columns.size() != 2) {
+            panic("Could not parse workspace rule: " + line)
+        }
+        let package = columns.grab(0)
+        let location = columns.grab(1)
+        let fixedLocation = if(location.endsWith("/")) {location} else {location + "/"}
+        if(package == "*") {
+            defaultLocation = Some(fixedLocation)
+            None
+        } else {
+            let packageParts = package.split(':')
+            if(packageParts.size() != 2) {
+                panic("Could not parse workspace package: " + package)
+            }
+            if(packageParts.grab(0) == "*") {
+                panic("Unexpected wildcard: " + package)
+            }
+            Some(WorkspaceRule(
+                packageGroup = packageParts.grab(0)
+                packageName = if(packageParts.grab(1) != "*") {packageParts.grab(1)}
+                location = fixedLocation
+            ))
+        }
+    }
+    Workspace(rules, defaultLocation.else {centralLocation}, packageDirectory.absolute())
+}
+
+extend self: Workspace {
+
+    findPackageLocation(packagePair: PackagePair, version: Version): String {
+        self.rules.find {rule =>
+            rule.packageGroup == packagePair.group && rule.packageName.all {_ == packagePair.name}
+        }.map {rule =>
+            let prefix = if(rule.packageName == None) {packagePair.name + "/"} else {""}
+            if(rule.location.contains(":")) {
+                rule.location + prefix + tarGzName(packagePair, version)
+            } else {
+                self.packageDirectory + "/" + rule.location + prefix
+            }
+        }.else {
+            self.defaultLocation + packagePair.group + "/" + packagePair.name + "/" +
+            tarGzName(packagePair, version)
+        }
+    }
+
+}
+
+tarGzName(packagePair: PackagePair, version: Version): String {
+    packagePair.group + "_" + packagePair.name + "_" +
+    version.major + "_" + version.minor + "_" + version.patch + ".tar.gz"
+}

package/core/.firefly/include/package.json

@@ -1,5 +1,5 @@
-{
-    "dependencies": {
-        "esbuild": "^0.21.5"
-    }
-}
+{
+    "dependencies": {
+        "esbuild": "^0.21.5"
+    }
+}

package/core/.firefly/package.ff

@@ -1,2 +1,2 @@
-package ff:core:0.0.0
-include "node_modules"
+package ff:core:0.0.0
+include "node_modules"

package/core/Any.ff

@@ -1,30 +1,26 @@
-data Any {}
-data AnyTag[T] {}
-
-trait T: HasAnyTag {
-    anyTag(): AnyTag[T]
-}
-
-toAny[T: HasAnyTag](value: T): Any
-    target js sync """
-        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
-        return {anyTag: anyTag, value: value_}
-    """
-
-fromAny[T: HasAnyTag](any: Any): Option[T]
-    target js sync """
-        const anyTag = ff_core_Any_HasAnyTag$T.anyTag_()
-        return any_.anyTag === anyTag ? ff_core_Option.Some(any_.value) : ff_core_Option.None()
-    """
-
-extend self[T]: AnyTag[T] {
-    show(): String
-        target js sync """
-            return self_
-        """
-}
-
-internalAnyTag[T](tag: String): AnyTag[T]
-    target js sync """
-        return tag_
-    """
+data Any {}
+data AnyTag[T] {}
+
+trait T: HasAnyTag {
+    anyTag(): AnyTag[T]
+}
+
+toAny[T: HasAnyTag](value: T): Any {
+    let anyTag: AnyTag[T] = anyTag()
+    Js->(anyTag = anyTag!, value = value!)?
+}
+
+fromAny[T: HasAnyTag](any: Any): Option[T] {
+    let anyTag: AnyTag[T] = anyTag()
+    if(any!->anyTag.equals(anyTag!)) {any!->value?}
+}
+
+extend self[T]: AnyTag[T] {
+    show(): String {
+        self!?
+    }
+}
+
+internalAnyTag[T](tag: String): AnyTag[T] {
+    tag!?
+}