emacs: Move guile related code to "guix-guile.el".
* emacs/guix-backend.el (guix-make-guile-expression): Move to... * emacs/guix-guile.el: ... here. New file. * emacs/guix-base.el: Use it. * emacs/guix-command.el: Use it. * emacs.am (ELFILES): Add it.
This commit is contained in:
parent
ee1c4cbaf9
commit
c74cd6cc12
1
emacs.am
1
emacs.am
|
@ -25,6 +25,7 @@ ELFILES = \
|
||||||
emacs/guix-command.el \
|
emacs/guix-command.el \
|
||||||
emacs/guix-emacs.el \
|
emacs/guix-emacs.el \
|
||||||
emacs/guix-external.el \
|
emacs/guix-external.el \
|
||||||
|
emacs/guix-guile.el \
|
||||||
emacs/guix-help-vars.el \
|
emacs/guix-help-vars.el \
|
||||||
emacs/guix-history.el \
|
emacs/guix-history.el \
|
||||||
emacs/guix-info.el \
|
emacs/guix-info.el \
|
||||||
|
|
|
@ -305,24 +305,6 @@ additional internal REPL if it exists."
|
||||||
(defvar guix-operation-buffer nil
|
(defvar guix-operation-buffer nil
|
||||||
"Buffer from which the latest Guix operation was performed.")
|
"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)
|
(defun guix-eval (str &optional wrap)
|
||||||
"Evaluate guile expression STR.
|
"Evaluate guile expression STR.
|
||||||
If WRAP is non-nil, wrap STR into (begin ...) form.
|
If WRAP is non-nil, wrap STR into (begin ...) form.
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
(require 'cl-lib)
|
(require 'cl-lib)
|
||||||
(require 'guix-profiles)
|
(require 'guix-profiles)
|
||||||
(require 'guix-backend)
|
(require 'guix-backend)
|
||||||
|
(require 'guix-guile)
|
||||||
(require 'guix-utils)
|
(require 'guix-utils)
|
||||||
(require 'guix-history)
|
(require 'guix-history)
|
||||||
(require 'guix-messages)
|
(require 'guix-messages)
|
||||||
|
|
|
@ -65,6 +65,7 @@
|
||||||
(require 'guix-help-vars)
|
(require 'guix-help-vars)
|
||||||
(require 'guix-read)
|
(require 'guix-read)
|
||||||
(require 'guix-base)
|
(require 'guix-base)
|
||||||
|
(require 'guix-guile)
|
||||||
(require 'guix-external)
|
(require 'guix-external)
|
||||||
|
|
||||||
(defgroup guix-commands nil
|
(defgroup guix-commands nil
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue