firefly-compiler 0.4.78 → 0.4.79

package/experimental/random/Symbols.ff

@@ -1,74 +1,74 @@
-nodeMain(system: NodeSystem) {
-    /*
-    Log.show(splitCamelCased(""))
-    Log.show(splitCamelCased("ABC"))
-    Log.show(splitCamelCased("abc"))
-    Log.show(splitCamelCased("AbC"))
-    Log.show(splitCamelCased("AbCd"))
-    Log.show(splitCamelCased("aaBccDee"))
-    Log.show(splitCamelCased("AaBccDee"))
-    
-    Log.show(prefixes(""))
-    Log.show(prefixes("abcde"))
-    
-    test(["add", "addAll", "addToList"], "al")
-    test(["aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ"], "abcdefghijklmnopqrstuvwxyz")
-    test(["aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ"], "abcdefghijklmnopqrstuvwxyzA")
-    test(["aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ"], "aabcdefghijklmnopqrstuvwxyz")
-    */
-    printTime(system.time(), "matchSymbol") {
-        Log.show(matchSymbol(splitCamelCased("aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ", True), "abcdefghijklmnopqrstuvwxyzA", True))
-    }
-    
-}
-
-test(symbols: List[String], query: String) {
-    Log.debug("")
-    Log.debug("#" + query)
-    symbols.each {s => 
-        let symbolWords = splitCamelCased(s, True)
-        let match = matchSymbol(symbolWords, query, !query.any {_.isAsciiUpper()})
-        Log.debug(s + " (" + Show.show(symbolWords) + " ): " + Show.show(match))
-    }
-}
-
-matchSymbol(symbolWords: List[String], query: String, lower: Bool): Bool {
-    let memo: IntMap[IntMap[Bool]] = IntMap.new()
-    function go(wordIndex: Int, queryOffset: Int): Bool {
-        memo.getOrSet(wordIndex) {IntMap.new()}.getOrSet(queryOffset):
-        if(queryOffset >= query.size()) {True} else:
-        if(wordIndex >= symbolWords.size()) {False} else:
-        prefixes(query.dropFirst(queryOffset)).any {prefix => 
-            symbolWords.grab(wordIndex).startsWith(prefix) && 
-            go(wordIndex + 1, queryOffset + prefix.size())
-        }
-    }
-    go(0, 0)
-}
-
-prefixes(string: String): List[String] {
-    if(string == "") {
-        [""]
-    } else {
-        [string, ...prefixes(string.dropLast())]
-    }
-}
-
-splitCamelCased(name: String, lower: Bool): List[String] {
-    name.first().{
-        | None => []
-        | Some(c) => 
-            let word = c.toString() + name.dropFirst().takeWhile {_.isAsciiLower()}
-            let rest = name.dropFirst(word.size())
-            [if(lower) {word.lower()} else {word}, ...splitCamelCased(rest, lower)]
-    }
-}
-
-printTime[R](ts: TimeSystem, label: String, body: () => R): R {
-    let start = ts.elapsed()
-    let result = body()
-    let stop = ts.elapsed()
-    let duration = ("" + (stop.seconds - start.seconds)).slice(0, 5)
-    Log.trace(label + ": " + duration + "s")
-    result
+nodeMain(system: NodeSystem) {
+    /*
+    Log.show(splitCamelCased(""))
+    Log.show(splitCamelCased("ABC"))
+    Log.show(splitCamelCased("abc"))
+    Log.show(splitCamelCased("AbC"))
+    Log.show(splitCamelCased("AbCd"))
+    Log.show(splitCamelCased("aaBccDee"))
+    Log.show(splitCamelCased("AaBccDee"))
+    
+    Log.show(prefixes(""))
+    Log.show(prefixes("abcde"))
+    
+    test(["add", "addAll", "addToList"], "al")
+    test(["aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ"], "abcdefghijklmnopqrstuvwxyz")
+    test(["aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ"], "abcdefghijklmnopqrstuvwxyzA")
+    test(["aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ"], "aabcdefghijklmnopqrstuvwxyz")
+    */
+    printTime(system.time(), "matchSymbol") {
+        Log.show(matchSymbol(splitCamelCased("aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ", True), "abcdefghijklmnopqrstuvwxyzA", True))
+    }
+    
+}
+
+test(symbols: List[String], query: String) {
+    Log.debug("")
+    Log.debug("#" + query)
+    symbols.each {s => 
+        let symbolWords = splitCamelCased(s, True)
+        let match = matchSymbol(symbolWords, query, !query.any {_.isAsciiUpper()})
+        Log.debug(s + " (" + Show.show(symbolWords) + " ): " + Show.show(match))
+    }
+}
+
+matchSymbol(symbolWords: List[String], query: String, lower: Bool): Bool {
+    let memo: IntMap[IntMap[Bool]] = IntMap.new()
+    function go(wordIndex: Int, queryOffset: Int): Bool {
+        memo.getOrSet(wordIndex) {IntMap.new()}.getOrSet(queryOffset):
+        if(queryOffset >= query.size()) {True} else:
+        if(wordIndex >= symbolWords.size()) {False} else:
+        prefixes(query.dropFirst(queryOffset)).any {prefix => 
+            symbolWords.grab(wordIndex).startsWith(prefix) && 
+            go(wordIndex + 1, queryOffset + prefix.size())
+        }
+    }
+    go(0, 0)
+}
+
+prefixes(string: String): List[String] {
+    if(string == "") {
+        [""]
+    } else {
+        [string, ...prefixes(string.dropLast())]
+    }
+}
+
+splitCamelCased(name: String, lower: Bool): List[String] {
+    name.first().{
+        | None => []
+        | Some(c) => 
+            let word = c.toString() + name.dropFirst().takeWhile {_.isAsciiLower()}
+            let rest = name.dropFirst(word.size())
+            [if(lower) {word.lower()} else {word}, ...splitCamelCased(rest, lower)]
+    }
+}
+
+printTime[R](ts: TimeSystem, label: String, body: () => R): R {
+    let start = ts.elapsed()
+    let result = body()
+    let stop = ts.elapsed()
+    let duration = ("" + (stop.seconds - start.seconds)).slice(0, 5)
+    Log.trace(label + ": " + duration + "s")
+    result
 }

package/experimental/random/Tensor.ff

@@ -1,52 +1,52 @@
-// Brainstorming representation for Tensors where the scalar types and operators are left open ended.
-// The purpose of this type is to build up a syntax tree of tensor operations that can then be
-// optimized and executed on CPU/GPU/TPU, enabling machine learning and other numerical applications.
-
-data Tensor(scalar: String, shape: List[Int]) {
-    TensorVariable(name: String)
-    TensorInts(data: Array[Int])
-    TensorFloats(data: Array[Float])
-    TensorBuffer(data: Buffer)
-    TensorOperator(operator: String, operands: List[Tensor])
-}
-
-data TensorException(message: String)
-
-capability TensorProcessor(
-    toFloats: Tensor => Array[Float]
-    toInts: Tensor => Array[Int]
-    toBuffer: Tensor => Buffer
-)
-
-defaultProcessor(): TensorProcessor {
-    throw(TensorException("Default tensor processor not yet implemented"))
-}
-
-f32(shape: List[Int], data: List[Float]): Tensor {
-    TensorFloats("ff_f32", shape, data.toArray())
-}
-
-f32a(shape: List[Int], data: Array[Float]): Tensor {
-    TensorFloats("ff_f64", shape, data)
-}
-
-extend this: Tensor {
-
-    multiply(that: Tensor): Tensor {
-        if(this.scalar != that.scalar) {
-            throw(TensorException("Scalar type mismatch: " + this.scalar + " vs. " + that.scalar))
-        }
-        let scalar = this.scalar
-        let shape = [] // TODO: Check and compute
-        TensorOperator(scalar, shape, "ff_multiply", [this, that])
-    }
-
-    toFloats(processor: TensorProcessor = defaultProcessor()): Array[Float] {
-        processor.toFloats(this)
-    }
-
-}
-
-main(system: NodeSystem) {
-    let tensor = Tensor.f32([], [1.0])
-}
+// Brainstorming representation for Tensors where the scalar types and operators are left open ended.
+// The purpose of this type is to build up a syntax tree of tensor operations that can then be
+// optimized and executed on CPU/GPU/TPU, enabling machine learning and other numerical applications.
+
+data Tensor(scalar: String, shape: List[Int]) {
+    TensorVariable(name: String)
+    TensorInts(data: Array[Int])
+    TensorFloats(data: Array[Float])
+    TensorBuffer(data: Buffer)
+    TensorOperator(operator: String, operands: List[Tensor])
+}
+
+data TensorException(message: String)
+
+capability TensorProcessor(
+    toFloats: Tensor => Array[Float]
+    toInts: Tensor => Array[Int]
+    toBuffer: Tensor => Buffer
+)
+
+defaultProcessor(): TensorProcessor {
+    throw(TensorException("Default tensor processor not yet implemented"))
+}
+
+f32(shape: List[Int], data: List[Float]): Tensor {
+    TensorFloats("ff_f32", shape, data.toArray())
+}
+
+f32a(shape: List[Int], data: Array[Float]): Tensor {
+    TensorFloats("ff_f64", shape, data)
+}
+
+extend this: Tensor {
+
+    multiply(that: Tensor): Tensor {
+        if(this.scalar != that.scalar) {
+            throw(TensorException("Scalar type mismatch: " + this.scalar + " vs. " + that.scalar))
+        }
+        let scalar = this.scalar
+        let shape = [] // TODO: Check and compute
+        TensorOperator(scalar, shape, "ff_multiply", [this, that])
+    }
+
+    toFloats(processor: TensorProcessor = defaultProcessor()): Array[Float] {
+        processor.toFloats(this)
+    }
+
+}
+
+main(system: NodeSystem) {
+    let tensor = Tensor.f32([], [1.0])
+}

package/experimental/random/Units.ff

@@ -1,36 +1,36 @@
-
-nodeMain(system: NodeSystem) {
-    if(True) {
-        1 + 1
-    } else {
-        "foo"
-    }
-    if(True) {
-        1
-    } elseIf {False} {
-        'x'
-    } else {
-        "foo"
-    }
-    if(True) {
-        if(True) {
-            1
-        } else {
-            "foo"
-        }
-    } else {
-        "foo"
-    }
-    try {
-        1
-    } catchAny {_ =>
-        "foo"
-    } grab()
-    [1, 2, 3].each {_ =>
-        try {
-            if(False) {1} else {2}
-        } catchAny {_ =>
-            "foo"
-        } grab()
-    }
-}
+
+nodeMain(system: NodeSystem) {
+    if(True) {
+        1 + 1
+    } else {
+        "foo"
+    }
+    if(True) {
+        1
+    } elseIf {False} {
+        'x'
+    } else {
+        "foo"
+    }
+    if(True) {
+        if(True) {
+            1
+        } else {
+            "foo"
+        }
+    } else {
+        "foo"
+    }
+    try {
+        1
+    } catchAny {_ =>
+        "foo"
+    } grab()
+    [1, 2, 3].each {_ =>
+        try {
+            if(False) {1} else {2}
+        } catchAny {_ =>
+            "foo"
+        } grab()
+    }
+}

package/experimental/s3/S3TestAuthorizationHeader.ff

@@ -1,39 +1,40 @@
-import S3
-
-nodeMain(system: NodeSystem) {
-    // Trying to reproduce the result from an example here 
-    // https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-header-based-auth.html
-    let expectedHeader = "AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130524/us-east-1/s3/aws4_request,SignedHeaders=date;host;x-amz-content-sha256;x-amz-date;x-amz-storage-class,Signature=98ad721746da40c64f1a55b78f14c238d841ea1380cd77a1b5971af0ece108bd"
-    let amzDate = "20130524T000000Z" // TODO
-    let headerDate = "Fri, 24 May 2013 00:00:00 GMT" // TODO
-    let bucket = "examplebucket"
-    let body = "Welcome to Amazon S3.".toBuffer()
-    let actualHeader = S3.makeS3AuthorizationHeader(
-        system = system
-        accessKeyId = "AKIAIOSFODNN7EXAMPLE"
-        secretAccessKey = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
-        region = "us-east-1"
-        bucket = bucket
-        encodedKey = S3.encode("test$file.text")
-        body = body
-        canonicalHeaders = [
-            Pair("date", headerDate) 
-            Pair("host", bucket + ".s3.amazonaws.com")
-            Pair("x-amz-date", amzDate)
-            Pair("x-amz-content-sha256", system.crypto().sha256(body).toHex())
-            Pair("x-amz-storage-class", "REDUCED_REDUNDANCY")
-        ]        
-        amzDate = amzDate
-    )
-    system.writeLine("")
-    system.writeLine("actual  : " + actualHeader)
-    system.writeLine("")
-    system.writeLine("expected: " + expectedHeader)
-    
-    system.writeLine("")
-    if(actualHeader == expectedHeader) {
-        system.writeLine("Test passed")
-    } else {
-        system.writeLine("Test failed")
-    }
+dependency ff:s3:0.0.0
+import S3 from ff:s3
+
+nodeMain(system: NodeSystem) {
+    // Trying to reproduce the result from an example here 
+    // https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-header-based-auth.html
+    let expectedHeader = "AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130524/us-east-1/s3/aws4_request,SignedHeaders=date;host;x-amz-content-sha256;x-amz-date;x-amz-storage-class,Signature=98ad721746da40c64f1a55b78f14c238d841ea1380cd77a1b5971af0ece108bd"
+    let amzDate = "20130524T000000Z" // TODO
+    let headerDate = "Fri, 24 May 2013 00:00:00 GMT" // TODO
+    let bucket = "examplebucket"
+    let body = "Welcome to Amazon S3.".toBuffer()
+    let actualHeader = S3.makeS3AuthorizationHeader(
+        system = system
+        accessKeyId = "AKIAIOSFODNN7EXAMPLE"
+        secretAccessKey = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
+        region = "us-east-1"
+        bucket = bucket
+        encodedKey = S3.encode("test$file.text")
+        body = body
+        canonicalHeaders = [
+            Pair("date", headerDate) 
+            Pair("host", bucket + ".s3.amazonaws.com")
+            Pair("x-amz-date", amzDate)
+            Pair("x-amz-content-sha256", system.crypto().sha256(body).toHex())
+            Pair("x-amz-storage-class", "REDUCED_REDUNDANCY")
+        ]        
+        amzDate = amzDate
+    )
+    system.writeLine("")
+    system.writeLine("actual  : " + actualHeader)
+    system.writeLine("")
+    system.writeLine("expected: " + expectedHeader)
+    
+    system.writeLine("")
+    if(actualHeader == expectedHeader) {
+        system.writeLine("Test passed")
+    } else {
+        system.writeLine("Test failed")
+    }
 }

package/experimental/s3/S3TestPut.ff

@@ -1,16 +1,17 @@
-import S3
-
-nodeMain(system: NodeSystem) {
-    S3.put(system, 
-        accessKeyId = ""
-        secretAccessKey = ""
-        region = "eu-central-1"
-        bucket = "firefly-site"
-        objectKey = "tmp/test4"
-        "Hello S3 3".toBuffer()
-        headers = [
-            //Pair("x-amz-storage-class", "REDUCED_REDUNDANCY")
-            Pair("Content-Type", "text/plain")            
-        ]
-    )
+dependency ff:s3:0.0.0
+import S3 from ff:s3
+
+nodeMain(system: NodeSystem) {
+    S3.put(system, 
+        accessKeyId = ""
+        secretAccessKey = ""
+        region = "eu-central-1"
+        bucket = "firefly-site"
+        objectKey = "tmp/test4"
+        "Hello S3 3".toBuffer()
+        headers = [
+            //Pair("x-amz-storage-class", "REDUCED_REDUNDANCY")
+            Pair("Content-Type", "text/plain")            
+        ]
+    )
 }

package/experimental/tests/TestJson.ff

@@ -1,26 +1,26 @@
-nodeMain(system: NodeSystem) {
-    let jsons = [
-        Json.object()
-        Json.object().with("x", 1) 
-        Json.object().with("y", 1)
-        Json.object().with("x", 1).with("y", 1)
-        Json.object().with("y", 2).with("x", 1)
-        Json.object().with("x", 1).with("y", 2)
-        Json.array([Json.int(3)])
-        Json.int(3)
-        Json.null()
-        Json.float(3.5)
-        Json.bool(True)
-        Json.bool(False)
-    ]
-    system.writeLine(Show.show(Json.array(jsons.sort())))
-    jsons.each {json =>
-        let equal = jsons.filter {_ == json}
-        if(equal.size() != 1) {
-            system.writeLine(
-                "None-singleton equals: " + 
-                equal.map {j => Show.show(json) + " == " + Show.show(j)}.join(" && ")
-            )
-        }
-    }
-}
+nodeMain(system: NodeSystem) {
+    let jsons = [
+        Json.object()
+        Json.object().with("x", 1) 
+        Json.object().with("y", 1)
+        Json.object().with("x", 1).with("y", 1)
+        Json.object().with("y", 2).with("x", 1)
+        Json.object().with("x", 1).with("y", 2)
+        Json.array([Json.int(3)])
+        Json.int(3)
+        Json.null()
+        Json.float(3.5)
+        Json.bool(True)
+        Json.bool(False)
+    ]
+    system.writeLine(Show.show(Json.array(jsons.sort())))
+    jsons.each {json =>
+        let equal = jsons.filter {_ == json}
+        if(equal.size() != 1) {
+            system.writeLine(
+                "None-singleton equals: " + 
+                equal.map {j => Show.show(json) + " == " + Show.show(j)}.join(" && ")
+            )
+        }
+    }
+}

package/fireflysite/.firefly/package.ff

@@ -1,4 +1,4 @@
-package ff:fireflysite:0.0.0
-dependency ff:webserver:0.0.0
-dependency ff:lux:0.0.0
-dependency ff:compiler:0.0.0
+package ff:fireflysite:0.0.0
+dependency ff:webserver:0.0.0
+dependency ff:lux:0.0.0
+dependency ff:compiler:0.0.0

package/fireflysite/CommunityOverview.ff

@@ -1,20 +1,20 @@
-import Guide
-import CountingButtonDemo
-import MatchingPasswordsDemo
-
-new(): Document {
-    Document([
-        Section("Community", [
-            Paragraph([
-                Text("The developers of Firefly hang out in")
-                Code("#firefly")
-                Text("on the")
-                Link("r/ProgrammingLanguages", "https://discord.gg/yQ9mSk7CJ5")
-                Text("Discord.")
-            ])
-            Paragraph([
-                Text("If you're interested in Firefly, that's the best way to be part of the community for now.")
-            ])
-        ])
-    ])
-}
+import Guide
+import CountingButtonDemo
+import MatchingPasswordsDemo
+
+new(): Document {
+    ReadyDocument([
+        Section("Community", [
+            Paragraph([
+                Text("The developers of Firefly hang out in")
+                Code("#firefly")
+                Text("on the")
+                Link("r/ProgrammingLanguages", "https://discord.gg/yQ9mSk7CJ5")
+                Text("Discord.")
+            ])
+            Paragraph([
+                Text("If you're interested in Firefly, that's the best way to be part of the community for now.")
+            ])
+        ])
+    ])
+}