Skip to content

Commit 4118065

Browse files
committed
:protocol-method -> :protocol-prop, that's what we're actually checking for
1 parent 7a0ec41 commit 4118065

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/clojure/cljs/analyzer.cljc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3417,7 +3417,7 @@
34173417
nil)]
34183418
(when (and (not= 'constructor prop)
34193419
(not (string/starts-with? (str prop) "cljs$"))
3420-
(not (-> prop meta :protocol-method)))
3420+
(not (-> prop meta :protocol-prop)))
34213421
;; Adding to Object
34223422
(when (= 'Object (first (-> tag meta :prefix)))
34233423
(warning :infer-warning env

src/main/clojure/cljs/core.cljc

+4-4
Original file line numberDiff line numberDiff line change
@@ -2110,7 +2110,7 @@
21102110
check
21112111
`(if (and (not (nil? ~fsig))
21122112
;; Property access needed here.
2113-
(not (nil? (. ~fsig ~(with-meta (symbol (core/str "-" slot)) {:protocol-method true})))))
2113+
(not (nil? (. ~fsig ~(with-meta (symbol (core/str "-" slot)) {:protocol-prop true})))))
21142114
(. ~fsig ~slot ~@sig)
21152115
(~dyn-name ~@sig))]
21162116
`(~sig ~check)))
@@ -2162,7 +2162,7 @@
21622162
~@(map (core/fn [sig]
21632163
(expand-sig dyn-name
21642164
(with-meta (symbol (core/str slot "$arity$" (count sig)))
2165-
{:protocol-method true})
2165+
{:protocol-prop true})
21662166
sig))
21672167
sigs)))))]
21682168
`(do
@@ -2213,7 +2213,7 @@
22132213
(if-not (nil? ~xsym)
22142214
(if (or ~(if bit `(unsafe-bit-and (. ~xsym ~msym) ~bit) false)
22152215
(identical? cljs.core/PROTOCOL_SENTINEL
2216-
(. ~xsym ~(with-meta (symbol (core/str "-" prefix)) {:protocol-method true}))))
2216+
(. ~xsym ~(with-meta (symbol (core/str "-" prefix)) {:protocol-prop true}))))
22172217
true
22182218
(if (coercive-not (. ~xsym ~msym))
22192219
(cljs.core/native-satisfies? ~psym ~xsym)
@@ -2222,7 +2222,7 @@
22222222
`(if-not (nil? ~x)
22232223
(if (or ~(if bit `(unsafe-bit-and (. ~x ~msym) ~bit) false)
22242224
(identical? cljs.core/PROTOCOL_SENTINEL
2225-
(. ~x ~(with-meta (symbol (core/str "-" prefix)) {:protocol-method true}))))
2225+
(. ~x ~(with-meta (symbol (core/str "-" prefix)) {:protocol-prop true}))))
22262226
true
22272227
(if (coercive-not (. ~x ~msym))
22282228
(cljs.core/native-satisfies? ~psym ~x)

0 commit comments

Comments
 (0)