diff options
| author | Andrey Orst <andreyorst@gmail.com> | 2020-11-09 09:17:48 +0300 |
|---|---|---|
| committer | Andrey Orst <andreyorst@gmail.com> | 2020-11-09 09:17:48 +0300 |
| commit | ae76d82a06a9fcfe84ee0ae86f4a5440eaf0b656 (patch) | |
| tree | b60c668d52b1c5cc206629e2e5ea6b468c15d615 | |
| parent | e9fba1130b30fc223bceafc7126a3fb1da62cec9 (diff) | |
fix: use not= instead of Lua's ~=
| -rw-r--r-- | core.fnl | 13 | ||||
| -rw-r--r-- | macros/fn.fnl | 4 |
2 files changed, 9 insertions, 8 deletions
@@ -38,8 +38,9 @@ arguments to `args'." (if-let [t (fast-table-type tbl)] (= t :table) (let [(k _) (next tbl)] - (and (~= k nil) (or (~= (type k) :number) - (~= k 1))))))) + (and (not= k nil) + (or (not= (type k) :number) + (not= k 1))))))) (fn& core.seq? "Check whether `tbl' is an sequential table." @@ -48,7 +49,7 @@ arguments to `args'." (if-let [t (fast-table-type tbl)] (= t :seq) (let [(k _) (next tbl)] - (and (~= k nil) (= (type k) :number) (= k 1)))))) + (and (not= k nil) (= (type k) :number) (= k 1)))))) (fn& core.nil? @@ -123,7 +124,7 @@ arguments to `args'." "Test if `x' is a number with floating point data." [x] (and (= (type x) :number) - (~= x (math.floor x)))) + (not= x (math.floor x)))) (fn& core.empty? "Check if collection is empty." @@ -334,8 +335,8 @@ ignored. Returns a table of results." ([f t1 t2 t3 & tbls] (let [step (fn step [tbls] (if (->> tbls - (mapv #(~= (next $) nil)) - (reduce #(and $1 $2))) + (mapv #(not= (next $) nil)) + (reduce #(and $1 $2))) (cons (mapv #(. (safe-seq $) 1) tbls) (step (mapv #(do [(unpack $ 2)]) tbls))) (vector))) res (vector)] diff --git a/macros/fn.fnl b/macros/fn.fnl index 24f909d..8146a0b 100644 --- a/macros/fn.fnl +++ b/macros/fn.fnl @@ -79,7 +79,7 @@ (var prev nil) (each [_ cur (ipairs t)] (if prev - (when (~= (+ prev 1) cur) + (when (not= (+ prev 1) cur) (lua "return false"))) (set prev cur)) prev)) @@ -156,7 +156,7 @@ ,(arity-dispatcher 'len# bodies - (if (~= (next bodies&) nil) + (if (not= (next bodies&) nil) (. bodies& 1)) fname)))) |