diff options
| -rw-r--r-- | emacs.am | 1 | ||||
| -rw-r--r-- | emacs/guix-backend.el | 18 | ||||
| -rw-r--r-- | emacs/guix-base.el | 1 | ||||
| -rw-r--r-- | emacs/guix-command.el | 1 | ||||
| -rw-r--r-- | emacs/guix-guile.el | 47 |
5 files changed, 50 insertions, 18 deletions
@@ -25,6 +25,7 @@ ELFILES = \ emacs/guix-command.el \ emacs/guix-emacs.el \ emacs/guix-external.el \ + emacs/guix-guile.el \ emacs/guix-help-vars.el \ emacs/guix-history.el \ emacs/guix-info.el \ diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el index 7db1daacf0..26e33b3d15 100644 --- a/emacs/guix-backend.el +++ b/emacs/guix-backend.el @@ -305,24 +305,6 @@ additional internal REPL if it exists." (defvar guix-operation-buffer nil "Buffer from which the latest Guix operation was performed.") -(defun guix-make-guile-expression (fun &rest args) - "Return string containing a guile expression for calling FUN with ARGS." - (format "(%S %s)" fun - (mapconcat - (lambda (arg) - (cond - ((null arg) "'()") - ((or (eq arg t) - ;; An ugly hack to separate 'false' from nil - (equal arg 'f) - (keywordp arg)) - (concat "#" (prin1-to-string arg t))) - ((or (symbolp arg) (listp arg)) - (concat "'" (prin1-to-string arg))) - (t (prin1-to-string arg)))) - args - " "))) - (defun guix-eval (str &optional wrap) "Evaluate guile expression STR. If WRAP is non-nil, wrap STR into (begin ...) form. diff --git a/emacs/guix-base.el b/emacs/guix-base.el index 685e4498d8..e64e375e33 100644 --- a/emacs/guix-base.el +++ b/emacs/guix-base.el @@ -30,6 +30,7 @@ (require 'cl-lib) (require 'guix-profiles) (require 'guix-backend) +(require 'guix-guile) (require 'guix-utils) (require 'guix-history) (require 'guix-messages) diff --git a/emacs/guix-command.el b/emacs/guix-command.el index 6fdfb93981..504d5f7ca0 100644 --- a/emacs/guix-command.el +++ b/emacs/guix-command.el @@ -65,6 +65,7 @@ (require 'guix-help-vars) (require 'guix-read) (require 'guix-base) +(require 'guix-guile) (require 'guix-external) (defgroup guix-commands nil diff --git a/emacs/guix-guile.el b/emacs/guix-guile.el new file mode 100644 index 0000000000..af8c7d255a --- /dev/null +++ b/emacs/guix-guile.el @@ -0,0 +1,47 @@ +;;; guix-guile.el --- Auxiliary tools for working with guile code -*- 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 for parsing guile code, making guile +;; expressions, etc. + +;;; Code: + +(defun guix-make-guile-expression (fun &rest args) + "Return string containing a guile expression for calling FUN with ARGS." + (format "(%S %s)" fun + (mapconcat + (lambda (arg) + (cond + ((null arg) "'()") + ((or (eq arg t) + ;; An ugly hack to separate 'false' from nil. + (equal arg 'f) + (keywordp arg)) + (concat "#" (prin1-to-string arg t))) + ((or (symbolp arg) (listp arg)) + (concat "'" (prin1-to-string arg))) + (t (prin1-to-string arg)))) + args + " "))) + +(provide 'guix-guile) + +;;; guix-guile.el ends here |