mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-30 01:27:53 +00:00
0d000f5680
* lisp/ob-core.el (org-babel--get-vars): New function. (org-babel-get-header): Delete. * lisp/ob-C.el (org-babel-C-expand-C): (org-babel-C-expand-D): * lisp/ob-R.el (org-babel-variable-assignments:R): * lisp/ob-abc.el (org-babel-expand-body:abc): * lisp/ob-asymptote.el (org-babel-variable-assignments:asymptote): * lisp/ob-awk.el (org-babel-execute:awk): * lisp/ob-calc.el (org-babel-execute:calc): * lisp/ob-clojure.el (org-babel-expand-body:clojure): * lisp/ob-dot.el (org-babel-expand-body:dot): * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): * lisp/ob-fortran.el (org-babel-expand-body:fortran): (org-babel-fortran-ensure-main-wrap): * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): * lisp/ob-haskell.el (org-babel-variable-assignments:haskell): * lisp/ob-js.el (org-babel-variable-assignments:js): * lisp/ob-latex.el (org-babel-expand-body:latex): * lisp/ob-lilypond.el (org-babel-expand-body:lilypond): * lisp/ob-lisp.el (org-babel-expand-body:lisp): * lisp/ob-maxima.el (org-babel-maxima-expand): * lisp/ob-ocaml.el (org-babel-variable-assignments:ocaml): * lisp/ob-octave.el (org-babel-variable-assignments:octave): * lisp/ob-org.el (org-babel-expand-body:org): * lisp/ob-perl.el (org-babel-variable-assignments:perl): * lisp/ob-picolisp.el (org-babel-expand-body:picolisp): * lisp/ob-processing.el (org-babel-variable-assignments:processing): * lisp/ob-python.el (org-babel-variable-assignments:python): * lisp/ob-ruby.el (org-babel-variable-assignments:ruby): * lisp/ob-scheme.el (org-babel-expand-body:scheme): * lisp/ob-shell.el (org-babel-variable-assignments:shell): * lisp/ob-shen.el (org-babel-expand-body:shen): * lisp/ob-sql.el (org-babel-expand-body:sql): * lisp/ob-sqlite.el (org-babel-expand-body:sqlite): Adapt to change. * etc/ORG-NEWS: Document change.
79 lines
2.7 KiB
EmacsLisp
79 lines
2.7 KiB
EmacsLisp
;;; ob-shen.el --- Babel Functions for Shen -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric Schulte
|
|
;; Keywords: literate programming, reproducible research, shen
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs 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 Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Currently this only works using session evaluation as there is no
|
|
;; defined method for executing shen code outside of a session.
|
|
|
|
;;; Requirements:
|
|
|
|
;; - shen-mode and inf-shen will soon be available through the GNU
|
|
;; elpa, however in the interim they are available at
|
|
;; https://github.com/eschulte/shen-mode
|
|
|
|
;;; Code:
|
|
(require 'ob)
|
|
|
|
(declare-function shen-eval-defun "ext:inf-shen" (&optional and-go))
|
|
(declare-function org-babel-ruby-var-to-ruby "ob-ruby" (var))
|
|
|
|
(defvar org-babel-default-header-args:shen '()
|
|
"Default header arguments for shen code blocks.")
|
|
|
|
(defun org-babel-expand-body:shen (body params)
|
|
"Expand BODY according to PARAMS, return the expanded body."
|
|
(let ((vars (org-babel--get-vars params)))
|
|
(if (> (length vars) 0)
|
|
(concat "(let "
|
|
(mapconcat (lambda (var)
|
|
(format "%s %s" (car var)
|
|
(org-babel-shen-var-to-shen (cdr var))))
|
|
vars " ")
|
|
body ")")
|
|
body)))
|
|
|
|
(defun org-babel-shen-var-to-shen (var)
|
|
"Convert VAR into a shen variable."
|
|
(if (listp var)
|
|
(concat "[" (mapconcat #'org-babel-ruby-var-to-ruby var " ") "]")
|
|
(format "%S" var)))
|
|
|
|
(defun org-babel-execute:shen (body params)
|
|
"Execute a block of Shen code with org-babel.
|
|
This function is called by `org-babel-execute-src-block'"
|
|
(require 'inf-shen)
|
|
(let* ((result-params (cdr (assoc :result-params params)))
|
|
(full-body (org-babel-expand-body:shen body params)))
|
|
(let ((results
|
|
(with-temp-buffer
|
|
(insert full-body)
|
|
(call-interactively #'shen-eval-defun))))
|
|
(org-babel-result-cond result-params
|
|
results
|
|
(condition-case nil (org-babel-script-escape results)
|
|
(error results))))))
|
|
|
|
(provide 'ob-shen)
|
|
;;; ob-shen.el ends here
|