Merge release Beta 1 into stable #21

Merged
Felisp merged 35 commits from dev into stable 2024-08-13 17:48:09 +02:00
2 changed files with 1 additions and 12 deletions
Showing only changes of commit 008d609a8b - Show all commits

View file

@ -66,7 +66,7 @@
[cmd-args]
(let [file-to-try (u/nil?-else (first cmd-args)
"./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.")
CONFIG-DEFAULT)))

View file

@ -31,17 +31,6 @@
result#)))
(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.
If it's not, execute everything in [else] and return last expr."
[tst & else]