forked from mirrors/org-mode
ob-perl: implement results interpretation and improve wrapper
* lisp/ob-perl.el (org-babel-execute:perl): Pass `result-params´ through to `org-babel-perl-evaluate´. * lisp/ob-perl.el (org-babel-variable-assignments:perl): Add "my" to variable declaration so that it becomes compatible with "use strict;". * lisp/ob-perl.el (org-babel-varariable-assignments:perl): Use new internal formatting function `org-babel-perl--var-to-perl´. * lisp/ob-perl.el (org-babel-perl--var-to-perl): New internal function, uses Perl non-interpolating quoting on the string that defines the variable to suppress spurious interpretation of it as Perl syntax. * lisp/ob-perl.el (org-babel-perl-wrapper-method): Use a block and declare all variables as "my", also use Perl quoting throughout. Redirect STDOUT to the temporary file so that simply "print" will put the results there. Check the return value and output in table form if it is an ARRAY ref, otherwise print it without a final newline. * lisp/ob-perl.el (org-babel-perl-preface): Content of this variable is prepended to body before invocation of perl. * lisp/ob-perl.el (org-babel-perl-evaluate): Rename input parameter body to ibody and let-bind body to concatentation of org-babel-perl-preface and ibody. Implement results interpretation so that tables are easier to produce. Following suggestions by Daniel M. German in http://thread.gmane.org/gmane.emacs.orgmode/66855.
This commit is contained in:
parent
94934010d7
commit
ca125b82b3
|
@ -48,7 +48,7 @@ This function is called by `org-babel-execute-src-block'."
|
||||||
body params (org-babel-variable-assignments:perl params)))
|
body params (org-babel-variable-assignments:perl params)))
|
||||||
(session (org-babel-perl-initiate-session session)))
|
(session (org-babel-perl-initiate-session session)))
|
||||||
(org-babel-reassemble-table
|
(org-babel-reassemble-table
|
||||||
(org-babel-perl-evaluate session full-body result-type)
|
(org-babel-perl-evaluate session full-body result-type result-params)
|
||||||
(org-babel-pick-name
|
(org-babel-pick-name
|
||||||
(cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
|
(cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
|
||||||
(org-babel-pick-name
|
(org-babel-pick-name
|
||||||
|
@ -62,9 +62,7 @@ This function is called by `org-babel-execute-src-block'."
|
||||||
"Return list of perl statements assigning the block's variables."
|
"Return list of perl statements assigning the block's variables."
|
||||||
(mapcar
|
(mapcar
|
||||||
(lambda (pair)
|
(lambda (pair)
|
||||||
(format "$%s=%s;"
|
(org-babel-perl--var-to-perl (cdr pair) (car pair)))
|
||||||
(car pair)
|
|
||||||
(org-babel-perl-var-to-perl (cdr pair))))
|
|
||||||
(mapcar #'cdr (org-babel-get-header params :var))))
|
(mapcar #'cdr (org-babel-get-header params :var))))
|
||||||
|
|
||||||
;; helper functions
|
;; helper functions
|
||||||
|
@ -72,13 +70,25 @@ This function is called by `org-babel-execute-src-block'."
|
||||||
(defvar org-babel-perl-var-wrap "q(%s)"
|
(defvar org-babel-perl-var-wrap "q(%s)"
|
||||||
"Wrapper for variables inserted into Perl code.")
|
"Wrapper for variables inserted into Perl code.")
|
||||||
|
|
||||||
(defun org-babel-perl-var-to-perl (var)
|
(defvar org-babel-perl--lvl)
|
||||||
|
(defun org-babel-perl--var-to-perl (var &optional varn)
|
||||||
"Convert an elisp value to a perl variable.
|
"Convert an elisp value to a perl variable.
|
||||||
The elisp value, VAR, is converted to a string of perl source code
|
The elisp value, VAR, is converted to a string of perl source code
|
||||||
specifying a var of the same value."
|
specifying a var of the same value."
|
||||||
|
(if varn
|
||||||
|
(let ((org-babel-perl--lvl 0) (lvar (listp var)) prefix)
|
||||||
|
(concat "my $" (symbol-name varn) "=" (when lvar "\n")
|
||||||
|
(org-babel-perl--var-to-perl var)
|
||||||
|
";\n"))
|
||||||
|
(let ((prefix (make-string (* 2 org-babel-perl--lvl) ?\ )))
|
||||||
|
(concat prefix
|
||||||
(if (listp var)
|
(if (listp var)
|
||||||
(concat "[" (mapconcat #'org-babel-perl-var-to-perl var ", ") "]")
|
(let ((org-babel-perl--lvl (1+ org-babel-perl--lvl)))
|
||||||
(format org-babel-perl-var-wrap var)))
|
(concat "[\n"
|
||||||
|
(mapconcat #'org-babel-perl--var-to-perl var "")
|
||||||
|
prefix "]"))
|
||||||
|
(concat "q(" (princ var) ")"))
|
||||||
|
(unless (zerop org-babel-perl--lvl) ",\n")))))
|
||||||
|
|
||||||
(defvar org-babel-perl-buffers '(:default . nil))
|
(defvar org-babel-perl-buffers '(:default . nil))
|
||||||
|
|
||||||
|
@ -86,24 +96,41 @@ specifying a var of the same value."
|
||||||
"Return nil because sessions are not supported by perl."
|
"Return nil because sessions are not supported by perl."
|
||||||
nil)
|
nil)
|
||||||
|
|
||||||
(defvar org-babel-perl-wrapper-method
|
(defvar org-babel-perl-wrapper-method "{
|
||||||
"
|
my $babel_sub = sub {
|
||||||
sub main {
|
|
||||||
%s
|
%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;
|
||||||
|
if (qq(ARRAY) eq $rt) {
|
||||||
|
local $\\=$/;
|
||||||
|
foreach my $rv ( @$rv ) {
|
||||||
|
my $rt = ref $rv;
|
||||||
|
if (qq(ARRAY) eq $rt) {
|
||||||
|
print join q(|), @$rv;
|
||||||
|
} else {
|
||||||
|
print $rv;
|
||||||
}
|
}
|
||||||
@r = main;
|
}
|
||||||
open(o, \">%s\");
|
} else {
|
||||||
print o join(\"\\n\", @r), \"\\n\"")
|
print $rv;
|
||||||
|
}
|
||||||
|
}")
|
||||||
|
|
||||||
|
(defvar org-babel-perl-preface nil)
|
||||||
|
|
||||||
(defvar org-babel-perl-pp-wrapper-method
|
(defvar org-babel-perl-pp-wrapper-method
|
||||||
nil)
|
nil)
|
||||||
|
|
||||||
(defun org-babel-perl-evaluate (session body &optional result-type)
|
(defun org-babel-perl-evaluate (session ibody &optional result-type result-params)
|
||||||
"Pass BODY to the Perl process in SESSION.
|
"Pass BODY to the Perl process in SESSION.
|
||||||
If RESULT-TYPE equals 'output then return a list of the outputs
|
If RESULT-TYPE equals 'output then return a list of the outputs
|
||||||
of the statements in BODY, if RESULT-TYPE equals 'value then
|
of the statements in BODY, if RESULT-TYPE equals 'value then
|
||||||
return the value of the last statement in BODY, as elisp."
|
return the value of the last statement in BODY, as elisp."
|
||||||
(when session (error "Sessions are not supported for Perl"))
|
(when session (error "Sessions are not supported for Perl"))
|
||||||
|
(let ((body (concat org-babel-perl-preface ibody)))
|
||||||
(case result-type
|
(case result-type
|
||||||
(output (org-babel-eval org-babel-perl-command body))
|
(output (org-babel-eval org-babel-perl-command body))
|
||||||
(value (let ((tmp-file (org-babel-temp-file "perl-")))
|
(value (let ((tmp-file (org-babel-temp-file "perl-")))
|
||||||
|
@ -111,7 +138,11 @@ return the value of the last statement in BODY, as elisp."
|
||||||
org-babel-perl-command
|
org-babel-perl-command
|
||||||
(format org-babel-perl-wrapper-method body
|
(format org-babel-perl-wrapper-method body
|
||||||
(org-babel-process-file-name tmp-file 'noquote)))
|
(org-babel-process-file-name tmp-file 'noquote)))
|
||||||
(org-babel-eval-read-file tmp-file)))))
|
(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))))))))
|
||||||
|
|
||||||
(provide 'ob-perl)
|
(provide 'ob-perl)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue