summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2013-04-17 19:38:21 (GMT)
committer Achim Gratz <Stromeko@Stromeko.DE>2013-04-17 19:40:15 (GMT)
commitf6bf19f898b1e89728db4e3be2b3c176a4067e53 (patch)
treef3d1ddbc64d52ef42a6f00368bdf3809504f3221
parent99f88219951ca73bfea95e433211f566b354fedc (diff)
downloadorg-mode-f6bf19f898b1e89728db4e3be2b3c176a4067e53.zip
org-mode-f6bf19f898b1e89728db4e3be2b3c176a4067e53.tar.gz
ob-perl: fix result handling
* lisp/ob-perl.el (org-babel-perl-wrapper-method): Select output handle only after evaluation so that output is not mixed into results eavaluation. (org-babel-perl-evaluate): Fix the handling of results for ":results output" to also parse tables. Use the same lambda construction as in ob-sh.el to avoid code duplication.
-rw-r--r--lisp/ob-perl.el34
1 files changed, 20 insertions, 14 deletions
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index d90ca18..43ab946 100644
--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@@ -101,9 +101,9 @@ specifying a var of the same value."
%s
};
open my $BOH, qq(>%s) or die qq(Perl: Could not open output file.$/);
- select $BOH;
my $rv = &$babel_sub();
my $rt = ref $rv;
+ select $BOH;
if (qq(ARRAY) eq $rt) {
local $\\=$/;
local $,=qq(\t);
@@ -131,19 +131,25 @@ If RESULT-TYPE equals 'output then return a list of the outputs
of the statements in BODY, if RESULT-TYPE equals 'value then
return the value of the last statement in BODY, as elisp."
(when session (error "Sessions are not supported for Perl"))
- (let ((body (concat org-babel-perl-preface ibody)))
- (case result-type
- (output (org-babel-eval org-babel-perl-command body))
- (value (let ((tmp-file (org-babel-temp-file "perl-")))
- (org-babel-eval
- org-babel-perl-command
- (format org-babel-perl-wrapper-method body
- (org-babel-process-file-name tmp-file 'noquote)))
- (org-babel-result-cond result-params
- (with-temp-buffer
- (insert-file-contents tmp-file)
- (buffer-string))
- (org-babel-import-elisp-from-file tmp-file '(16))))))))
+ (let* ((body (concat org-babel-perl-preface ibody))
+ (tmp-file (org-babel-temp-file "perl-"))
+ (tmp-babel-file (org-babel-process-file-name
+ tmp-file 'noquote)))
+ ((lambda (results)
+ (when results
+ (org-babel-result-cond result-params
+ (org-babel-eval-read-file tmp-file)
+ (org-babel-import-elisp-from-file tmp-file '(16)))))
+ (case result-type
+ (output
+ (with-temp-file tmp-file
+ (insert
+ (org-babel-eval org-babel-perl-command body))
+ (buffer-string)))
+ (value
+ (org-babel-eval org-babel-perl-command
+ (format org-babel-perl-wrapper-method
+ body tmp-babel-file)))))))
(provide 'ob-perl)