diff --git a/src/api.ps b/src/api.ps --- a/src/api.ps +++ b/src/api.ps @@ -36,14 +36,14 @@ (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-id :qsp-main) - (api-call clear-id :qsp-stat) - (api-call clear-act) + (this.clear-id :qsp-main) + (this.clear-id :qsp-stat) + (this.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) + (this.update-objs) (values))) ;;; Misc @@ -92,23 +92,23 @@ (t (report-error "Internal error!")))) (defm (root api get-frame) (key) - (document.get-element-by-id (api-call key-to-id key))) + (document.get-element-by-id (this.key-to-id key))) (defm (root api add-text) (key text) - (api-call append-id (api-call key-to-id key) text)) + (this.append-id (this.key-to-id key) text)) (defm (root api get-text) (key) - (api-call get-id (api-call key-to-id key))) + (this.get-id (this.key-to-id key))) (defm (root api clear-text) (key) - (api-call clear-id (api-call key-to-id key))) + (this.clear-id (this.key-to-id key))) (defm (root api newline) (key) - (let ((div (api-call get-frame key))) + (let ((div (this.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))) + (let ((clss (ps:getprop (this.get-frame key) 'class-list))) (setf clss.style.display (if enable "block" "none")) (values))) @@ -117,22 +117,22 @@ (defm (root api add-act) (title img act) (setf (ps:getprop (root acts) title) (ps:create :img img :act act)) - (api-call update-acts)) + (this.update-acts)) (defm (root api del-act) (title) (delete (ps:getprop (root acts) title)) - (api-call update-acts)) + (this.update-acts)) (defm (root api clear-act) () (setf (root acts) (ps:create)) - (api-call clear-id "qsp-acts")) + (this.clear-id "qsp-acts")) (defm (root api update-acts) () - (api-call clear-id "qsp-acts") + (this.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)))))) + (this.append-id "qsp-acts" + (this.make-act-html title (ps:getprop obj :img)))))) ;;; Variables @@ -147,7 +147,7 @@ name)) (defm (root api ensure-var) (name index) - (let ((store (api-call var-ref name))) + (let ((store (this.var-ref name))) (unless store (setf store (ps:create)) (setf (ps:getprop (root vars) name) store))) @@ -156,8 +156,8 @@ (values)) (defm (root api var-ref) (name) - (let ((var-name (api-call var-real-name name)) - (local-store (api-call current-local-frame))) + (let ((var-name (this.var-real-name name)) + (local-store (this.current-local-frame))) (cond ((in var-name local-store) (ps:getprop local-store)) ((in var-name (root vars)) @@ -165,19 +165,14 @@ (t nil)))) (defm (root api get-var) (name index) - (let ((store (var-ref name))) - (if store - (if (in index store) - (ps:getprop store index (api-call var-slot name)) - (report-error (+ "Non-existing index: " name "[" index "]"))) - (report-error (+ "Unknown variable: " name))))) + (this.ensure-var name index) + (let ((store (this.var-ref name))) + (ps:getprop store index (this.var-slot name)))) (defm (root api set-var) (name index value) - (let ((store (var-ref name))) - (api-call ensure-var var-name index) - (setf (ps:getprop store index - (api-call var-slot name)) - value) + (this.ensure-var name index) + (let ((store (this.var-ref name))) + (setf (ps:getprop store index (this.var-slot name)) value) (values))) (defm (root api get-array) (name) @@ -193,7 +188,7 @@ (values)) (defm (root api array-size) (name) - (ps:getprop (root vars) (api-call var-real-name name) 'length)) + (ps:getprop (root vars) (this.var-real-name name) 'length)) ;;; Objects @@ -212,7 +207,7 @@ (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))) + :do (incf elt.inner-h-t-m-l (this.make-menu-item-html i item.text item.icon item.loc))) (setf elt.style.display "block"))) ;;; Content @@ -235,7 +230,7 @@ (elt (root locals) (1- (length (root locals))))) (defm (root api new-local) (name) - (let ((frame (api-call current-local-frame)) - (var-name (api-call var-real-name name))) + (let ((frame (this.current-local-frame)) + (var-name (this.var-real-name name))) (unless (in var-name frame) (setf (ps:getprop frame var-name) (ps:create)))))