steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FUEL: a bunch of functions replaced with alist-get calls

factor-shell
Björn Lindqvist 2018-02-06 05:31:02 +01:00
parent 428023ad22
commit e257280abd
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
misc/fuel/fuel-connection.el
View File

@ -49,12 +49,6 @@
(defsubst fuel-con--request-p (req) (defsubst fuel-con--request-p (req)
(and (listp req) (eq (car req) :fuel-connection-request))) (and (listp req) (eq (car req) :fuel-connection-request)))
(defsubst fuel-con--request-string (req)
(alist-get :string req))
(defsubst fuel-con--request-buffer (req)
(alist-get :buffer req))
(defsubst fuel-con--request-deactivate (req) (defsubst fuel-con--request-deactivate (req)
(setcdr (assoc :continuation req) nil)) (setcdr (assoc :continuation req) nil))
@ -73,12 +67,6 @@
(defsubst fuel-con--connection-p (c) (defsubst fuel-con--connection-p (c)
(and (listp c) (eq (car c) :fuel-connection))) (and (listp c) (eq (car c) :fuel-connection)))
(defsubst fuel-con--connection-requests (c)
(alist-get :requests c))
(defsubst fuel-con--connection-current-request (c)
(alist-get :current c))
(defun fuel-con--connection-clean-current-request (c) (defun fuel-con--connection-clean-current-request (c)
(let* ((cell (assoc :current c)) (let* ((cell (assoc :current c))
(req (cdr cell))) (req (cdr cell)))
@ -89,9 +77,6 @@
(defsubst fuel-con--connection-completed-p (c id) (defsubst fuel-con--connection-completed-p (c id)
(gethash id (alist-get :completed c))) (gethash id (alist-get :completed c)))
(defsubst fuel-con--connection-buffer (c)
(alist-get :buffer c))
(defun fuel-con--connection-pop-request (c) (defun fuel-con--connection-pop-request (c)
(let ((reqs (assoc :requests c)) (let ((reqs (assoc :requests c))
(current (assoc :current c))) (current (assoc :current c)))
@ -194,10 +179,10 @@ sexp. fuel-con-error is thrown if the sexp is malformed."
(error (list 'fuel-con-error (format "%s" cerr)))))) (error (list 'fuel-con-error (format "%s" cerr))))))
(defun fuel-con--process-next (con) (defun fuel-con--process-next (con)
(when (not (fuel-con--connection-current-request con)) (when (not (alist-get :current con))
(let* ((buffer (fuel-con--connection-buffer con)) (let* ((buffer (alist-get :buffer con))
(req (fuel-con--connection-pop-request con)) (req (fuel-con--connection-pop-request con))
(str (and req (fuel-con--request-string req))) (str (and req (alist-get :string req)))
(cbuf (with-current-buffer (fuel-con--comint-buffer) (cbuf (with-current-buffer (fuel-con--comint-buffer)
(erase-buffer) (erase-buffer)
(current-buffer)))) (current-buffer))))
@ -211,8 +196,8 @@ sexp. fuel-con-error is thrown if the sexp is malformed."
(defun fuel-con--process-completed-request (req) (defun fuel-con--process-completed-request (req)
(let ((cont (alist-get :continuation req)) (let ((cont (alist-get :continuation req))
(id (alist-get :id req)) (id (alist-get :id req))
(rstr (fuel-con--request-string req)) (rstr (alist-get :string req))
(buffer (fuel-con--request-buffer req))) (buffer (alist-get :buffer req)))
(if (not cont) (if (not cont)
(fuel-log--warn "<%s> Dropping result for request %S (%s)" (fuel-log--warn "<%s> Dropping result for request %S (%s)"
id rstr req) id rstr req)
@ -226,7 +211,7 @@ sexp. fuel-con-error is thrown if the sexp is malformed."
(defun fuel-con--comint-redirect-hook () (defun fuel-con--comint-redirect-hook ()
(if (not fuel-con--connection) (if (not fuel-con--connection)
(fuel-log--error "No connection in buffer") (fuel-log--error "No connection in buffer")
(let ((req (fuel-con--connection-current-request fuel-con--connection))) (let ((req (alist-get :current fuel-con--connection)))
(if (not req) (fuel-log--error "No current request") (if (not req) (fuel-log--error "No current request")
(fuel-con--process-completed-request req) (fuel-con--process-completed-request req)
(fuel-con--connection-clean-current-request fuel-con--connection))))) (fuel-con--connection-clean-current-request fuel-con--connection)))))