This commit is contained in:
Nathan Dwarshuis 2022-03-27 14:56:03 -04:00
parent 1e384f2026
commit 97aa47ef67
1 changed files with 4 additions and 1 deletions

View File

@ -1606,6 +1606,9 @@ used for optimization."
(-when-let (p (alist-get org-x-prop-parent-type props nil nil #'equal)) (-when-let (p (alist-get org-x-prop-parent-type props nil nil #'equal))
(equal p org-x-prop-parent-type-iterator)))) (equal p org-x-prop-parent-type-iterator))))
;; TODO these next two could be made more efficient by cutting out the
;; earlystop form and returning error in the rank form (the trans form is
;; still needed in case there is only one child)
(defun org-x-dag-bs-action-subiter-complete-fold (child-bss type-name comp-key) (defun org-x-dag-bs-action-subiter-complete-fold (child-bss type-name comp-key)
(declare (indent 1)) (declare (indent 1))
(org-x-dag-bs-fold-children child-bss `(,comp-key ,it-comptime) (org-x-dag-bs-fold-children child-bss `(,comp-key ,it-comptime)
@ -1668,7 +1671,7 @@ used for optimization."
(org-x-dag-bs :error "Sub-iterators with children cannot be scheduled")) (org-x-dag-bs :error "Sub-iterators with children cannot be scheduled"))
((and dead child-bss) ((and dead child-bss)
(org-x-dag-bs :error "Sub-iterators with children cannot be deadlined")) (org-x-dag-bs :error "Sub-iterators with children cannot be deadlined"))
((not (xor sched dead)) ((and (not child-bss) (not (xor sched dead)))
(org-x-dag-bs :error "Sub-iterators must either be deadlined or scheduled")) (org-x-dag-bs :error "Sub-iterators must either be deadlined or scheduled"))
((org-x-dag-node-data-is-iterator-p node-data) ((org-x-dag-node-data-is-iterator-p node-data)
(org-x-dag-bs :error "Iterators cannot be nested")) (org-x-dag-bs :error "Iterators cannot be nested"))