Skip to content
Snippets Groups Projects
Commit 89bed1d5 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Remove redundant functions.

parent f35dcfa0
No related branches found
No related tags found
No related merge requests found
...@@ -138,16 +138,16 @@ ...@@ -138,16 +138,16 @@
(eval-pred predicate rest)) (eval-pred predicate rest))
(let ((next (car rest))) (let ((next (car rest)))
(generic-run-spec next input output error predicate (cdr rest) (generic-run-spec next input output error predicate (cdr rest)
(if (typep next 'sequence-spec) (if (typep next 'sequence-spec)
r r
resume))) resume)))
(when resume (when resume
(with-slots (predicate rest resume input output error) resume (with-slots (predicate rest resume input output error) resume
(when (and (consp rest) (consp (cdr rest))) (when (and (consp rest) (consp (cdr rest)))
(let ((remainder (cdr rest))) (let ((remainder (cdr rest)))
(when (eval-pred predicate remainder) (when (eval-pred predicate remainder)
(generic-run-spec (second rest) input output error (generic-run-spec (second rest) input output error
predicate (cddr rest) resume)))))))))) predicate (cddr rest) resume))))))))))
(defun process-result-list (rl) (defun process-result-list (rl)
(if (listp rl) (if (listp rl)
......
...@@ -40,36 +40,6 @@ ...@@ -40,36 +40,6 @@
(defun process-wait (p) (defun process-wait (p)
(sb-ext:process-wait p)) (sb-ext:process-wait p))
(defmethod process-result ((r result))
(labels ((eval-pred (pred rest)
(and (consp rest)
(or (null pred)
(and (functionp pred) (funcall pred (result-process r)))))))
(with-slots (process predicate rest input output error resume) r
(when process
(sb-ext:process-wait process))
(if (or (not process)
(eval-pred predicate rest))
(let ((next (car rest)))
(generic-run-spec next input output error predicate (cdr rest)
(if (typep next 'sequence-spec)
r
resume)))
(when resume
(with-slots (predicate rest resume input output error) resume
(when (and (consp rest) (consp (cdr rest)))
(let ((remainder (cdr rest)))
(when (eval-pred predicate remainder)
(generic-run-spec (second rest) input output error
predicate (cddr rest) resume))))))))))
(defun process-result-list (rl)
(if (listp rl)
(mapcar #'process-result-list rl)
(let ((next (process-result rl)))
(when next
(alexandria:flatten (list next (process-result-list next)))))))
(defun sbcl-run (spec &key input output error ignore-error-status) (defun sbcl-run (spec &key input output error ignore-error-status)
(declare (ignore ignore-error-status)) ;; THIS IS A BUG! (declare (ignore ignore-error-status)) ;; THIS IS A BUG!
(labels ((collect-threads (r) (labels ((collect-threads (r)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment