work to remove render points

Author: phantomics

libraries/dfns/array/demo.lisp

@@ -101,12 +101,12 @@
          (is "fuzzy∘months¨'dcmbr' 'marching' 'febury'" #("December" "March" "February"))
          (is "↓dsp 'hello' 'world'" #("───────────"
                                       "hello│world"))
-         ;; (is "↓0 dsp Rgt⍣5 ⊢2 Tape 2/¨12↑⎕A" #("────────────────│FF│GG│────────────────"
-         ;;                                       "─────────────│EE       HH│─────────────"
-         ;;                                       "──────────│DD             II│──────────"
-         ;;                                       "───────│CC                   JJ│───────"
-         ;;                                       "────│BB                         KK│────"
-         ;;                                       "∘│AA                               LL│∘"))
+         (is "↓0 dsp Rgt⍣5 ⊢2 Tape 2/¨12↑⎕A" #("────────────────│FF│GG│────────────────"
+                                               "─────────────│EE       HH│─────────────"
+                                               "──────────│DD             II│──────────"
+                                               "───────│CC                   JJ│───────"
+                                               "────│BB                         KK│────"
+                                               "∘│AA                               LL│∘"))
          (is "↓dsp 3 3⍴⊂2 2⍴⍳4" #("───────────"
                                   "1 2│1 2│1 2"
                                   "3 4│3 4│3 4"

libraries/dfns/power/demo.lisp

@@ -31,7 +31,7 @@
          (is "⌊1000×GM 1 2 3 4 5" #(2605))
          (is "⌊1000×AGM 1 2 3 4 5" 2799)
          (is "⌊1000×÷AGM 1 2*÷2" 834)
-         ;; (is "⌊1000×ArcTan 0.5" 463)
+         (is "⌊1000×ArcTan 0.5" 463)
          (is "⌊1000ׯ3○0.5" 463)
          (is "⌊1000×⍬⍴{⍵×2-¯1↑⍵} limit 20 0.3" 66666)
          (is "6 {'<',⍵,'>'} pow 'wow'" "<<<<<<wow>>>>>>")

utilities.lisp

@@ -1152,7 +1152,6 @@
                                                                   )
                                                               arg `(render-varrays ,arg)))))
     ;; (print (list :aa arguments))
-    ;; { ee←{↑⍪/(⊂⍺),⍶,⊂⍵} ⋄ ⍵⊃⊃↑{⍺ ee⌿⍵}/9⍴⊂⍳9 } 22 - fails without rendered args
     ;; (print (list :aa arguments))
     (or (when (and (listp function)
                    (eql 'function (first function))

varray/derived.lisp

@@ -3012,20 +3012,24 @@
                         (if (= 1 path-length)
                             (let ((indexer (if (not (functionp base-indexer))
                                                base-indexer
-                                               (if (typep base 'vader-mix)
+                                               (if (or (typep base 'vader-mix)
+                                                       (and (typep base 'vader-pick)
+                                                            (typep (vader-base base) 'vader-mix)))
+                                                   ;; vader-pick is handled here for cases like
+                                                   ;; { ee←{↑⍪/(⊂⍺),⍶,⊂⍵} ⋄ ⍵⊃⊃↑{⍺ ee⌿⍵}/9⍴⊂⍳9 } 22
+                                                   ;; TODO: condense successive picks like ⍵⊃⊃ into one
                                                    (let ((bix (funcall base-indexer 0)))
+                                                     ;; (print (list :ib bix path-value))
                                                      (if (not (arrayp bix))
-                                                         bix (row-major-aref bix path-value)))
-                                                   (funcall base-indexer path-value))
-                                               ;; (let ((bix (funcall base-indexer 0)))
-                                               ;;   (if (or (not (arrayp bix))
-                                               ;;           (typep base 'vader-mix))
-                                               ;;       bix (row-major-aref bix path-value)))
-                                               )))
-                              ;; (print (list :nn indexer base-indexer (funcall base-indexer 0)))
-                              (if (and (not (shape-of indexer))
-                                       (or (arrayp indexer) (varrayp indexer)))
-                                  (setf (vads-subrendering varray) t))
+                                                         (funcall (generator-of bix) path-value)
+                                                         (row-major-aref bix path-value)))
+                                                   (funcall base-indexer path-value)))))
+                              ;; (print (list :nn base indexer base-indexer (funcall base-indexer 0)))
+                              ;; (print (list :n2 base indexer path-value))
+                              ;; (setf april::oop base)
+                              (when (and (not (shape-of indexer))
+                                         (or (arrayp indexer) (varrayp indexer)))
+                                (setf (vads-subrendering varray) t))
                               indexer)
                             (fetch-reference varray (funcall base-indexer path-value)
                                              path (1+ (or path-index 0)))))))
@@ -3041,14 +3045,9 @@
                                      (if (zerop (size-of base))
                                          (prototype-of base)
                                          (let ((bix (funcall base-indexer 0)))
-                                           ;; (print (list :ba base bix (funcall (generator-of base) 0)
-                                           ;;              (render (generator-of
-                                           ;;               (generator-of (funcall (generator-of base) 0))))
-                                           ;;              ))
                                            (if (or (not (arrayp bix))
                                                    ;; TODO: special mix case, generalize
-                                                   (not (typep base 'vader-mix))
-                                                   )
+                                                   (not (typep base 'vader-mix)))
                                                bix (row-major-aref bix 0)))))))
                     ;; (print (list :ind indexer base (shape-of base)))
                     (when (and (shape-of base) (not (shape-of indexer))