From: "\"José L. Doménech\"" <domenechjosel@gmail.com>
To: "\"José Luis Doménech Martínez\"" <domenechjosel@gmail.com>
Cc: Org Mode <emacs-orgmode@gnu.org>
Subject: Enhance Org babel scheme
Date: Sun, 16 Jul 2017 19:08:02 +0200 [thread overview]
Message-ID: <87o9skwbrh.wl-domenechjosel@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 712 bytes --]
Hello, I have modified 'ob-scheme.el' to be able to return org tables.
This is a quick patch. I hope you find it useful buut I could modify,
document or write test for it if necesary.
I have already assigned the copyright for Emacs to the FSF.
Enhance the scheme babel block output.
Allow scheme code blocks to return a table.
* lisp/ob-scheme.el (org-babel-scheme-null-to): New custom option that
allows to use a empty list to format the table output, initially assigned
to 'hlines.
(org-babel-scheme-table-or-string): New helper function to convert the
return value from the block as a table or a string.
(org-babel-execute-src-block): Changed to allow the return of a table for
the output.
[-- Attachment #2: ob-scheme.el.diff --]
[-- Type: text/plain, Size: 3043 bytes --]
1 file changed, 35 insertions(+), 11 deletions(-)
lisp/ob-scheme.el | 46 +++++++++++++++++++++++++++++++++++-----------
modified lisp/ob-scheme.el
@@ -51,6 +51,13 @@
(start end &optional and-go raw nomsg))
(declare-function geiser-repl-exit "ext:geiser-repl" (&optional arg))
+(defcustom org-babel-scheme-null-to 'hline
+ "Replace `null' in scheme tables with this before returning."
+ :group 'org-babel
+ :version "24.4"
+ :package-version '(Org . "8.0")
+ :type 'symbol)
+
(defvar org-babel-default-header-args:scheme '()
"Default header arguments for scheme code blocks.")
@@ -176,6 +183,18 @@ is true; otherwise returns the last value."
result))))
result))
+(defun org-babel-scheme-table-or-string (results)
+ "Convert RESULTS into an appropriate elisp value.
+If the results look like a list or tuple, then convert them into an
+Emacs-lisp table, otherwise return the results as a string."
+ (let ((res (org-babel-script-escape results)))
+ (if (listp res)
+ (mapcar (lambda (el) (if (or (eq el '()) (eq el 'null))
+ org-babel-scheme-null-to
+ el))
+ res)
+ res)))
+
(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'"
@@ -184,7 +203,6 @@ This function is called by `org-babel-execute-src-block'"
"^ ?\\*\\([^*]+\\)\\*" "\\1"
(buffer-name source-buffer))))
(save-excursion
- (org-babel-reassemble-table
(let* ((result-type (cdr (assq :result-type params)))
(impl (or (when (cdr (assq :scheme params))
(intern (cdr (assq :scheme params))))
@@ -192,16 +210,22 @@ This function is called by `org-babel-execute-src-block'"
(car geiser-active-implementations)))
(session (org-babel-scheme-make-session-name
source-buffer-name (cdr (assq :session params)) impl))
- (full-body (org-babel-expand-body:scheme body params)))
- (org-babel-scheme-execute-with-geiser
- full-body ; code
- (string= result-type "output") ; output?
- impl ; implementation
- (and (not (string= session "none")) session))) ; session
- (org-babel-pick-name (cdr (assq :colname-names params))
- (cdr (assq :colnames params)))
- (org-babel-pick-name (cdr (assq :rowname-names params))
- (cdr (assq :rownames params)))))))
+ (full-body (org-babel-expand-body:scheme body params))
+ (result
+ (org-babel-scheme-execute-with-geiser
+ full-body ; code
+ (string= result-type "output") ; output?
+ impl ; implementation
+ (and (not (string= session "none")) session))) ; session
+ )
+ (let ((table
+ (org-babel-reassemble-table
+ result
+ (org-babel-pick-name (cdr (assq :colname-names params))
+ (cdr (assq :colnames params)))
+ (org-babel-pick-name (cdr (assq :rowname-names params))
+ (cdr (assq :rownames params))))))
+ (org-babel-scheme-table-or-string table))))))
(provide 'ob-scheme)
[-- Attachment #3: Type: text/plain, Size: 37 bytes --]
Best regards:
José L. Doménech
next reply other threads:[~2017-07-16 17:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-16 17:08 "José L. Doménech" [this message]
2017-07-17 17:55 ` [PATCH] An amended to the enhance Org babel for scheme blocks "José L. Doménech"
2017-07-23 9:32 ` Nicolas Goaziou
2017-07-24 7:27 ` "José L. Doménech"
2017-07-24 10:06 ` Nicolas Goaziou
2017-07-24 10:44 ` "José L. Doménech"
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o9skwbrh.wl-domenechjosel@gmail.com \
--to=domenechjosel@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).