diff options
author | Dan Davison <davison@stats.ox.ac.uk> | 2010-10-21 12:52:24 +0100 |
---|---|---|
committer | Dan Davison <davison@stats.ox.ac.uk> | 2010-10-21 13:06:54 +0100 |
commit | 369cf54146722316ea5837c60b8acb5d3aa27531 (patch) | |
tree | ab2e9100c39b04ebc3cfa62d37906dfe8bef144c | |
parent | 542f77d3f50fdc4d55a7d092d3ce7b7d91f983ae (diff) | |
download | org-mode-369cf54146722316ea5837c60b8acb5d3aa27531.tar.gz |
babel:removing calls to ob-process-params, and updating use of results
* lisp/ob-C.el (org-babel-C-execute): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-R.el (org-babel-execute:R): removing call to
org-babel-process-params which should no longer be called from
within a language file
(org-babel-R-variable-assignments): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-asymptote.el (org-babel-execute:asymptote): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-clojure.el (org-babel-execute:clojure): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-dot.el (org-babel-execute:dot): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): removing
call to org-babel-process-params which should no longer be called
from within a language file
(org-babel-execute:emacs-lisp): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-haskell.el (org-babel-execute:haskell): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-js.el (org-babel-execute:js): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-lisp.el (org-babel-execute:lisp): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-ocaml.el (org-babel-execute:ocaml): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-octave.el (org-babel-execute:octave): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-perl.el (org-babel-execute:perl): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-python.el (org-babel-execute:python): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-ruby.el (org-babel-execute:ruby): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-scheme.el (org-babel-execute:scheme): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-screen.el (org-babel-execute:screen): removing call to
org-babel-process-params which should no longer be called from
within a language file
(org-babel-prep-session:screen): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-sh.el (org-babel-execute:sh): removing call to
org-babel-process-params which should no longer be called from
within a language file
* lisp/ob-sql.el (org-babel-execute:sql): removing call to
org-babel-process-params which should no longer be called from
within a language file
* ob-haskell.el (org-babel-execute:haskell): Remove reference
to processed params
* ob-clojure.el (org-babel-execute:clojure): Remove reference
to processed params
* ob-R.el (org-babel-execute:R): Remove reference to processed
params
-rw-r--r-- | lisp/ob-C.el | 9 | ||||
-rw-r--r-- | lisp/ob-R.el | 32 | ||||
-rw-r--r-- | lisp/ob-asymptote.el | 3 | ||||
-rw-r--r-- | lisp/ob-clojure.el | 11 | ||||
-rw-r--r-- | lisp/ob-dot.el | 3 | ||||
-rw-r--r-- | lisp/ob-emacs-lisp.el | 20 | ||||
-rw-r--r-- | lisp/ob-haskell.el | 15 | ||||
-rw-r--r-- | lisp/ob-js.el | 9 | ||||
-rw-r--r-- | lisp/ob-lisp.el | 6 | ||||
-rw-r--r-- | lisp/ob-ocaml.el | 7 | ||||
-rw-r--r-- | lisp/ob-octave.el | 15 | ||||
-rw-r--r-- | lisp/ob-perl.el | 12 | ||||
-rw-r--r-- | lisp/ob-python.el | 12 | ||||
-rw-r--r-- | lisp/ob-ruby.el | 12 | ||||
-rw-r--r-- | lisp/ob-scheme.el | 7 | ||||
-rw-r--r-- | lisp/ob-screen.el | 6 | ||||
-rw-r--r-- | lisp/ob-sh.el | 10 | ||||
-rw-r--r-- | lisp/ob-sql.el | 9 |
18 files changed, 92 insertions, 106 deletions
diff --git a/lisp/ob-C.el b/lisp/ob-C.el index 41927b8..6dd1a4f 100644 --- a/lisp/ob-C.el +++ b/lisp/ob-C.el @@ -82,8 +82,7 @@ header arguments (calls `org-babel-C-expand')." (defun org-babel-C-execute (body params) "This function should only be called by `org-babel-execute:C' or `org-babel-execute:c++'." - (let* ((processed-params (org-babel-process-params params)) - (tmp-src-file (org-babel-temp-file + (let* ((tmp-src-file (org-babel-temp-file "C-src-" (cond ((equal org-babel-c-variant 'c) ".c") @@ -106,15 +105,15 @@ or `org-babel-execute:c++'." (org-babel-process-file-name tmp-src-file)) "")))) ((lambda (results) (org-babel-reassemble-table - (if (member "vector" (nth 2 processed-params)) + (if (member "vector" (cdr (assoc :result-params params))) (let ((tmp-file (org-babel-temp-file "c-"))) (with-temp-file tmp-file (insert results)) (org-babel-import-elisp-from-file tmp-file)) (org-babel-read results)) (org-babel-pick-name - (nth 4 processed-params) (cdr (assoc :colnames params))) + (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) (org-babel-pick-name - (nth 5 processed-params) (cdr (assoc :rownames params))))) + (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params))))) (org-babel-trim (org-babel-eval (concat tmp-bin-file (if cmdline (concat " " cmdline) "")) ""))))) diff --git a/lisp/ob-R.el b/lisp/ob-R.el index a1f1d57..a2b9925 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -51,7 +51,7 @@ (defvar org-babel-R-command "R --slave --no-save" "Name of command to use for executing R code.") -(defun org-babel-expand-body:R (body params &optional processed-params) +(defun org-babel-expand-body:R (body params) "Expand BODY according to PARAMS, return the expanded body." (let (out-file (cdr (assoc :file params))) (mapconcat @@ -63,28 +63,29 @@ inside (list "dev.off()")) inside)) - (append (org-babel-variable-assignments:R params processed-params) + (append (org-babel-variable-assignments:R params) (list body))) "\n"))) (defun org-babel-execute:R (body params) "Execute a block of R code. This function is called by `org-babel-execute-src-block'." (save-excursion - (let* ((processed-params (org-babel-process-params params)) - (result-type (nth 3 processed-params)) + (let* ((result-type (cdr (assoc :result-type params))) (session (org-babel-R-initiate-session - (first processed-params) params)) + (cdr (assoc :session params)) params)) (colnames-p (cdr (assoc :colnames params))) (rownames-p (cdr (assoc :rownames params))) (out-file (cdr (assoc :file params))) - (full-body (org-babel-expand-body:R body params processed-params)) + (full-body (org-babel-expand-body:R body params)) (result (org-babel-R-evaluate session full-body result-type (or (equal "yes" colnames-p) - (org-babel-pick-name (nth 4 processed-params) colnames-p)) + (org-babel-pick-name + (cdr (assoc :colname-names params)) colnames-p)) (or (equal "yes" rownames-p) - (org-babel-pick-name (nth 5 processed-params) rownames-p))))) + (org-babel-pick-name + (cdr (assoc :rowname-names params)) rownames-p))))) (message "result is %S" result) (or out-file result)))) @@ -109,10 +110,9 @@ This function is called by `org-babel-execute-src-block'." ;; helper functions -(defun org-babel-variable-assignments:R (params &optional processed-params) +(defun org-babel-variable-assignments:R (params) "Return list of R statements assigning the block's variables" - (let ((processed-params - (or processed-params (org-babel-process-params params)))) + (let ((vars (mapcar #'cdr (org-babel-get-header params :var)))) (mapcar (lambda (pair) (org-babel-R-assign-elisp @@ -121,12 +121,12 @@ This function is called by `org-babel-execute-src-block'." (equal "yes" (cdr (assoc :rownames params))))) (mapcar (lambda (i) - (cons (car (nth i (nth 1 processed-params))) + (cons (car (nth i vars)) (org-babel-reassemble-table - (cdr (nth i (nth 1 processed-params))) - (cdr (nth i (nth 4 processed-params))) - (cdr (nth i (nth 5 processed-params)))))) - (org-number-sequence 0 (1- (length (nth 1 processed-params)))))))) + (cdr (nth i vars)) + (cdr (nth i (cdr (assoc :colname-names params)))) + (cdr (nth i (cdr (assoc :rowname-names params))))))) + (org-number-sequence 0 (1- (length vars))))))) (defun org-babel-R-quote-tsv-field (s) "Quote field S for export to R." diff --git a/lisp/ob-asymptote.el b/lisp/ob-asymptote.el index 3b04b0b..b0d64b4 100644 --- a/lisp/ob-asymptote.el +++ b/lisp/ob-asymptote.el @@ -58,8 +58,7 @@ (defun org-babel-execute:asymptote (body params) "Execute a block of Asymptote code. This function is called by `org-babel-execute-src-block'." - (let* ((processed-params (org-babel-process-params params)) - (result-params (split-string (or (cdr (assoc :results params)) ""))) + (let* ((result-params (split-string (or (cdr (assoc :results params)) ""))) (out-file (cdr (assoc :file params))) (format (or (and out-file (string-match ".+\\.\\(.+\\)" out-file) diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el index b5cd84f..7ee9499 100644 --- a/lisp/ob-clojure.el +++ b/lisp/ob-clojure.el @@ -301,16 +301,15 @@ return the value of the last statement in BODY as elisp." (defun org-babel-execute:clojure (body params) "Execute a block of Clojure code." (require 'slime) (require 'swank-clojure) - (let* ((processed-params (org-babel-process-params params)) - (body (org-babel-expand-body:clojure body params)) + (let* ((body (org-babel-expand-body:clojure body params)) (session (org-babel-clojure-initiate-session - (first processed-params)))) + (cdr (assoc :session params))))) (org-babel-reassemble-table - (org-babel-clojure-evaluate session body (nth 3 processed-params)) + (org-babel-clojure-evaluate session body (cdr (assoc :result-type params))) (org-babel-pick-name - (nth 4 processed-params) (cdr (assoc :colnames params))) + (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) (org-babel-pick-name - (nth 5 processed-params) (cdr (assoc :rownames params)))))) + (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))) (provide 'ob-clojure) diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el index a4425b2..9a2265e 100644 --- a/lisp/ob-dot.el +++ b/lisp/ob-dot.el @@ -64,8 +64,7 @@ (defun org-babel-execute:dot (body params) "Execute a block of Dot code with org-babel. This function is called by `org-babel-execute-src-block'." - (let* ((processed-params (org-babel-process-params params)) - (result-params (split-string (or (cdr (assoc :results params)) ""))) + (let* ((result-params (cdr (assoc :result-params params))) (out-file (cdr (assoc :file params))) (cmdline (or (cdr (assoc :cmdline params)) (format "-T%s" (file-name-extension out-file)))) diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el index 72814e4..b9e9830 100644 --- a/lisp/ob-emacs-lisp.el +++ b/lisp/ob-emacs-lisp.el @@ -38,9 +38,8 @@ (defun org-babel-expand-body:emacs-lisp (body params) "Expand BODY according to PARAMS, return the expanded body." - (let* ((processed-params (org-babel-process-params params)) - (vars (nth 1 processed-params)) - (result-params (nth 2 processed-params)) + (let* ((vars (mapcar #'cdr (org-babel-get-header params :var))) + (result-params (cdr (assoc :result-params params))) (print-level nil) (print-length nil) (body (if (> (length vars) 0) (concat "(let (" @@ -57,14 +56,13 @@ (defun org-babel-execute:emacs-lisp (body params) "Execute a block of emacs-lisp code with Babel." (save-window-excursion - (let ((processed-params (org-babel-process-params params))) - (org-babel-reassemble-table - (eval (read (format "(progn %s)" - (org-babel-expand-body:emacs-lisp body params)))) - (org-babel-pick-name (nth 4 processed-params) - (cdr (assoc :colnames params))) - (org-babel-pick-name (nth 5 processed-params) - (cdr (assoc :rownames params))))))) + (org-babel-reassemble-table + (eval (read (format "(progn %s)" + (org-babel-expand-body:emacs-lisp body params)))) + (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)))))) (provide 'ob-emacs-lisp) diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el index 8552b4d..f70198e 100644 --- a/lisp/ob-haskell.el +++ b/lisp/ob-haskell.el @@ -61,10 +61,9 @@ (defun org-babel-execute:haskell (body params) "Execute a block of Haskell code." - (let* ((processed-params (org-babel-process-params params)) - (session (nth 0 processed-params)) - (vars (nth 1 processed-params)) - (result-type (nth 3 processed-params)) + (let* ((session (cdr (assoc :session params))) + (vars (mapcar #'cdr (org-babel-get-header params :var))) + (result-type (cdr (assoc :result-type params))) (full-body (org-babel-expand-body:generic body params (org-babel-variable-assignments:haskell params))) @@ -85,10 +84,10 @@ (mapconcat #'identity (reverse (cdr results)) "\n")) ((equal result-type 'value) (org-babel-haskell-table-or-string (car results)))) - (org-babel-pick-name (nth 4 processed-params) - (cdr (assoc :colnames params))) - (org-babel-pick-name (nth 5 processed-params) - (cdr (assoc :rownames params)))))) + (org-babel-pick-name (cdr (assoc :colname-names params)) + (cdr (assoc :colname-names params))) + (org-babel-pick-name (cdr (assoc :rowname-names params)) + (cdr (assoc :rowname-names params)))))) (defun org-babel-haskell-read-string (string) "Strip \\\"s from around a haskell string." diff --git a/lisp/ob-js.el b/lisp/ob-js.el index 189ecbe..25652f0 100644 --- a/lisp/ob-js.el +++ b/lisp/ob-js.el @@ -67,16 +67,15 @@ (defun org-babel-execute:js (body params) "Execute a block of Javascript code with org-babel. This function is called by `org-babel-execute-src-block'" - (let* ((processed-params (org-babel-process-params params)) - (org-babel-js-cmd (or (cdr (assoc :cmd params)) org-babel-js-cmd)) - (result-type (nth 3 processed-params)) + (let* ((org-babel-js-cmd (or (cdr (assoc :cmd params)) org-babel-js-cmd)) + (result-type (cdr (assoc :result-type params))) (full-body (org-babel-expand-body:generic body params (org-babel-variable-assignments:js params)))) (org-babel-js-read - (if (not (string= (nth 0 processed-params) "none")) + (if (not (string= (cdr (assoc :session params)) "none")) ;; session evaluation (let ((session (org-babel-prep-session:js - (nth 0 processed-params) params))) + (cdr (assoc :session params)) params))) (nth 1 (org-babel-comint-with-output (session (format "%S" org-babel-js-eoe) t body) diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el index 5d12091..6e88996 100644 --- a/lisp/ob-lisp.el +++ b/lisp/ob-lisp.el @@ -64,9 +64,9 @@ "Execute a block of Lisp code with org-babel. This function is called by `org-babel-execute-src-block'" (message "executing Lisp source code block") - (let* ((processed-params (org-babel-process-params params)) - (session (org-babel-lisp-initiate-session (first processed-params))) - (result-type (fourth processed-params)) + (let* ((session (org-babel-lisp-initiate-session + (cdr (assoc :session params)))) + (result-type (cdr (assoc :result-type params))) (full-body (org-babel-expand-body:lisp body params))) (read (if session diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el index 6e087ee..d5e79f4 100644 --- a/lisp/ob-ocaml.el +++ b/lisp/ob-ocaml.el @@ -53,8 +53,7 @@ (defun org-babel-execute:ocaml (body params) "Execute a block of Ocaml code with Babel." - (let* ((processed-params (org-babel-process-params params)) - (vars (nth 1 processed-params)) + (let* ((vars (mapcar #'cdr (org-babel-get-header params :var))) (full-body (org-babel-expand-body:generic body params (org-babel-variable-assignments:ocaml params))) @@ -77,9 +76,9 @@ (org-babel-reassemble-table (org-babel-ocaml-parse-output (org-babel-trim clean)) (org-babel-pick-name - (nth 4 processed-params) (cdr (assoc :colnames params))) + (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) (org-babel-pick-name - (nth 5 processed-params) (cdr (assoc :rownames params)))))) + (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))) (defvar tuareg-interactive-buffer-name) (defun org-babel-prep-session:ocaml (session params) diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index 8eb6745..e2f12d2 100644 --- a/lisp/ob-octave.el +++ b/lisp/ob-octave.el @@ -75,14 +75,13 @@ end") (defun org-babel-execute:octave (body params &optional matlabp) "Execute a block of octave code with Babel." - (let* ((processed-params (org-babel-process-params params)) - (session + (let* ((session (funcall (intern (format "org-babel-%s-initiate-session" (if matlabp "matlab" "octave"))) - (nth 0 processed-params) params)) - (vars (nth 1 processed-params)) - (result-params (nth 2 processed-params)) - (result-type (nth 3 processed-params)) + (cdr (assoc :session params)) params)) + (vars (mapcar #'cdr (org-babel-get-header params :var))) + (result-params (cdr (assoc :result-params params))) + (result-type (cdr (assoc :result-type params))) (out-file (cdr (assoc :file params))) (full-body (org-babel-expand-body:generic @@ -93,9 +92,9 @@ end") (org-babel-reassemble-table result (org-babel-pick-name - (nth 4 processed-params) (cdr (assoc :colnames params))) + (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) (org-babel-pick-name - (nth 5 processed-params) (cdr (assoc :rownames params))))))) + (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params))))))) (defun org-babel-prep-session:matlab (session params) "Prepare SESSION according to PARAMS." diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el index 87f3d01..ae5fc89 100644 --- a/lisp/ob-perl.el +++ b/lisp/ob-perl.el @@ -41,20 +41,18 @@ (defun org-babel-execute:perl (body params) "Execute a block of Perl code with Babel. This function is called by `org-babel-execute-src-block'." - (let* ((processed-params (org-babel-process-params params)) - (session (nth 0 processed-params)) - (vars (nth 1 processed-params)) - (result-params (nth 2 processed-params)) - (result-type (nth 3 processed-params)) + (let* ((session (cdr (assoc :session params))) + (result-params (cdr (assoc :result-params params))) + (result-type (cdr (assoc :result-type params))) (full-body (org-babel-expand-body:generic body params (org-babel-variable-assignments:perl params))) (session (org-babel-perl-initiate-session session))) (org-babel-reassemble-table (org-babel-perl-evaluate session full-body result-type) (org-babel-pick-name - (nth 4 processed-params) (cdr (assoc :colnames params))) + (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) (org-babel-pick-name - (nth 5 processed-params) (cdr (assoc :rownames params)))))) + (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))) (defun org-babel-prep-session:perl (session params) "Prepare SESSION according to the header arguments in PARAMS." diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 0697028..a99b6fe 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -52,10 +52,10 @@ (defun org-babel-execute:python (body params) "Execute a block of Python code with Babel. This function is called by `org-babel-execute-src-block'." - (let* ((processed-params (org-babel-process-params params)) - (session (org-babel-python-initiate-session (first processed-params))) - (result-params (nth 2 processed-params)) - (result-type (nth 3 processed-params)) + (let* ((session (org-babel-python-initiate-session + (cdr (assoc :session params)))) + (result-params (cdr (assoc :result-params params))) + (result-type (cdr (assoc :result-type params))) (full-body (org-babel-expand-body:generic body params (org-babel-variable-assignments:python params))) @@ -64,9 +64,9 @@ This function is called by `org-babel-execute-src-block'." (or (cdr (assoc :file params)) (org-babel-reassemble-table result - (org-babel-pick-name (nth 4 processed-params) + (org-babel-pick-name (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) - (org-babel-pick-name (nth 5 processed-params) + (org-babel-pick-name (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params))))))) (defun org-babel-prep-session:python (session params) diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 5ccdb6e..7f56104 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -55,10 +55,10 @@ (defun org-babel-execute:ruby (body params) "Execute a block of Ruby code with Babel. This function is called by `org-babel-execute-src-block'." - (let* ((processed-params (org-babel-process-params params)) - (session (org-babel-ruby-initiate-session (first processed-params))) - (result-params (nth 2 processed-params)) - (result-type (nth 3 processed-params)) + (let* ((session (org-babel-ruby-initiate-session + (cdr (assoc :session params)))) + (result-params (cdr (assoc :result-params params))) + (result-type (cdr (assoc :result-type params))) (full-body (org-babel-expand-body:generic body params (org-babel-variable-assignments:ruby params))) (result (org-babel-ruby-evaluate @@ -66,9 +66,9 @@ This function is called by `org-babel-execute-src-block'." (or (cdr (assoc :file params)) (org-babel-reassemble-table result - (org-babel-pick-name (nth 4 processed-params) + (org-babel-pick-name (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) - (org-babel-pick-name (nth 5 processed-params) + (org-babel-pick-name (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params))))))) (defun org-babel-prep-session:ruby (session params) diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el index aeb5b95..6c5fbdb 100644 --- a/lisp/ob-scheme.el +++ b/lisp/ob-scheme.el @@ -74,16 +74,15 @@ (defun org-babel-execute:scheme (body params) "Execute a block of Scheme code with org-babel. This function is called by `org-babel-execute-src-block'" - (let* ((processed-params (org-babel-process-params params)) - (result-type (nth 3 processed-params)) + (let* ((result-type (cdr (assoc :result-type params))) (org-babel-scheme-cmd (or (cdr (assoc :scheme params)) org-babel-scheme-cmd)) (full-body (org-babel-expand-body:scheme body params))) (read - (if (not (string= (nth 0 processed-params) "none")) + (if (not (string= (cdr (assoc :session params)) "none")) ;; session evaluation (let ((session (org-babel-prep-session:scheme - (nth 0 processed-params) params))) + (cdr (assoc :session params)) params))) (org-babel-comint-with-output (session (format "%S" org-babel-scheme-eoe) t body) (mapc diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el index e6a5ce1..a07db7a 100644 --- a/lisp/ob-screen.el +++ b/lisp/ob-screen.el @@ -50,8 +50,7 @@ In case you want to use a different screen than one selected by your $PATH") \"default\" session is used when none is specified." (message "Sending source code block to interactive terminal session...") (save-window-excursion - (let* ((processed-params (org-babel-process-params params)) - (session (nth 0 processed-params)) + (let* ((session (cdr (assoc :session params))) (socket (org-babel-screen-session-socketname session))) (unless socket (org-babel-prep-session:screen session params)) (org-babel-screen-session-execute-string @@ -59,8 +58,7 @@ In case you want to use a different screen than one selected by your $PATH") (defun org-babel-prep-session:screen (session params) "Prepare SESSION according to the header arguments specified in PARAMS." - (let* ((processed-params (org-babel-process-params params)) - (session (nth 0 processed-params)) + (let* ((session (cdr (assoc :session params))) (socket (org-babel-screen-session-socketname session)) (cmd (cdr (assoc :cmd params))) (terminal (cdr (assoc :terminal params))) diff --git a/lisp/ob-sh.el b/lisp/ob-sh.el index 774e1ed..153579f 100644 --- a/lisp/ob-sh.el +++ b/lisp/ob-sh.el @@ -48,17 +48,17 @@ This will be passed to `shell-command-on-region'") (defun org-babel-execute:sh (body params) "Execute a block of Shell commands with Babel. This function is called by `org-babel-execute-src-block'." - (let* ((processed-params (org-babel-process-params params)) - (session (org-babel-sh-initiate-session (nth 0 processed-params))) - (result-params (nth 2 processed-params)) + (let* ((session (org-babel-sh-initiate-session + (cdr (assoc :session params)))) + (result-params (cdr (assoc :result-params params))) (full-body (org-babel-expand-body:generic body params (org-babel-variable-assignments:sh params)))) (org-babel-reassemble-table (org-babel-sh-evaluate session full-body result-params) (org-babel-pick-name - (nth 4 processed-params) (cdr (assoc :colnames params))) + (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) (org-babel-pick-name - (nth 5 processed-params) (cdr (assoc :rownames params)))))) + (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))) (defun org-babel-prep-session:sh (session params) "Prepare SESSION according to the header arguments specified in PARAMS." diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index fcb03d1..98f4183 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -53,8 +53,7 @@ (defun org-babel-execute:sql (body params) "Execute a block of Sql code with Babel. This function is called by `org-babel-execute-src-block'." - (let* ((result-params (split-string (or (cdr (assoc :results params)) ""))) - (processed-params (org-babel-process-params params)) + (let* ((result-params (cdr (assoc :result-params params))) (cmdline (cdr (assoc :cmdline params))) (engine (cdr (assoc :engine params))) (in-file (org-babel-temp-file "sql-in-")) @@ -78,8 +77,10 @@ This function is called by `org-babel-execute-src-block'." (org-table-import out-file nil) (org-babel-reassemble-table (org-table-to-lisp) - (org-babel-pick-name (nth 4 processed-params) (cdr (assoc :colnames params))) - (org-babel-pick-name (nth 5 processed-params) (cdr (assoc :rownames params))))))) + (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))))))) (defun org-babel-prep-session:sql (session params) |