Skip to content

Commit c2b864d

Browse files
frenchy64swannodette
authored andcommitted
rename :f to :fn in :invoke op
1 parent 9cae8d2 commit c2b864d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/clojure/cljs/analyzer.cljc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@
12821282
(into then-tag else-tag))))))))
12831283

12841284
(defn infer-invoke [env e]
1285-
(let [{info :info :as f} (:f e)]
1285+
(let [{info :info :as f} (:fn e)]
12861286
(if-some [ret-tag (if (or (true? (:fn-var info))
12871287
(true? (:js-fn-var info)))
12881288
(:ret-tag info)
@@ -3187,7 +3187,7 @@
31873187
~@(if bind-args? arg-syms args)))))
31883188
(let [ana-expr #(analyze enve %)
31893189
argexprs (map ana-expr args)]
3190-
{:env env :op :invoke :form form :f fexpr :args (vec argexprs)
3190+
{:env env :op :invoke :form form :fn fexpr :args (vec argexprs)
31913191
:children (into [fexpr] argexprs)}))))
31923192

31933193
(defn parse-invoke
@@ -3563,7 +3563,7 @@
35633563
(when (and (not (analyzed? ast))
35643564
#?(:clj (= :invoke op)
35653565
:cljs (keyword-identical? :invoke op)))
3566-
(when-some [[name {:keys [valid? warning-type]}] (find invoke-arg-type-validators (-> ast :f :info :name))]
3566+
(when-some [[name {:keys [valid? warning-type]}] (find invoke-arg-type-validators (-> ast :fn :info :name))]
35673567
(let [types (mapv :tag (:args ast))]
35683568
(when-not (valid? types)
35693569
(warning warning-type env

src/main/clojure/cljs/compiler.cljc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@
10051005
"$")))
10061006

10071007
(defmethod emit* :invoke
1008-
[{:keys [f args env] :as expr}]
1008+
[{f :fn :keys [args env] :as expr}]
10091009
(let [info (:info f)
10101010
fn? (and ana/*cljs-static-fns*
10111011
(not (:dynamic info))

0 commit comments

Comments
 (0)