Skip to content

Commit db0cc1b

Browse files
mfikesswannodette
authored andcommitted
CLJS-2060: Backport CLJ-2141 Return only true/false from qualified-* predicates
1 parent cec745d commit db0cc1b

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/main/cljs/cljs/core.cljs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3224,23 +3224,23 @@ reduces them without incurring seq initialization"
32243224

32253225
(defn ^boolean qualified-ident?
32263226
"Return true if x is a symbol or keyword with a namespace"
3227-
[x] (and (ident? x) (namespace x) true))
3227+
[x] (boolean (and (ident? x) (namespace x) true)))
32283228

32293229
(defn ^boolean simple-symbol?
32303230
"Return true if x is a symbol without a namespace"
32313231
[x] (and (symbol? x) (nil? (namespace x))))
32323232

32333233
(defn ^boolean qualified-symbol?
32343234
"Return true if x is a symbol with a namespace"
3235-
[x] (and (symbol? x) (namespace x) true))
3235+
[x] (boolean (and (symbol? x) (namespace x) true)))
32363236

32373237
(defn ^boolean simple-keyword?
32383238
"Return true if x is a keyword without a namespace"
32393239
[x] (and (keyword? x) (nil? (namespace x))))
32403240

32413241
(defn ^boolean qualified-keyword?
32423242
"Return true if x is a keyword with a namespace"
3243-
[x] (and (keyword? x) (namespace x) true))
3243+
[x] (boolean (and (keyword? x) (namespace x) true)))
32443244

32453245
(defn keyword
32463246
"Returns a Keyword with the given namespace and name. Do not use :

src/test/cljs/cljs/predicates_test.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
[[] false true true false false false false false false false false false]
2222
[nil false false false false false false false false false false false false]
2323
[{} false false true false false false false false false false false false]
24-
[:foo false false false true false false true nil false false true nil]
24+
[:foo false false false true false false true false false false true false]
2525
[::foo false false false true false false false true false false false true]
26-
['foo false false false true false false true nil true nil false false]
26+
['foo false false false true false false true false true false false false]
2727
['foo/bar false false false true false false false true false true false false]
2828
[uuid false false false false true false false false false false false false]
2929
[(array) false false true false false false false false false false false false]

0 commit comments

Comments
 (0)