mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-03 08:30:03 +00:00
Code

babel: R: New variable assignment scheme

Browse Source 
* ob-R.el (org-babel-expand-body:R): Use new function
	`org-babel-variable-assignments:R'; don't trim body.
	(org-babel-execute:R): Respond to changes in
	`org-babel-expand-body:R'
	(org-babel-prep-session:R): Called function is now named
	`org-babel-variable-assignments:R'
	(org-babel-variable-assignments:R): Receives processed-params
	as new optional argument
This commit is contained in:
Dan Davison 2010-10-21 11:34:55 +01:00
parent 86418567cd
commit e3d9d21802
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/ob-R.el
View File

@ -51,11 +51,11 @@
(defvar org-babel-R-command "R --slave --no-save" (defvar org-babel-R-command "R --slave --no-save"
"Name of command to use for executing R code.") "Name of command to use for executing R code.")
(defun org-babel-expand-body:R (body params) (defun org-babel-expand-body:R (body params &optional processed-params)
"Expand BODY according to PARAMS, return the expanded body." "Expand BODY according to PARAMS, return the expanded body."
(let (out-file (cdr (assoc :file params))) (let (out-file (cdr (assoc :file params)))
(mapconcat (mapconcat
#'org-babel-trim #'identity
((lambda (inside) ((lambda (inside)
(if out-file (if out-file
(append (append
@ -63,7 +63,8 @@
inside inside
(list "dev.off()")) (list "dev.off()"))
inside)) inside))
(append (org-babel-R-variable-assignments params) (list body))) "\n"))) (append (org-babel-variable-assignments:R params processed-params)
(list body))) "\n")))
(defun org-babel-execute:R (body params) (defun org-babel-execute:R (body params)
"Execute a block of R code. "Execute a block of R code.
@ -76,7 +77,7 @@ This function is called by `org-babel-execute-src-block'."
(colnames-p (cdr (assoc :colnames params))) (colnames-p (cdr (assoc :colnames params)))
(rownames-p (cdr (assoc :rownames params))) (rownames-p (cdr (assoc :rownames params)))
(out-file (cdr (assoc :file params))) (out-file (cdr (assoc :file params)))
(full-body (org-babel-expand-body:R body params)) (full-body (org-babel-expand-body:R body params processed-params))
(result (result
(org-babel-R-evaluate (org-babel-R-evaluate
session full-body result-type session full-body result-type
@ -90,7 +91,7 @@ This function is called by `org-babel-execute-src-block'."
(defun org-babel-prep-session:R (session params) (defun org-babel-prep-session:R (session params)
"Prepare SESSION according to the header arguments specified in PARAMS." "Prepare SESSION according to the header arguments specified in PARAMS."
(let* ((session (org-babel-R-initiate-session session params)) (let* ((session (org-babel-R-initiate-session session params))
(var-lines (org-babel-R-variable-assignments params))) (var-lines (org-babel-variable-assignments:R params)))
(org-babel-comint-in-buffer session (org-babel-comint-in-buffer session
(mapc (lambda (var) (mapc (lambda (var)
(end-of-line 1) (insert var) (comint-send-input nil t) (end-of-line 1) (insert var) (comint-send-input nil t)
@ -108,9 +109,10 @@ This function is called by `org-babel-execute-src-block'."
;; helper functions ;; helper functions
(defun org-babel-R-variable-assignments (params) (defun org-babel-variable-assignments:R (params &optional processed-params)
"Return list of R statements assigning the block's variables" "Return list of R statements assigning the block's variables"
(let ((processed-params (org-babel-process-params params))) (let ((processed-params
(or processed-params (org-babel-process-params params))))
(mapcar (mapcar
(lambda (pair) (lambda (pair)
(org-babel-R-assign-elisp (org-babel-R-assign-elisp