diff options
| -rw-r--r-- | core.fnl | 36 | ||||
| -rw-r--r-- | test/core.fnl | 10 |
2 files changed, 23 insertions, 23 deletions
@@ -5,7 +5,7 @@ (require-macros :macros.fn) (require-macros :macros.core) -(fn* core.vec +(fn* core.vector "Constructs sequential table out of it's arguments." [& args] (setmetatable args {:cljlib/table-type :seq})) @@ -18,7 +18,7 @@ arguments to `args'." ([f a b args] (f a b (unpack args))) ([f a b c args] (f a b c (unpack args))) ([f a b c d & args] - (let [flat-args (vec)] + (let [flat-args (vector)] (for [i 1 (- (length args) 1)] (insert flat-args (. args i))) (each [_ a (ipairs (. args (length args)))] @@ -150,8 +150,8 @@ If `tbl' is sequential table, returns its shallow copy." [tbl] (when-some [_ (and tbl (next tbl))] (var assoc? false) - (let [assoc (vec) - seq (vec)] + (let [assoc (vector) + seq (vector)] (each [k v (pairs tbl)] (if (and (not assoc?) (not (= (type k) :number))) @@ -162,7 +162,7 @@ If `tbl' is sequential table, returns its shallow copy." (macro safe-seq [tbl] "Create sequential table, or empty table if `seq' returned `nil'." - `(or (seq ,tbl) (vec))) + `(or (seq ,tbl) (vector))) (fn& core.first "Return first element of a table. Calls `seq' on its argument." @@ -175,8 +175,8 @@ If `tbl' is sequential table, returns its shallow copy." `seq' on its argument." [tbl] (if-some [tbl (seq tbl)] - (vec (unpack tbl 2)) - (vec))) + (vector (unpack tbl 2)) + (vector))) (fn& core.last "Returns the last element of a table. Calls `seq' on its argument." @@ -201,11 +201,11 @@ If `tbl' is sequential table, returns its shallow copy." (fn* core.conj "Insert `x' as a last element of indexed table `tbl'. Modifies `tbl'" - ([] (vec)) + ([] (vector)) ([tbl] tbl) ([tbl x] (when-some [x x] - (let [tbl (or tbl (vec))] + (let [tbl (or tbl (vector))] (if (map? tbl) (tset tbl (. x 1) (. x 2)) (insert tbl x)))) @@ -215,7 +215,7 @@ If `tbl' is sequential table, returns its shallow copy." (fn* consj "Like conj but joins at the front. Modifies `tbl'." - ([] (vec)) + ([] (vector)) ([tbl] tbl) ([tbl x] (when-some [x x] @@ -299,13 +299,13 @@ table. Then applies `f' to second value of each table. Continues until any of the tables is exhausted. All remaining values are ignored. Returns a table of results." ([f tbl] - (local res (vec)) + (local res (vector)) (each [_ v (ipairs (safe-seq tbl))] (when-some [tmp (f v)] (insert res tmp))) res) ([f t1 t2] - (let [res (vec) + (let [res (vector) t1 (safe-seq t1) t2 (safe-seq t2)] (var (i1 v1) (next t1)) @@ -317,7 +317,7 @@ ignored. Returns a table of results." (set (i2 v2) (next t2 i2))) res)) ([f t1 t2 t3] - (let [res (vec) + (let [res (vector) t1 (safe-seq t1) t2 (safe-seq t2) t3 (safe-seq t3)] @@ -337,8 +337,8 @@ ignored. Returns a table of results." (mapv #(~= (next $) nil)) (reduce #(and $1 $2))) (cons (mapv #(. (safe-seq $) 1) tbls) (step (mapv #(do [(unpack $ 2)]) tbls))) - (vec))) - res (vec)] + (vector))) + res (vector)] (each [_ v (ipairs (step (consj tbls t3 t2 t1)))] (when-some [tmp (apply f v)] (insert res tmp))) @@ -353,7 +353,7 @@ ignored. Returns a table of results." (fn kvseq [tbl] "Transforms any table kind to key-value sequence." - (let [res (vec)] + (let [res (vector)] (each [k v (pairs tbl)] (insert res [k v])) res)) @@ -412,7 +412,7 @@ oppisite truth value." ([upper] (range 0 upper 1)) ([lower upper] (range lower upper 1)) ([lower upper step] - (let [res (vec)] + (let [res (vector)] (for [i lower (- upper step) step] (insert res i)) res))) @@ -421,7 +421,7 @@ oppisite truth value." "Returns table with same items as in `tbl' but in reverse order." [tbl] (when-some [tbl (seq tbl)] - (reduce consj (vec) tbl))) + (reduce consj (vector) tbl))) (fn* core.inc "Increase number by one" [x] (+ x 1)) (fn* core.dec "Decrease number by one" [x] (- x 1)) diff --git a/test/core.fnl b/test/core.fnl index 54b2d00..52b198e 100644 --- a/test/core.fnl +++ b/test/core.fnl @@ -3,7 +3,7 @@ (require-macros :test.test) (local - {: vec + {: vector : hash-map : apply : seq @@ -596,10 +596,10 @@ (deftest vec (testing vec - (assert-eq (vec) []) - (assert-eq (vec 1) [1]) - (assert-eq (vec 1 2 3) [1 2 3]) - (assert-eq (getmetatable (vec 1 2 3)) {:cljlib/table-type :seq}))) + (assert-eq (vector) []) + (assert-eq (vector 1) [1]) + (assert-eq (vector 1 2 3) [1 2 3]) + (assert-eq (getmetatable (vector 1 2 3)) {:cljlib/table-type :seq}))) (deftest hash-map (testing hash-map |