mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

now able to pass arguments to source block from header-arguments variable assignment

This commit is contained in:
Eric Schulte 2009-05-09 17:44:52 -07:00
parent 728869fef8
commit 9865923f84
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
litorgy/litorgy-ref.el
View File

@ -59,6 +59,22 @@ names, and the emacs-lisp representation of the related value."
(mapcar #'litorgy-ref-parse
(delq nil (mapcar (lambda (pair) (if (eq (car pair) :var) (cdr pair))) params))))
(defun litorgy-ref-parse (assignment)
"Parse a variable ASSIGNMENT in a header argument. If the
right hand side of the assignment has a literal value return that
value, otherwise interpret as a reference to an external resource
and find it's value using `litorgy-ref-resolve-reference'.
Return a list with two elements. The first element of the list
will be the name of the variable, and the second will be an
emacs-lisp representation of the value of the variable."
(message (format "assignment=%S" assignment))
(if (string-match "\\(.+?\\)=\\(.+\\)" assignment)
(let ((var (match-string 1 assignment))
(ref (match-string 2 assignment)))
(cons (intern var)
(or (litorgy-ref-literal ref)
(litorgy-ref-resolve-reference ref))))))
(defun litorgy-ref-literal (ref)
"Determine if the right side of a header argument variable
assignment is a literal value or is a reference to some external
@ -69,25 +85,16 @@ return nil."
(if (string-match "\"\\(.+\\)\"" ref) (read ref) ;; string
nil)))) ;; reference
(defun litorgy-ref-parse (assignment)
"Parse a variable ASSIGNMENT in a header argument. If the
right hand side of the assignment has a literal value return that
value, otherwise interpret as a reference to an external resource
and find it's value using `litorgy-ref-resolve-reference'.
Return a list with two elements. The first element of the list
will be the name of the variable, and the second will be an
emacs-lisp representation of the value of the variable."
(if (string-match "\\(.+\\)=\\(.+\\)" assignment)
(let ((var (match-string 1 assignment))
(ref (match-string 2 assignment)))
(cons (intern var)
(or (litorgy-ref-literal ref)
(litorgy-ref-resolve-reference ref))))))
(defun litorgy-ref-resolve-reference (ref)
"Resolve the reference and return it's value"
(save-excursion
(let (direction type args)
(let (direction type args new-ref)
;; assign any arguments to pass to source block
(when (string-match "\\(.+\\)\(\\(.+\\)\)" ref)
(save-match-data
(setq args (mapcar (lambda (ref) (cons :var ref))
(split-string (match-string 2 ref) ",[ \f\t\n\r\v]*"))))
(setq ref (match-string 1 ref)))
(when (string-match "\\(.+\\):\\(.+\\)" ref)
(find-file (match-string 1 ref))
(setf ref (match-string 2 ref)))
@ -118,9 +125,6 @@ emacs-lisp representation of the value of the variable."
(mapcar #'litorgy-read row))
(org-table-to-lisp)))
('source-block
;; assign any arguments to pass to source block
(when (string-match "\(\\(.+\\)\)" ref)
(setq args (mapcar (lambda (ref) (cons :var ref)) (split-string ref ",[ \f\t\n\r\v]*"))))
(litorgy-execute-src-block t nil args))))))
(defun litorgy-ref-at-ref-p ()

2
litorgy/litorgy.el
View File

@ -113,7 +113,7 @@ the header arguments specified at the source code block." ; TODO implement!!
(let* ((info (or info (litorgy-get-src-block-info)))
(lang (first info))
(body (second info))
(params (third info))
(params (org-combine-plists (third info) params))
(cmd (intern (concat "litorgy-execute:" lang)))
result)
(unless (member lang litorgy-interpreters)

5
rorg.org
View File

@ -634,10 +634,13 @@ inline source code blocks) [[file:test-export.org]]
: 15
#+begin_src emacs-lisp :var result=triple(n=8)
#+begin_src emacs-lisp :var result=triple(n=default, m=98) :results replace
result
#+end_src
: 15
#+begin_src ruby :var num="eric"
num+" schulte"
#+end_src