2011-03-31 02:11:58 -04:00
|
|
|
;;; ob-lisp.el --- org-babel functions for common lisp evaluation
|
2010-08-03 11:09:11 -04:00
|
|
|
|
2013-01-08 09:04:32 -05:00
|
|
|
;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
|
2010-08-03 11:09:11 -04:00
|
|
|
|
2012-04-01 18:53:28 -04:00
|
|
|
;; Authors: Joel Boehland
|
|
|
|
;; Eric Schulte
|
|
|
|
;; David T. O'Toole <dto@gnu.org>
|
2011-03-31 02:11:58 -04:00
|
|
|
;; Keywords: literate programming, reproducible research
|
2010-08-03 11:09:11 -04:00
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
2011-03-31 02:11:58 -04:00
|
|
|
;; This file is part of GNU Emacs.
|
2010-08-03 11:09:11 -04:00
|
|
|
|
2011-03-31 02:11:58 -04:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2010-08-03 11:09:11 -04:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2011-03-31 02:11:58 -04:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
2010-08-03 11:09:11 -04:00
|
|
|
;; 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.
|
2011-03-31 02:11:58 -04:00
|
|
|
|
2010-08-03 11:09:11 -04:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2011-03-31 02:11:58 -04:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2010-08-03 11:09:11 -04:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2011-03-31 02:11:58 -04:00
|
|
|
;;; support for evaluating common lisp code, relies on slime for all eval
|
2010-08-03 11:09:11 -04:00
|
|
|
|
|
|
|
;;; Requirements:
|
|
|
|
|
|
|
|
;; Requires SLIME (Superior Lisp Interaction Mode for Emacs.)
|
|
|
|
;; See http://common-lisp.net/project/slime/
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
(require 'ob)
|
2010-11-12 19:02:24 -05:00
|
|
|
|
|
|
|
(declare-function slime-eval "ext:slime" (sexp &optional package))
|
2010-08-03 11:09:11 -04:00
|
|
|
|
2011-06-21 18:34:41 -04:00
|
|
|
(defvar org-babel-tangle-lang-exts)
|
2011-03-31 02:11:58 -04:00
|
|
|
(add-to-list 'org-babel-tangle-lang-exts '("lisp" . "lisp"))
|
2010-08-03 11:09:11 -04:00
|
|
|
|
2011-03-31 02:11:58 -04:00
|
|
|
(defvar org-babel-default-header-args:lisp '())
|
2012-04-10 19:03:37 -04:00
|
|
|
(defvar org-babel-header-args:lisp '((package . :any)))
|
2010-08-03 11:09:11 -04:00
|
|
|
|
2011-06-01 20:52:33 -04:00
|
|
|
(defcustom org-babel-lisp-dir-fmt
|
|
|
|
"(let ((*default-pathname-defaults* #P%S)) %%s)"
|
|
|
|
"Format string used to wrap code bodies to set the current directory.
|
|
|
|
For example a value of \"(progn ;; %s\\n %%s)\" would ignore the
|
2011-06-14 14:23:56 -04:00
|
|
|
current directory string."
|
|
|
|
:group 'org-babel
|
2012-03-19 16:38:12 -04:00
|
|
|
:version "24.1"
|
2011-06-14 14:23:56 -04:00
|
|
|
:type 'string)
|
2011-06-01 20:52:33 -04:00
|
|
|
|
2010-10-15 23:35:45 -04:00
|
|
|
(defun org-babel-expand-body:lisp (body params)
|
2010-08-03 11:09:11 -04:00
|
|
|
"Expand BODY according to PARAMS, return the expanded body."
|
2011-03-31 02:11:58 -04:00
|
|
|
(let* ((vars (mapcar #'cdr (org-babel-get-header params :var)))
|
|
|
|
(result-params (cdr (assoc :result-params params)))
|
|
|
|
(print-level nil) (print-length nil)
|
|
|
|
(body (org-babel-trim
|
|
|
|
(if (> (length vars) 0)
|
|
|
|
(concat "(let ("
|
|
|
|
(mapconcat
|
|
|
|
(lambda (var)
|
|
|
|
(format "(%S (quote %S))" (car var) (cdr var)))
|
|
|
|
vars "\n ")
|
|
|
|
")\n" body ")")
|
2011-05-31 11:54:23 -04:00
|
|
|
body))))
|
2011-03-31 02:11:58 -04:00
|
|
|
(if (or (member "code" result-params)
|
|
|
|
(member "pp" result-params))
|
|
|
|
(format "(pprint %s)" body)
|
2010-08-03 11:09:11 -04:00
|
|
|
body)))
|
|
|
|
|
|
|
|
(defun org-babel-execute:lisp (body params)
|
2011-03-31 02:11:58 -04:00
|
|
|
"Execute a block of Common Lisp code with Babel."
|
2010-11-12 19:02:24 -05:00
|
|
|
(require 'slime)
|
2011-04-07 13:31:56 -04:00
|
|
|
(org-babel-reassemble-table
|
2013-11-12 15:00:49 -05:00
|
|
|
<<<<<<< HEAD
|
2011-06-01 08:32:10 -04:00
|
|
|
((lambda (result)
|
2012-11-18 20:02:09 -05:00
|
|
|
(org-babel-result-cond (cdr (assoc :result-params params))
|
2013-09-29 15:42:37 -04:00
|
|
|
result
|
2011-06-01 08:32:10 -04:00
|
|
|
(condition-case nil
|
2013-10-06 19:13:01 -04:00
|
|
|
(if (member "output" (cdr (assoc :result-params params)))
|
|
|
|
;; read printed output using normal org table parsing
|
|
|
|
(let ((tmp-file (org-babel-temp-file "lisp-output-")))
|
|
|
|
(with-temp-file tmp-file (insert result))
|
|
|
|
(org-babel-import-elisp-from-file tmp-file))
|
|
|
|
;; read valued output as lisp
|
|
|
|
(read (org-babel-lisp-vector-to-list result)))
|
2013-09-29 15:42:37 -04:00
|
|
|
(error result))))
|
|
|
|
(funcall (if (member "output" (cdr (assoc :result-params params)))
|
|
|
|
#'car #'cadr)
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert (org-babel-expand-body:lisp body params))
|
|
|
|
(slime-eval `(swank:eval-and-grab-output
|
|
|
|
,(let ((dir (if (assoc :dir params)
|
|
|
|
(cdr (assoc :dir params))
|
|
|
|
default-directory)))
|
2013-09-29 15:43:59 -04:00
|
|
|
(format (format org-babel-lisp-dir-fmt dir)
|
|
|
|
(buffer-substring-no-properties
|
|
|
|
(point-min) (point-max)))))
|
2013-09-29 15:42:37 -04:00
|
|
|
(cdr (assoc :package params))))))
|
2013-11-12 15:00:49 -05:00
|
|
|
=======
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 14:57:31 -05:00
|
|
|
(let ((result
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert (org-babel-expand-body:lisp body params))
|
|
|
|
(slime-eval `(swank:eval-and-grab-output
|
|
|
|
,(let ((dir (if (assoc :dir params)
|
|
|
|
(cdr (assoc :dir params))
|
|
|
|
default-directory)))
|
|
|
|
(format
|
|
|
|
(if dir (format org-babel-lisp-dir-fmt dir)
|
|
|
|
"(progn %s)")
|
|
|
|
(buffer-substring-no-properties
|
|
|
|
(point-min) (point-max)))))
|
|
|
|
(cdr (assoc :package params))))))
|
|
|
|
(org-babel-result-cond (cdr (assoc :result-params params))
|
|
|
|
(car result)
|
|
|
|
(condition-case nil
|
|
|
|
(read (org-babel-lisp-vector-to-list (cadr result)))
|
|
|
|
(error (cadr result)))))
|
2013-11-12 15:00:49 -05:00
|
|
|
>>>>>>> maint
|
2011-04-07 13:31:56 -04:00
|
|
|
(org-babel-pick-name (cdr (assoc :colname-names params))
|
|
|
|
(cdr (assoc :colnames params)))
|
|
|
|
(org-babel-pick-name (cdr (assoc :rowname-names params))
|
|
|
|
(cdr (assoc :rownames params)))))
|
2010-08-03 11:09:11 -04:00
|
|
|
|
2011-11-14 12:24:02 -05:00
|
|
|
(defun org-babel-lisp-vector-to-list (results)
|
2011-04-07 14:31:10 -04:00
|
|
|
;; TODO: better would be to replace #(...) with [...]
|
|
|
|
(replace-regexp-in-string "#(" "(" results))
|
|
|
|
|
2010-08-03 11:09:11 -04:00
|
|
|
(provide 'ob-lisp)
|
|
|
|
|
2011-08-15 14:04:38 -04:00
|
|
|
|
2010-08-03 11:09:11 -04:00
|
|
|
|
|
|
|
;;; ob-lisp.el ends here
|