Re: [O] [PATCH] Adding support for :results output for clojure src blocks.
Eric Schulte writes: > However, in this particular case, you could easily sneak your patch into > under 10 lines by replacing the `cond' with a nested `if', and I would > be happy to include such a patch immediately. I just applied Robert's patch in a way that makes his contribution short enough... in size, not in significance! Thanks again, -- Bastien
Re: [O] [PATCH] Adding support for :results output for clojure src blocks.
Eric Schulte writes: > Yes, please do consider signing the FSF papers to enable this and future > contributions to be included into Org-mode. Robert sent the paper, let's wait till the process is done. > However, in this particular case, you could easily sneak your patch into > under 10 lines by replacing the `cond' with a nested `if', and I would > be happy to include such a patch immediately. :) Robert, can you reapply a <10-lines patch? > Also, for patches directed at ob-* files, if you don't mind building the > patch with "git format-patch" I would prefer that format -- although > I'll happily take patches in any format. For the record, I much prefer patch with "git format-patch". Easy to read, easy to apply, easy to amend. Thanks! -- Bastien
Re: [O] [PATCH] Adding support for :results output for clojure src blocks.
Yes, please do consider signing the FSF papers to enable this and future contributions to be included into Org-mode. However, in this particular case, you could easily sneak your patch into under 10 lines by replacing the `cond' with a nested `if', and I would be happy to include such a patch immediately. Also, for patches directed at ob-* files, if you don't mind building the patch with "git format-patch" I would prefer that format -- although I'll happily take patches in any format. Thanks for contributing! -- Eric Bastien writes: > Hi Robert, > > Robert McIntyre writes: > >> This small patch handles :results output for clojure src blocks by >> using clojure's with-out-str function. > > I let Eric Schulte apply (or not) your patch. > >> Please let me know if I've done anything wrong as this is my first >> patch to org-mode. > > It is more than 10 lines long, so for the patch to be applied we would > need you to sign FSF papers. I will send them to you privately. > > Thanks! -- Eric Schulte http://cs.unm.edu/~eschulte/
Re: [O] [PATCH] Adding support for :results output for clojure src blocks.
Hi Robert, Robert McIntyre writes: > This small patch handles :results output for clojure src blocks by > using clojure's with-out-str function. I let Eric Schulte apply (or not) your patch. > Please let me know if I've done anything wrong as this is my first > patch to org-mode. It is more than 10 lines long, so for the patch to be applied we would need you to sign FSF papers. I will send them to you privately. Thanks! -- Bastien
[O] [PATCH] Adding support for :results output for clojure src blocks.
This small patch handles :results output for clojure src blocks by using clojure's with-out-str function. Please let me know if I've done anything wrong as this is my first patch to org-mode. sincerely, --Robert McIntyre diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el index a72b14c..00013b8 100644 --- a/lisp/ob-clojure.el +++ b/lisp/ob-clojure.el @@ -62,16 +62,22 @@ vars "\n ") "]\n" body ")") body -(if (or (member "code" result-params) - (member "pp" result-params)) - (format - (concat - "(let [org-mode-print-catcher (java.io.StringWriter.)] " - "(clojure.pprint/with-pprint-dispatch clojure.pprint/%s-dispatch " - "(clojure.pprint/pprint (do %s) org-mode-print-catcher) " - "(str org-mode-print-catcher)))") - (if (member "code" result-params) "code" "simple") body) - body))) +(cond + ((or (member "code" result-params) + (member "pp" result-params)) + (format + (concat + "(let [org-mode-print-catcher (java.io.StringWriter.)] " + "(clojure.pprint/with-pprint-dispatch clojure.pprint/%s-dispatch " + "(clojure.pprint/pprint (do %s) org-mode-print-catcher) " + "(str org-mode-print-catcher)))") + (if (member "code" result-params) "code" "simple") body)) + ;; if (:results output), collect printed output + ((member "output" result-params) + (format "(clojure.core/with-out-str %s)" body)) + (t body + + (defun org-babel-execute:clojure (body params) "Execute a block of Clojure code with Babel."
