A better UI

extras/body.html

@@ -0,0 +1,7 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>

extras/default.css

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

src/api.ps

@@ -1,127 +1,147 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) ()
   )
 
+;;; 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)
-  (append-id-contents (api-call key-to-id key) text))
+  (api-call append-id (api-call key-to-id key) text))
 
 (defm (root api get-text) (key)
-  (get-id-contents (api-call key-to-id key)))
+  (api-call get-id (api-call key-to-id key)))
 
 (defm (root api clear-text) (key)
-  (set-id-contents (api-call key-to-id 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))
-  (set-id-contents "qsp-acts" ""))
+  (api-call clear-id "qsp-acts"))
 
 (defm (root api update-acts) ()
-  (set-id-contents "qsp-acts" "")
+  (api-call clear-id "qsp-acts")
   (ps:for-in (title (root acts))
     (let ((obj (ps:getprop (root acts) title)))
-      (append-id-contents "qsp-acts"
-                          (api-call make-act-html title (ps:getprop obj :img))))))
+      (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 (getprop (root vars) name))
-      (ps:delete (getprop (root vars) name index)))
+      (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/main.lisp

@@ -1,168 +1,172 b''
 
 (in-package sugar-qsp)
 
-(defun entry-point (&rest args)
-  (init-vars)
+(defun entry-point-no-args ()
+  (entry-point uiop:*command-line-arguments*))
+
+(defun entry-point (args)
   (catch :terminate
-    (destructuring-bind (&key source target js css body compile beautify)
-        (parse-opts args)
-      ;; Just compile the source
-      (when compile
-        (alexandria:write-string-into-file
-         (make-javascript (parse-file source))
-         target :if-exists :supersede)
-        (return-from entry-point))
-      ;; Read in body
-      (when body
-        (setf *html-template-body*
-              (alexandria:read-file-into-string body)))
-      ;; Compile the game's JS
-      (push (make-javascript (parse-file source)) *js-files*)
-      ;; Include js files
-      (dolist (js-file js)
-        (push (format nil "// Included file ~A~%~A" js-file
-                      (alexandria:read-file-into-string js-file))
-              *js-files*))
-      ;; Include css files
-      (dolist (css-file css)
-        (push (format nil "// Included file ~A~%~A" css-file
-                      (alexandria:read-file-into-string css-file))
-              *css-files*))
-      ;; Compile into one file
-      (alexandria:write-string-into-file (make-html beautify) target
-                                         :if-exists :supersede))))
-
-(defun init-vars ()
-  (setf *css-files* (list "
-.col1 { flush: left; clear: left; width: 80%; }
-.col2 { flush: right; clear: right; width: 20%; }
-.row1 { height: 70%; }
-.row2 { height: 30%; }
-.qsp-frame {border: 1px black; }
-#qsp-acts a {display: block; }
-"))
-  (setf *js-files* (list (compile-ps (ps-file "intrinsics.ps"))
-                         (compile-ps (ps-file "api.ps"))
-                         (compile-ps (ps-file "main.ps")))))
+    (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~^~%~%~}"
           (mapcar #'ps:ps* locations)))
 
-(defun make-html (beautify-js)
-  (html-sources (css-sources)
-                (if beautify-js
-                    (js-sources)
-                    (cl-uglify-js:ast-gen-code
-                     (cl-uglify-js:ast-mangle
-                      (cl-uglify-js:ast-squeeze
-                       (parse-js:parse-js (js-sources))))
-                     :beautify nil))))
+(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)
-  (break)
   (throw :terminate nil))
 
 ;;; JS
 
-(defparameter *js-files* nil)
-
-(defun ps-file (filename)
+(defun src-file (filename)
   (uiop/pathname:merge-pathnames*
-   (format nil "src/~A" filename)
+   filename
    (asdf:system-source-directory :sugar-qsp)))
 
-(defun js-sources ()
-  (format nil "~{~A~^~%~%~}" (reverse *js-files*)))
+(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
 
-(defparameter *css-files* nil)
-
-(defun css-sources ()
-  (format nil "~{~A~^~%~%~}" *css-files*))
+(defmethod css-sources ((compiler compiler))
+  (format nil "~{~A~^~%~%~}" (css compiler)))
 
 ;;; HTML
 
-(defparameter *html-template-body*
-  (flute:h
-    (div#qsp
-     (div#qsp-main.qsp-frame.col1.row1 " ")
-     (hr)
-     "Действия:"
-     (div#qsp-acts.qsp-frame.row2 " ")
-     (hr)
-     "Дополнительное окно:"
-     (div#qsp-stat.qsp-frame.row1 " ")
-     (hr)
-     "Инвентарь:"
-     (div#qsp-objs.qsp-frame.row2 " "))))
-
-(defun html-sources (&optional (css " ") (javascript " "))
-  (with-output-to-string (out)
-    (write
-     (let ((flute:*escape-html* nil))
+(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
-           *html-template-body*
+           body-template
            (style css)
-           (script javascript)))))
-     :stream out
-     :pretty nil)))
+           (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)))
 
-(defun write-html-default-body (filename)
-  (with-open-file (out filename :direction :output)
-    (write *html-template-body*
-           :stream out
-           :pretty t)))
+(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,14 +1,15 b''
 
 (in-package sugar-qsp)
 
-(setf (root) (ps:create vars (ps:create)
-                        objs (list)
-                        acts (ps:create)
-                        locations (ps:create)))
+(setf (root)
+      (ps:create vars (ps:create)
+                 objs (list)
+                 acts (ps:create)
+                 locations (ps:create)))
 
-(defm (root start) ()
-  (api-call init-dom)
-  (funcall (root locations *start*)))
-
-(setf window.onload (lambda ()
-                      (funcall (root start))))
+(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,206 +1,193 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 get-id-contents (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)))
-
-(ps:defpsmacro set-id-contents (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)))
-
-(ps:defpsmacro append-id-contents (id contents)
-  `(set-id-contents ,id (+ (get-id-contents ,id) ,contents)))
-
 (ps:defpsmacro conserving-vars (vars &body body)
   "Calls body with safely stored away VARS, and restores their values after that returning what BODY returns."
   `(let ((__conserved (list ,@(loop :for var :in vars
                                  :collect `(var ,var 0)))))
      ,@(loop :for var :in vars
           :collect `(set (var ,var 0) ,(if (char= #\$ (elt (string var) 0))
                                            "" 0)))
      (unwind-protect
           (progn ,@body)
        (progn
          ,@(loop :for var :in vars
                 :for i from 0
               :collect `(set (var ,var 0) (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