Use flex in html

TODO

@@ -1,8 +1,9 b''
 
 * Windows GUI
+* Save-load game
 * 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

extras/body.html

@@ -1,7 +1,12 b''
 
 <div id="qsp">
-  <div id="qsp-main" class="qsp-frame">&nbsp;</div>
-  <div id="qsp-acts" class="qsp-frame">&nbsp;</div>
-  <div id="qsp-stat" class="qsp-frame">&nbsp;</div>
-  <div id="qsp-objs" class="qsp-frame">&nbsp;</div>
+  <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>

extras/default.css

@@ -1,54 +1,59 b''
 
 .qsp-frame {
     border: 1px solid black;
     overflow: auto;
-    position: absolute;
     padding: 5px;
     box-sizing: border-box;
 }
 
 #qsp {
-    position: fixed;
+    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 {
-    height: 60%;
-    width: 70%;
-    top: 0;
-    left: 0;
+    flex: 6 6 60px;
 }
 
 #qsp-acts {
-    height: 40%;
-    width: 70%;
-    bottom: 0;
-    left: 0;
+    flex: 4 4 40px;
+}
+
+#qsp-input {
 }
 
 #qsp-stat {
-    height: 50%;
-    width: 30%;
-    top: 0;
-    right: 0;
+    flex: 5 5 50px;
 }
 
 #qsp-objs {
-    height: 50%;
-    width: 30%;
-    bottom: 0;
-    right: 0;
+    flex: 5 5 50px;
 }
 
 .qsp-act {
     display: block;
     padding: 2px;
     font-size: large;
 }
 
 .qsp-act:hover {
     outline: #9E9E9E outset 3px
 }

src/api.ps

@@ -1,147 +1,150 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>"))
 
-;;; Startup
-
-(defm (root api init-dom) ()
-  )
+;; 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)))
+  (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")
     (t (report-error "Internal error!"))))
 
 (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))))
     (ps:chain div (append-child (document.create-element "br")))))
 
 ;;; Actions
 
 (defm (root api add-act) (title img act)
   (setf (ps:getprop (root acts) title)
         (ps:create :img img :act act)))
 
 (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 kill-var) (name index)
   (if (eq index :whole)
       (ps:delete (ps:getprop (root vars) name))
       (ps:delete (ps:getprop (root vars) name index)))
   (values))
 
 ;;; 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>")))

src/intrinsics.ps

@@ -1,298 +1,299 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)
+  (api-call stash-state)
   (funcall (ps:getprop (root locations) (ps:chain target (to-upper-case)))))
 
 ;;; 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)
   (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
 
 (defm (root lib iif) (cond-expr then-expr else-expr)
   (if (= -1 cond-expr) then-expr else-expr))
 
 ;;; 8sub
 
 (defm (root lib gosub) (target &rest args)
-  (conserving-vars (args $args result $result)
+  (conserving-vars (args result)
     (api-call init-args args)
     (funcall (ps:getprop (root locations) target))
     (values)))
 
 (defm (root lib func) (target &rest args)
-  (conserving-vars (args $args result $result)
+  (conserving-vars (args result)
     (api-call init-args args)
     (funcall (ps:getprop (root locations) target))
     (api-call get-result)))
 
 ;;; 9loops
 
 ;;; 10dynamic
 
 (defm (root lib dyneval) (block &rest args)
-  (conserving-vars (args $args result $result)
+  (conserving-vars (args result)
     (api-call init-args args)
     (funcall block)
     (api-call get-result)))
 
 (defm (root lib dynamic) (&rest args)
-  (conserving-vars (args $args result $result)
+  (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))
 
 (defm (root lib main-pl) (s)
   (api-call add-text :main s)
   (api-call newline :main))
 
 (defm (root lib main-nl) (s)
   (api-call newline :main)
   (api-call add-text :main s))
 
 (defm (root lib maintxt) (s)
   (api-call get-text :main))
 
 (defm (root lib desc) (s)
-  (api-call report-error "DESC is not supported"))
+  "")
 
 (defm (root lib main-clear) ()
   (api-call clear-text :main))
 
 ;;; 12stat
 
 (defm (root lib showstat) ())
 
 (defm (root lib stat-p) ())
 
 (defm (root lib stat-pl) ())
 
 (defm (root lib stat-nl) ())
 
 (defm (root lib stattxt) ())
 
 (defm (root lib clear) ())
 
 (defm (root lib cls) ())
 
 ;;; 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) ())
 
 ;;; 15objs
 
 (defm (root lib showobjs) ())
 
 (defm (root lib addobj) (name)
   (ps:chain (root objs) (push name))
   (api-call update-objs))
 
 (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))
 
 (defm (root lib killobj) ())
 
 (defm (root lib countobj) ())
 
 (defm (root lib getobj) ())
 
 ;;; 16menu
 
 (defm (root lib menu) ())
 
 ;;; 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) ())
 
 (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 savegame) ())

src/main.ps

@@ -1,15 +1,15 b''
 
 (in-package sugar-qsp)
 
 (setf (root)
       (ps:create vars (ps:create)
                  objs (list)
+                 state-stash (ps:create)
                  acts (ps:create)
                  locations (ps:create)))
 
 (setf window.onload
       (lambda ()
-        (api-call init-dom)
         (funcall (ps:getprop (root locations)
                              (ps:chain *object (keys (root locations)) 0)))
         (values)))

src/ps-macros.lisp

@@ -1,193 +1,192 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, and restores their values after that returning what BODY returns."
+  "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 `(var ,var 0)))))
+                                 :collect `(root vars ,var)))))
      ,@(loop :for var :in vars
-          :collect `(set (var ,var 0) ,(if (char= #\$ (elt (string var) 0))
-                                           "" 0)))
+          :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 `(set (var ,var 0) (ps:@ __conserved ,i)))))))
+              :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)
 
 (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)
          (lambda ()
            (label-block
             ,@body
             (api-call update-acts)))))
 
 (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