luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better handling of calling a non-function

Browse source
This commit is contained in:
Michiel Borkent 2019-08-11 00:29:12 +02:00
parent 297a7f2111
commit dd9b89b5e1
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/babashka/interpreter.clj
View file

@ -160,6 +160,10 @@
(define-lookup) (define-lookup)
(defmacro one-of [x elements]
`(let [x# ~x]
(case x# (~@elements) x# nil)))
(defn resolve-symbol [expr] (defn resolve-symbol [expr]
(let [n (name expr)] (let [n (name expr)]
(if (str/starts-with? n "'") (if (str/starts-with? n "'")
@ -180,6 +184,8 @@
(into (empty expr) (map i expr)) (into (empty expr) (map i expr))
(seq? expr) (seq? expr)
(if-let [f (first expr)] (if-let [f (first expr)]
(let [f (or (one-of f [if when and or -> ->>])
(interpret f in))]
(if-let [v (var-lookup f)] (if-let [v (var-lookup f)]
(apply-fn v i (rest expr)) (apply-fn v i (rest expr))
(case f (case f
@ -204,7 +210,7 @@
(apply-fn (resolve-symbol f) i (rest expr)) (apply-fn (resolve-symbol f) i (rest expr))
(ifn? f) (ifn? f)
(apply-fn f i (rest expr)) (apply-fn f i (rest expr))
:else nil))) :else (throw (Exception. (format "Cannot call %s as a function." (pr-str f))))))))
expr) expr)
;; read fn passed as higher order fn, still needs input ;; read fn passed as higher order fn, still needs input
(-> expr meta ::fn) (-> expr meta ::fn)