From: Vladimir Panteleev <git@thecybershadow.net>
To: emacs-orgmode@gnu.org
Cc: Vladimir Panteleev <git@thecybershadow.net>
Subject: [PATCH v2 2/3] ob-table: Fix org-sbe's handling of list arguments
Date: Mon, 19 Mar 2018 00:23:13 +0000 [thread overview]
Message-ID: <20180319002314.8162-3-git@thecybershadow.net> (raw)
In-Reply-To: <20180319002314.8162-1-git@thecybershadow.net>
* ob-table.el (org-sbe): Add an explicit case for handling list
arguments. This avoids doing the wrong thing (%s-formatting a list,
thus losing syntax like double-quotes). This enables passing org-table
ranges through org-sbe in a simple and correct manner.
* test-ob-table.el: Add test.
---
lisp/ob-table.el | 17 +++++++++++------
testing/lisp/test-ob-table.el | 23 +++++++++++++++++++++++
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index 105aca5e2..17810dd74 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -132,12 +132,17 @@ as shown in the example below.
"("
(mapconcat
(lambda (var-spec)
- (if (> (length (cdr var-spec)) 1)
- (format "%S='%S"
- (car var-spec)
- (mapcar #'read (cdr var-spec)))
- (format "%S=%s"
- (car var-spec) (cadr var-spec))))
+ (cond
+ ((> (length (cdr var-spec)) 1)
+ (format "%S='%S"
+ (car var-spec)
+ (mapcar #'read (cdr var-spec))))
+ ((stringp (cadr var-spec))
+ (format "%S=%s"
+ (car var-spec) (cadr var-spec)))
+ (t
+ (format "%S=%S"
+ (car var-spec) (cadr var-spec)))))
',variables ", ")
")")))))
(org-babel-execute-src-block
diff --git a/testing/lisp/test-ob-table.el b/testing/lisp/test-ob-table.el
index 3d9b1d160..fb6d05796 100644
--- a/testing/lisp/test-ob-table.el
+++ b/testing/lisp/test-ob-table.el
@@ -52,6 +52,29 @@
1
"#+TBLFM: $2 = '(org-sbe identity (x $$1))"))
+(ert-deftest test-ob-table/sbe-list ()
+ "Test that `org-sbe' can correctly handle ranges as lists."
+ (org-test-table-target-expect
+ "
+#+name: concat
+#+begin_src emacs-lisp :eval yes
+ (mapconcat #'identity x \"\")
+#+end_src
+
+| foo | bar | replace |
+"
+ "
+#+name: concat
+#+begin_src emacs-lisp :eval yes
+ (mapconcat #'identity x \"\")
+#+end_src
+
+| foo | bar | foobar |
+"
+ 1
+ "#+TBLFM: $3 = '(org-sbe concat (x (list $1..$2)))"
+ "#+TBLFM: $3 = '(org-sbe concat (x $ (list $1..$2)))"))
+
(provide 'test-ob-table)
;;; test-ob-table.el ends here
--
2.16.2
next prev parent reply other threads:[~2018-03-19 0:23 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 22:58 [PATCH 0/3] org-sbe fixes Vladimir Panteleev
2018-03-07 22:58 ` [PATCH 1/3] ob-table: Fix org-sbe's handling of quotes in arguments Vladimir Panteleev
2018-03-12 23:15 ` Nicolas Goaziou
2018-03-13 19:16 ` Vladimir Panteleev
2018-03-14 13:49 ` Nicolas Goaziou
2018-03-14 14:03 ` Vladimir Panteleev
2018-03-14 15:00 ` Nicolas Goaziou
2018-03-14 16:23 ` Vladimir Panteleev
2018-03-18 22:24 ` Nicolas Goaziou
2018-03-18 22:43 ` Vladimir Panteleev
2018-03-18 23:30 ` Nicolas Goaziou
2018-03-19 0:23 ` [PATCH v2 0/3] org-sbe fixes Vladimir Panteleev
2018-03-19 0:23 ` [PATCH v2 1/3] ob-table: Fix org-sbe's handling of quotes in cell values Vladimir Panteleev
2018-03-19 0:23 ` Vladimir Panteleev [this message]
2018-03-19 0:23 ` [PATCH v2 3/3] ob-table: Mention passing ranges as lists in org-sbe's documentation Vladimir Panteleev
2018-03-19 23:07 ` [PATCH v2 0/3] org-sbe fixes Nicolas Goaziou
2018-03-25 18:24 ` Alan Schmitt
2018-03-25 20:26 ` Nicolas Goaziou
2018-03-25 20:40 ` Vladimir Panteleev
2018-03-25 21:06 ` Nicolas Goaziou
2018-03-25 22:08 ` Vladimir Panteleev
2018-03-26 20:16 ` Nicolas Goaziou
2018-03-26 21:33 ` Vladimir Panteleev
2018-03-26 21:42 ` Nicolas Goaziou
2018-03-26 21:53 ` Vladimir Panteleev
2018-03-27 6:21 ` Nicolas Goaziou
2018-03-26 8:12 ` Alan Schmitt
2018-03-26 21:40 ` Nicolas Goaziou
2018-03-27 1:01 ` Bastien
2018-03-07 22:58 ` [PATCH 2/3] ob-table: Fix org-sbe's handling of list arguments Vladimir Panteleev
2018-03-07 22:58 ` [PATCH 3/3] ob-table: Mention passing ranges as lists in org-sbe's documentation Vladimir Panteleev
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=20180319002314.8162-3-git@thecybershadow.net \
--to=git@thecybershadow.net \
--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).