Skip to content

Commit 270be69

Browse files
committed
Fix MapEntry
Signed-off-by: James Hamlin <jfhamlin@gmail.com>
1 parent 45006e9 commit 270be69

3 files changed

Lines changed: 27 additions & 24 deletions

File tree

pkg/codegen/testdata/codegen/test/core.go

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/stdlib/glojure/core.glj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@
14741474
"Return true if x is a map entry"
14751475
{:added "1.8"}
14761476
[x]
1477-
(instance? java.util.Map$Entry x))
1477+
(instance? github.com$glojurelang$glojure$pkg$lang.MapEntry x))
14781478

14791479
(defn contains?
14801480
"Returns true if key is present in the given collection, otherwise
@@ -1564,14 +1564,14 @@
15641564
"Returns the key of the map entry."
15651565
{:added "1.0"
15661566
:static true}
1567-
[^java.util.Map$Entry e]
1567+
[^github.com$glojurelang$glojure$pkg$lang.MapEntry e]
15681568
(. e (GetKey)))
15691569

15701570
(defn val
15711571
"Returns the value in the map entry."
15721572
{:added "1.0"
15731573
:static true}
1574-
[^java.util.Map$Entry e]
1574+
[^github.com$glojurelang$glojure$pkg$lang.MapEntry e]
15751575
(. e (GetValue)))
15761576

15771577
(defn rseq

scripts/rewrite-core/rewrite.clj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,9 @@
274274
(sexpr-replace 'clojure.lang.PersistentArrayMap/createAsIfByAssoc
275275
'github.com$glojurelang$glojure$pkg$lang.NewPersistentArrayMapAsIfByAssoc)
276276

277+
278+
(sexpr-replace 'java.util.Map$Entry 'github.com$glojurelang$glojure$pkg$lang.MapEntry)
279+
277280
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
278281
;; struct map
279282
(sexpr-replace '(. clojure.lang.PersistentStructMap (createSlotMap keys))

0 commit comments

Comments
 (0)