Optimizations: JUMP-loops, FOR loops, and variable access

examples/21locals.txt

@@ -1,8 +1,15 b''
 
 # locals
 
+local variable
+variable = 5
+*pl variable
+global = 42
+
 var = 1
 dynamic { local var = 2 & *pl var }
 *pl var
 
+dynamic { *pl 'Здесь нет локальных переменных' }
+
 ----- locals ---------------

examples/bench.txt

@@ -1,22 +1,37 b''
 
 # start
+act 'Протестировать цикл на метках':
+  gs 'test_jump'
+end
+act 'Протестировать цикл for':
+  gs 'test_for'
+end
+-
+
+# test_jump
+*nl
 i = 0
+local start_time = MSECSCOUNT
 :loop
 if i < 10000000:
   i += 1
   if (i MOD 100000) = 0:
     *p '.'
   end
-  jump loop
+  jump 'loop'
 end
-looptime = MSECSCOUNT
+local looptime = MSECSCOUNT - start_time
 *nl 'JUMP: Выполнено за <<looptime>> миллисекунд'
+-
+
+# test_for
 *nl
+local start_time = MSECSCOUNT
 for i = 0 to 10000000:
   if (i MOD 100000) = 0:
     *p '.'
   end
 end
-fortime = MSECSCOUNT - looptime
-*nl 'FOR: Выполнено за <<fortime>> миллисекунд'
+local looptime = MSECSCOUNT - start_time
+*nl 'FOR: Выполнено за <<looptime>> миллисекунд'
 -

extras/body.html

@@ -1,26 +1,26 b''
 
 <div id="qsp">
   <div class="qsp-col qsp-col1">
-    <div id="qsp-main" class="qsp-frame">&nbsp;</div>
-    <div id="qsp-acts" class="qsp-frame">&nbsp;</div>
+    <div id="qsp-main" class="qsp-frame">&zwnj;</div>
+    <div id="qsp-acts" class="qsp-frame">&zwnj;</div>
     <input id="qsp-input" class="qsp-frame">
   </div>
   <div class="qsp-col qsp-col2">
-    <div id="qsp-stat" class="qsp-frame">&nbsp;</div>
-    <div id="qsp-objs" class="qsp-frame">&nbsp;</div>
+    <div id="qsp-stat" class="qsp-frame">&zwnj;</div>
+    <div id="qsp-objs" class="qsp-frame">&zwnj;</div>
   </div>
   <div class="qsp-col qsp-col3">
     <a id="qsp-btn-save"><img></a>
     <a id="qsp-btn-open"><img></a>
   </div>
 </div>
 
 <div id="qsp-dropdown">
 </div>
 
 <div id="qsp-image-container" class="center-on-screen">
   <img id="qsp-image">
 </div>
 
 <style id="qsp-style">
 </style>

src/api.ps

@@ -1,551 +1,481 b''
 
 (in-package sugar-qsp.api)
 
 ;;; API deals with DOM manipulation and some bookkeeping for the
 ;;; intrinsics, namely variables
 ;;; API is an implementation detail and has no QSP documentation. It
 ;;; doesn't call intrinsics
 
 ;;; Utils
 
 (defun make-act-html (title img)
   (+ "<a class='qsp-act' href='" (href-call call-act title) "' onmouseover='" (inline-call select-act title) "'>"
      (if img (+ "<img src='" img "'>") "")
      title
      "</a>"))
 
 (defun make-menu-item-html (num title img loc)
   (+ "<a href='" (href-call finish-menu loc) "'>"
      (if img (+ "<img src='" img "'>") "")
      title
      "</a>"))
 
 (defun make-obj (title img selected)
   (+ "<li onclick='" (inline-call select-obj title img) "'>"
      "<a class='qsp-obj" (if selected " qsp-obj-selected" "") "'>"
      (if img (+ "<img src='" img "'>") "")
      title
      "</a>"))
 
 (defun make-menu-delimiter ()
   "<hr>")
 
 (defun report-error (text)
   (alert text))
 
 (defun start-sleeping ()
   (chain (by-id "qsp") class-list (add "disable")))
 
 (defun finish-sleeping ()
   (chain (by-id "qsp") class-list (remove "disable")))
 
 (defun sleep (msec)
   (with-sleep (resume)
     (set-timeout resume msec)))
 
 (defun init-dom ()
   ;; Save/load buttons
   (let ((btn (by-id "qsp-btn-save")))
     (setf (@ btn onclick) savegame)
     (setf (@ btn href) "#"))
   (let ((btn (by-id "qsp-btn-open")))
     (setf (@ btn onclick) opengame)
     (setf (@ btn href) "#"))
   ;; Close image on click
   (setf (@ (by-id "qsp-image-container") onclick)
         show-image)
   ;; Enter in input field
   (setf (@ (get-frame :input) onkeyup)
         on-input-key)
   ;; Close the dropdown on any click
   (setf (@ window onclick)
         (lambda (event)
           (setf (@ window mouse)
                 (list (@ event page-x)
                       (@ event page-y)))
           (finish-menu nil))))
 
 (defun call-serv-loc (var-name &rest args)
-  (let ((loc-name (get-var var-name 0 :str)))
+  (let ((loc-name (get-global var-name 0)))
     (when loc-name
       (let ((loc (getprop (root locs) loc-name)))
         (when loc
           (call-loc loc-name args))))))
 
 (defun filename-game (filename)
   (let ((game-name (chain filename (match "(.*/)?([^.]+)(\\.[a-zA-Z]+)?") 2))))
   (getprop (root games) game-name))
 
 (defun run-game (name)
   (let ((game (filename-game name)))
     (setf (root main-game) name)
     ;; Replace locations with the new game's 
     (setf (root locs) game)
     (funcall (getprop game
                       (chain *object (keys game) 0))
              (list))))
 
 ;;; Misc
 
 (defun newline (key)
   (append-id (key-to-id key) "<br>" t))
 
 (defun clear-id (id)
   (setf (inner-html (by-id id)) ""))
 
 (defun escape-html (text)
   (chain text
          (replace (regex "/&/g") "&amp;")
          (replace (regex "/</g") "&lt;")
          (replace (regex "/>/g") "&gt;")
          (replace (regex "/\"/g") "&quot;")
          (replace (regex "/'/g") "&apos;")))
 
 (defun prepare-contents (s &optional force-html)
-  (if (or force-html (get-var "USEHTML" 0 :num))
+  (setf s (chain s (to-string)))
+  (if (or force-html (get-global "USEHTML" 0))
       s
       (escape-html s)))
 
 (defun get-id (id &optional force-html)
   (inner-html (by-id id)))
 
 (defun set-id (id contents &optional force-html)
   (setf (inner-html (by-id id)) (prepare-contents contents force-html)))
 
 (defun append-id (id contents &optional force-html)
   (when contents
     (incf (inner-html (by-id id)) (prepare-contents contents force-html))))
 
 (defun on-input-key (ev)
   (when (= 13 (@ ev key-code))
     (chain ev (prevent-default))
-    (call-serv-loc "USERCOM")))
+    (call-serv-loc "$USERCOM")))
 
 ;;; Function calls
 
 (defun init-args (args)
   (dotimes (i (length args))
     (let ((arg (elt args i)))
       (if (numberp arg)
           (set-var args i :num arg)
           (set-var args i :str arg)))))
 
 (defun get-result ()
-  (if (not (equal "" (get-var "RESULT" 0 :str)))
-      (get-var "RESULT" 0 :str)
-      (get-var "RESULT" 0 :num)))
+  (or (get-global "$RESULT" 0)
+      (get-global "RESULT" 0)))
 
 (defun call-loc (name args)
   (setf name (chain name (to-upper-case)))
   (with-frame
       (with-call-args args
         (funcall (getprop (root locs) name)))))
 
 (defun call-act (title)
   (with-frame
       (funcall (getprop (root acts) title :act))))
 
 ;;; Text windows
 
 (defun key-to-id (key)
   (case key
     (:all "qsp")
     (:main "qsp-main")
     (:stat "qsp-stat")
     (:objs "qsp-objs")
     (:acts "qsp-acts")
     (:input "qsp-input")
     (:image "qsp-image")
     (:dropdown "qsp-dropdown")
     (t (report-error "Internal error!"))))
 
 (defun get-frame (key)
   (by-id (key-to-id key)))
 
 (defun add-text (key text)
   (append-id (key-to-id key) text))
 
 (defun get-text (key)
   (get-id (key-to-id key)))
 
 (defun clear-text (key)
   (clear-id (key-to-id key)))
 
 (defun enable-frame (key enable)
   (let ((obj (get-frame key)))
     (setf (@ obj style display) (if enable "block" "none"))
     (void)))
 
 ;;; Actions
 
 (defun add-act (title img act)
   (setf (getprop (root acts) title)
         (create :title title :img img :act act :selected nil))
   (update-acts))
 
 (defun del-act (title)
   (delete (getprop (root acts) title))
   (update-acts))
 
 (defun clear-act ()
   (setf (root acts) (create))
   (update-acts))
 
 (defun update-acts ()
   (clear-id "qsp-acts")
   (let ((elt (by-id "qsp-acts")))
     (for-in (title (root acts))
             (let ((obj (getprop (root acts) title)))
               (incf (inner-html elt) (make-act-html title (getprop obj :img)))))))
 
 (defun select-act (title)
   (loop :for (k v) :of (root acts)
      :do (setf (getprop v :selected) nil))
   (setf (getprop (root acts) title :selected) t)
-  (call-serv-loc "ONACTSEL"))
+  (call-serv-loc "$ONACTSEL"))
 
 ;;; "Syntax"
 
 (defun qspfor (name index from to step body)
   (for ((i from))
        ((< i to))
        ((incf i step))
        (set-var name index :num i)
        (unless (await (funcall body))
          (return-from qspfor))))
 
-;;; Variable class
-
-(defun *var (name)
-  ;; From strings to numbers
-  (setf (@ this :indexes) (create))
-  ;; From numbers to {num: 0, str: ""} objects
-  (setf (@ this :values) (list))
-  (void))
-
-(defun new-value ()
-  (create :num 0 :str ""))
-
-(setf (@ *var prototype index-num)
-      (lambda (index)
-        (let ((num-index
-               (if (stringp index)
-                   (if (in index (@ this :indexes))
-                       (getprop (@ this :indexes) index)
-                       (let ((n (length (@ this :values))))
-                         (setf (getprop (@ this :indexes) index) n)
-                         n))
-                   index)))
-          (unless (in num-index (@ this :values))
-            (setf (elt (@ this :values) num-index) (new-value)))
-          num-index)))
-
-(setf (@ *var prototype get)
-      (lambda (index slot)
-        (unless (or index (= 0 index))
-          (setf index (1- (length (@ this :values)))))
-        (getprop (@ this :values) (chain this (index-num index)) slot)))
-
-(setf (@ *var prototype set)
-      (lambda (index slot value)
-        (unless (or index (= 0 index))
-          (setf index (length (@ this :values))))
-        (case slot
-          (:num (setf value (chain *number (parse-int value))))
-          (:str (setf value (chain value (to-string)))))
-        (setf (getprop (@ this :values)
-                       (chain this (index-num index))
-                       slot) value)
-        (void)))
-
-(setf (@ *var prototype kill)
-      (lambda (index)
-        (setf (elt (@ this :values) (chain this (index-num index)))
-              (new-value))
-        (delete (getprop 'this :indexes index))))
-
 ;;; Variables
 
-(defun var-real-name (name)
-  (if (= (@ name 0) #\$)
-      (values (chain name (substr 1)) :str)
-      (values name :num)))
-
-(defun ensure-var (name)
-  (setf name (chain name (to-upper-case)))
-  (let ((store (var-ref name)))
-    (unless store
-      (setf store (new (*var name)))
-      (setf (getprop (root vars) name) store))
-    store))
-
-(defun var-ref (name)
-  (let ((local-store (current-local-frame)))
-    (cond ((and local-store (in name local-store))
-           (getprop local-store name))
-          ((in name (root vars))
-           (getprop (root vars) name))
-          (t nil))))
+(defun new-var (&optional index)
+  (let ((v (list)))
+    (when index
+      (setf (elt v index) (if (eq #\$ (elt slot 0)) "" 0)))
+    (setf (@ v indexes) (create))
+    v))
 
-(defun get-var (name index slot)
-  (chain (ensure-var name) (get index slot)))
-
-(defun set-var (name index slot value)
-  (chain (ensure-var name) (set index slot value))
-  (let ((serv-var (getprop serv-vars name)))
-    (when serv-var
-      (funcall (@ serv-var :body)
-               (get-var name index (@ serv-var :slot))
-               index)))
-  (void))
+(defun set-str-element (slot index value)
+  (if (in index (getprop slot :indexes))
+      (setf (elt (getprop slot) 
+                 (getprop slot :indexes index))
+            value)
+      (progn
+        (chain slot (push value))
+        (setf (elt slot index)
+              (length slot)))))
 
-(defun get-array (name)
-  (setf name (chain name (to-upper-case)))
-  (ensure-var name))
+(defun set-any-element (slot index value)
+  (if (numberp index)
+      (setf (elt slot index) value)
+      (set-str-element slot index value)))
 
-(defun set-array (name value)
-  (setf name (chain name (to-upper-case)))
-  (let ((store (ensure-var name)))
-    (setf (@ store :values) (@ value :values))
-    (setf (@ store :indexes) (@ value :indexes)))
-  (void))
+(defun get-element (slot index)
+  (if (numberp index)
+      (elt slot index)
+      (elt slot (getprop slot :indexes index))))
 
-(defun kill-var (name &optional index)
+(defun get-global (name index)
+  (elt (getprop (root vars) name) index))
+
+(defun kill-var (store name &optional index)
   (setf name (chain name (to-upper-case)))
   (if (and index (not (= 0 index))) 
       (chain (getprop (root vars) name) (kill index))
       (delete (getprop (root vars) name)))
   (void))
 
 (defun array-size (name)
   (@ (var-ref name) :values length))
 
 ;;; Locals
 
 (defun push-local-frame ()
   (chain (root locals) (push (create)))
   (void))
 
 (defun pop-local-frame ()
   (chain (root locals) (pop))
   (void))
 
 (defun current-local-frame ()
   (elt (root locals) (1- (length (root locals)))))
 
-(defun new-local (name)
-  (let ((frame (current-local-frame)))
-    (unless (in name frame)
-      (setf (getprop frame name) (create)))
-    (void)))
-
 ;;; Objects
 
 (defun select-obj (title img)
   (loop :for (k v) :of (root objs)
      :do (setf (getprop v :selected) nil))
   (setf (getprop (root objs) title :selected) t)
-  (call-serv-loc "ONOBJSEL" title img))
+  (call-serv-loc "$ONOBJSEL" title img))
 
 (defun update-objs ()
   (let ((elt (by-id "qsp-objs")))
     (setf (inner-html elt) "<ul>")
     (loop :for (name obj) :of (root objs)
        :do (incf (inner-html elt)
                  (make-obj name (@ obj :img) (@ obj :selected))))
     (incf (inner-html elt) "</ul>")))
 
 ;;; Menu
 
 (defun open-menu (menu-data)
   (let ((elt (get-frame :dropdown))
         (i 0))
     (loop :for item :in menu-data
        :do (incf i)
        :do (incf (inner-html elt)
                  (if (eq item :delimiter)
                      (make-menu-delimiter i)
                      (make-menu-item-html i
                                           (@ item :text)
                                           (@ item :icon)
                                           (@ item :loc)))))
     (let ((mouse (@ window mouse)))
       (setf (@ elt style left) (+ (elt mouse 0) "px"))
       (setf (@ elt style top) (+ (elt mouse 1) "px"))
       ;; Make sure it's inside the viewport
       (when (> (@ document body inner-width)
                (+ (elt mouse 0) (@ elt inner-width)))
         (incf (@ elt style left) (@ elt inner-width)))
       (when (> (@ document body inner-height)
                (+ (elt mouse 0) (@ elt inner-height)))
         (incf (@ elt style top) (@ elt inner-height))))
     (setf (@ elt style display) "block")))
 
 (defun finish-menu (loc)
   (when (root menu-resume)
     (let ((elt (get-frame :dropdown)))
       (setf (inner-html elt) "")
       (setf (@ elt style display) "none")
       (funcall (root menu-resume))
       (setf (root menu-resume) nil))
     (when loc
       (call-loc loc)))
   (void))
 
 (defun menu (menu-data)
   (with-sleep (resume)
     (open-menu menu-data)
     (setf (root menu-resume) resume))
   (void))
 
 ;;; Content
 
 (defun clean-audio ()
   (loop :for k :in (chain *object (keys (root playing)))
      :for v := (getprop (root playing) k)
      :do (when (@ v ended)
            (delete (@ (root playing) k)))))
 
 (defun show-image (path)
   (let ((img (get-frame :image)))
     (cond (path
            (setf (@ img src) path)
            (setf (@ img style display) "flex"))
           (t
            (setf (@ img src) "")
            (setf (@ img style display) "hidden")))))
 
 (defun show-inline-images (frame-name images)
   (let ((frame (get-frame frame-name))
         (text ""))
     (incf text "<div style='position:relative; display: inline-block'>")
     (incf text (+ "<img src='" (@ images 0) "'>"))
     (loop :for image :in (chain images (slice 1))
        :do (incf text
                  (+ "<img style='position:absolute' src='" image "'>")))
     (incf text "</div>")
     (incf (inner-html frame) text)))
 
 (defun rgb-string (rgb)
   (let ((red (ps::>> rgb 16))
         (green (logand (ps::>> rgb 8) 255))
         (blue (logand rgb 255)))
     (flet ((rgb-to-hex (comp)
              (let ((hex (chain (*number comp) (to-string 16))))
                (if (< (length hex) 2)
                    (+ "0" hex)
                    hex))))
       (+ "#" (rgb-to-hex red) (rgb-to-hex green) (rgb-to-hex red)))))
 
 ;;; Saves
 
 (defun opengame ()
   (let ((element (chain document (create-element :input))))
     (chain element (set-attribute :type :file))
     (chain element (set-attribute :id :qsp-opengame))
     (chain element (set-attribute :tabindex -1))
     (chain element (set-attribute "aria-hidden" t))
     (setf (@ element style display) :block)
     (setf (@ element style visibility) :hidden)
     (setf (@ element style position) :fixed)
     (setf (@ element onchange)
           (lambda (event)
             (let* ((file (@ event target files 0))
                    (reader (new (*file-reader))))
               (setf (@ reader onload)
                     (lambda (ev)
                       (block nil
                         (let ((target (@ ev current-target)))
                           (unless (@ target result)
                             (return))
                           (base64-to-state (@ target result))
                           (unstash-state)))))
               (chain reader (read-as-text file)))))
     (chain document body (append-child element))
     (chain element (click))
     (chain document body (remove-child element))))
 
 (defun savegame ()
   (let ((element (chain document (create-element :a))))
     (chain element (set-attribute :href (+ "data:text/plain;charset=utf-8," (state-to-base64))))
     (chain element (set-attribute :download "savegame.sav"))
     (setf (@ element style display) :none)
     (chain document body (append-child element))
     (chain element (click))
     (chain document body (remove-child element))))
 
 (defun stash-state (args)
-  (call-serv-loc "ONGSAVE")
+  (call-serv-loc "$ONGSAVE")
   (setf (root state-stash)
         (chain *j-s-o-n (stringify
                          (create :vars (root vars)
                                  :objs (root objs)
                                  :loc-args args
                                  :msecs (- (chain *date (now)) (root started-at))
                                  :timer-interval (root timer-interval)
                                  :main-html (inner-html
                                              (get-frame :main))
                                  :stat-html (inner-html
                                              (get-frame :stat))
                                  :next-location (root current-location)))))
   (void))
 
 (defun unstash-state ()
   (let ((data (chain *j-s-o-n (parse (root state-stash)))))
     (clear-act)
     (setf (root vars) (@ data :vars))
     (loop :for k :in (chain *object (keys (root vars)))
        :do (chain *object (set-prototype-of (getprop (root vars) k)
                                             (@ *var prototype))))
     (setf (root started-at) (- (chain *date (now)) (@ data :msecs)))
     (setf (root objs) (@ data :objs))
     (setf (root current-location) (@ data :next-location))
     (setf (inner-html (get-frame :main))
           (@ data :main-html))
     (setf (inner-html (get-frame :stat))
           (@ data :stat-html))
     (update-objs)
     (set-timer (@ data :timer-interval))
-    (call-serv-loc "ONGLOAD")
+    (call-serv-loc "$ONGLOAD")
     (call-loc (root current-location) (@ data :loc-args))
     (void)))
 
 (defun state-to-base64 ()
   (btoa (encode-u-r-i-component (root state-stash))))
 
 (defun base64-to-state (data)
   (setf (root state-stash) (decode-u-r-i-component (atob data))))
 
 ;;; Timers
 
 (defun set-timer (interval)
   (setf (root timer-interval) interval)
   (clear-interval (root timer-obj))
   (setf (root timer-obj)
         (set-interval
          (lambda ()
-           (call-serv-loc "COUNTER"))
+           (call-serv-loc "$COUNTER"))
          interval)))
 
 ;;; Special variables
 
 (defvar serv-vars (create))
 
 (define-serv-var backimage (:str path)
   (setf (@ (get-frame :main) style background-image) path))
 
 (define-serv-var bcolor (:num color)
   (setf (@ (get-frame :all) style background-color) (rgb-string color)))
 
 (define-serv-var fcolor (:num color)
   (setf (@ (get-frame :all) style color) (rgb-string color)))
 
 (define-serv-var lcolor (:num color)
   (setf (@ (get-frame :style) inner-text)
         (+ "a { color: " (rgb-string color) ";}")))
 
 (define-serv-var fsize (:num size)
   (setf (@ (get-frame :all) style font-size) size))
 
 (define-serv-var fname (:str font-name)
   (setf (@ (get-frame :all) style font-family) (+ font-name ",serif")))

src/package.lisp

@@ -1,99 +1,104 b''
 
 (in-package cl-user)
 
 (defpackage :sugar-qsp.js)
 
 (defpackage :sugar-qsp.main
   (:use :cl :ps :sugar-qsp.js)
   (:export #:api-call #:by-id
            #:root #:in
            #:vars #:objs #:current-location
            #:started-at #:timer-interval #:timer-obj
            #:state-stash #:playing #:locals
            #:acts #:locs #:games))
 
+(defpackage :code-walker
+  (:use :cl)
+  (:export #:deftransform
+           #:deftransform-stop
+           #:walk
+           #:whole
+           #:walk-continue))
+
 ;;; API functions
 (defpackage :sugar-qsp.api
   (:use :cl :ps :sugar-qsp.main :sugar-qsp.js)
   (:export #:with-frame #:with-call-args
            #:stash-state
 
            #:report-error #:sleep #:init-dom #:call-serv-loc
            #:newline #:clear-id #:prepare-contents #:get-id #:set-id #:append-id
            #:init-args #:get-result #:call-loc #:call-act
            #:get-frame #:add-text #:get-text #:clear-text #:enable-frame
            #:add-act #:del-act #:clear-act #:update-acts
            #:qspfor
            #:*var #:new-value #:index-num #:get #:set #:kill
            #:var-real-name #:ensure-var #:var-ref #:get-var #:set-var
            #:get-array #:set-array #:kill-var #:array-size
            #:push-local-frame #:pop-local-frame #:current-local-frame #:new-local
            #:update-objs
            #:menu
            #:clean-audio
            #:show-image
            #:opengame #:savegame
            ))
 
 ;;; QSP library functions and macros
 (defpackage :sugar-qsp.lib
   (:use :cl :ps :sugar-qsp.main :sugar-qsp.js)
-  (:local-nicknames (#:api :sugar-qsp.api))
+  (:local-nicknames (#:api :sugar-qsp.api)
+                    (#:walker :code-walker))
   (:export #:str #:exec #:qspblock #:qspfor #:game #:location
            #:qspcond #:qspvar #:set #:local #:jump
 
            #:killvar #:killall
            #:obj #:loc #:no
            #:qspver #:curloc
            #:rnd #:qspmax #:qspmin
            #:arrsize #:len
            #:mid #:ucase #:lcase #:trim #:replace #:val #:qspstr
            #:exit #:desc
            #:showstat #:msg
            #:showacts #:delact #:cla
            #:showobjs #:countobj #:getobj
            #:isplay
            #:view
            #:showinput
            #:wait #:settimer
            #:local
            #:opengame #:savegame
 
            #:goto #:xgoto
            #:rand
            #:copyarr #:arrpos #:arrcomp
            #:instr #:isnum #:strcomp #:strfind #:strpos
            #:iif
            #:gosub #:func
            #:dynamic #:dyneval
            #:main-p #:main-pl #:main-nl #:maintxt #:desc #:main-clear
            #:stat-p #:stat-pl #:stat-nl #:stattxt #:stat-clear #:cls
            #:curacts
            #:addobj #:delobj #:killobj
            #:menu
            #:play #:close #:closeall
            #:refint
            #:usertxt #:cmdclear #:input
            #:msecscount
            #:rgb
            #:openqst #:addqst #:killqst
            ))
 
 (setf (ps:ps-package-prefix "SUGAR-QSP.MAIN") "qsp_")
 (setf (ps:ps-package-prefix "SUGAR-QSP.API") "qsp_api_")
 (setf (ps:ps-package-prefix "SUGAR-QSP.LIB") "qsp_lib_")
 
-(defpackage :code-walker
-  (:use :cl)
-  (:export #:deftransform
-           #:walk))
-
 ;;; The compiler
 (defpackage :sugar-qsp
   (:use :cl)
   (:local-nicknames (#:p #:esrap)
                     (#:lib :sugar-qsp.lib)
                     (#:api :sugar-qsp.api)
-                    (#:main :sugar-qsp.main))
+                    (#:main :sugar-qsp.main)
+                    (#:walker :code-walker))
   (:export #:parse-file #:entry-point))
 

src/parser.lisp

@@ -1,627 +1,623 b''
 
 (in-package sugar-qsp)
 
 ;;;; Parses TXT source to an intermediate representation
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defparameter *max-args* 10))
 
 ;;; Utility
 
 (defun remove-nth (list nth)
   (append (subseq list 0 nth)
           (subseq list (1+ nth))))
 
 (defun not-quote (char)
   (not (eql #\' char)))
 
 
 (defun not-doublequote (char)
   (not (eql #\" char)))
 
 (defun not-brace (char)
   (not (eql #\} char)))
 
 (defun not-integer (string)
   (when (find-if-not #'digit-char-p string)
     t))
 
 (defun not-newline (char)
   (not (eql #\newline char)))
 
 (defun id-any-char (char)
   (and
    (not (digit-char-p char))
    (not (eql #\newline char))
    (not (find char " 	!:&=<>+-*/,'\"()[]{}"))))
 
 (defun intern-first (list)
   (list* (intern (string-upcase (first list)) :lib)
          (rest list)))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun remove-nil (list)
     (remove nil list)))
 
 (defun binop-rest (list)
   (destructuring-bind (ws1 operator ws2 operand2)
       list
     (declare (ignore ws1 ws2))
-    (list (intern (string-upcase operator) :lib) operand2)))
+    (list (intern (string-upcase operator) "SUGAR-QSP.LIB") operand2)))
 
 (defun do-binop% (left-op other-ops)
   (if (null other-ops)
       left-op
       (destructuring-bind ((operator right-op) &rest rest-ops)
           other-ops
         (if (and (listp left-op)
                  (eq (first left-op)
                      operator))
             (do-binop% (append left-op (list right-op)) rest-ops)
             (do-binop% (list operator left-op right-op) rest-ops)))))
 
 (defun do-binop (list)
   (destructuring-bind (left-op rest-ops)
       list
     (do-binop% left-op
       (mapcar #'binop-rest rest-ops))))
 
 (p:defrule line-continuation (and #\_ #\newline)
   (:constant nil))
 
 (p:defrule text-spaces (+ (or #\space #\tab line-continuation))
   (:text t))
 
 (p:defrule spaces (+ (or #\space #\tab line-continuation))
   (:constant nil)
   (:error-report nil))
 
 (p:defrule spaces? (* (or #\space #\tab line-continuation))
   (:constant nil)
   (:error-report nil))
 
 (p:defrule colon #\:
   (:constant nil))
 
 (p:defrule equal #\=
   (:constant nil))
 
 (p:defrule alphanumeric (alphanumericp character))
 
 (p:defrule not-newline (not-newline character))
 
 (p:defrule squote-esc "''"
   (:lambda (list)
     (p:text (elt list 0))))
 
 (p:defrule dquote-esc "\"\""
   (:lambda (list)
     (p:text (elt list 0))))
 
 (p:defrule sstring-chars (+ (and (and (p:! "<<") (p:! (p:~ "\"exec:")))
                                  (or squote-esc (not-quote character))))
   (:lambda (list)
     (p:text (mapcar #'second list))))
 
 (p:defrule dstring-chars (+ (and (and (p:! "<<") (p:! (p:~ "'exec:")))
                                  (or dquote-esc (not-doublequote character))))
   (:lambda (list)
     (p:text (mapcar #'second list))))
 
 ;;; Identifiers
 
 (defparameter *keywords* '(act addlib addobj addqst and arrcomp arrpos arrsize cla clear *clear close clr *clr cls cmdclear cmdclr copyarr counter countobj curacts curloc debug delact dellib delobj desc disablescroll disablesubex dynamic dyneval else elseif end exit for freelib func getobj gosub goto gs gt if iif img *img inclib input instr isnum isplay jump killall killobj killqst killvar lcase lcolor len let loc local maintxt max menu mid min mod msecscount msg nl *nl no nosave obj opengame openqst or p *p pl *pl play qspver rand refint replace rgb rnd savegame selact selobj set settimer showacts showinput showobjs showstat stattxt step str strcomp strfind strpos to trim ucase unsel unselect usercom user_text usrtxt val view wait xgoto xgt))
 
 (defun trim-$ (str)
   (if (char= #\$ (elt str 0))
       (subseq str 1)
       str))
 
 (defun qsp-keyword-p (id)
   (member (intern (trim-$ (string-upcase id))) *keywords*))
 
 (defun not-qsp-keyword-p (id)
   (not (member (intern (trim-$ (string-upcase id))) *keywords*)))
 
 (p:defrule qsp-keyword (qsp-keyword-p identifier-raw))
 
 (p:defrule id-first (id-any-char character))
 (p:defrule id-next (or (id-any-char character)
                        (digit-char-p character)))
 (p:defrule identifier-raw (and id-first (* id-next))
   (:lambda (list)
     (intern (string-upcase (p:text list)) :lib)))
 
 (p:defrule identifier (not-qsp-keyword-p identifier-raw))
 
 ;;; Strings
 
 (p:defrule qsp-string (or normal-string brace-string))
 
 (p:defrule normal-string (or sstring dstring)
   (:lambda (str)
     (list* 'lib:str (or str (list "")))))
 
 (p:defrule sstring (and #\' (* (or string-interpol
                                    sstring-exec
                                    sstring-chars))
                         #\')
   (:function second))
 
 (p:defrule dstring (and #\" (* (or string-interpol
                                    dstring-exec
                                    dstring-chars))
                         #\")
   (:function second))
 
 (p:defrule string-interpol (and "<<" expression ">>")
   (:function second))
 
 (p:defrule sstring-exec-body (+ (or squote-esc (not-doublequote character)))
   (:text t))
 
 (p:defrule dstring-exec-body (+ (or dquote-esc (not-quote character)))
   (:text t))
 
 (p:defrule sstring-exec (and (p:~ "\"exec:") sstring-exec-body #\")
   (:lambda (list)
     (list* 'lib:exec (p:parse 'exec-body (second list)))))
 
 (p:defrule dstring-exec (and (p:~ "'exec:") dstring-exec-body #\')
   (:lambda (list)
     (list* 'lib:exec (p:parse 'exec-body (second list)))))
 
 (p:defrule brace-string (and #\{ before-statement block-body #\})
   (:lambda (list)
     (list* 'lib:qspblock (third list))))
 
 ;;; Location
 
 (p:defrule sugar-qsp-grammar (and (* (or spaces #\newline))
                                   (* location))
   (:lambda (list)
     `(lib:game ,@(second list))))
 
 (p:defrule location (and location-header block-body location-end)
   (:destructure (header body end)
     (declare (ignore end))
     `(lib:location (,header) ,@body)))
 
 (p:defrule location-header (and #\#
                                 (+ not-newline)
                                 (and #\newline spaces? before-statement))
   (:destructure (spaces1 name spaces2)
     (declare (ignore spaces1 spaces2))
     (string-upcase (string-trim " " (p:text name)))))
 
 (p:defrule location-end (and #\- (* not-newline) #\newline before-statement)
   (:constant nil))
 
 ;;; Block body
 
 (p:defrule newline-block-body (and #\newline spaces? block-body)
   (:function third))
 
 (p:defrule block-body (* statement)
   (:function remove-nil))
 
 ;; Just for <a href="exec:...'>
 ;; Explicitly called from that rule's production
 (p:defrule exec-body (and before-statement line-body)
   (:function second))
 
 (p:defrule line-body (and inline-statement (* next-inline-statement))
   (:lambda (list)
     (list* (first list) (second list))))
 
 (p:defrule before-statement (* (or #\newline spaces))
   (:constant nil))
 
 (p:defrule statement-end (or statement-end-real statement-end-block-close))
 
 (p:defrule statement-end-real (and (or #\newline
                                        (and #\& spaces? (p:& statement%)))
                                    before-statement)
   (:constant nil))
 
 (p:defrule statement-end-block-close (or (p:& #\}))
   (:constant nil))
 
 (p:defrule inline-statement (and statement% spaces?)
   (:function first))
 
 (p:defrule next-inline-statement (and #\& spaces? inline-statement)
   (:function third))
 
 (p:defrule not-a-non-statement (and (p:! (p:~ "elseif"))
                                     (p:! (p:~ "else"))
                                     (p:! (p:~ "end"))))
 
 (p:defrule statement (and inline-statement statement-end)
   (:function first))
 
 (p:defrule statement% (and not-a-non-statement
                            (or label comment string-output
                                block non-returning-intrinsic local
                                assignment expression-output))
   (:function second))
 
 (p:defrule expr-stopper (or comment block non-returning-intrinsic))
 
 (p:defrule string-output qsp-string
   (:lambda (string)
     (list 'lib:main-pl string)))
 
 (p:defrule expression-output expression
   (:lambda (list)
     (list 'lib:main-pl list)))
 
 (p:defrule label (and colon identifier)
   (:lambda (list)
     (intern (string (second list)) :keyword)))
 
 (p:defrule comment (and #\! (* (or qsp-string brace-comment text-spaces not-newline)))
   (:constant nil))
 
 (p:defrule brace-comment (and #\{ (* (not-brace character)) #\})
   (:constant nil))
 
 (p:defrule local (and (p:~ "local") spaces variable (p:? (and spaces? #\= spaces? expression)))
   (:lambda (list)
     (list* 'lib:local (third list)
            (when (fourth list)
              (list (fourth (fourth list)))))))
 
 ;;; Blocks
 
 (p:defrule block (or block-act block-if block-for))
 
 (p:defrule block-if (and block-if-head block-if-body)
   (:destructure (head body)
     `(lib:qspcond (,@head ,@(first body))
                   ,@(rest body))))
 
 (p:defrule block-if-head (and (p:~ "if") spaces expression spaces? colon spaces?)
   (:function remove-nil)
   (:function cdr))
 
 (p:defrule block-if-body (or block-if-ml block-if-sl)
   (:destructure (if-body elseifs else &rest ws)
     (declare (ignore ws))
     `(,(remove-nil if-body) ,@elseifs ,@(when else `((else ,@else))))))
 
 (p:defrule block-if-sl (and line-body
                             (p:? block-if-elseif-inline)
                             (p:? block-if-else-inline)
                             spaces?))
 
 (p:defrule block-if-ml (and (and #\newline spaces?)
                             block-body
                             (p:? block-if-elseif)
                             (p:? block-if-else)
                             block-if-end)
   (:lambda (list)
     (cdr list)))
 
 (p:defrule block-if-elseif-inline (and block-if-elseif-head line-body (p:? block-if-elseif-inline))
   (:destructure (head statements elseif)
     `((,@(rest head) ,@(remove-nil statements)) ,@elseif)))
 
 (p:defrule block-if-elseif (and block-if-elseif-head statement-end block-body (p:? block-if-elseif))
   (:destructure (head ws statements elseif)
     (declare (ignore ws))
     `((,@(rest head) ,@(remove-nil statements)) ,@elseif)))
 
 (p:defrule block-if-elseif-head (and (p:~ "elseif") spaces expression spaces? colon spaces?)
   (:function remove-nil)
   (:function intern-first))
 
 (p:defrule block-if-else-inline (and block-if-else-head line-body)
   (:function second))
 
 (p:defrule block-if-else (and block-if-else-head #\newline spaces? block-body)
   (:function fourth))
 
 (p:defrule block-if-else-head (and (p:~ "else") spaces?)
   (:constant nil))
 
 (p:defrule block-if-end (and (p:~ "end") 
                              (p:? (and spaces (p:~ "if"))))
   (:constant nil))
 
 (p:defrule block-act (and block-act-head (or block-ml block-sl))
   (:lambda (list)
     (apply #'append list)))
 
 (p:defrule block-act-head (and (p:~ "act") spaces? qsp-string spaces?
                                (p:? block-act-head-img)
                                colon spaces?)
   (:lambda (list)
     (intern-first (list (first list)
                         (third list)
                         (or (fifth list) '(lib:str ""))))))
 
 (p:defrule block-act-head-img (and #\, spaces? qsp-string spaces?)
   (:lambda (list)
     (or (third list) "")))
 
 (p:defrule block-for (and block-for-head (or block-ml block-sl))
   (:lambda (list)
     (apply #'append list)))
 
 (p:defrule block-for-head (and (p:~ "for") spaces variable spaces? equal spaces? expression 
                                (p:~ "to") spaces expression
                                block-for-head-step
                                colon spaces?)
   (:lambda (list)
-    (unless (eq (fourth (third list)) :num)
-      (error "For counter variable must be numeric."))
     (list 'lib:qspfor
           (elt list 2)
           (elt list 6)
           (elt list 9)
           (elt list 10))))
 
 (p:defrule block-for-head-step (p:? (and (p:~ "step") spaces expression spaces?))
   (:lambda (list)
     (if list
         (third list)
         1)))
 
 (p:defrule block-sl line-body)
 
 (p:defrule block-ml (and newline-block-body block-end)
   (:lambda (list)
     (apply #'list* (butlast list))))
 
 (p:defrule block-end (and (p:~ "end"))
   (:constant nil))
 
 ;;; Calls
 
 (p:defrule first-argument (and expression spaces?)
   (:function first))
 (p:defrule next-argument (and "," spaces? expression)
   (:function third))
 (p:defrule arguments (or parenthesized-arguments plain-arguments no-arguments))
 (p:defrule parenthesized-arguments (and spaces? #\( base-arguments #\))
   (:function third))
 (p:defrule plain-arguments (and spaces? base-arguments)
   (:function second))
 (p:defrule no-arguments (or (and spaces? (p:& #\newline))
                             (and spaces? (p:& #\&))
                             spaces?)
   (:constant nil))
 (p:defrule base-arguments (or (and first-argument (* next-argument)) spaces?)
   (:lambda (list)
     (if (null list)
         nil
         (list* (first list) (second list)))))
 
 ;;; Intrinsics
 
 (defmacro defintrinsics ((rule-name returning-rule-name non-returning-rule-name) &body clauses)
   `(progn
      ,@(loop :for clause :in clauses
           :collect `(defintrinsic ,@clause))
      (p:defrule ,returning-rule-name (or ,@(remove-nil
                                             (mapcar (lambda (clause)
                                                       (when (second clause)
                                                         (alexandria:symbolicate
                                                          'intrinsic- (first clause))))
                                                     clauses))))
      (p:defrule ,non-returning-rule-name (or ,@(remove-nil
                                                 (mapcar (lambda (clause)
                                                           (unless (second clause)
                                                             (alexandria:symbolicate
                                                              'intrinsic- (first clause))))
                                                         clauses))))
      (p:defrule ,rule-name (or ,returning-rule-name ,non-returning-rule-name))))
 
 (defmacro defintrinsic (sym returning &optional (min-arity 0) max-arity &rest names)
   (declare (ignore returning))
   (unless max-arity
     (setf max-arity *max-args*))
   (setf names 
         (if names
             (mapcar #'string-upcase names)
             (list (string sym))))
   `(p:defrule ,(alexandria:symbolicate 'intrinsic- sym)
        (and (p:? #\$) (or ,@(loop :for name :in names :collect `(p:~ ,name)))
             arguments)
      (:destructure (dollar name arguments)
        (declare (ignore dollar))
        (unless (<= ,min-arity (length arguments) ,max-arity)
          (error "Intrinsic ~A expects between ~A and ~A arguments but ~A were provided:~%~S"
                 name ,min-arity ,max-arity (length arguments) arguments))
        (list* ',(intern (string sym) :lib) arguments))))
 
 (defintrinsics (intrinsic returning-intrinsic non-returning-intrinsic)
   ;; Transitions
   (goto%    nil 0 nil "gt" "goto")
   (xgoto%   nil 0 nil "xgt" "xgoto")
   ;; Variables
   (killvar  nil 0 2)
   ;; Expressions
   (obj      t   1 1)
   (loc      t   1 1)
   (no       t   1 1)
   ;; Basic
   (qspver   t   0 0)
   (curloc   t   0 0)
   (rand     t   1 2)
   (rnd      t   0 0)
   (qspmax   t   1 nil "max")
   (qspmin   t   1 nil "min")
   ;; Arrays
   (killall  nil 0 0)
   (copyarr  nil 2 4)
   (arrsize  t   1 1)
   (arrpos   t   2 3)
   (arrcomp  t   2 3)
   ;; Strings
   (len      t   1 1)
   (mid      t   2 3)
   (ucase    t   1 1)
   (lcase    t   1 1)
   (trim     t   1 1)
   (replace  t   2 3)
   (instr    t   2 3)
   (isnum    t   1 1)
   (val      t   1 1)
   (qspstr   t   1 1 "str")
   (strcomp  t   2 2)
   (strfind  t   2 3)
   (strpos   t   2 3)
   ;; IF
   (iif      t   2 3)
   ;; Subs
   (gosub    nil 1 nil "gosub" "gs")
   (func     t   1 nil)
   (exit     nil 0 0)
   ;; Jump
   (jump     nil 1 1)
   ;; Dynamic
   (dynamic  nil 1 nil)
   (dyneval  t   1 nil)
   ;; Sound
   (play     nil 1 2)
   (isplay   t   1 1)
   (close    nil 1 1)
   (closeall nil 0 0 "close all")
   ;; Main window
   (main-pl  nil 1 1 "*pl")
   (main-nl  nil 0 1 "*nl")
   (main-p   nil 1 1 "*p")
   (maintxt  t   0 0)
   (desc     t   1 1)
   (main-clear   nil 0 0 "*clear" "*clr")
   ;; Aux window
   (showstat nil 1 1)
   (stat-pl   nil 1 1 "pl")
   (stat-nl   nil 0 1 "nl")
   (stat-p    nil 1 1 "p")
   (stattxt  t   0 0)
   (stat-clear    nil 0 0 "clear" "clr")
   (cls      nil 0 0)
   ;; Dialog
   (msg      nil 1 1)
   ;; Acts
   (showacts nil 1 1)
   (delact   nil 1 1 "delact" "del act")
   (curacts  t   0 0)
   (cla      nil 0 0)
   ;; Objects
   (showobjs nil 1 1)
   (addobj   nil 1 3 "addobj" "add obj")
   (delobj   nil 1 1 "delobj" "del obj")
   (killobj  nil 0 1)
   (countobj t   0 0)
   (getobj   t   1 1)
   ;; Menu
   (menu     nil 1 1)
   ;; Images
   (refint   nil 0 0)
   (view     nil 0 1)
   (img      nil 1)
   (*img     nil 1)
   ;; Fonts
   (rgb      t   3 3)
   ;; Input
   (showinput nil 1 1)
   (usertxt  t   0 0 "user_text" "usrtxt")
   (cmdclear nil 0 0 "cmdclear" "cmdclr")
   (input    t   1 1)
   ;; Files
   (openqst  nil 1 1)
   (addqst   nil 1 1 "addqst" "addlib" "inclib")
   (killqst  nil 1 1 "killqst" "dellib" "freelib")
   (opengame nil 0 0)
   (savegame nil 0 0)
   ;; Real time
   (wait     nil 1 1)
   (msecscount t 0 0)
   (settimer nil 1 1))
 
 ;;; Expression
 
 (p:defrule expression or-expr)
 
 (p:defrule or-expr (and and-expr (* (and spaces? or-op spaces? and-expr)))
   (:function do-binop))
 
 (p:defrule and-expr (and eq-expr (* (and spaces? and-op spaces? eq-expr)))
   (:function do-binop))
 
 (p:defrule eq-expr (and sum-expr (* (and spaces? (or "<=" ">=" "=<" "=>" "<>"
                                                      "=" "<" ">" "!")
                                          spaces? sum-expr)))
   (:function do-binop))
 
 (p:defrule sum-expr (and mod-expr (* (and spaces? (or #\+ #\-) spaces? mod-expr)))
   (:function do-binop))
 
 (p:defrule mod-expr (and mul-expr (* (and spaces? (p:~ "mod") spaces? mul-expr)))
   (:function do-binop))
 
 (p:defrule mul-expr (and unary-expr (* (and spaces? (or #\* #\/) spaces? unary-expr)))
   (:function do-binop))
 
 (p:defrule unary-expr (and (p:? (or #\+ #\-)) atom-expr)
   (:lambda (list)
     (let ((expr (remove-nil list)))
       (if (= 1 (length expr))
           (first expr)
           (intern-first expr)))))
 
 (p:defrule atom-expr (and (or variable literal returning-intrinsic paren-expr) spaces?)
   (:function first))
 
 (p:defrule paren-expr (and #\( spaces? expression spaces? #\))
   (:function third))
 
 (p:defrule or-op (p:~ "or")
   (:constant "or"))
 
 (p:defrule and-op (p:~ "and")
   (:constant "and"))
 
 ;;; Variables
 
 (p:defrule variable (and identifier (p:? array-index))
   (:destructure (id idx-raw)
     (let ((idx (case idx-raw
                  ((nil) 0)
                  (:last nil)
                  (t idx-raw))))
-      (if (char= #\$ (elt (string id) 0))
-          (list 'lib:qspvar (intern (subseq (string-upcase id) 1) :lib) idx :str)
-          (list 'lib:qspvar id idx :num)))))
+      (list 'lib:qspvar id idx))))
 
 (p:defrule array-index (and #\[ spaces? (p:? expression) spaces? #\])
   (:lambda (list)
     (or (third list) :last)))
 
 (p:defrule assignment (or kw-assignment plain-assignment op-assignment)
   (:destructure (qspvar eq expr)
     (declare (ignore eq))
     (list 'lib:set qspvar expr)))
 
 (p:defrule kw-assignment (and (or (p:~ "let") (p:~ "set")) spaces? (or op-assignment plain-assignment))
   (:function third))
 
 (p:defrule op-assignment (and variable spaces? (or "+" "-" "*" "/") #\= spaces? expression)
   (:destructure (qspvar ws1 op eq ws2 expr)
                 (declare (ignore ws1 ws2))
                 (list qspvar eq (intern-first (list op qspvar expr)))))
 
 (p:defrule plain-assignment (and variable spaces? #\= spaces? expression)
   (:function remove-nil))
 
 ;;; Non-string literals
 
 (p:defrule literal (or qsp-string brace-string number))
 
 (p:defrule number (+ (or #\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9))
   (:lambda (list)
     (parse-integer (p:text list))))

src/ps-macros.lisp

@@ -1,188 +1,354 b''
 
 (in-package sugar-qsp.lib)
 
 ;;;; Parenscript macros which make the parser's intermediate
 ;;;; representation directly compilable by Parenscript
 ;;;; Some utility macros for other .ps sources too.
 
+;;;; Block type | Has own locals | Has labels | async
+;;;  Location   | TRUE           | TRUE       | TRUE
+;;;  Act        | TRUE           | TRUE       | TRUE
+;;;  {}         | TRUE           | TRUE       | TRUE
+;;;  IF         | FALSE          | TRUE       | TRUE
+;;;  FOR        | FALSE          | TRUE       | TRUE
+;;;  
+
 ;;; Utils
 
 ;;; Common
 
 (defpsmacro label-block (() &body body)
   (let ((has-labels (some #'keywordp body)))
     `(block nil
        ,@(when has-labels
            '((var _labels (list))))
        (tagbody
           ,@body
           (void)))))
 
 (defpsmacro str (&rest forms)
   (cond ((zerop (length forms))
          "")
         ((and (= 1 (length forms))
               (stringp (first forms)))
          (first forms))
         (t
          `(& ,@forms))))
 
+(defpsmacro locals-block (&body body)
+  "Includes labels too (through qsp-lambda)"
+  (let ((*locals* nil))
+    (walker:walk 'locals body)
+    `(qsp-lambda
+      (create-locals ,*locals*)
+      ,@(walker:walk 'apply-vars body))))
+
 ;;; 1loc
 
+(defparameter *service-variables*
+  '((usehtml 0)
+    (result 0)
+    ($result "")
+    ($ongload "")
+    ($ongsave "")
+    ($onobjadd "")
+    ($onobjdel "")
+    ($onobjsel "")
+    ($onnewloc "")
+    ($onactsel "")
+    ($counter "")
+    ($usercom "")))
+
 (defpsmacro game ((name) &body body)
+  (setf body (walker:walk 'for-transform body))
+  (setf *globals* *service-variables*)
+  (walker:walk 'globals body)
   `(progn
+     ;; Game object
      (setf (root games ,name)
            (create))
+     ;; Global variables from this game
+     (create-globals ,*globals*)
+     ;; Locations
      ,@(loop :for location :in body
           :collect `(setf (root games ,name ,(caadr location))
                           ,location))))
 
 (defpsmacro location ((name) &body body)
   (declare (ignore name))
   "Name is used by the game macro above"
-  `(async-lambda ()
-     (label-block ()
-       ,@body)))
+  `(locals-block ,@body))
 
 (defpsmacro goto% (target &rest args)
   `(progn
      (goto ,target ,args)
      (exit)))
 
 (defpsmacro xgoto% (target &rest args)
   `(progn
      (xgoto ,target ,args)
      (exit)))
 
 ;;; 2var
 
-(defpsmacro qspvar (name index slot)
-  `(api-call get-var ,(string name) ,index ,slot))
+(defvar *globals* nil)
+(defvar *locals* nil)
+
+(defpsmacro create-globals (globals)
+  `(chain *object
+          (assign (root vars)
+                  (create ,@(loop :for (name index slot)
+                               :in globals
+                               :append `(,(string-upcase name) (api-call new-var ,index)))))))
+
+(walker:deftransform globals qspvar (&rest var)
+  (pushnew var *globals* :test #'equal)
+  (walker:walk-continue))
+
+(walker:deftransform globals local (var &rest expr)
+  (declare (ignore var))
+  (walker:walk 'globals expr))
+
+(defpsmacro create-locals (locals)
+  (when locals
+    `(progn
+       (var locals (create
+                    ,@(loop :for (name index) :in locals
+                         :append `(,(string-upcase name) (api-call new-var))))))))
+
+;; locations, blocks, and acts all have their own locals namespace
+(walker:deftransform-stop locals qspblock)
+(walker:deftransform-stop locals act)
+
+(walker:deftransform locals local (var &optional expr)
+  (declare (ignore expr))
+  (pushnew (rest var) *locals* :test #'equal)
+  nil)
+
+;; index types:
+;; literal number
+;; literal string
+;; variable number
+;; variable string
+;; expression (may be possible to determine if it's a string or a number)
+
+(defun $-var-p (sym)
+  (char= #\$ (elt (string-upcase (symbol-name sym)) 0)))
+
+(defun literal-string-p (form)
+  (and (listp form)
+       (eq 'str (first form))))
+
+(defun variable-number-p (form)
+  (and (listp form)
+       (eq 'qspvar (first form))
+       (not ($-var-p (second form)))))
 
-(defpsmacro set ((var vname vindex vslot) value)
-  (assert (eq var 'qspvar))
-  `(api-call set-var ,(string vname) ,vindex ,vslot ,value))
+(defun variable-string-p (form)
+  (and (listp form)
+       (eq 'qspvar (first form))
+       ($-var-p (second form))))
+
+(walker:deftransform apply-vars set (var expr)
+  (destructuring-bind (qspvar name index)
+      var
+    (declare (ignore qspvar))
+    (let ((slot `(getprop
+                  ,(if (member name *locals* :key #'first)
+                       'locals '(root vars))
+                  ,(string-upcase name))))
+      (cond
+        ((or (numberp index)
+             (variable-number-p index))
+         `(setf (elt ,slot ,index)
+                ,(walker:walk 'apply-vars expr)))
+        ((or (literal-string-p index)
+             (variable-string-p index))
+         `(set-str-element ,slot ,(walker:walk 'apply-vars index)
+                           (walker:walk 'apply-vars ,expr)))
+        (t
+         `(set-any-element ,slot ,index
+                           (walker:walk 'apply-vars ,expr)))))))
+
+(walker:deftransform apply-vars local (var &optional expr)
+  (when expr
+    (walker:walk 'apply-vars (list 'set var expr))))
+
+(walker:deftransform apply-vars qspvar (name index)
+  (let ((slot `(getprop
+                ,(if (member name *locals* :key #'first) 'locals '(root vars))
+                ,(string-upcase name))))
+    (cond
+      ((or (numberp index)
+           (variable-number-p index))
+       `(elt ,slot ,index))
+      ((or (literal-string-p index)
+           (variable-string-p index))
+       `(elt ,slot (@ ,slot :indexes ,index)))
+      (t
+       `(get-element ,slot ,index)))))
+
+(walker:deftransform apply-vars qspblock (&rest block)
+  (declare (ignore block))
+  (walker:whole))
+(walker:deftransform apply-vars act (&rest block)
+  (declare (ignore block))
+  (walker:whole))
+(walker:deftransform apply-vars qspfor (var from to step body)
+  (list* 'qspfor var (mapcar #'walker:walk-continue (list from to step body))))
 
 ;;; 3expr
 
 (defpsmacro <> (op1 op2)
   `(not (equal ,op1 ,op2)))
 
 (defpsmacro ! (op1 op2)
   `(not (equal ,op1 ,op2)))
 
 ;;; 4code
 
 (defpsmacro exec (&body body)
   (format nil "javascript: ~{~A~^~%~}" (mapcar #'ps* body)))
 
 ;;; 5arrays
 
 ;;; 6str
 
 (defpsmacro & (&rest args)
   `(chain "" (concat ,@args)))
 
 ;;; 7if
 
 (defpsmacro qspcond (&rest clauses)
   `(cond ,@(loop :for clause :in clauses
               :collect (list (first clause)
                              `(tagbody
                                  ,@(rest clause))))))
 
 ;;; 8sub
 
 ;;; 9loops
 ;;; Yep, that's a huge kludge since Javascript doesn't support arbitrary labels
 
 (defpsmacro jump (target)
   `(return-from label-body ,(string-upcase (second target))))
 
 (defpsmacro tagbody (&body body)
+  (let ((create-locals (if (eq (caar body) 'create-locals)
+                           (list (car body))))
+        (void (if (equal (car (last body)) '(void))
+                  '((void)))))
+    (when create-locals
+      (setf body (cdr body)))
+    (when void
+      (setf body (butlast body)))
   (let ((funcs (list nil "_nil")))
     (dolist (form body)
       (cond ((keywordp form)
              (setf (first funcs) (reverse (first funcs)))
              (push (string-upcase form) funcs)
              (push nil funcs))
             (t
              (push form (first funcs)))))
     (setf (first funcs) (reverse (first funcs)))
     (setf funcs (reverse funcs))
-    (if (= 2 (length funcs))
+      `(progn
+         ,@create-locals
+         ,(if (= 2 (length funcs))
         `(progn
            ,@body)
         `(progn
            (tagbody-blocks ,funcs)
-           (setf _nextblock :_nil)
            (loop
               :for _nextblock
                 := :_nil
                 :then (await (funcall (getprop _labels _nextblock)))
-              :while _nextblock)))))
+                    :while _nextblock)))
+         ,@void))))
+
+(defvar *current-label*)
+(defvar *has-jump-back*)
+(walker:deftransform optimize-jump jump (target)
+  (cond ((string= (string-upcase (second target)) *current-label*)
+         (setf *has-jump-back* t)
+         '(continue))
+        (t
+         (walker:walk-continue))))
 
 (defpsmacro tagbody-blocks (funcs)
   `(setf ,@(loop :for (label code . rest-labels) :on funcs :by #'cddr
               :append `((@ _labels ,label)
                         (async-lambda ()
                           (block label-body
+                            (tagbody-block-body ,label ,code
+                                                ,(first rest-labels))))))))
+
+(defpsmacro tagbody-block-body (label code next-label)
+  (let ((*current-label* label)
+        (*has-jump-back* nil))
+    (let ((code (walker:walk 'optimize-jump code)))
+      (if *has-jump-back*
+          `(progn
+             (loop :do (progn
                             ,@code
-                            ,@(if rest-labels
-                                  (list (first rest-labels))
-                                  nil)))))))
+                         (break)))
+             ,@(if next-label
+                   (list next-label)
+                   nil))
+          `(progn
+             ,@code
+             ,@(if next-label
+                   (list next-label)
+                   nil))))))
 
 (defpsmacro exit ()
   '(return-from nil (values)))
 
 ;;; 10dynamic
 
 (defpsmacro qspblock (&body body)
+  `(locals-block
+    ,@body))
+
+(defpsmacro qsp-lambda (&body body)
   `(async-lambda (args)
      (label-block ()
        ,@body)))
 
 ;;; 11main
 
 (defpsmacro act (name img &body body)
   `(api-call add-act ,name ,img
-             (async-lambda ()
-               (label-block ()
-                 ,@body))))
+             (locals-block
+               ,@body)))
 
 ;;; 12aux
 
 ;;; 13diag
 
 ;;; 14act
 
 ;;; 15objs
 
 ;;; 16menu
 
 ;;; 17sound
 
 ;;; 18img
 
 ;;; 19input
 
 ;;; 20time
 
 ;;; 21local
 
-(defpsmacro local (var &optional expr)
-  `(progn
-     (api-call new-local ,(string (second var)))
-     ,@(when expr
-         `((set ,var ,expr)))))
-
 ;;; 22for
 
-(defpsmacro qspfor (var from to step &body body)
-  `(,(intern "QSPFOR" "API")
-    ,(string (second var)) ,(third var) ;; name and index
-    ,from ,to ,step
-    (async-lambda ()
-      (block nil
-        ,@body
-        t))))
+;; Transform because it creates a (set ...) hence it has to be processed
+;; before the apply-vars transform. And macros are processed *after* all
+;; the transforms
+(walker:deftransform for-transform qspfor (var from to step &rest body)
+  `(loop :for i :from ,from :to ,to :by ,step
+      :do (set ,var i)
+      :do (block nil
+            ,@(walker:walk-continue body))))

src/walker.lisp

@@ -1,19 +1,42 b''
 
 (in-package code-walker)
 
 (defvar *transformers* (make-hash-table :test #'equal))
 
 (defmacro deftransform (transformer-name head args &body body)
   `(progn
      (setf (gethash (list ',transformer-name ',head) *transformers*)
            (lambda ,args ,@body))
      (list ',transformer-name ',head)))
 
+(defmacro deftransform-stop (transformer-name head)
+  `(progn
+     (setf (gethash (list ',transformer-name ',head) *transformers*)
+           (lambda (&rest args)
+             (declare (ignore args))
+             nil))
+     (list ',transformer-name ',head)))
+
+(defvar *whole*)
+(defvar *transformer-name*)
+
+(defun whole ()
+  *whole*)
+
+(defun walk-continue (&optional subform)
+  (if subform
+      (walk *transformer-name* subform)
+      (mapcar (lambda (subform)
+                (walk *transformer-name* subform))
+              *whole*)))
+
 (defun walk (transformer-name form)
+  (let ((*transformer-name* transformer-name)
+        (*whole* form))
   (if (listp form)
       (let ((transformer (gethash (list transformer-name (first form))
-                                  *transformers*)))
+                                    *transformers* nil)))
         (if transformer
             (apply transformer (rest form))
-            (mapcar (lambda (subform) (walk transformer-name subform)) form)))
-      form))
+              (walk-continue)))
+        form)))