sci: restructure internal ns

This commit is contained in:
Michiel Borkent 2020-12-16 13:03:35 +01:00
parent 663a2710dd
commit e88dc25709
2 changed files with 3 additions and 4 deletions

2
sci

@ -1 +1 @@
Subproject commit b7b4bb958786191f100c7d2b5ab85723f20bfb7d Subproject commit caa838cf5471e112ece9ba202916f6dfffba9aea

View file

@ -234,11 +234,10 @@
babashka.impl.clojure.test babashka.impl.clojure.test
(:require [babashka.impl.common :refer [ctx]] (:require [babashka.impl.common :refer [ctx]]
[clojure.stacktrace :as stack] [clojure.stacktrace :as stack]
[clojure.string :as str]
[clojure.template :as temp] [clojure.template :as temp]
[sci.core :as sci] [sci.core :as sci]
[sci.impl.analyzer :as ana]
[sci.impl.namespaces :as sci-namespaces] [sci.impl.namespaces :as sci-namespaces]
[sci.impl.resolve :as resolve]
[sci.impl.vars :as vars])) [sci.impl.vars :as vars]))
;; Nothing is marked "private" here, so you can rebind things to plug ;; Nothing is marked "private" here, so you can rebind things to plug
@ -407,7 +406,7 @@
{:added "1.1"} {:added "1.1"}
[x] [x]
(if (symbol? x) ;; TODO (if (symbol? x) ;; TODO
(when-let [v (second (ana/lookup @ctx x false))] (when-let [v (second (resolve/lookup @ctx x false))]
(when-let [value (if (vars/var? v) @v v)] (when-let [value (if (vars/var? v) @v v)]
(and (fn? value) (and (fn? value)
(not (:sci/macro (meta v)))))) (not (:sci/macro (meta v))))))