From: stardiviner <numbchild@gmail.com>
To: org-mode <emacs-orgmode@gnu.org>
Cc: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Subject: Re: ob-clojure should not tangle with inserting (ns ..) line when no :ns specified.
Date: Mon, 14 Jan 2019 13:52:56 +0800 [thread overview]
Message-ID: <87fttveqfb.fsf@gmail.com> (raw)
In-Reply-To: <87r2dlz3jq.fsf@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]
I updated the patch by adding a test.
With command "make test" I got:
```
Tangled 0 code blocks from babel.org
passed 132/828 ob-tangle/no-excessive-id-insertion-on-tangle
passed 133/828 ob-test/org-babel-combine-header-arg-lists
failed 134/828 org-missing-dependency/test-ob-R
failed 135/828 org-missing-dependency/test-ob-clojure
failed 136/828 org-missing-dependency/test-ob-eshell
failed 137/828 org-missing-dependency/test-ob-lua
failed 138/828 org-missing-dependency/test-ob-maxima
failed 139/828 org-missing-dependency/test-ob-plantuml
failed 140/828 org-missing-dependency/test-ob-ruby
failed 141/828 org-missing-dependency/test-ob-scheme
failed 142/828 org-missing-dependency/test-ob-vala
failed 143/828 org-missing-dependency/test-org-attach-annex
failed 144/828 org-missing-dependency/test-org-protocol
passed 145/828 test-ob-exp/org-babel-exp-src-blocks/w-no-file
passed 146/828 test-ob-exp/org-babel-exp-src-blocks/w-no-headers
passed 147/828 test-ob-exp/org-babel-exp-src-blocks/w-no-headers2
executing Emacs-Lisp code block...
```
With command:
$ make BTEST_RE="ob-clojure/tangle-without-ns" test-dirty
I got:
```
Loading /home/stardiviner/Code/Emacs/org-mode/testing/lisp/test-property-inheritance.el (source)...
selected tests: ob-clojure/tangle-without-ns
Running 0 tests (2019-01-14 13:27:58+0800)
Ran 0 tests, 0 results as expected (2019-01-14 13:27:58+0800)
make cleantest
```
I don't know why it report missing requirement, so the test failed.
Nicolas, do you have any idea why this? You can check out the test code.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-lisp-ob-clojure.el-Don-t-tangle-with-auto-prepend-ns.patch --]
[-- Type: text/x-patch, Size: 4052 bytes --]
From 8a64ccf659afcbd510e69eaa4ac175946f1ae311 Mon Sep 17 00:00:00 2001
From: stardiviner <numbchild@gmail.com>
Date: Thu, 10 Jan 2019 09:34:39 +0800
Subject: [PATCH] lisp/ob-clojure.el: Don't tangle with auto prepend ns
statement
* lisp/ob-clojure.el: (org-babel-expand-body:clojure,
org-babel-header-args:clojure): whether auto prepend Clojure (ns ..)
statement depend on whether have :ns header argument specified.
* etc/ORG-NEWS: mentioned this changed in ORG-NEWS.
* testing/test-ob-clojure.el: add a test for tangled clojure code
without (ns ..).
---
etc/ORG-NEWS | 5 +++++
lisp/ob-clojure.el | 34 ++++++++++++++++++---------------
testing/lisp/test-ob-clojure.el | 14 ++++++++++++++
3 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 1bb485ad1..2eea00d97 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -13,6 +13,11 @@ Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
* Version 9.3
** Incompatible changes
+*** ob-clojure will not auto prepend ~(ns ..)~ statement now
+When tangling, user usually just want to tangle literally code instead
+of prepend inserting a ~(ns ..)~ statement before source block
+code. Now, when you have no ~:ns~ header argument specified, this
+behavior will not happend automatically.
*** Change in behavior on exit from an Org edit buffer
Org will no longer attempt to restore the window configuration in the
frame to which the user returns after editing a source block with
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 2088ab375..55a4c3eb4 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -63,7 +63,11 @@
(add-to-list 'org-babel-tangle-lang-exts '("clojure" . "clj"))
(defvar org-babel-default-header-args:clojure '())
-(defvar org-babel-header-args:clojure '((package . :any)))
+(defvar org-babel-header-args:clojure '((package . :any))
+ "For the :ns header argument, when you don't specify it, it
+ will not auto prepend (ns ..) statement before source block
+ code. If you have a :ns specified, the (ns ..) statement will
+ be auto prepended before source block code.")
(defcustom org-babel-clojure-sync-nrepl-timeout 10
"Timeout value, in seconds, of a Clojure sync call.
@@ -103,20 +107,20 @@ If the value is nil, timeout is disabled."
(result-params (cdr (assq :result-params params)))
(print-level nil)
(print-length nil)
- (body
- (org-trim
- (format "(ns %s)\n%s"
- ;; Source block specified namespace :ns.
- ns
- ;; Variables binding.
- (if (null vars) (org-trim body)
- (format "(let [%s]\n%s)"
- (mapconcat
- (lambda (var)
- (format "%S (quote %S)" (car var) (cdr var)))
- vars
- "\n ")
- body))))))
+ (body (org-trim
+ (concat
+ ;; Source block specified namespace :ns.
+ (if (not (null (cdr (assq :ns params))))
+ (format "(ns %s)\n" ns))
+ ;; Variables binding.
+ (if (null vars) (org-trim body)
+ (format "(let [%s]\n%s)"
+ (mapconcat
+ (lambda (var)
+ (format "%S (quote %S)" (car var) (cdr var)))
+ vars
+ "\n ")
+ body))))))
(if (or (member "code" result-params)
(member "pp" result-params))
(format "(clojure.pprint/pprint (do %s))" body)
diff --git a/testing/lisp/test-ob-clojure.el b/testing/lisp/test-ob-clojure.el
index f917ca4cc..a5391dcb3 100644
--- a/testing/lisp/test-ob-clojure.el
+++ b/testing/lisp/test-ob-clojure.el
@@ -71,6 +71,20 @@
(should (string=
": 1"
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))))
+(ert-deftest ob-clojure/tangle-without-ns ()
+ (org-test-with-temp-text
+ "#+begin_src clojure :tangle /tmp/test.clj
+(print 1)
+#+end_src"
+ (org-babel-next-src-block)
+ (org-babel-tangle)
+ (should
+ (string=
+ "(print 1)
+"
+ (with-temp-buffer
+ (insert-file-contents "/tmp/test.clj")
+ (buffer-substring-no-properties (point-min) (point-max)))))))
(provide 'test-ob-clojure)
--
2.20.1
[-- Attachment #3: Type: text/plain, Size: 247 bytes --]
--
[ stardiviner ]
I try to make every word tell the meaning what I want to express.
Blog: https://stardiviner.github.io/
IRC(freenode): stardiviner, Matrix: stardiviner
GPG: F09F650D7D674819892591401B5DF1C95AE89AC3
next prev parent reply other threads:[~2019-01-14 5:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-30 8:46 ob-clojure should not tangle with inserting (ns ..) line when no :ns specified stardiviner
2018-11-30 21:25 ` Tim Cross
2018-12-03 6:25 ` stardiviner
2018-12-04 21:22 ` Tim Cross
2018-12-05 9:04 ` stardiviner
2019-01-10 1:47 ` stardiviner
2019-01-14 5:52 ` stardiviner [this message]
2019-01-21 0:39 ` [PATCH] " stardiviner
2019-01-21 20:19 ` Nicolas Goaziou
2019-01-22 7:57 ` stardiviner
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=87fttveqfb.fsf@gmail.com \
--to=numbchild@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
/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).