From 35cc08fafa9939911a8c4d568ebe049dcdb1e184 Mon Sep 17 00:00:00 2001 From: Christian Koestlin 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