From 997da9e93e9c52a117f19500ab3b0ed340407ba0 Mon Sep 17 00:00:00 2001 From: davidnolen Date: Sun, 8 Jun 2025 23:05:27 -0400 Subject: [PATCH 1/5] * remove pr-writer-impl dependence on lazy seq --- src/main/cljs/cljs/core.cljs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/cljs/cljs/core.cljs b/src/main/cljs/cljs/core.cljs index 79a8fe96d..c578fbf45 100644 --- a/src/main/cljs/cljs/core.cljs +++ b/src/main/cljs/cljs/core.cljs @@ -10529,8 +10529,8 @@ reduces them without incurring seq initialization" (do (-write writer "#js ") (print-map - (map (fn [k] - (MapEntry. (cond-> k (some? (re-matches #"[A-Za-z_\*\+\?!\-'][\w\*\+\?!\-']*" k)) keyword) (unchecked-get obj k) nil)) + (.map (fn [k] + (MapEntry. (cond-> k (some? (re-matches #"[A-Za-z_\*\+\?!\-'][\w\*\+\?!\-']*" k)) keyword) (unchecked-get obj k) nil)) (js-keys obj)) pr-writer writer opts)) From 2982a12b905c9b6f246e4f8fefd5eebff5a0a05d Mon Sep 17 00:00:00 2001 From: davidnolen Date: Sun, 8 Jun 2025 23:17:00 -0400 Subject: [PATCH 2/5] * fix map arg order --- src/main/cljs/cljs/core.cljs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/cljs/cljs/core.cljs b/src/main/cljs/cljs/core.cljs index c578fbf45..0815df349 100644 --- a/src/main/cljs/cljs/core.cljs +++ b/src/main/cljs/cljs/core.cljs @@ -1679,9 +1679,9 @@ reduces them without incurring seq initialization" (aget arr i) not-found))) - ISequential - IEquiv - (-equiv [coll other] (equiv-sequential coll other)) + ;ISequential + ;IEquiv + ;(-equiv [coll other] (equiv-sequential coll other)) IIterable (-iterator [coll] @@ -10529,9 +10529,10 @@ reduces them without incurring seq initialization" (do (-write writer "#js ") (print-map - (.map (fn [k] - (MapEntry. (cond-> k (some? (re-matches #"[A-Za-z_\*\+\?!\-'][\w\*\+\?!\-']*" k)) keyword) (unchecked-get obj k) nil)) - (js-keys obj)) + (.map + (js-keys obj) + (fn [k] + (MapEntry. (cond-> k (some? (re-matches #"[A-Za-z_\*\+\?!\-'][\w\*\+\?!\-']*" k)) keyword) (unchecked-get obj k) nil))) pr-writer writer opts)) (array? obj) From 1887fa42ab6bc38d76cf4e6b7caa3491f9621667 Mon Sep 17 00:00:00 2001 From: davidnolen Date: Sun, 8 Jun 2025 23:20:11 -0400 Subject: [PATCH 3/5] * revert spurious change --- src/main/cljs/cljs/core.cljs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/cljs/cljs/core.cljs b/src/main/cljs/cljs/core.cljs index 0815df349..96bfc2547 100644 --- a/src/main/cljs/cljs/core.cljs +++ b/src/main/cljs/cljs/core.cljs @@ -1679,9 +1679,9 @@ reduces them without incurring seq initialization" (aget arr i) not-found))) - ;ISequential - ;IEquiv - ;(-equiv [coll other] (equiv-sequential coll other)) + ISequential + IEquiv + (-equiv [coll other] (equiv-sequential coll other)) IIterable (-iterator [coll] From 865f49909bc19c641c7f0b3ec49e64c28a32e7bc Mon Sep 17 00:00:00 2001 From: davidnolen Date: Sun, 8 Jun 2025 23:41:18 -0400 Subject: [PATCH 4/5] * lower level primitives for map printing --- src/main/cljs/cljs/core.cljs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/cljs/cljs/core.cljs b/src/main/cljs/cljs/core.cljs index 96bfc2547..35058e15a 100644 --- a/src/main/cljs/cljs/core.cljs +++ b/src/main/cljs/cljs/core.cljs @@ -10532,7 +10532,12 @@ reduces them without incurring seq initialization" (.map (js-keys obj) (fn [k] - (MapEntry. (cond-> k (some? (re-matches #"[A-Za-z_\*\+\?!\-'][\w\*\+\?!\-']*" k)) keyword) (unchecked-get obj k) nil))) + (reify + IMapEntry + (-key [_] + (cond-> k (some? (.match k #"[A-Za-z_\*\+\?!\-'][\w\*\+\?!\-']*")) keyword)) + (-val [_] + (unchecked-get obj k))))) pr-writer writer opts)) (array? obj) From 71a000250ee8e6bc0049b2e4f3335d4169fc559e Mon Sep 17 00:00:00 2001 From: davidnolen Date: Mon, 9 Jun 2025 08:19:46 -0400 Subject: [PATCH 5/5] * fix regex --- src/main/cljs/cljs/core.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/cljs/cljs/core.cljs b/src/main/cljs/cljs/core.cljs index 35058e15a..f6a8d24ea 100644 --- a/src/main/cljs/cljs/core.cljs +++ b/src/main/cljs/cljs/core.cljs @@ -10535,7 +10535,7 @@ reduces them without incurring seq initialization" (reify IMapEntry (-key [_] - (cond-> k (some? (.match k #"[A-Za-z_\*\+\?!\-'][\w\*\+\?!\-']*")) keyword)) + (cond-> k (some? (.match k #"^[A-Za-z_\*\+\?!\-'][\w\*\+\?!\-']*$")) keyword)) (-val [_] (unchecked-get obj k))))) pr-writer writer opts))