Use pun in a few places.

Author: Kodiologist

simalq/geometry.hy

@@ -5,7 +5,7 @@
 ;; --------------------------------------------------------------
 
 (require
-  hyrule [unless do-n]
+  hyrule [unless do-n pun]
   simalq.macros [defdataclass defmeth])
 (import
   itertools [chain]
@@ -125,7 +125,7 @@
       (%= y map.height))
     (unless (and (<= 0 x (- map.width 1)) (<= 0 y (- map.height 1)))
       (raise (GeometryError f"Illegal position: {x}, {y}")))
-    (for [[k v] (.items (dict  :map map  :x x  :y y))]
+    (for [[k v] (.items (pun (dict :!map :!x :!y)))]
       ; Call `object.__setattr__` to bypass `dataclass`'s frozen
       ; checks.
       (object.__setattr__ @ k v)))

simalq/quest_definition/__init__.hy

@@ -7,7 +7,7 @@ quest definitions from other files in this directory."
 ;; --------------------------------------------------
 
 (require
-  hyrule [unless])
+  hyrule [unless pun])
 (import
   math [ceil]
   re
@@ -54,14 +54,14 @@ quest definitions from other files in this directory."
     [name "Test Quest"]
     [authors "Mitt Lowporch and Cire Whyhall"]
     [title "Test Quest title"]]
-  (Quest
-    :name name
-    :authors authors
-    :title title
-    :starting-hp starting-hp
+  (pun (Quest
+    :!name
+    :!authors
+    :!title
+    :!starting-hp
     :levels (tuple (gfor
       [i level-args] (enumerate levels)
-      (mk-level :n (+ i 1) #** (kwdict level-args))))))
+      (mk-level :n (+ i 1) #** (kwdict level-args)))))))
 
 (defn mk-level [
   ; Make a level.
@@ -87,16 +87,16 @@ quest definitions from other files in this directory."
         (mk-tile
           (Pos m (+ (get player-start 0) i 1) (get player-start 1))
           tile-spec))))
-  (Level
-    :title title
-    :n n
+  (pun (Level
+    :!title
+    :!n
     :next-level (or next-level (+ n 1))
     :map m
     :player-start (Pos m #* player-start)
-    :poison-intensity poison-intensity
-    :time-limit time-limit
-    :exit-delay exit-delay
-    :timed-exit-start timed-exit-start))
+    :!poison-intensity
+    :!time-limit
+    :!exit-delay
+    :!timed-exit-start)))
 
 (defn parse-text-map [text [map-marks #()] [wrap-x False] [wrap-y False]]
   (setv text (dedent

simalq/tile/__init__.hy

@@ -3,7 +3,7 @@
 ;; --------------------------------------------------------------
 
 (require
-  hyrule [unless defmacro-kwargs]
+  hyrule [unless defmacro-kwargs pun]
   simalq.macros [field-defaults defmeth])
 (import
   copy [deepcopy]
@@ -321,7 +321,7 @@
     (for [[iq-ix field-value] (.items d)]
       (assert (not-in iq-ix Tile.types-by-iq-ix))
       (setv (get Tile.types-by-iq-ix iq-ix)
-        (dict :cls cls :field field :value field-value))))
+        (pun (dict :!cls :!field :value field-value)))))
 
   ; Update `hy.repr`.
   (hy.repr-register cls (fn [x]
@@ -496,6 +496,5 @@
   simalq.tile.monster [Monster]
   simalq.tile.unimplemented [UnimplementedTile])
 
-(setv Tile.superclasses (do-mac (dfor
-  c '[Scenery Item Monster Player]
-  (str c) c)))
+(setv Tile.superclasses (pun (dict
+  :!Scenery :!Item :!Monster :!Player)))

simalq/tile/monster.hy

@@ -3,7 +3,7 @@
 ;; --------------------------------------------------------------
 
 (require
-  hyrule [unless do-n list-n defmacro-kwargs case]
+  hyrule [unless do-n list-n defmacro-kwargs case pun]
   simalq.macros [field-defaults pop-integer-part defmeth]
   simalq.tile [deftile])
 (import
@@ -19,6 +19,8 @@
   simalq.tile.scenery [Scenery walkability can-occupy?])
 (setv  T True  F False)
 
+(pun
+
 ;; --------------------------------------------------------------
 ;; * Declarations
 ;; --------------------------------------------------------------
@@ -108,7 +110,7 @@
 
     ; Otherwise, try a ranged attack.
     (when (and (not attack) (or @damage-shot @special-shot))
-      (for [target (ray :pos pos :direction d :length
+      (for [target (ray :!pos :direction d :length
           (min (or @shot-range Inf) G.rules.reality-bubble-size))]
         (when (= target G.player.pos)
           (setv attack 'shot)
@@ -226,9 +228,9 @@
             tile (at intermediate)
             (and (isinstance tile Scenery) tile.superblock))))
           (setx target (+ intermediate d))
-          (can-occupy? target :monster? T :ethereal-to ethereal-to))
+          (can-occupy? target :monster? T :!ethereal-to))
         (do
-          (setv [target wly] (walkability @pos d :monster? T :ethereal-to ethereal-to))
+          (setv [target wly] (walkability @pos d :monster? T :!ethereal-to))
           (= wly 'walk))))
 
     (unless (ok-target)
@@ -282,7 +284,7 @@
     (setv [d @wander-state] (@pseudorandom-dir @wander-state))
     (unless d
       (return))
-    (setv [target wly] (walkability @pos d :monster? T :ethereal-to ethereal-to))
+    (setv [target wly] (walkability @pos d :monster? T :!ethereal-to))
     (unless (= wly 'walk)
       (return))
     (when (> (dist G.player.pos target) G.rules.reality-bubble-size)
@@ -354,7 +356,7 @@
           ; end summoning, wasting the consumed summon power.
           (return)))
       ; We have a target. Place the monster.
-      (@make target stem :hp hp))
+      (@make target stem :!hp))
     T))
 
 ;; --------------------------------------------------------------
@@ -446,8 +448,8 @@
         ; We need `[hp hp]` above to be sure we get a separate variable
         ; for each closure.
         [((get Tile.types "generator")
-          :pos pos
-          :hp hp
+          :!pos
+          :!hp
           :summon-class ~(get (.partition name " ") 2)
           :summon-hp (>> te-v2 5)
           :summon-frequency (get
@@ -760,8 +762,8 @@
 (setv (get Tile.types-by-iq-ix 135) (fn [pos _ te-v2]
   ; Unlike IQ, we represent the spider and its web separately.
   [
-    ((get Tile.types "giant spider") :pos pos :hp te-v2)
-    ((get Tile.types "web") :pos pos)]))
+    ((get Tile.types "giant spider") :!pos :hp te-v2)
+    ((get Tile.types "web") :!pos)]))
 
 
 (deftile "Z " "a turret" Stationary
@@ -861,3 +863,5 @@
          T)))
 
   :flavor "This mermaid is all giggles and smiles, but she's obviously trying to kill you. She sings an enchanted song that can briefly enrapture you, holding you in place in a momentary crisis of conscience. The words go like this: \"Oh please, kind sir, spare me. Oh please, sir, get me back to the water. Let me live, oh let me live.\" Pretty rude of her to misgender you like that.\n\n    Hey guys, did you know that…")
+
+)

tests/test_geometry.hy

@@ -2,7 +2,7 @@
 
 
 (require
-  hyrule [ebranch])
+  hyrule [ebranch pun])
 (import
   copy [deepcopy]
   hyrule [thru]
@@ -13,6 +13,9 @@
 (setv  T True  F False)
 
 
+(pun
+
+
 (defn test-map []
   (setv  w 5  h 3)
   (setv m (Map.from-data :wrap-x F :wrap-y F :data
@@ -130,7 +133,7 @@
 (defn test-adjacent? []
   (defn all-adjacencies [[wrap-x F] [wrap-y F]]
     "Get all adjacencies from (0, 0)."
-    (setv m (Map.make :wrap-x wrap-x :wrap-y wrap-y :width 4 :height 5))
+    (setv m (Map.make :!wrap-x :!wrap-y :width 4 :height 5))
     (lfor
       y (reversed (range m.height))
       x (range m.width)
@@ -165,7 +168,7 @@
 (defn test-dir-to []
   (defn all-dirs [[wrap-x F] [wrap-y F]]
     "Get all directions from (1, 1)."
-    (setv m (Map.make :wrap-x wrap-x :wrap-y wrap-y :width 5 :height 6))
+    (setv m (Map.make :!wrap-x :!wrap-y :width 5 :height 6))
     (lfor
       y (reversed (range m.height))
       x (range m.width)
@@ -210,7 +213,7 @@
   (setv d 7)
   (defn all-dists [[wrap-x F] [wrap-y F]]
     "Get all distances from (1, 1)."
-    (setv m (Map.make :wrap-x wrap-x :wrap-y wrap-y :width d :height d))
+    (setv m (Map.make :!wrap-x :!wrap-y :width d :height d))
     (lfor
       y (reversed (range m.height))
       x (range m.width)
@@ -252,8 +255,7 @@
 
 (defn test-burst []
   (for [size [2 6]  exclude-center [F T]  wrap-x [F T]  wrap-y [F T]]
-    (setv m (Map.make :width 5 :height 7
-      :wrap-x wrap-x :wrap-y wrap-y))
+    (setv m (Map.make :!wrap-x :!wrap-y :width 5 :height 7))
     (setv p0 (Pos m 1 1))
     (setv b (tuple (burst p0 size exclude-center)))
     ; A burst shouldn't duplicate positions.
@@ -316,3 +318,6 @@
   (setv m (Map.make :width 20 :height 20 :wrap-x T :wrap-y T))
   (setv b (list (burst (Pos m 4 7) Inf)))
   (assert (= (len b) (* 20 20))))
+
+
+)