When-else2 should be correct, replaced original implementation
What am i doing with my life, it's 5:37 in the morning ffs
This commit is contained in:
parent
c575d75de7
commit
008d609a8b
2 changed files with 1 additions and 12 deletions
|
@ -66,7 +66,7 @@
|
||||||
[cmd-args]
|
[cmd-args]
|
||||||
(let [file-to-try (u/nil?-else (first cmd-args)
|
(let [file-to-try (u/nil?-else (first cmd-args)
|
||||||
"./config.edn")]
|
"./config.edn")]
|
||||||
(u/when-else2 (load-config file-to-try)
|
(u/when-else (load-config file-to-try)
|
||||||
(println "WARN: Using default internal config because suggessted " file-to-try " not found.")
|
(println "WARN: Using default internal config because suggessted " file-to-try " not found.")
|
||||||
CONFIG-DEFAULT)))
|
CONFIG-DEFAULT)))
|
||||||
|
|
||||||
|
|
|
@ -31,17 +31,6 @@
|
||||||
result#)))
|
result#)))
|
||||||
|
|
||||||
(defmacro when-else
|
(defmacro when-else
|
||||||
"Evaluates tst, if it's true returns it's result.
|
|
||||||
If it's not, return else"
|
|
||||||
[tst else]
|
|
||||||
`(let [res# ~tst]
|
|
||||||
(if res#
|
|
||||||
res#
|
|
||||||
~else)))
|
|
||||||
|
|
||||||
;; Todo: Test this properly and if working, replace when-else with this
|
|
||||||
;; Todo: find a way to download clojure documentation for offline use
|
|
||||||
(defmacro when-else2
|
|
||||||
"Evaluates [tst], if it's truthy value returns that value.
|
"Evaluates [tst], if it's truthy value returns that value.
|
||||||
If it's not, execute everything in [else] and return last expr."
|
If it's not, execute everything in [else] and return last expr."
|
||||||
[tst & else]
|
[tst & else]
|
||||||
|
|
Loading…
Reference in a new issue