restore bb logic on sym/kw
Signed-off-by: Sean Corfield <sean@corfield.org>
This commit is contained in:
parent
74cf16c134
commit
a981ed9171
1 changed files with 8 additions and 3 deletions
|
|
@ -436,7 +436,8 @@
|
||||||
(defn- format-simple-var
|
(defn- format-simple-var
|
||||||
([x]
|
([x]
|
||||||
(let [c (if (keyword? x)
|
(let [c (if (keyword? x)
|
||||||
#?(:clj (str (.sym ^clojure.lang.Keyword x))
|
#?(:bb (subs (str x) 1)
|
||||||
|
:clj (str (.sym ^clojure.lang.Keyword x))
|
||||||
:default (subs (str x) 1))
|
:default (subs (str x) 1))
|
||||||
(str x))]
|
(str x))]
|
||||||
(format-simple-var x c {})))
|
(format-simple-var x c {})))
|
||||||
|
|
@ -454,7 +455,8 @@
|
||||||
;; for multiple / in the %fun.call case so that
|
;; for multiple / in the %fun.call case so that
|
||||||
;; qualified column names can be used:
|
;; qualified column names can be used:
|
||||||
(let [c (if (keyword? x)
|
(let [c (if (keyword? x)
|
||||||
#?(:clj (str (.sym ^clojure.lang.Keyword x))
|
#?(:bb (subs (str x) 1)
|
||||||
|
:clj (str (.sym ^clojure.lang.Keyword x))
|
||||||
:default (subs (str x) 1))
|
:default (subs (str x) 1))
|
||||||
(str x))]
|
(str x))]
|
||||||
(cond (str/starts-with? c "%")
|
(cond (str/starts-with? c "%")
|
||||||
|
|
@ -1733,7 +1735,10 @@
|
||||||
qualifier, if any."
|
qualifier, if any."
|
||||||
[k]
|
[k]
|
||||||
(if (keyword? k)
|
(if (keyword? k)
|
||||||
#?(:clj (.sym ^clojure.lang.Keyword k)
|
#?(:bb (if-let [n (namespace k)]
|
||||||
|
(symbol n (name k))
|
||||||
|
(symbol (name k)))
|
||||||
|
:clj (.sym ^clojure.lang.Keyword k)
|
||||||
:default (if-let [n (namespace k)]
|
:default (if-let [n (namespace k)]
|
||||||
(symbol n (name k))
|
(symbol n (name k))
|
||||||
(symbol (name k))))
|
(symbol (name k))))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue