kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

variadic concat. Close #18

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-07-22 13:55:47 -06:00
parent 8e741bf37f
commit b676e992e7
6 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kiss/src/kiss/Kiss.hx
View File

@@ -56,6 +56,7 @@ class Kiss {
"print" => Symbol("Prelude.print"), "print" => Symbol("Prelude.print"),
"sort" => Symbol("Prelude.sort"), "sort" => Symbol("Prelude.sort"),
"groups" => Symbol("Prelude.groups"), "groups" => Symbol("Prelude.groups"),
"concat" => Symbol("Prelude.concat"),
"pairs" => Symbol("Prelude.pairs"), // TODO test pairs "pairs" => Symbol("Prelude.pairs"), // TODO test pairs
"reversed" => Symbol("Prelude.reversed"), // TODO test reversed "reversed" => Symbol("Prelude.reversed"), // TODO test reversed
"memoize" => Symbol("Prelude.memoize"), // TODO test memoize "memoize" => Symbol("Prelude.memoize"), // TODO test memoize

10
kiss/src/kiss/Prelude.hx
View File

@@ -170,6 +170,16 @@ class Prelude {
return fullGroups; return fullGroups;
} }
static function _concat(arrays:Array<Dynamic>):Array<Dynamic> {
var arr:Array<Dynamic> = arrays[0];
for (nextArr in arrays.slice(1)) {
arr = arr.concat(nextArr);
}
return arr;
}
public static var concat:Function = Reflect.makeVarArgs(_concat);
public static function zip(arrays:Array<Array<Dynamic>>, extraHandling = Drop):kiss.List<kiss.List<Dynamic>> { public static function zip(arrays:Array<Array<Dynamic>>, extraHandling = Drop):kiss.List<kiss.List<Dynamic>> {
var lengthsAreEqual = true; var lengthsAreEqual = true;
var lengths = [for (arr in arrays) arr.length]; var lengths = [for (arr in arrays) arr.length];

4
kiss/src/test/cases/BasicTestCase.hx
View File

@@ -55,6 +55,10 @@ class BasicTestCase extends Test {
_testCollect(); _testCollect();
} }
function testConcat() {
_testConcat();
}
function testVariadicAdd() { function testVariadicAdd() {
Assert.equals(6, BasicTestCase.mySum); Assert.equals(6, BasicTestCase.mySum);
} }

3
kiss/src/test/cases/BasicTestCase.kiss
View File

@@ -109,6 +109,9 @@
(defun myTypeCheck [] (defun myTypeCheck []
(the Int 5)) (the Int 5))
(defun _testConcat []
(Assert.equals (.toString [1 2 3 4]) (.toString (concat [1] [2 3] [4]))))
(defun _testGroups [] (defun _testGroups []
(Assert.equals (.toString [[1 2] [3 4]]) (.toString (groups [1 2 3 4] 2))) (Assert.equals (.toString [[1 2] [3 4]]) (.toString (groups [1 2 3 4] 2)))
(Assert.equals (.toString [[1 2 3] [4]]) (.toString (groups [1 2 3 4] 3 Keep))) (Assert.equals (.toString [[1 2 3] [4]]) (.toString (groups [1 2 3 4] 3 Keep)))

6
projects/aoc/src/year2020/Passports.kiss
View File

@@ -22,9 +22,9 @@
(unless (and (unless (and
(hcl.startsWith "#") (hcl.startsWith "#")
(= hcl.length 7) (= hcl.length 7)
(apply = (.concat [true] (apply = (concat [true]
(for c (.split (hcl.substr 1) "") (for c (.split (hcl.substr 1) "")
(<= 0 (.indexOf (.split "0123456789abcdef" "") c)))))) (<= 0 (.indexOf (.split "0123456789abcdef" "") c))))))
(return false))) (return false)))
(let [ecl (dictGet pp "ecl")] (let [ecl (dictGet pp "ecl")]
(unless (<= 0 (.indexOf (.split "amb blu brn gry grn hzl oth" " ") ecl)) (return false))) (unless (<= 0 (.indexOf (.split "amb blu brn gry grn hzl oth" " ") ecl)) (return false)))

2
projects/aoc/src/year2020/Toboggan.kiss
View File

@@ -1,7 +1,7 @@
(defun path [:kiss.List<String> hillTile x0 y0 dx dy] (defun path [:kiss.List<String> hillTile x0 y0 dx dy]
(if (>= y0 .length hillTile) (if (>= y0 .length hillTile)
[] []
(.concat [(.charAt (nth hillTile y0) (Math.floor (% x0 .length (nth hillTile y0))))] (path hillTile (+ x0 dx) (+ y0 dy) dx dy)))) (concat [(.charAt (nth hillTile y0) (Math.floor (% x0 .length (nth hillTile y0))))] (path hillTile (+ x0 dx) (+ y0 dy) dx dy))))
(defun pathString [:kiss.List<String> hillTile x0 y0 dx dy] (.join (path hillTile x0 y0 dx dy) "")) (defun pathString [:kiss.List<String> hillTile x0 y0 dx dy] (.join (path hillTile x0 y0 dx dy) ""))