Menu, game saving

src/class.lisp

@@ -0,0 +1,21 b''
+
+(in-package sugar-qsp)
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defun src-file (filename)
+    (uiop/pathname:merge-pathnames*
+     filename
+     (asdf:system-source-directory :sugar-qsp)))
+  (defun compile-ps (filename)
+    (format nil "////// Parenscript file: ~A~%~%~A"
+            (file-namestring filename) (ps:ps-compile-file filename))))
+
+(defclass compiler ()
+  ((body :accessor body :initform #.(alexandria:read-file-into-string (src-file "extras/body.html")))
+   (css  :accessor css  :initform (list #.(alexandria:read-file-into-string (src-file "extras/default.css"))))
+   (js   :accessor js   :initform (list #.(compile-ps (src-file "src/intrinsics.ps"))
+                                        #.(compile-ps (src-file "src/api.ps"))
+                                        #.(compile-ps (src-file "src/main.ps"))))
+   (compile :accessor compile-only :initarg :compile)
+   (target  :accessor target :initarg :target)
+   (beautify :accessor beautify :initarg :beautify)))

src/intrinsic-macros.lisp

@@ -0,0 +1,137 b''
+
+(in-package sugar-qsp)
+
+;;;; Macros implementing some intrinsics where it makes sense
+;;;; E.g. an equivalent JS function exists, or it's a direct API call
+
+;;; 1loc
+
+;;; 2var
+
+(ps:defpsmacro killvar (varname &optional (index :whole))
+  `(api-call kill-var ,varname ,index))
+
+(ps:defpsmacro killall ()
+  `(api-call kill-all))
+
+;;; 3expr
+
+(ps:defpsmacro obj (name)
+  `(funcall (root objs includes) ,name))
+
+(ps:defpsmacro loc (name)
+  `(funcall (root locs includes) ,name))
+
+(ps:defpsmacro no (arg)
+  `(- -1 ,arg))
+
+;;; 4code
+
+(ps:defpsmacro qspver ()
+  "0.0.1")
+
+(ps:defpsmacro curloc ()
+  `(root current-location))
+
+(ps:defpsmacro rnd ()
+  `(funcall (root lib rand) 1 1000))
+
+(ps:defpsmacro qspmax (&rest args)
+  `(max ,@args))
+
+(ps:defpsmacro qspmin (&rest args)
+  `(min ,@args))
+
+;;; 5arrays
+
+(ps:defpsmacro arrsize (name)
+  `(api-call array-size ,name))
+
+;;; 6str
+
+(ps:defpsmacro len (s)
+  `(length ,s))
+
+(ps:defpsmacro mid (s from &optional count)
+  `(ps:chain ,s (substring ,from ,count)))
+
+(ps:defpsmacro ucase (s)
+  `(ps:chain ,s (to-upper-case)))
+
+(ps:defpsmacro lcase (s)
+  `(ps:chain ,s (to-lower-case)))
+
+(ps:defpsmacro trim (s)
+  `(ps:chain ,s (trim)))
+
+(ps:defpsmacro replace (s from to)
+  `(ps:chain ,s (replace ,from ,to)))
+
+(ps:defpsmacro val (s)
+  `(parse-int ,s 10))
+
+(ps:defpsmacro qspstr (n)
+  `(ps:chain ,n (to-string)))
+
+;;; 7if
+
+;;; 8sub
+
+;;; 9loops
+
+;; JUMP is in ps-macros.lisp (because it's a part of a huge kludge)
+
+(ps:defpsmacro exit ()
+  `(return-from nil (values)))
+
+;;; 10dynamic
+
+;;; 11main
+
+(ps:defpsmacro desc (s)
+  (declare (ignore s))
+  "")
+
+;;; 12stat
+
+(ps:defpsmacro showstat (enable)
+  `(api-call enable-frame :stat ,enable))
+
+;;; 13diag
+
+(ps:defpsmacro msg (text)
+  `(alert ,text))
+
+;;; 14act
+
+(ps:defpsmacro showacts (enable)
+  `(api-call enable-frame :acts ,enable))
+
+(ps:defpsmacro delact (name)
+  `(api-call del-act ,name))
+
+(ps:defpsmacro cla ()
+  `(api-call clear-act))
+
+;;; 15objs
+
+(ps:defpsmacro showobjs (enable)
+  `(api-call enable-frame :objs ,enable))
+
+(ps:defpsmacro countobj ()
+  `(length (root objs)))
+
+(ps:defpsmacro getobj (index)
+  `(or (elt (root objs) ,index) ""))
+
+;;; 16menu
+
+;;; 17sound
+
+;;; 18img
+
+;;; 19input
+
+;;; 20time
+
+;;; misc

TODO

@@ -1,9 +1,6 b''
 
-* Windows GUI
-* Save-load game
+* Windows GUI (for the compiler)
+* Save-load game in slots
 * Resizable frames
 * Build Istreblenie
-** modifying it to suit compiler specifics
-** Implementing apis and intrinsics as needed
-
-* Use real characters in cl-uglify-js
  No newline at end of file
+** modifying it to suit compiler specifics
  No newline at end of file

extras/body.html

@@ -1,12 +1,15 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>
     <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>
 </div>
+
+<div id="qsp-dropdown">
+</div>

extras/default.css

@@ -1,59 +1,84 b''
 
 .qsp-frame {
     border: 1px solid black;
     overflow: auto;
     padding: 5px;
     box-sizing: border-box;
 }
 
 #qsp {
     position: absolute;
     display: flex;
     flex-flow: row;
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
 }
 
 .qsp-col {
     display: flex;
     flex-flow: column;
 }
 
 .qsp-col1 {
     flex: 7 7 70px;
 }
 
 .qsp-col2 {
     flex: 3 3 30px;
 }
 
 #qsp-main {
     flex: 6 6 60px;
 }
 
 #qsp-acts {
     flex: 4 4 40px;
 }
 
 #qsp-input {
 }
 
 #qsp-stat {
     flex: 5 5 50px;
 }
 
 #qsp-objs {
     flex: 5 5 50px;
 }
 
 .qsp-act {
     display: block;
     padding: 2px;
     font-size: large;
 }
 
 .qsp-act:hover {
     outline: #9E9E9E outset 3px
 }
+
+// Dropdown
+
+#qsp-dropdown {
+  display: none;
+  position: absolute;
+  background-color: #f1f1f1;
+  min-width: 160px;
+  overflow: auto;
+  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+  z-index: 1;
+  margin: auto;
+  top: 200;
+}
+
+#qsp-dropdown a {
+  color: black;
+  padding: 12px 16px;
+  text-decoration: none;
+  display: block;
+}
+
+#qsp-dropdown a:hover {
+    background-color: #ddd;
+}

src/api.ps

@@ -1,150 +1,200 b''
 
 (in-package sugar-qsp)
 
 ;;; 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
 
 (setf (root api) (ps:create))
 
 ;;; Utils
 
 (defm (root api make-act-html) (title img)
   (+ "<a class='qsp-act' href='#' onclick='SugarQSP.acts[\"" title "\"].act();'>"
      title
      "</a>"))
 
+(defm (root api make-menu-item-html) (num title img loc)
+  (+ "<a href='#' onclick='SugarQSP.api.runMenu(" num ", \"" loc "\")();'>"
+     "<img src='" img "'>"
+     title
+     "</a>"))
+
 ;; To be used in saving game
 (defm (root api stash-state) ()
   (setf (root state-stash)
-        (ps:create vars (root vars)
-                   objs (root objs)
-                   next-location (root current-location)))
+        (*j-s-o-n.stringify
+         (ps:create vars (root vars)
+                    objs (root objs)
+                    next-location (root current-location))))
   (values))
 
+(defm (root api state-to-base64) ()
+  (btoa (encode-u-r-i-component (root state-stash))))
+
+(defm (root api base64-to-state) (data)
+  (setf (root state-stash) (decode-u-r-i-component (atob data)))
+  (let ((data (*j-s-o-n.parse (root state-stash))))
+    (api-call clear-act)
+    (setf (root vars) (ps:@ data vars))
+    (setf (root objs) (ps:@ data objs))
+    (setf (root current-location) (ps:@ data next-location))
+    (funcall (root locs (root current-location)))
+    (api-call update-objs)
+    (values)))
+
 ;;; Misc
 
 (defm (root api clear-id) (id)
   (setf (ps:chain document (get-element-by-id id) inner-text) ""))
 
 (defm (root api get-id) (id)
   (if (var "USEHTML" 0)
       (ps:chain (document.get-element-by-id id) inner-h-t-m-l)
       (ps:chain (document.get-element-by-id id) inner-text)))
 
 (defm (root api set-id) (id contents)
   (if (var "USEHTML" 0)
       (setf (ps:chain (document.get-element-by-id id) inner-h-t-m-l) contents)
       (setf (ps:chain (document.get-element-by-id id) inner-text) contents)))
 
 (defm (root api append-id) (id contents)
   (if (var "USEHTML" 0)
       (incf (ps:chain (document.get-element-by-id id) inner-h-t-m-l) contents)
       (incf (ps:chain (document.get-element-by-id id) inner-text) contents)))
 
 ;;; Function calls
 
 (defm (root api init-args) (args)
   (dotimes (i (length args))
     (if (numberp (elt args i))
         (set (var args i) (elt args i))
         (set (var $args i) (elt args i)))))
 
 (defm (root api get-result) ()
   (if (not (equal "" (var $result 0)))
       (var $result 0)
       (var result 0)))
 
 ;;; Text windows
 
 (defm (root api key-to-id) (key)
   (case key
     (:main "qsp-main")
     (:stat "qsp-stat")
+    (:objs "qsp-objs")
+    (:acts "qsp-acts")
+    (:input "qsp-input")
+    (:dropdown "qsp-dropdown")
     (t (report-error "Internal error!"))))
 
+(defm (root api get-frame) (key)
+  (document.get-element-by-id (api-call key-to-id key)))
+
 (defm (root api add-text) (key text)
   (api-call append-id (api-call key-to-id key) text))
 
 (defm (root api get-text) (key)
   (api-call get-id (api-call key-to-id key)))
 
 (defm (root api clear-text) (key)
   (api-call clear-id (api-call key-to-id key)))
 
 (defm (root api newline) (key)
-  (let ((div (document.get-element-by-id
-               (api-call key-to-id key))))
+  (let ((div (api-call get-frame key)))
     (ps:chain div (append-child (document.create-element "br")))))
 
+(defm (root api enable-frame) (key enable)
+  (let ((clss (ps:getprop (api-call get-frame key) 'class-list)))
+    (setf clss.style.display (if enable "block" "none"))
+    (values)))
+
 ;;; Actions
 
 (defm (root api add-act) (title img act)
   (setf (ps:getprop (root acts) title)
-        (ps:create :img img :act act)))
+        (ps:create :img img :act act))
+  (api-call update-acts))
 
 (defm (root api del-act) (title)
   (delete (ps:getprop (root acts) title))
   (api-call update-acts))
 
 (defm (root api clear-act) ()
   (setf (root acts) (ps:create))
   (api-call clear-id "qsp-acts"))
 
 (defm (root api update-acts) ()
   (api-call clear-id "qsp-acts")
   (ps:for-in (title (root acts))
     (let ((obj (ps:getprop (root acts) title)))
       (api-call append-id "qsp-acts"
                 (api-call make-act-html title (ps:getprop obj :img))))))
 
 ;;; Variables
 
 (defm (root api var-slot) (name)
   (if (= (ps:@ name 0) #\$)
       :str
       :num))
 
 (defm (root api var-real-name) (name)
   (if (= (ps:@ name 0) #\$)
       (ps:chain name (substr 1))
       name))
 
 (defm (root api ensure-var) (name index)
   (unless (in name (root vars))
     (setf (ps:getprop (root vars) name)
           (ps:create)))
   (unless (in index (ps:getprop (root vars) name))
     (setf (ps:getprop (root vars) name index)
           (ps:create :num 0 :str "")))
   (values))
 
 (defm (root api get-var) (name index)
   (let ((var-name (api-call var-real-name name)))
     (api-call ensure-var var-name index)
     (ps:getprop (root vars) var-name index
                 (api-call var-slot name))))
 
 (defm (root api set-var) (name index value)
   (let ((var-name (api-call var-real-name name)))
     (api-call ensure-var var-name index)
     (setf (ps:getprop (root vars) var-name index
                       (api-call var-slot name))
           value)
     (values)))
 
+(defm (root api get-array) (name type)
+  (ps:getprop (root vars) (api-call var-real-name name)))
+
 (defm (root api kill-var) (name index)
   (if (eq index :whole)
       (ps:delete (ps:getprop (root vars) name))
       (ps:delete (ps:getprop (root vars) name index)))
   (values))
 
+(defm (root api array-size) (name)
+  (ps:getprop (root vars) (api-call var-real-name name) 'length))
+
 ;;; Objects
 
 (defm (root api update-objs) ()
   (let ((elt (document.get-element-by-id "qsp-objs")))
     (setf elt.inner-h-t-m-l "<ul>")
     (loop :for obj :in (root objs)
        :do (incf elt.inner-h-t-m-l (+ "<li>" obj)))
     (incf elt.inner-h-t-m-l "</ul>")))
+
+;;; Menu
+
+(defm (root api menu) (menu-data)
+  (let ((elt (document.get-element-by-id "qsp-dropdown"))
+        (i 0))
+    (setf elt.inner-h-t-m-l "")
+    (loop :for item :in menu-data
+       :do (incf i)
+       :do (incf elt.inner-h-t-m-l (api-call make-menu-item-html i item.text item.icon item.loc)))
+    (setf elt.style.display "block")))

src/intrinsics.ps

@@ -1,299 +1,313 b''
 
 (in-package sugar-qsp)
 
 ;;;; Functions and procedures defined by the QSP language.
 ;;;; They can call api and deal with locations and other data directly.
 ;;;; Except vars. Use VAR and SET or GET-VAR and SET-VAR api calls.
 
 (setf (root lib) (ps:create))
 
 ;;; 1loc
 
 (defm (root lib goto) (target &rest args)
   (api-call clear-text :main)
   (apply (root lib xgoto) target args))
 
 (defm (root lib xgoto) (target &rest args)
   (api-call clear-act)
   (api-call init-args args)
-  (setf (root current-location) target)
+  (setf (root current-location) (ps:chain target (to-upper-case)))
   (api-call stash-state)
-  (funcall (ps:getprop (root locations) (ps:chain target (to-upper-case)))))
+  (funcall (ps:getprop (root locs) (root current-location))))
 
 ;;; 2var
 
-(defm (root lib killvar) (varname &optional (index :whole))
-  (api-call kill-var varname index))
-
-(defm (root lib killall) ()
-  (api-call kill-all))
-
 ;;; 3expr
 
-(defm (root lib obj) (name)
-  (funcall (root objs includes) name))
-
-(defm (root lib loc) ()
-  (funcall (root locations includes) name))
-
-(defm (root lib no) (arg)
-  (- -1 arg))
-
 ;;; 4code
 
-(defm (root lib qspver) ()
-  "0.0.1")
-
-(defm (root lib curloc) ()
-  (root current-location))
-
-(defm (root lib rand) (a b)
+(defm (root lib rand) (a &optional (b 1))
   (let ((min (min a b))
         (max (max a b)))
     (+ min (ps:chain *math (random (- max min))))))
 
-(defm (root lib rnd) ()
-  (funcall (root lib rand) 1 1000))
-
-(defm (root lib qspmax) (&rest args)
-  (apply (ps:@ *math max) args))
-
-(defm (root lib qspmin) (&rest args)
-  (apply (ps:@ *math min) args))
-
 ;;; 5arrays
 
 (defm (root lib copyarr) (to from start count)
   (ps:for ((i start))
           ((< i (min (api-call array-size from)
                      (+ start count))))
           ((incf i))
     (api-call set-var to (+ start i)
               (api-call get-var from (+ start i)))))
 
-(defm (root lib arrsize) (name)
-  (api-call array-size name))
-
 (defm (root lib arrpos) (name value &optional (start 0))
   (ps:for ((i start)) ((< i (api-call array-size name))) ((incf i))
     (when (eq (api-call get-var name i) value)
       (return i)))
   -1)
 
 (defm (root lib arrcomp) (name pattern &optional (start 0))
   (ps:for ((i start)) ((< i (api-call array-size name))) ((incf i))
     (when (funcall (ps:getprop (api-call get-var name i) 'match) pattern)
       (return i)))
   -1)
 
 ;;; 6str
 
-(defm (root lib len) (s)
-  (length s))
-
-(defm (root lib mid) (s from &optional count)
-  (s.substring from count))
-
-(defm (root lib ucase) (s)
-  (s.to-upper-case))
-
-(defm (root lib lcase) (s)
-  (s.to-lower-case))
-
-(defm (root lib trim) (s)
-  (s.trim))
-
-(defm (root lib replace) (s from to)
-  (s.replace from to))
-
 (defm (root lib instr) (s subs &optional (start 1))
   (+ start (ps:chain s (substring (- start 1)) (search subs))))
 
 (defm (root lib isnum) (s)
   (if (is-na-n s)
       0
       -1))
 
-(defm (root lib val) (s)
-  (parse-int s 10))
-
-(defm (root lib qspstr) (n)
-  (+ "" n))
-
 (defm (root lib strcomp) (s pattern)
   (if (s.match pattern)
       -1
       0))
 
 (defm (root lib strfind) (s pattern group)
   (let* ((re (ps:new (*reg-exp pattern)))
          (match (re.exec s)))
     (match.group group)))
 
 (defm (root lib strpos) (s pattern &optional (group 0))
   (let* ((re (ps:new (*reg-exp pattern)))
          (match (re.exec s))
          (found (match.group group)))
     (if found
         (s.search found)
         0)))
 
 ;;; 7if
 
+;; Has to be a function because it always evaluates all three of its
+;; arguments
 (defm (root lib iif) (cond-expr then-expr else-expr)
-  (if (= -1 cond-expr) then-expr else-expr))
+  (if cond-expr then-expr else-expr))
 
 ;;; 8sub
 
 (defm (root lib gosub) (target &rest args)
   (conserving-vars (args result)
     (api-call init-args args)
-    (funcall (ps:getprop (root locations) target))
+    (funcall (ps:getprop (root locs) target))
     (values)))
 
 (defm (root lib func) (target &rest args)
   (conserving-vars (args result)
     (api-call init-args args)
-    (funcall (ps:getprop (root locations) target))
+    (funcall (ps:getprop (root locs) target))
     (api-call get-result)))
 
 ;;; 9loops
 
 ;;; 10dynamic
 
 (defm (root lib dyneval) (block &rest args)
   (conserving-vars (args result)
     (api-call init-args args)
     (funcall block)
     (api-call get-result)))
 
 (defm (root lib dynamic) (&rest args)
   (conserving-vars (args result)
     (api-call init-args args)
     (funcall block)
     (values)))
 
 ;;; 11main
 
 (defm (root lib main-p) (s)
-  (api-call add-text :main s))
+  (api-call add-text :main s)
+  (values))
 
 (defm (root lib main-pl) (s)
   (api-call add-text :main s)
-  (api-call newline :main))
+  (api-call newline :main)
+  (values))
 
 (defm (root lib main-nl) (s)
   (api-call newline :main)
-  (api-call add-text :main s))
+  (api-call add-text :main s)
+  (values))
 
 (defm (root lib maintxt) (s)
-  (api-call get-text :main))
+  (api-call get-text :main)
+  (values))
 
+;; For clarity (it leaves a lib.desc() call in JS)
 (defm (root lib desc) (s)
   "")
 
 (defm (root lib main-clear) ()
-  (api-call clear-text :main))
+  (api-call clear-text :main)
+  (values))
 
 ;;; 12stat
 
-(defm (root lib showstat) ())
+(defm (root lib stat-p) (s)
+  (api-call add-text :stat s)
+  (values))
 
-(defm (root lib stat-p) ())
+(defm (root lib stat-pl) (s)
+  (api-call add-text :stat s)
+  (api-call newline :stat)
+  (values))
 
-(defm (root lib stat-pl) ())
+(defm (root lib stat-nl) (s)
+  (api-call newline :stat)
+  (api-call add-text :stat s)
+  (values))
 
-(defm (root lib stat-nl) ())
-
-(defm (root lib stattxt) ())
+(defm (root lib stattxt) (s)
+  (api-call get-text :stat)
+  (values))
 
-(defm (root lib clear) ())
+(defm (root lib stat-clear) ()
+  (api-call clear-text :stat)
+  (values))
 
-(defm (root lib cls) ())
+(defm (root lib cls) ()
+  (funcall (root lib stat-clear))
+  (funcall (root lib main-clear))
+  (funcall (root lib cla))
+  (funcall (root lib cmdclear))
+  (values))
 
 ;;; 13diag
 
-(defm (root lib msg) ())
-
 ;;; 14act
 
-(defm (root lib showacts) ())
-
-(defm (root lib delact) (name)
-  (api-call del-act name))
-
-(defm (root lib curacts) ())
-
-(defm (root lib cla) ())
+(defm (root lib curacts) ()
+  (let ((acts (root acts)))
+    (lambda ()
+      (setf (root acts) acts)
+      (values))))
 
 ;;; 15objs
 
-(defm (root lib showobjs) ())
-
 (defm (root lib addobj) (name)
   (ps:chain (root objs) (push name))
-  (api-call update-objs))
+  (api-call update-objs)
+  (values))
 
 (defm (root lib delobj) (name)
   (let ((index (ps:chain (root objs) (index-of name))))
     (when (> index -1)
-      (ps:chain (root objs) (splice index 1))))
-  (api-call update-objs))
+      (funcall (root lib killobj) index)))
+  (values))
 
-(defm (root lib killobj) ())
-
-(defm (root lib countobj) ())
-
-(defm (root lib getobj) ())
+(defm (root lib killobj) (&optional num)
+  (if num
+      (ps:chain (root objs) (splice (1+ num) 1))
+      (setf (root objs) (list)))
+  (api-call update-objs)
+  (values))
 
 ;;; 16menu
 
-(defm (root lib menu) ())
+(defm (root lib menu) (menu-name)
+  (let ((menu-data (list)))
+    (loop :for item :in (api-call get-array menu-name)
+       :do (cond ((string= item "")
+                  (break))
+                 ((string= item "-:-")
+                  (ps:chain menu-data (push :delimiter)))
+                 (t
+                  (let* ((tokens (ps:chain item (split ":"))))
+                    (when (= (length tokens) 2)
+                      (tokens.push ""))
+                    (let* ((text (ps:chain tokens (splice 0 (- tokens.length 2)) (join ":")))
+                           (loc (ps:getprop tokens (- tokens.length 2)))
+                           (icon (ps:getprop tokens (- tokens.length 1))))
+                      (ps:chain menu-data
+                                (push (ps:create text text
+                                                 loc loc
+                                                 icon icon))))))))
+    (api-call menu menu-data)
+    (values)))
 
 ;;; 17sound
 
 (defm (root lib play) ())
 
 (defm (root lib isplay) ())
 
 (defm (root lib close) ())
 
 (defm (root lib closeall) ())
 
 ;;; 18img
 
 (defm (root lib refint) ())
 
 (defm (root lib view) ())
 
 ;;; 19input
 
 (defm (root lib showinput) ())
 
 (defm (root lib usertxt) ())
 
 (defm (root lib cmdclear) ())
 
 (defm (root lib input) ())
 
 ;;; 20time
 
-(defm (root lib wait) ())
+;; I wonder if there's a better solution than busy-wait
+(defm (root lib wait) (msec)
+  (let* ((now (ps:new (*date)))
+         (exit-time (+ (funcall now.get-time) msec)))
+    (loop :while (< (funcall now.get-time) exit-time))))
 
 (defm (root lib msecscount) ())
 
 (defm (root lib settimer) ())
 
 ;;; misc
 
 (defm (root lib rgb) ())
 
 (defm (root lib openqst) ())
 
 (defm (root lib addqst) ())
 
 (defm (root lib killqst) ())
 
-(defm (root lib opengame) ())
+(defm (root lib opengame) (&optional filename)
+  (let ((element (document.create-element :input)))
+    (element.set-attribute :type :file)
+    (element.set-attribute :id :qsp-opengame)
+    (element.set-attribute :tabindex -1)
+    (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 (elt event.target.files 0))
+                   (reader (ps:new (*file-reader))))
+              (setf reader.onload
+                    (lambda (ev)
+                      (block nil
+                             (let ((target ev.current-target))
+                               (unless target.result
+                                 (return))
+                               (api-call base64-to-state target.result)))))
+              (reader.read-as-text file))))
+    (document.body.append-child element)
+    (element.click)
+    (document.body.remove-child element)))
 
-(defm (root lib savegame) ())
+(defm (root lib savegame) (&optional filename)
+  (let ((element (document.create-element :a)))
+    (element.set-attribute :href (+ "data:text/plain;charset=utf-8," (api-call state-to-base64)))
+    (element.set-attribute :download "savegame.sav")
+    (setf element.style.display :none)
+    (document.body.append-child element)
+    (element.click)
+    (document.body.remove-child element)))

src/main.lisp

@@ -1,172 +1,153 b''
 
 (in-package sugar-qsp)
 
 (defun entry-point-no-args ()
   (entry-point uiop:*command-line-arguments*))
 
 (defun entry-point (args)
   (catch :terminate
     (let ((compiler (apply #'make-instance 'compiler (parse-opts args))))
       (write-compiled-file compiler)))
   (values))
 
 (defun parse-opts (args)
   (let ((mode :source)
         (data (list :source nil :target nil :js nil :css nil :body nil :compile nil :beautify nil)))
     (loop :for arg :in args
        :do (alexandria:switch (arg :test #'string=)
              ("-o" (setf mode :target))
              ("--js" (setf mode :js))
              ("--css" (setf mode :css))
              ("--body" (setf mode :body))
              ("-c" (setf (getf data :compile) t))
              ("--beautify" (setf (getf data :beautify) t))
              (t (push arg (getf data mode)))))
     (unless (= 1 (length (getf data :source)))
       (print-usage)
       (report-error "There should be exactly one source"))
     (unless (> 1 (length (getf data :target)))
       (print-usage)
       (report-error "There should be no more than one target"))
     (unless (> 1 (length (getf data :body)))
       (print-usage)
       (report-error "There should be no more than one body"))
     (unless (getf data :target)
       (setf (getf data :target)
             (let* ((source (first (getf data :source)))
                    (tokens (uiop:split-string source :separator "."))
                    (target (format nil "~{~A~^.~}.html"
                                    (butlast tokens))))
               (list target))))
     (list :source (first (getf data :source))
           :target (first (getf data :target))
           :js (getf data :js)
           :css (getf data :css)
           :body (first (getf data :body))
           :compile (getf data :compile)
           :beautify (getf data :beautify))))
 
 (defun print-usage ()
   (format t "USAGE: "))
 
 (defun parse-file (filename)
   (p:parse 'sugar-qsp-grammar
            (alexandria:read-file-into-string filename)))
 
 (defun make-javascript (locations)
-  (format nil "~{~A~^~%~%~}"
+  (format nil "////// THE GAME STARTS HERE~%~%~{~A~^~%~%~}"
           (mapcar #'ps:ps* locations)))
 
 (defun uglify-js::write-json-chars (quote s stream)
   "Write JSON representations (chars or escape sequences) of
 characters in string S to STREAM.
 Monkey-patched to output plain utf-8 instead of escape-sequences."
   (write-char quote stream)
   (loop :for ch :across s
      :for code := (char-code ch)
      :with special
      :do (cond ((eq ch quote)
                 (write-char #\\ stream) (write-char ch stream))
                ((setq special (car (rassoc ch uglify-js::+json-lisp-escaped-chars+)))
                 (write-char #\\ stream) (write-char special stream))
                (t
                 (write-char ch stream))))
   (write-char quote stream))
 
 (defun preprocess-js (js beautify)
   (if beautify
       (cl-uglify-js:ast-gen-code
        (cl-uglify-js:ast-squeeze
         (parse-js:parse-js js)
         :sequences nil)
        :beautify t)
       (cl-uglify-js:ast-gen-code
        (cl-uglify-js:ast-mangle
         (cl-uglify-js:ast-squeeze
          (parse-js:parse-js js)))
        :beautify nil)))
 
 (defun report-error (fmt &rest args)
   (apply #'format t fmt args)
   (throw :terminate nil))
 
 ;;; JS
 
-(defun src-file (filename)
-  (uiop/pathname:merge-pathnames*
-   filename
-   (asdf:system-source-directory :sugar-qsp)))
-
 (defmethod js-sources ((compiler compiler))
   (format nil "~{~A~^~%~%~}" (reverse (js compiler))))
 
-(defun compile-ps (filename)
-  (format nil "////// Parenscript file: ~A~%~%~A"
-          (file-namestring filename) (ps:ps-compile-file filename)))
-
 ;;; CSS
 
 (defmethod css-sources ((compiler compiler))
   (format nil "~{~A~^~%~%~}" (css compiler)))
 
 ;;; HTML
 
 (defmethod html-sources ((compiler compiler))
   (let ((flute:*escape-html* nil)
         (body-template (body compiler))
         (js (js-sources compiler))
         (css (css-sources compiler)))
     (with-output-to-string (out)
       (write
        (flute:h
          (html
           (head
            (title "SugarQSP"))
           (body
            body-template
            (style css)
            (script (preprocess-js js (beautify compiler))))))
        :stream out
        :pretty nil))))
 
-(defclass compiler ()
-  ((body :accessor body :initform #.(alexandria:read-file-into-string (src-file "extras/body.html")))
-   (css  :accessor css  :initform (list #.(alexandria:read-file-into-string (src-file "extras/default.css"))))
-   (js   :accessor js   :initform (list #.(compile-ps (src-file "src/intrinsics.ps"))
-                                        #.(compile-ps (src-file "src/api.ps"))
-                                        #.(compile-ps (src-file "src/main.ps"))))
-   (compile :accessor compile-only :initarg :compile)
-   (target  :accessor target :initarg :target)
-   (beautify :accessor beautify :initarg :beautify)))
-
 (defmethod initialize-instance ((compiler compiler) &key source ((:js js-files)) ((:css css-files)) ((:body body-file)) compile &allow-other-keys)
   (call-next-method)
   (with-slots (body css js)
       compiler
     ;; Compile the game's JS
     (push (make-javascript (parse-file source)) js)
     ;; Does the user need us to do anything else
     (unless compile
       ;; Read in body
       (when body-file
         (setf body
               (alexandria:read-file-into-string body-file)))
       ;; Include js files
       (dolist (js-file js-files)
         (push (format nil "////// Included file ~A~%~A" js-file
                       (alexandria:read-file-into-string js-file))
               js))
       ;; Include css files
       (dolist (css-file css-files)
         (push (format nil "////// Included file ~A~%~A" css-file
                       (alexandria:read-file-into-string css-file))
               css)))))
 
 (defmethod write-compiled-file ((compiler compiler))
   (alexandria:write-string-into-file
    (if (compile-only compiler)
        ;; Just the JS
        (preprocess-js (js-sources compiler) (beautify compiler))
        ;; All of it
        (html-sources compiler))
    (target compiler) :if-exists :supersede))

src/main.ps

@@ -1,15 +1,21 b''
 
 (in-package sugar-qsp)
 
 (setf (root)
       (ps:create vars (ps:create)
                  objs (list)
                  state-stash (ps:create)
                  acts (ps:create)
-                 locations (ps:create)))
+                 locs (ps:create)))
 
+;; Launch the game from the first location
 (setf window.onload
       (lambda ()
-        (funcall (ps:getprop (root locations)
-                             (ps:chain *object (keys (root locations)) 0)))
+        (funcall (ps:getprop (root locs)
+                             (ps:chain *object (keys (root locs)) 0)))
         (values)))
+
+;; Close the dropdown on any click
+(setf window.onclick
+      (lambda (event)
+        (setf (ps:@ (api-call get-frame :dropdown) style display) "none")))

src/parser.lisp

@@ -1,571 +1,571 b''
 
 (in-package sugar-qsp)
 
 ;;;; Parses TXT source to an intermediate representation
 
 ;;; 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)))
          (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)) 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))
 
 (p:defrule spaces? (* (or #\space #\tab line-continuation))
   (:constant nil))
 
 (p:defrule colon #\:
   (: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
 
 ;; From the official docs
 (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 fcolor $fname freelib fsize func getobj gosub goto gs gt if iif inclib input instr isnum isplay jump killall killobj killqst killvar lcase lcolor len let loc $maintxt max menu mid min mod msecscount msg nl *nl no nosave obj $onactsel $ongload $ongsave $onnewloc $onobjadd $onobjdel $onobjsel opengame openqst or p *p pl *pl play qspver rand refint replace rgb rnd savegame selact selobj set settimer showacts showinput showobjs showstat $stattxt str strcomp strfind strpos trim ucase unsel unselect $usercom user_text usrtxt val view wait xgoto xgt))
 
 (defun qsp-keyword-p (id)
   (member (intern (string-upcase id)) *keywords*))
 
 (defun not-qsp-keyword-p (id)
   (not (member (intern (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)
     (let ((id (p:text list)))
       (when (member id *keywords*)
         (error "~A is a keyword" id))
       (intern (string-upcase id)))))
 
 (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* '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* 'exec (p:parse 'exec-body (second list)))))
 
 (p:defrule dstring-exec (and (p:~ "'exec:") dstring-exec-body #\')
   (:lambda (list)
     (list* 'exec (p:parse 'exec-body (second list)))))
 
 (p:defrule brace-string (and #\{ before-statement block-body #\})
   (:lambda (list)
     (list* 'qspblock (third list))))
 
 ;;; Location
 
 (p:defrule sugar-qsp-grammar (and (* (or spaces #\newline))
                                   (* location))
   (:function second))
 
 (p:defrule location (and location-header block-body location-end)
   (:destructure (header body end)
     (declare (ignore end))
     `(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 #\- #\newline before-statement)
+(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 assignment
                                expression-output))
   (:function second))
 
 (p:defrule expr-stopper (or comment block non-returning-intrinsic))
 
 (p:defrule string-output qsp-string
   (:lambda (string)
     (list 'main-pl string)))
 
 (p:defrule expression-output expression
   (:lambda (list)
     (list 'main-pl list)))
 
 (p:defrule label (and colon identifier)
   (:lambda (list)
     (intern (string (second list)) :keyword)))
 
 (p:defrule comment (and #\! (* (or text-spaces qsp-string brace-string not-newline)))
   (:constant nil))
 
 ;;; Blocks
 
 (p:defrule block (or block-act block-if))
 
 (p:defrule block-if (and block-if-head block-if-body)
   (:destructure (head body)
     `(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-act-ml block-act-sl))
   (:lambda (list)
     (apply #'append list)))
 
 (p:defrule block-act-sl line-body)
 
 (p:defrule block-act-ml (and newline-block-body block-act-end)
   (:lambda (list)
     (apply #'list* (butlast 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) '(str ""))))))
 
 (p:defrule block-act-head-img (and #\, spaces? qsp-string spaces?)
   (:lambda (list)
     (or (third list) "")))
 
 (p:defrule block-act-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 spaces (p:& #\newline) (p:& #\&))
   (:constant nil))
 (p:defrule base-arguments (and first-argument (* next-argument))
   (:destructure (first rest)
     (list* first rest)))
 
 ;;; 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 10) &rest names)
   (declare (ignore returning))
   (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* ',sym arguments))))
 
 (defintrinsics (intrinsic returning-intrinsic non-returning-intrinsic)
   ;; Transitions
   (goto     nil 0 10 "gt" "goto")
   (xgoto    nil 0 10 "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 10 "max")
   (qspmin   t   1 10 "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 10 "gosub" "gs")
   (func     t   1 10)
   (exit     nil 0 0)
   ;; Jump
   (jump     nil 1 1)
   ;; Dynamic
   (dynamic  nil 1 10)
   (dyneval  t   1 10)
   ;; Main window
   (main-p   nil 1 1 "*p")
   (main-pl  nil 1 1 "*pl")
   (main-nl  nil 0 1 "*nl")
   (maintxt  t   0 0)
   (desc     t   1 1)
   (main-clear   nil 0 0 "*clear" "*clr")
   ;; Aux window
   (showstat nil 1 1)
   (stat-p    nil 1 1 "p")
   (stat-pl   nil 1 1 "pl")
   (stat-nl   nil 0 1 "nl")
   (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)
   ;; Sound
   (play     nil 1 2)
   (isplay   t   1 1)
   (close    nil 1 1)
   (closeall nil 0 0 "close all")
   ;; Images
   (refint   nil 0 0)
   (view     nil 0 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 1)
-  (savegame nil 0 1)
+  (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 cat-expr (* (and spaces? (or "<>" "<=" ">=" "=<" "=>"
                                                           #\= #\< #\> #\!)
                                          spaces? cat-expr)))
   (:function do-binop))
 
 (p:defrule cat-expr (and sum-expr (* (and spaces? #\& spaces? (p:! expr-stopper) sum-expr)))
   (:lambda (list)
     (do-binop (list (first list) (mapcar (lambda (l)
                                            (remove-nth l 3))
                                          (second list))))))
 
 (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)
     (list 'var id (or idx 0))))
 
 (p:defrule array-index (and #\[ spaces? (p:? expression) spaces? #\])
   (:lambda (list)
     (or (third list) :end)))
 
 (p:defrule assignment (or kw-assignment plain-assignment)
   (:destructure (var eq expr)
     (declare (ignore eq))
     (list 'set var expr)))
 
 (p:defrule plain-assignment (and variable spaces? #\= spaces? expression)
   (:function remove-nil))
 (p:defrule kw-assignment (and (or (p:~ "let") (p:~ "set")) spaces? plain-assignment)
   (:function third))
 
 ;;; 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,192 +1,188 b''
 
 (in-package sugar-qsp)
 
 ;;;; Parenscript macros which make the parser's intermediate
 ;;;; representation directly compilable by Parenscript
 ;;;; Some utility macros for other .ps sources too.
 
 ;;; Utils
 
 (ps:defpsmacro defm (path args &body body)
   `(setf ,path (lambda ,args ,@body)))
 
 (ps:defpsmacro root (&rest path)
   `(ps:@ *sugar-q-s-p ,@path))
 
 (ps:defpsmacro in (key obj)
   `(ps:chain ,obj (has-own-property ,key)))
 
 (ps:defpsmacro conserving-vars (vars &body body)
   "Calls body with safely stored away VARS (whole arrays, both namespaces), and restores their values after that returning what BODY returns."
   `(let ((__conserved (list ,@(loop :for var :in vars
                                  :collect `(root vars ,var)))))
      ,@(loop :for var :in vars
           :collect `(setf (root vars ,var) (ps:create :num 0 :str "")))
      (unwind-protect
           (progn ,@body)
        (progn
          ,@(loop :for var :in vars
               :for i from 0
               :collect `(setf (root vars ,var) (ps:@ __conserved ,i)))))))
 
 ;;; Common
 
 (defmacro defpsintrinsic (name)
   `(ps:defpsmacro ,name (&rest args)
      `(funcall (root lib ,',name)
                ,@args)))
 
 (defmacro defpsintrinsics (() &rest names)
   `(progn ,@(loop :for name :in names
                  :collect `(defpsintrinsic ,name))))
 
 (defpsintrinsics ()
-    killvar obj loc no qspver curloc rand rnd qspmax qspmin killall copyarr arrsize arrpos arrcomp len mid ucase lcase trim replace instr isnum val qspstr strcomp strfind strpos iif gosub func dynamic dyneval main-p main-pl main-nl maintxt main-clear showstat stat-p stat-pl stat-nl stattxt stat-clear cls msg showacts delact curacts cla showobjs addobj delobj killobj countobj getobj menu play isplay close closeall refint view rgb showinput usertxt cmdclear input openqst addqst killqst opengame savegame wait msecscount settimer)
+    rand copyarr arrpos arrcomp instr isnum strcomp strfind strpos iif gosub func dynamic dyneval main-p main-pl main-nl maintxt main-clear stat-p stat-pl stat-nl stattxt stat-clear cls curacts addobj delobj killobj menu play isplay close closeall refint view rgb showinput usertxt cmdclear input openqst addqst killqst opengame savegame wait msecscount settimer)
 
 (ps:defpsmacro api-call (func &rest args)
   `(funcall (root api ,func) ,@args))
 
 (ps:defpsmacro label-block (&body body)
   `(block nil
      ,@(when (some #'keywordp body)
          '((defvar __labels)))
      (tagbody
         ,@body)
      (values)))
 
 (ps:defpsmacro str (&rest forms)
   (cond ((zerop (length forms))
          "")
         ((and (= 1 (length forms))
               (stringp (first forms)))
          (first forms))
         (t
          `(& ,@forms))))
 
 ;;; 1loc
 
 (ps:defpsmacro location ((name) &body body)
-  `(setf (root locations ,name)
+  `(setf (root locs ,name)
          (lambda ()
            (label-block
-            ,@body
-            (api-call update-acts)))))
+            ,@body))))
 
 (ps:defpsmacro goto (target &rest args)
   `(progn
      (funcall (root lib goto) ,target ,@args)
      (exit)))
 
 (ps:defpsmacro xgoto (target &rest args)
   `(progn
      (funcall (root lib xgoto) ,target ,@args)
      (exit)))
 
 (ps:defpsmacro desc (target)
   (declare (ignore target))
   (report-error "DESC is not supported"))
 
 ;;; 2var
 
 (ps:defpsmacro var (name index)
   `(api-call get-var ,(string name) ,index))
 
 (ps:defpsmacro set ((var vname vindex) value)
   (assert (eq var 'var))
   `(api-call set-var ,(string vname) ,vindex ,value))
 
 ;;; 3expr
 
 (ps:defpsmacro <> (op1 op2)
   `(not (equal ,op1 ,op2)))
 
 (ps:defpsmacro ! (op1 op2)
   `(not (equal ,op1 ,op2)))
 
 ;;; 4code
 
 (ps:defpsmacro exec (&body body)
   (format nil "javascript: ~{~A~^~%~}" (mapcar #'ps:ps* body)))
 
 ;;; 5arrays
 
 ;;; 6str
 
 (ps:defpsmacro & (&rest args)
   `(ps:chain "" (concat ,@args)))
 
 ;;; 7if
 
 (ps: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
 
 (ps:defpsmacro jump (target)
   `(return-from ,(intern (string-upcase (second target)))
      (funcall (ps:getprop __labels ,target))))
 
 (ps:defpsmacro tagbody (&body body)
   (let ((funcs (list nil :__nil)))
     (dolist (form body)
       (cond ((keywordp form)
              (setf (first funcs) (reverse (first funcs)))
              (push 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
            ,@body)
         `(progn
            (setf ,@(loop :for f :on funcs :by #'cddr
                       :append (list `(ps:@ __labels ,(first f))
                                     `(block ,(intern (string-upcase (string (first f))))
                                        ,@(second f)
                                        ,@(when (third f)
                                            `((funcall
                                               (ps:getprop __labels ,(third f)))))))))
            (jump (str "__nil"))))))
 
-(ps:defpsmacro exit ()
-  `(return-from nil (values)))
-
 ;;; 10dynamic
 
 (ps:defpsmacro qspblock (&body body)
   `(lambda ()
      (label-block
       ,@body)))
 
 ;;; 11main
 
 (ps:defpsmacro act (name img &body body)
   `(api-call add-act ,name ,img
              (lambda ()
                (label-block
                 ,@body))))
 
 ;;; 12aux
 
 ;;; 13diag
 
 ;;; 14act
 
 ;;; 15objs
 
 ;;; 16menu
 
 ;;; 17sound
 
 ;;; 18img
 
 ;;; 19input
 
 ;;; 20time

sugar-qsp.asd

@@ -1,11 +1,13 b''
 
 (defsystem sugar-qsp
   :description "QSP compiler to monolithic HTML page"
   :depends-on (:alexandria :esrap
                :parenscript :parse-js :cl-uglify-js :flute)
   :pathname "src/"
   :serial t
   :components ((:file "package")
                (:file "ps-macros")
+               (:file "intrinsic-macros")
+               (:file "class")
                (:file "main")
                (:file "parser")))