emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Christian Köstlin" <christian.koestlin@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [PATCH] Please add support for dlangs packagemanager to ob-C.el - v3
Date: Sun, 2 Oct 2022 00:04:29 +0200	[thread overview]
Message-ID: <CAG741+bUT_Yt3PdLuVpMNH7vo-bb3n1iiynf2Cime1LW=214NQ@mail.gmail.com> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 134 bytes --]

After adding unit-tests (following in another patchset) I found a bug in my
last patch.
Sorry for the noise.

Kind regards,
Christian

[-- Attachment #1.2: Type: text/html, Size: 199 bytes --]

[-- Attachment #2: 0001-lisp-ob-C.el-Support-dub-in-ob-D.patch --]
[-- Type: application/octet-stream, Size: 2508 bytes --]

From 35cc08fafa9939911a8c4d568ebe049dcdb1e184 Mon Sep 17 00:00:00 2001
From: Christian Koestlin <christian.koestlin@gmail.com>
Date: Tue, 8 Mar 2022 23:12:31 +0100
Subject: [PATCH 1/2] lisp/ob-C.el: Support dub in ob-D

Dlangs official package manager dub (https://dub.pm/) supports running
single files that carry dub-dependency information in a comment
block.

This patch switches from rdmd to dub if dependencies are used in the
source block. The dependency format used in the sourceblocks is
`:dependencies '(dep1=1.0.0 ...)`.
The version specifier can be left out or be used with `*` which then
resolves to the latest version of the package.

TINYCHANGE
---
 lisp/ob-C.el | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index 74309a0e9..e48fa4d75 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -176,7 +176,7 @@ or `org-babel-execute:C++' or `org-babel-execute:D'."
 	       (concat tmp-bin-file cmdline))
 	      (`d
 	       (format "%s %s %s %s"
-		       org-babel-D-compiler
+		       (if (eq 'nil (cdr (assq :dependencies params))) org-babel-D-compiler "dub")
 		       flags
 		       (org-babel-process-file-name tmp-src-file)
 		       cmdline)))
@@ -268,11 +268,20 @@ or `org-babel-execute:C++' or `org-babel-execute:D'."
 		    (org-babel-C-ensure-main-wrap body)
 		  body) "\n") "\n")))
 
+(defun org-babel-D-dependencies (dependencies)
+  "Convert DEPENDENCIES to dub.sdl code."
+  (mapconcat (lambda (x) (let* ((s (split-string (symbol-name x) "="))
+                                (d (car s))
+                                (v (or (car (cdr s)) "*")))
+                               (format "dependency \"%s\" version=\"%s\"" d v)))
+   dependencies "\n"))
+
 (defun org-babel-C-expand-D (body params)
   "Expand a block of D code with org-babel according to its header arguments."
   (let ((vars (org-babel--get-vars params))
 	(colnames (cdr (assq :colname-names params)))
 	(main-p (not (string= (cdr (assq :main params)) "no")))
+	(dependencies (cdr (assq :dependencies params)))
 	(imports (or (cdr (assq :imports params))
 		     (org-babel-read (org-entry-get nil "imports" t)))))
     (when (stringp imports)
@@ -280,6 +289,9 @@ or `org-babel-execute:C++' or `org-babel-execute:D'."
     (setq imports (append imports '("std.stdio" "std.conv")))
     (mapconcat 'identity
 	       (list
+		"/+ dub.sdl:"
+		(org-babel-D-dependencies dependencies)
+		"+/"
 		"module mmm;"
 		;; imports
 		(mapconcat
-- 
2.37.3


             reply	other threads:[~2022-10-01 22:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-01 22:04 Christian Köstlin [this message]
2023-07-27 10:36 ` [PATCH] Please add support for dlangs packagemanager to ob-C.el - v3 Ihor Radchenko
2023-09-01 11:48   ` Ihor Radchenko

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='CAG741+bUT_Yt3PdLuVpMNH7vo-bb3n1iiynf2Cime1LW=214NQ@mail.gmail.com' \
    --to=christian.koestlin@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).