Null indexes

examples/5arrays.txt

@@ -20,6 +20,7 b''
 $objs[] = 'Топор'      &! [0] = 'Напильник',
 $objs[] = 'Доска'      &! [1] = 'Топор', [2] = 'Доска'
 
-$a = $objs[] &! 'Доска' из примера выше
-a = сорт_яблока[] &! 4 из примера выше
+*pl $objs[0] &! 'Напильник' из примера выше
+*pl $objs[] &! 'Доска' из примера выше
+*pl сорт_яблока[] &! 4 из примера выше
 -

src/api.ps

@@ -216,11 +216,11 b''
 
 ;;; Variables
 
-(defun new-var (&optional index)
+(defun new-var (slot &rest indexes)
   (let ((v (list)))
-    (when index
+    (dolist (index indexes)
       (setf (elt v index) (if (eq #\$ (elt slot 0)) "" 0)))
-    (setf (@ v indexes) (create))
+    (setf (@ v :indexes) (create))
     v))
 
 (defun set-str-element (slot index value)

src/package.lisp

@@ -31,7 +31,7 b''
            #:init-args #:get-result #:call-loc #:call-act
            #:get-frame #:add-text #:get-text #:clear-text #:enable-frame
            #:add-act #:del-act #:clear-act #:update-acts
-           #:qspfor
+           #:set-str-element #:set-any-element
            #:*var #:new-value #:index-num #:get #:set #:kill
            #:var-real-name #:ensure-var #:var-ref #:get-var #:set-var
            #:get-array #:set-array #:kill-var #:array-size

src/ps-macros.lisp

@@ -48,16 +48,16 b''
 (defparameter *service-variables*
   '((usehtml 0)
     (result 0)
-    ($result "")
-    ($ongload "")
-    ($ongsave "")
-    ($onobjadd "")
-    ($onobjdel "")
-    ($onobjsel "")
-    ($onnewloc "")
-    ($onactsel "")
-    ($counter "")
-    ($usercom "")))
+    ($result 0)
+    ($ongload 0)
+    ($ongsave 0)
+    ($onobjadd 0)
+    ($onobjdel 0)
+    ($onobjsel 0)
+    ($onnewloc 0)
+    ($onactsel 0)
+    ($counter 0)
+    ($usercom 0)))
 
 (defpsmacro game ((name) &body body)
   (setf body (walker:walk 'for-transform body))
@@ -95,11 +95,22 b''
 (defvar *locals* nil)
 
 (defpsmacro create-globals (globals)
-  `(chain *object
-          (assign (root vars)
-                  (create ,@(loop :for (name index slot)
-                               :in globals
-                               :append `(,(string-upcase name) (api-call new-var ,index)))))))
+  (flet ((indexes (name)
+           (remove nil
+                   (remove-if #'listp
+                              (mapcar #'second
+                                      (remove name globals
+                                              :key #'first
+                                              :test-not #'eq))))))
+    (let ((names (remove-duplicates (mapcar #'first globals))))
+      `(chain *object
+              (assign (root vars)
+                      (create
+                       ,@(loop :for sym :in names
+                            :for indexes := (indexes sym)
+                            :for name := (string-upcase sym)
+                            :append `(,name
+                                      (api-call new-var ,name ,@indexes)))))))))
 
 (walker:deftransform globals qspvar (&rest var)
   (pushnew var *globals* :test #'equal)
@@ -113,8 +124,9 b''
   (when locals
     `(progn
        (var locals (create
-                    ,@(loop :for (name index) :in locals
-                         :append `(,(string-upcase name) (api-call new-var))))))))
+                    ,@(loop :for (sym index) :in locals
+                         :for name := (string-upcase sym)
+                         :append `(,name (api-call new-var ,name))))))))
 
 ;; locations, blocks, and acts all have their own locals namespace
 (walker:deftransform-stop locals qspblock)
@@ -137,7 +149,9 b''
 
 (defun literal-string-p (form)
   (and (listp form)
-       (eq 'str (first form))))
+       (= 2 (length form))
+       (eq 'str (first form))
+       (stringp (second form))))
 
 (defun variable-number-p (form)
   (and (listp form)
@@ -158,17 +172,19 b''
                        'locals '(root vars))
                   ,(string-upcase name))))
       (cond
+        ((null index)
+         `(chain (elt ,slot) (push ,expr)))
         ((or (numberp index)
              (variable-number-p index))
          `(setf (elt ,slot ,index)
                 ,(walker:walk 'apply-vars expr)))
         ((or (literal-string-p index)
              (variable-string-p index))
-         `(set-str-element ,slot ,(walker:walk 'apply-vars index)
-                           (walker:walk 'apply-vars ,expr)))
+         `(api:set-str-element ,slot ,(walker:walk 'apply-vars index)
+                               ,(walker:walk-continue expr)))
         (t
-         `(set-any-element ,slot ,index
-                           (walker:walk 'apply-vars ,expr)))))))
+         `(api:set-any-element ,slot ,(walker:walk 'apply-vars index)
+                               ,(walker:walk-continue expr)))))))
 
 (walker:deftransform apply-vars local (var &optional expr)
   (when expr
@@ -179,14 +195,16 b''
                 ,(if (member name *locals* :key #'first) 'locals '(root vars))
                 ,(string-upcase name))))
     (cond
+      ((null index)
+       `(elt ,slot (1- (length ,slot))))
       ((or (numberp index)
            (variable-number-p index))
-       `(elt ,slot ,index))
+       `(elt ,slot ,(walker:walk-continue index)))
       ((or (literal-string-p index)
            (variable-string-p index))
-       `(elt ,slot (@ ,slot :indexes ,index)))
+       `(elt ,slot (@ ,slot :indexes ,(walker:walk-continue index))))
       (t
-       `(get-element ,slot ,index)))))
+       `(get-element ,slot ,(walker:walk-continue index))))))
 
 (walker:deftransform apply-vars qspblock (&rest block)
   (declare (ignore block))