emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Updated patch, fixed data structure for table


From: Christopher M. Miles
Subject: [PATCH] Updated patch, fixed data structure for table
Date: Sun, 10 Apr 2022 06:40:31 +0800
User-agent: mu4e 1.6.10; emacs 29.0.50

From 87c17465241b44030945391c6d036b44799a7694 Mon Sep 17 00:00:00 2001
From: stardiviner <numbchild@gmail.com>
Date: Sat, 9 Apr 2022 21:14:22 +0800
Subject: [PATCH] ob-clojure.el: Fix header argument :var binding passed table
 or list data

* lisp/ob-clojure.el (org-babel-expand-body:clojure): Add if condition
to handle source block :var passed org-mode table or list data for
clojure let-binding to avoid java.lang.ClassCastException.
---
 lisp/ob-clojure.el | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 5a44b6487..adcd99a7a 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -101,13 +101,24 @@
                 (and (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 %S" (car var) (cdr var)))
-                           vars
-                           "\n      ")
-                          body))))))
+                   ;; variable's value is a list from org-mode passed table or 
list.
+                  (if (listp (cdr (car vars)))
+                       (format "(let [%s]\n%s)"
+                               (mapconcat
+                                (lambda (var)
+                                  (format "%S '%S" (car var) (cdr var)))
+                                vars
+                                "\n      ")
+                               body)
+                     ;; else, the header argument variable's value is not a 
list.
+                     (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)
-- 
2.35.1


-- 
[ stardiviner ]
       I try to make every word tell the meaning that I want to express.

       Blog: https://stardiviner.github.io/
       IRC(freenode): stardiviner, Matrix: stardiviner
       GPG: F09F650D7D674819892591401B5DF1C95AE89AC3

Attachment: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]