Skip to content

Commit 9b9551a

Browse files
authored
Rename node args consistently to ast
Rename node args consistently to `ast` in the inference code to improve readability
1 parent 9e9b6d9 commit 9b9551a

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

src/main/clojure/cljs/analyzer.cljc

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,16 +1441,16 @@
14411441
(register-constant! env sym)
14421442
{:op :const :val sym :env env :form sym :tag 'cljs.core/Keyword})
14431443

1444-
(defn get-tag [e]
1445-
(if-some [tag (-> e :form meta :tag)]
1444+
(defn get-tag [ast]
1445+
(if-some [tag (-> ast :form meta :tag)]
14461446
tag
1447-
(if-some [tag (-> e :tag)]
1447+
(if-some [tag (-> ast :tag)]
14481448
tag
1449-
(-> e :info :tag))))
1449+
(-> ast :info :tag))))
14501450

1451-
(defn find-matching-method [f params]
1451+
(defn find-matching-method [fn-ast params]
14521452
;; if local fn, need to look in :info
1453-
(let [methods (or (:methods f) (-> f :info :methods))
1453+
(let [methods (or (:methods fn-ast) (-> fn-ast :info :methods))
14541454
c (count params)]
14551455
(some
14561456
(fn [m]
@@ -1476,21 +1476,21 @@
14761476

14771477
(declare infer-tag)
14781478

1479-
(defn unwrap-quote [{:keys [op] :as expr}]
1479+
(defn unwrap-quote [{:keys [op] :as ast}]
14801480
(if #?(:clj (= op :quote)
14811481
:cljs (keyword-identical? op :quote))
1482-
(:expr expr)
1483-
expr))
1482+
(:expr ast)
1483+
ast))
14841484

1485-
(defn infer-if [env e]
1486-
(let [{:keys [op form]} (unwrap-quote (:test e))
1487-
then-tag (infer-tag env (:then e))]
1485+
(defn infer-if [env ast]
1486+
(let [{:keys [op form]} (unwrap-quote (:test ast))
1487+
then-tag (infer-tag env (:then ast))]
14881488
(if (and #?(:clj (= op :const)
14891489
:cljs (keyword-identical? op :const))
14901490
(not (nil? form))
14911491
(not (false? form)))
14921492
then-tag
1493-
(let [else-tag (infer-tag env (:else e))]
1493+
(let [else-tag (infer-tag env (:else ast))]
14941494
(cond
14951495
(or #?(:clj (= then-tag else-tag)
14961496
:cljs (symbol-identical? then-tag else-tag))
@@ -1533,7 +1533,7 @@
15331533
(js-var-fn? fn-ast) 'js
15341534
:else (when (= 'js (:ns info)) 'js)))
15351535

1536-
(defn infer-invoke [env {fn-ast :fn :keys [args] :as e}]
1536+
(defn infer-invoke [env {fn-ast :fn :keys [args] :as ast}]
15371537
(let [me (assoc (find-matching-method fn-ast args) :op :fn-method)]
15381538
(if-some [ret-tag (infer-tag env me)]
15391539
ret-tag
@@ -1545,28 +1545,28 @@
15451545
(defn infer-tag
15461546
"Given env, an analysis environment, and e, an AST node, return the inferred
15471547
type of the node"
1548-
[env e]
1549-
(if-some [tag (get-tag e)]
1548+
[env ast]
1549+
(if-some [tag (get-tag ast)]
15501550
tag
1551-
(case (:op e)
1551+
(case (:op ast)
15521552
:recur impl/IGNORE_SYM
15531553
:throw impl/IGNORE_SYM
1554-
:let (infer-tag env (:body e))
1555-
:loop (infer-tag env (:body e))
1556-
:do (infer-tag env (:ret e))
1557-
:fn-method (infer-tag env (:body e))
1558-
:def (infer-tag env (:init e))
1559-
:invoke (infer-invoke env e)
1560-
:if (infer-if env e)
1561-
:const (case (:form e)
1554+
:let (infer-tag env (:body ast))
1555+
:loop (infer-tag env (:body ast))
1556+
:do (infer-tag env (:ret ast))
1557+
:fn-method (infer-tag env (:body ast))
1558+
:def (infer-tag env (:init ast))
1559+
:invoke (infer-invoke env ast)
1560+
:if (infer-if env ast)
1561+
:const (case (:form ast)
15621562
true impl/BOOLEAN_SYM
15631563
false impl/BOOLEAN_SYM
15641564
impl/ANY_SYM)
1565-
:quote (infer-tag env (:expr e))
1565+
:quote (infer-tag env (:expr ast))
15661566
(:var :local :js-var :binding)
1567-
(if-some [init (:init e)]
1567+
(if-some [init (:init ast)]
15681568
(infer-tag env init)
1569-
(infer-tag env (:info e)))
1569+
(infer-tag env (:info ast)))
15701570
(:host-field :host-call)
15711571
impl/ANY_SYM
15721572
:js impl/ANY_SYM

0 commit comments

Comments
 (0)