Update to new Polymode API

[pico8.git] / pico8.el

diff --git a/pico8.el b/pico8.el
index 0bb0d19..dabe69b 100644 (file)
--- a/pico8.el
+++ b/pico8.el
@@ -25,6 +25,7 @@
 (require 'lua-mode)
 (require 'thingatpt)
 (require 'dash)
+(require 'calc-bin)
 
 
 (defgroup pico8 nil
@@ -244,27 +245,52 @@ Make sure it is installed, and present in ‘pico8-executable-paths’")))
 \f
 (defun pico8-gff-current-position ()
   "Calculate the flag position of the cursor."
-  (pm-with-narrowed-to-span (pm-get-innermost-span)
+  (pm-with-narrowed-to-span (pm-innermost-span)
     (let ((row (1- (line-number-at-pos)))
           (col (min 255 (current-column))))
       (+ (/ col 2) (* row 128)))))
 
 (defun pico8-gff-lighter ()
   "Calculate the flag under the cursor."
-  (pm-with-narrowed-to-span (pm-get-innermost-span)
+  (pm-with-narrowed-to-span (pm-innermost-span)
     (let ((row (1- (line-number-at-pos)))
           (col (current-column)))
       (+ (* 128 row) (/ col 2)))))
 
+(defun pico8-gff-eldoc ()
+  "Show information about the flag under the point."
+  (save-excursion
+    (when (cl-oddp (current-column))
+      (backward-char))
+    (when (looking-at "..")
+      (let* ((hex (substring-no-properties (match-string 0)))
+             (int (string-to-number hex 16)))
+        (format "%08d  %3d  %02x"
+                (let ((calc-number-radix 2))
+                  (string-to-number (math-format-radix int)))
+                int int)))))
+
+(defconst pico8-gff-font-lock-keywords
+  '(("..\n?" 0
+     (prog1 nil
+       ;; TODO: Lots of work to do here…
+       (let ((pdl (or (car (overlays-at (match-beginning 0)))
+                      (make-overlay (match-beginning 0) (match-end 0)))))
+         (overlay-put pdl 'after-string " "))))))
+
+
 (define-derived-mode pico8-gff-mode pico8-data-mode
   '(:eval (format "Flag[%d]" (pico8-gff-lighter)))
-  "Major mode for editing flags in PICO-8 cartridges.")
+  "Major mode for editing flags in PICO-8 cartridges."
+  (font-lock-add-keywords nil pico8-gff-font-lock-keywords)
+  (setq-local eldoc-documentation-function #'pico8-gff-eldoc))
 
 (defun pico8-gff-offset-of-flag (flag)
   "Calculate the offset of of flag number FLAG."
   (unless (<= 0 flag 255)
     (error "Valid flag numbers are 0 to 255, inclusive"))
   (+ (* 2 flag) (if (> flag 128) 1 0)))
+
 \f
 (defface pico8-pixel
   '((t (:inherit pico8-data :height 100)))
@@ -286,7 +312,7 @@ Make sure it is installed, and present in ‘pico8-executable-paths’")))
 (defun pico8-gfx-current-position ()
   "Calculate the sprite and in-sprite position of the cursor."
   ;; FIXME: Ensure the span we got was actually the gfx one.
-  (pm-with-narrowed-to-span (pm-get-innermost-span)
+  (pm-with-narrowed-to-span (pm-innermost-span)
     (let ((row (1- (line-number-at-pos)))
           (col (min 127 (current-column))))
       (list (+ (* 16 (/ row 8)) (/ col 8))
@@ -301,7 +327,7 @@ Make sure it is installed, and present in ‘pico8-executable-paths’")))
                  (% (+ 256 n (nth 0 current)) 256)
                  (nth 1 current)
                  (nth 2 current))))
-    (pm-with-narrowed-to-span (pm-get-innermost-span)
+    (pm-with-narrowed-to-span (pm-innermost-span)
       (goto-char (+ (point-min) offset)))))
 
 (defun pico8-backward-sprite (n)
@@ -350,7 +376,7 @@ Make sure it is installed, and present in ‘pico8-executable-paths’")))
 
 (defun pico8-map-lighter ()
   "Calculate the map tile under the cursor."
-  (pm-with-narrowed-to-span (pm-get-innermost-span)
+  (pm-with-narrowed-to-span (pm-innermost-span)
     (let ((row (- (line-number-at-pos) 1))
           (col (current-column)))
       ;; TODO: Show sprite number and flags value
@@ -363,7 +389,7 @@ Make sure it is installed, and present in ‘pico8-executable-paths’")))
 \f
 (defun pico8-sfx-lighter ()
   "Calculate the sound effect under the cursor."
-  (pm-with-narrowed-to-span (pm-get-innermost-span)
+  (pm-with-narrowed-to-span (pm-innermost-span)
     (let ((row (- (line-number-at-pos) 1)))
       (format "%d" row))))
 
@@ -373,7 +399,7 @@ Make sure it is installed, and present in ‘pico8-executable-paths’")))
 \f
 (defun pico8-music-lighter ()
   "Calculate the map tile under the cursor."
-  (pm-with-narrowed-to-span (pm-get-innermost-span)
+  (pm-with-narrowed-to-span (pm-innermost-span)
     (let ((row (- (line-number-at-pos) 1)))
       (format "%d" row))))
 
@@ -549,27 +575,28 @@ See URL ‘https://github.com/mpeterv/luacheck’."
 (defmacro pico8--defchunkmode (name)
   "Define a PICO-8 polymode chunk for section NAME."
   `(defconst ,(intern (concat "pico8--pm-inner-" name))
-     (pm-hbtchunkmode :mode ',(intern (format "pico8-%s-mode" name))
-                      :head-mode 'host
-                      :head-reg ,(format "^__%s__\n" name)
-                      :tail-reg "^__[a-z]\\{3,5\\}__\n\\|^\n\\'")))
-
-(defconst pico8--pm-poly
-  (pm-polymode-multi
-   :hostmode
-   (defconst pico8--pm-host
-     (pm-bchunkmode :mode 'pico8-cartridge-mode))
+     (pm-inner-chunkmode
+      :name ,name
+      :mode ',(intern (format "pico8-%s-mode" name))
+      :head-mode 'host
+      :head-matcher ,(format "^__%s__\n" name)
+      :tail-matcher "^__[a-z]\\{3,5\\}__\n\\|^\n\\'")))
+
+
+(defconst pico8--pm-host
+  (pm-host-chunkmode :name "PICO-8" :mode 'pico8-cartridge-mode))
+
+(define-polymode pico8-mode
+   :hostmode 'pico8--pm-host
    :innermodes (list
                 (pico8--defchunkmode "lua")
                 (pico8--defchunkmode "gfx")
                 (pico8--defchunkmode "gff")
                 (pico8--defchunkmode "map")
                 (pico8--defchunkmode "sfx")
-                (pico8--defchunkmode "music"))))
-
-(define-polymode pico8-mode pico8--pm-poly
-  :lighter "P8"
-  :keymap '(("\C-c\C-r" . pico8-run-cartridge)
+                (pico8--defchunkmode "music"))
+   :lighter "P8"
+   :keymap '(("\C-c\C-r" . pico8-run-cartridge)
             ("\C-c\C-e" . pico8-load-cartridge)
             ("\M-gs" . pico8-goto-sprite)
             ("\M-gS" . pico8-goto-sprite-relevant-to-point)