diff options
| -rw-r--r-- | emacs.am | 1 | ||||
| -rw-r--r-- | emacs/guix-backend.el | 47 | ||||
| -rw-r--r-- | emacs/guix-geiser.el | 84 |
3 files changed, 102 insertions, 30 deletions
diff --git a/emacs.am b/emacs.am index f8bd86dc0b..5d403b212f 100644 --- a/emacs.am +++ b/emacs.am @@ -25,6 +25,7 @@ ELFILES = \ emacs/guix-command.el \ emacs/guix-emacs.el \ emacs/guix-external.el \ + emacs/guix-geiser.el \ emacs/guix-guile.el \ emacs/guix-help-vars.el \ emacs/guix-history.el \ diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el index 26e33b3d15..412d648b9d 100644 --- a/emacs/guix-backend.el +++ b/emacs/guix-backend.el @@ -1,6 +1,6 @@ -;;; guix-backend.el --- Communication with Geiser +;;; guix-backend.el --- Making and using Guix REPL -;; Copyright © 2014 Alex Kost <alezost@gmail.com> +;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com> ;; This file is part of GNU Guix. @@ -19,9 +19,10 @@ ;;; Commentary: -;; This file provides the code for interacting with Guile using Geiser. +;; This file provides the code for interacting with Guile using Guix REPL +;; (Geiser REPL with some guix-specific additions). -;; By default (if `guix-use-guile-server' is non-nil) 2 Geiser REPLs are +;; By default (if `guix-use-guile-server' is non-nil) 2 Guix REPLs are ;; started. The main one (with "guile --listen" process) is used for ;; "interacting" with a user - for showing a progress of ;; installing/deleting Guix packages. The second (internal) REPL is @@ -52,6 +53,8 @@ ;;; Code: (require 'geiser-mode) +(require 'geiser-guile) +(require 'guix-geiser) (require 'guix-config) (require 'guix-emacs) @@ -305,28 +308,15 @@ additional internal REPL if it exists." (defvar guix-operation-buffer nil "Buffer from which the latest Guix operation was performed.") -(defun guix-eval (str &optional wrap) - "Evaluate guile expression STR. -If WRAP is non-nil, wrap STR into (begin ...) form. -Return a list of strings with result values of evaluation." - (with-current-buffer (guix-get-repl-buffer 'internal) - (let* ((wrapped (if wrap (geiser-debug--wrap-region str) str)) - (code `(:eval (:scm ,wrapped))) - (ret (geiser-eval--send/wait code))) - (if (geiser-eval--retort-error ret) - (error "Error in evaluating guile expression: %s" - (geiser-eval--retort-output ret)) - (cdr (assq 'result ret)))))) - -(defun guix-eval-read (str &optional wrap) - "Evaluate guile expression STR. -For the meaning of WRAP, see `guix-eval'. -Return elisp expression of the first result value of evaluation." - ;; Parsing scheme code with elisp `read' is probably not the best idea. - (read (replace-regexp-in-string - "#f\\|#<unspecified>" "nil" - (replace-regexp-in-string - "#t" "t" (car (guix-eval str wrap)))))) +(defun guix-eval (str) + "Evaluate STR with guile expression using Guix REPL. +See `guix-geiser-eval' for details." + (guix-geiser-eval str (guix-get-repl-buffer 'internal))) + +(defun guix-eval-read (str) + "Evaluate STR with guile expression using Guix REPL. +See `guix-geiser-eval-read' for details." + (guix-geiser-eval-read str (guix-get-repl-buffer 'internal))) (defun guix-eval-in-repl (str &optional operation-buffer operation-type) "Switch to Guix REPL and evaluate STR with guile expression there. @@ -340,10 +330,7 @@ successful executing of the current operation, (setq guix-repl-operation-p t guix-repl-operation-type operation-type guix-operation-buffer operation-buffer) - (let ((repl (guix-get-repl-buffer))) - (with-current-buffer repl - (geiser-repl--send str)) - (geiser-repl--switch-to-buffer repl))) + (guix-geiser-eval-in-repl str (guix-get-repl-buffer))) (provide 'guix-backend) diff --git a/emacs/guix-geiser.el b/emacs/guix-geiser.el new file mode 100644 index 0000000000..de139b72ff --- /dev/null +++ b/emacs/guix-geiser.el @@ -0,0 +1,84 @@ +;;; guix-geiser.el --- Interacting with Geiser -*- lexical-binding: t -*- + +;; Copyright © 2015 Alex Kost <alezost@gmail.com> + +;; This file is part of GNU Guix. + +;; GNU Guix is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Guix is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <http://www.gnu.org/licenses/>. + +;;; Commentary: + +;; This file provides functions to evaluate guile code using Geiser. + +;;; Code: + +(require 'geiser-mode) + +(defun guix-geiser-repl () + "Return the current Geiser REPL." + (or geiser-repl--repl + (geiser-repl--repl/impl 'guile) + (error "Geiser REPL not found"))) + +(defun guix-geiser-eval (str &optional repl) + "Evaluate STR with guile expression using Geiser REPL. +If REPL is nil, use the current Geiser REPL. +Return a list of strings with result values of evaluation." + (with-current-buffer (or repl (guix-geiser-repl)) + (let ((res (geiser-eval--send/wait `(:eval (:scm ,str))))) + (if (geiser-eval--retort-error res) + (error "Error in evaluating guile expression: %s" + (geiser-eval--retort-output res)) + (cdr (assq 'result res)))))) + +(defun guix-geiser-eval-read (str &optional repl) + "Evaluate STR with guile expression using Geiser REPL. +Return elisp expression of the first result value of evaluation." + ;; Parsing scheme code with elisp `read' is probably not the best idea. + (read (replace-regexp-in-string + "#f\\|#<unspecified>" "nil" + (replace-regexp-in-string + "#t" "t" (car (guix-geiser-eval str repl)))))) + +(defun guix-repl-send (cmd &optional save-history) + "Send CMD input string to the current REPL buffer. +This is the same as `geiser-repl--send', but with SAVE-HISTORY +argument. If SAVE-HISTORY is non-nil, save CMD in the REPL +history." + (when (and cmd (eq major-mode 'geiser-repl-mode)) + (geiser-repl--prepare-send) + (goto-char (point-max)) + (comint-kill-input) + (insert cmd) + (let ((comint-input-filter (if save-history + comint-input-filter + 'ignore))) + (comint-send-input nil t)))) + +(defun guix-geiser-eval-in-repl (str &optional repl no-history no-display) + "Switch to Geiser REPL and evaluate STR with guile expression there. +If NO-HISTORY is non-nil, do not save STR in the REPL history. +If NO-DISPLAY is non-nil, do not switch to the REPL buffer." + (let ((repl (or repl (guix-geiser-repl)))) + (with-current-buffer repl + ;; XXX Since Geiser 0.8, `geiser-repl--send' has SAVE-HISTORY + ;; argument, so use this function eventually and remove + ;; `guix-repl-send'. + (guix-repl-send str (not no-history))) + (unless no-display + (geiser-repl--switch-to-buffer repl)))) + +(provide 'guix-geiser) + +;;; guix-geiser.el ends here |