From: Anoop GR <anoopemacs@gmail.com>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: emacs-orgmode@gnu.org, Bastien Guerry <bzg@gnu.org>
Subject: Re: ob-clojure breaks tangling of comments using org-babel-tangle for clojure source code blocks
Date: Thu, 17 Oct 2024 19:12:01 +0530 [thread overview]
Message-ID: <CACabEsTnLfwQysJ+86kVY7ySaKaG3yE-MDoa+3y_nBaEYDGhug@mail.gmail.com> (raw)
In-Reply-To: <87y12n6d5l.fsf@localhost>
[-- Attachment #1: Type: text/plain, Size: 2162 bytes --]
>
> I guess that we may leave the comments intact if the code block does not
> have :var.
>
I moved the comment stripping code in org-babel-expand-body:clojure to
follow the above idea:-
---
(defun org-babel-expand-body:clojure (body params)
"Expand BODY according to PARAMS, return the expanded body."
(let* ((vars (org-babel--get-vars params))
(backend-override (cdr (assq :backend params)))
(org-babel-clojure-backend
(cond
(backend-override (intern backend-override))
(org-babel-clojure-backend org-babel-clojure-backend)
(t (user-error "You need to customize `org-babel-clojure-backend'
or set the `:backend' header argument"))))
(ns (or (cdr (assq :ns params))
(if (eq org-babel-clojure-backend 'cider)
(or cider-buffer-ns
(let ((repl-buf (cider-current-connection)))
(and repl-buf (buffer-local-value
'cider-buffer-ns repl-buf))))
org-babel-clojure-default-ns)))
(result-params (cdr (assq :result-params params)))
(print-level nil)
(print-length nil)
(body (org-trim
(concat
;; Source block specified namespace :ns.
(and (cdr (assq :ns params)) (format "(ns %s)\n" ns))
;; Variables binding.
(if (null vars)
(org-trim body)
(let ((body (replace-regexp-in-string "^[ ]*;+.*$" ""
body))) ; Remove comments, they break (let [...] ...) bindings
(format "(let [%s]\n%s)"
(mapconcat
(lambda (var)
(format "%S '%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)
body)))
---
Now, it no longer loses comments on tangling.
[-- Attachment #2: Type: text/html, Size: 3017 bytes --]
next prev parent reply other threads:[~2024-10-17 13:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-15 17:43 ob-clojure breaks tangling of comments using org-babel-tangle for clojure source code blocks Anoop GR
2024-10-15 17:51 ` Anoop GR
2024-10-15 17:52 ` Anoop GR
2024-10-15 17:53 ` Anoop GR
2024-10-16 19:49 ` Ihor Radchenko
2024-10-17 13:42 ` Anoop GR [this message]
2024-10-17 17:59 ` Ihor Radchenko
2024-10-18 10:18 ` Anoop GR
2024-10-18 17:23 ` Ihor Radchenko
2024-10-18 20:16 ` Anoop GR
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=CACabEsTnLfwQysJ+86kVY7ySaKaG3yE-MDoa+3y_nBaEYDGhug@mail.gmail.com \
--to=anoopemacs@gmail.com \
--cc=bzg@gnu.org \
--cc=emacs-orgmode@gnu.org \
--cc=yantar92@posteo.net \
/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).