SuperKamiGuru/foss-mmo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Take the "wh" out of whactormaps.

Browse source 
WeakMaps are NOT ITERABLE in JavaScript for security/GC reasons!!!  I
don't know what to do about this long-term but for now I'm just going
to use a regular hashtable so I can keep making progress on the game!
This commit is contained in:
David Thompson 2024-05-18 18:47:58 -04:00
parent 13b7d93a34
commit de7078ef85
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/goblins/core-types.scm
View file

@ -130,11 +130,11 @@ Type: Any -> Boolean"
(define (whactormap-ref am key) (define (whactormap-ref am key)
(define wht (whactormap-data-wht (actormap-data am))) (define wht (whactormap-data-wht (actormap-data am)))
(weak-key-hashtable-ref wht key #f)) (hashtable-ref wht key #f))
(define (whactormap-set! am key val) (define (whactormap-set! am key val)
(define wht (whactormap-data-wht (actormap-data am))) (define wht (whactormap-data-wht (actormap-data am)))
(weak-key-hashtable-set! wht key val)) (hashtable-set! wht key val))
(define whactormap-metatype (define whactormap-metatype
(make-actormap-metatype 'whactormap whactormap-ref whactormap-set!)) (make-actormap-metatype 'whactormap whactormap-ref whactormap-set!))

12
modules/goblins/core.scm
View file

@ -403,6 +403,10 @@
;; Weak-hash actormaps ;; Weak-hash actormaps
;; =================== ;; ===================
;; UH OH: You cannot iterate JS WeakMaps. This breaks
;; copy-whactormap. So, I switched to using a regular hash table for
;; this game jam. Need more time to think about how to solve this
;; problem...
(define* (make-whactormap #:key [vat-connector #f]) (define* (make-whactormap #:key [vat-connector #f])
"Create and return a reference to a weak-hash actormap. If provided, "Create and return a reference to a weak-hash actormap. If provided,
@ -410,7 +414,7 @@ VAT-CONNECTOR is the syscaller of the containing vat.
Type: (Optional Syscaller) -> WHActormap" Type: (Optional Syscaller) -> WHActormap"
(_make-actormap whactormap-metatype (_make-actormap whactormap-metatype
(make-whactormap-data (make-weak-key-hashtable)) (make-whactormap-data (make-eq-hashtable))
vat-connector)) vat-connector))
;; TODO: again, confusing (see <actormap>) ;; TODO: again, confusing (see <actormap>)
@ -419,10 +423,10 @@ Type: (Optional Syscaller) -> WHActormap"
(define (copy-whactormap am) (define (copy-whactormap am)
"Copy whactormap AM to a new whactormap with the same contents." "Copy whactormap AM to a new whactormap with the same contents."
(define old-ht (whactormap-data-wht (actormap-data am))) (define old-ht (whactormap-data-wht (actormap-data am)))
(define new-ht (make-weak-key-hashtable)) (define new-ht (make-eq-hashtable))
;; Update new-ht with all of old-ht's values ;; Update new-ht with all of old-ht's values
(hashtable-for-each (lambda (key val) (hashtable-for-each (lambda (key val)
(weak-key-hashtable-set! new-ht key val)) (hashtable-set! new-ht key val))
old-ht) old-ht)
;; Return newly made whactormap ;; Return newly made whactormap
(_make-actormap whactormap-metatype (_make-actormap whactormap-metatype
@ -482,7 +486,7 @@ Type: TransActormap -> Void"
(unless (transactormap-data-merged? tm-data) (unless (transactormap-data-merged? tm-data)
(hashtable-for-each (hashtable-for-each
(lambda (key val) (lambda (key val)
(weak-key-hashtable-set! root-wht key val)) (hashtable-set! root-wht key val))
(transactormap-data-delta tm-data)) (transactormap-data-delta tm-data))
(set-transactormap-data-merged?! tm-data #t)) (set-transactormap-data-merged?! tm-data #t))