mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-24 07:20:29 +00:00
Code
main
org-mode/lisp/ob-clojure.el

355 lines
14 KiB
EmacsLisp
Raw Permalink Normal View History

Activate lexical binding in some libraries * lisp/ob-C.el (org-babel-prep-session:C): (org-babel-load-session:C): * lisp/ob-J.el: (org-babel-expand-body:J): (org-babel-execute:J): * lisp/ob-R.el: (org-babel-expand-body:R): * lisp/ob-abc.el: (org-babel-execute:abc): (org-babel-prep-session:abc): * lisp/ob-asymptote.el: (org-babel-execute:asymptote): (org-babel-prep-session:asymptote): * lisp/ob-awk.el: (org-babel-expand-body:awk): * lisp/ob-calc.el: (org-babel-expand-body:calc): * lisp/ob-clojure.el: * lisp/ob-comint.el: (org-babel-comint-in-buffer): (org-babel-comint-with-output): (org-babel-comint-eval-invisibly-and-wait-for-file): * lisp/ob-coq.el: * lisp/ob-css.el: (org-babel-execute:css): (org-babel-prep-session:css): * lisp/ob-ditaa.el: (org-babel-execute:ditaa): (org-babel-prep-session:ditaa): * lisp/ob-dot.el: (org-babel-execute:dot): (org-babel-prep-session:dot): * lisp/ob-ebnf.el: * lisp/ob-emacs-lisp.el: * lisp/ob-eval.el: * lisp/ob-forth.el: * lisp/ob-fortran.el: (org-babel-execute:fortran): (org-babel-prep-session:fortran): (org-babel-load-session:fortran): * lisp/ob-gnuplot.el: (org-babel-expand-body:gnuplot): (org-babel-prep-session:gnuplot): (org-babel-gnuplot-initiate-session): * lisp/ob-groovy.el: (org-babel-prep-session:groovy): (org-babel-groovy-initiate-session): * lisp/ob-haskell.el: (org-babel-haskell-initiate-session): * lisp/ob-io.el: (org-babel-prep-session:io): (org-babel-io-initiate-session): * lisp/ob-java.el: (org-babel-execute:java): * lisp/ob-js.el: * lisp/ob-keys.el: * lisp/ob-latex.el: (org-babel-prep-session:latex): * lisp/ob-ledger.el: (org-babel-execute:ledger): (org-babel-prep-session:ledger): * lisp/ob-lilypond.el: (org-babel-lilypond-commands): (org-babel-lilypond-process-basic): (org-babel-prep-session:lilypond): (org-babel-lilypond-parse-line-num): * lisp/ob-lisp.el: * lisp/ob-makefile.el: (org-babel-execute:makefile): (org-babel-prep-session:makefile): * lisp/ob-matlab.el: * lisp/ob-maxima.el: (org-babel-prep-session:maxima): * lisp/ob-mscgen.el: (org-babel-prep-session:mscgen): * lisp/ob-ocaml.el: (org-babel-execute:ocaml): (org-babel-prep-session:ocaml): * lisp/ob-octave.el: (org-babel-execute:octave): (org-babel-octave-initiate-session): * lisp/ob-org.el: (org-babel-prep-session:org): * lisp/ob-perl.el: (org-babel-prep-session:perl): (org-babel-perl--var-to-perl): (org-babel-perl-initiate-session): * lisp/ob-picolisp.el: (org-babel-expand-body:picolisp): (org-babel-execute:picolisp): * lisp/ob-plantuml.el: (org-babel-execute:plantuml): (org-babel-prep-session:plantuml): * lisp/ob-processing.el: (org-babel-prep-session:processing): * lisp/ob-python.el: (org-babel-python-initiate-session): * lisp/ob-ref.el: (org-babel-ref-resolve): * lisp/ob-ruby.el: (org-babel-ruby-initiate-session): * lisp/ob-sass.el: (org-babel-execute:sass): (org-babel-prep-session:sass): * lisp/ob-scala.el: (org-babel-execute:scala): (org-babel-prep-session:scala): (org-babel-scala-initiate-session): * lisp/ob-scheme.el: * lisp/ob-screen.el: (org-babel-prep-session:screen): (org-babel-screen-session-write-temp-file): (org-babel-screen-test): * lisp/ob.el: * lisp/org-colview.el: (org-columns-todo): (org-columns-set-tags-or-toggle): (org-columns-new): (org-columns-uncompile-format): (org-agenda-colview-summarize): * lisp/org-footnote.el: (electric-indent-mode): * lisp/org-indent.el: (org-indent-refresh-maybe): * lisp/org-list.el: * lisp/org-macro.el: (org-macro--collect-macros): * lisp/org-src.el: * lisp/org-table.el: (sort-fold-case): (org-table-create): (org-table-field-info): (org-table-transpose-table-at-point): (org-table-remove-rectangle-highlight): (orgtbl-create-or-convert-from-region): (org-define-lookup-function): * lisp/ox-ascii.el: (org-ascii-format-drawer-function): (org-ascii--has-caption-p): (org-ascii-bold): (org-ascii-center-block): (org-ascii-clock): (org-ascii-code): (org-ascii-dynamic-block): (org-ascii-entity): (org-ascii-example-block): (org-ascii-export-snippet): (org-ascii-export-block): (org-ascii-fixed-width): (org-ascii-footnote-reference): (org-ascii-horizontal-rule): (org-ascii-inline-src-block): (org-ascii-format-inlinetask-default): (org-ascii-italic): (org-ascii-keyword): (org-ascii-latex-environment): (org-ascii-latex-fragment): (org-ascii-line-break): (org-ascii-node-property): (org-ascii-planning): (org-ascii-quote-block): (org-ascii-radio-target): (org-ascii-special-block): (org-ascii-src-block): (org-ascii-statistics-cookie): (org-ascii-subscript): (org-ascii-superscript): (org-ascii-strike-through): (org-ascii-timestamp): (org-ascii-underline): (org-ascii-verbatim): (org-ascii-verse-block): (org-ascii-filter-headline-blank-lines): (org-ascii-filter-paragraph-spacing): (org-ascii-filter-comment-spacing): Use lexical binding.
2015-10-26 00:56:00 +00:00
;;; ob-clojure.el --- Babel Functions for Clojure -*- lexical-binding: t; -*-
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
Backport commit 8e1c56ae4 from Emacs ; Add 2024 to copyright years 8e1c56ae46754dd7baedff49a464f078f0e9912d Po Lu Tue Jan 2 09:47:10 2024 +0800
2024-01-02 01:47:10 +00:00
;; Copyright (C) 2009-2024 Free Software Foundation, Inc.
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
ob-clojure: Add :show-process * lisp/ob-clojure.el (org-babel-clojure-sync-nrepl-timeout): New variable. (org-babel-execute:clojure): Implement :show-process. Better error handling.
2016-11-18 17:01:02 +00:00
;; Author: Joel Boehland, Eric Schulte, Oleh Krehel, Frederick Giasson
lisp/ob-clojure.el: Add Daniel Kraus as maintainer
2022-09-27 19:36:33 +00:00
;; Maintainer: Daniel Kraus <daniel@kraus.my>
ob-clojure.el: switch to nREPL as the main method of evaluating Clojure. Get the old behavior with: (defalias 'org-babel-execute:clojure 'org-babel--execute-clojure-slime)
2013-10-03 16:23:16 +00:00
;;
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
;; Keywords: literate programming, reproducible research
Prefer "website" to "homepage" Emacs now advises using "website" (instead of "homepage") and consequently to use the "URL" comment header instead of "Homepage". * README: * README_ELPA: * doc/org-guide.org (Creating Footnotes): * doc/org-manual.org (Creating Footnotes): * etc/styles/README (URL): Prefer "website" to "homepage". * lisp/*.el: * mk/org-fixup.el: Replace the "Homepage" header comment with "URL".
2021-09-26 07:44:29 +00:00
;; URL: https://orgmode.org
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
babel: assigning copyright to the FSF for babel language files
2010-06-25 16:32:35 +00:00
;; This file is part of GNU Emacs.
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
babel: assigning copyright to the FSF for babel language files
2010-06-25 16:32:35 +00:00
;; GNU Emacs is free software: you can redistribute it and/or modify
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
;; it under the terms of the GNU General Public License as published by
babel: assigning copyright to the FSF for babel language files
2010-06-25 16:32:35 +00:00
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
babel: assigning copyright to the FSF for babel language files
2010-06-25 16:32:35 +00:00
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
;; You should have received a copy of the GNU General Public License
Backport commit bc511a64f from Emacs Prefer HTTPS to FTP and HTTP in documentation bc511a64f6da9ab51acc7c8865e80c4a4cb655c2 Paul Eggert Wed Sep 13 15:54:37 2017 -0700
2017-09-13 22:52:52 +00:00
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
;;; Commentary:
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
;; Support for evaluating Clojure / ClojureScript code.
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
ob-clojure.el: Add support for the cider backend * ob-clojure.el (org-babel-clojure-backend): Add customization options. (org-babel-execute:clojure): Add support for cider.
2013-11-04 10:30:34 +00:00
;; Requirements:
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
lisp/ob-clojure.el: Update headers
2022-10-28 08:48:16 +00:00
;; - Clojure (at least 1.2.0)
ob-clojure.el: Add support for the cider backend * ob-clojure.el (org-babel-clojure-backend): Add customization options. (org-babel-execute:clojure): Add support for cider.
2013-11-04 10:30:34 +00:00
;; - clojure-mode
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
;; - babashka, nbb, Clojure CLI tools, Cider, inf-clojure or SLIME
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
;; For clojure-mode, see https://github.com/clojure-emacs/clojure-mode
ob-clojure.el: Add support for babashka and nbb backend * lisp/ob-clojure.el: Add support for babashka and nbb backend.
2021-11-13 21:51:56 +00:00
;; For babashka, see https://github.com/babashka/babashka
;; For nbb, see https://github.com/babashka/nbb
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
;; For Clojure CLI tools, see https://clojure.org/guides/deps_and_cli
;; For Cider, see https://github.com/clojure-emacs/cider
;; For inf-clojure, see https://github.com/clojure-emacs/inf-clojure
;; For SLIME, see https://slime.common-lisp.dev
ob-clojure.el: switch to nREPL as the main method of evaluating Clojure. Get the old behavior with: (defalias 'org-babel-execute:clojure 'org-babel--execute-clojure-slime)
2013-10-03 16:23:16 +00:00
lisp/ob-clojure.el: Update headers
2022-10-28 08:48:16 +00:00
;; For SLIME, the best way to install its components is by following
ob-clojure.el: Add support for the cider backend * ob-clojure.el (org-babel-clojure-backend): Add customization options. (org-babel-execute:clojure): Add support for cider.
2013-11-04 10:30:34 +00:00
;; the directions as set out by Phil Hagelberg (Technomancy) on the
Prefer HTTPS to HTTP in most links
2021-03-21 18:55:14 +00:00
;; web page: https://technomancy.us/126
ob-clojure.el: Add support for the cider backend * ob-clojure.el (org-babel-clojure-backend): Add customization options. (org-babel-execute:clojure): Add support for cider.
2013-11-04 10:30:34 +00:00
org-babel-clojure: Added clojure language support to org-babel
2009-11-09 21:17:34 +00:00
;;; Code:
Assert all the Org files to load the same Org version * lisp/org-compat.el (org-assert-version): New macro comparing Org version at compile time and laod time. Add `org-assert-version' call to all files: * lisp/org-macs.el: * lisp/org-crypt.el: * lisp/org-ctags.el: * lisp/org-cycle.el: * lisp/org-datetree.el: * lisp/org-duration.el: * lisp/org-element.el (avl-tree): * lisp/org-entities.el: * lisp/org-faces.el: * lisp/org-feed.el: * lisp/org-fold-core.el: * lisp/org-fold.el: * lisp/org-footnote.el: * lisp/org-goto.el: * lisp/org-habit.el: * lisp/org-id.el: * lisp/org-indent.el: * lisp/org-inlinetask.el: * lisp/org-keys.el: * lisp/org-lint.el: * lisp/org-list.el: * lisp/org-macro.el: * lisp/org-mobile.el: * lisp/org-mouse.el: * lisp/org-num.el: * lisp/org-pcomplete.el: * lisp/org-persist.el: * lisp/org-plot.el: * lisp/org-protocol.el: * lisp/org-refile.el: * lisp/org-src.el: * lisp/org-table.el: * lisp/org-tempo.el: * lisp/org-timer.el: * lisp/org.el: * lisp/ox-ascii.el: * lisp/ox-beamer.el: * lisp/ox-html.el: * lisp/ox-icalendar.el: * lisp/ox-koma-letter.el: * lisp/ox-latex.el: * lisp/ox-man.el: * lisp/ox-md.el: * lisp/ox-odt.el: * lisp/ox-org.el: * lisp/ox-publish.el: * lisp/ox-texinfo.el: * lisp/ox.el:
2022-08-04 13:53:05 +00:00
(require 'org-macs)
(org-assert-version)
updating require and provide boilerplate for new ob* files
2010-06-11 23:02:42 +00:00
(require 'ob)
babel: all languages compiling cleanly (but R has a small problem) For some reason ob-R refuses to compile when it requires ob-comint. When (require 'ob-comint) is not included in ob-R.el everything compiles without error, but warnings are thrown because the arguments to a macro defined in ob-comint are mis-interpreted as functions. When (require 'ob-comint) is added to ob-R.el then it throws errors complaining that the last argument to a function is nil and should be a string. I don't understand this error at all and can't fix it.
2010-07-03 02:21:31 +00:00
ob-clojure: Silence byte-compiler
2015-10-11 21:56:35 +00:00
(declare-function cider-current-connection "ext:cider-client" (&optional type))
Fix incorrect argument call in ob-clojure.el * lisp/ob-clojure.el (org-babel-execute:clojure): Use `cider-current-ns' instead of `cider-current-session'. org-babel-execute-clojure was calling nrepl-sync-request:eval and nrepl-request:eval with the session ID as the 3rd argument when the functions expected a clojure namespace. TINYCHANGE
2017-03-07 08:00:27 +00:00
(declare-function cider-current-ns "ext:cider-client" ())
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(declare-function inf-clojure "ext:inf-clojure" (cmd))
(declare-function inf-clojure-cmd "ext:inf-clojure" (project-type))
(declare-function inf-clojure-eval-string "ext:inf-clojure" (code))
(declare-function inf-clojure-project-type "ext:inf-clojure" ())
ob-clojure: Silence byte-compiler
2014-10-13 20:05:12 +00:00
(declare-function nrepl-dict-get "ext:nrepl-client" (dict key))
* ob-clojure: Support :ns header argument * lisp/ob-clojure.el (org-babel-clojure-default-ns): New variable. (org-babel-clojure-cider-current-ns): New function. (org-babel-expand-body:clojure): (org-babel-execute:clojure): Support :ns header argument. Remove optional parameter (cider-current-ns) to better handle namespaces.
2018-03-26 03:35:21 +00:00
(declare-function nrepl-sync-request:eval "ext:nrepl-client" (input connection &optional ns tooling))
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(declare-function sesman-start-session "ext:sesman" (system))
ob-clojure.el: Add support for the cider backend * ob-clojure.el (org-babel-clojure-backend): Add customization options. (org-babel-execute:clojure): Add support for cider.
2013-11-04 10:30:34 +00:00
(declare-function slime-eval "ext:slime" (sexp &optional package))
* ob-clojure: Support :ns header argument * lisp/ob-clojure.el (org-babel-clojure-default-ns): New variable. (org-babel-clojure-cider-current-ns): New function. (org-babel-expand-body:clojure): (org-babel-execute:clojure): Support :ns header argument. Remove optional parameter (cider-current-ns) to better handle namespaces.
2018-03-26 03:35:21 +00:00
(defvar cider-buffer-ns)
ob-clojure: Add :show-process * lisp/ob-clojure.el (org-babel-clojure-sync-nrepl-timeout): New variable. (org-babel-execute:clojure): Implement :show-process. Better error handling.
2016-11-18 17:01:02 +00:00
initialize variable from ob-tangle in language files that use it * lisp/ob-C.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-asymptote.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-awk.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-clojure.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-haskell.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-latex.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-lisp.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-ocaml.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-perl.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-python.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-ruby.el (ob-tangle): initialize variable from ob-tangle. * lisp/ob-tangle.el (ob-tangle): initialize variable from ob-tangle.
2011-06-21 22:34:41 +00:00
(defvar org-babel-tangle-lang-exts)
babel: languages adding their extensions to `'org-babel-tangle-lang-exts'
2010-06-17 17:21:14 +00:00
(add-to-list 'org-babel-tangle-lang-exts '("clojure" . "clj"))
* lisp/ob-clojure.el: Add more ClojureScript src block support. * lisp/ob-clojure.el: Add ClojureScript src block tangle extension and header arguments support. * lisp/ob-clojure.el (org-babel-edit-prep:clojure): Auto inject src block :ns header argument into editing temporary src block buffer local. TINYCHANGE
2020-02-13 15:23:03 +00:00
(add-to-list 'org-babel-tangle-lang-exts '("clojurescript" . "cljs"))
babel: languages adding their extensions to `'org-babel-tangle-lang-exts'
2010-06-17 17:21:14 +00:00
babel: ensuring each language defined (possibly empty) default header arguments this makes customization easier when users can assume that org-babel-default-header-args:foo will exist for every language
2010-06-25 17:12:54 +00:00
(defvar org-babel-default-header-args:clojure '())
ob-clojure.el: Add a :backend header arg to clojure code blocks * ob-clojure.el (org-babel-header-args:clojure, org-babel-execute:clojure): Add a :backend header arg that can override the configured `org-babel-clojure-backend'. TINYCHANGE
2022-10-08 09:41:20 +00:00
(defvar org-babel-header-args:clojure
'((ns . :any)
(package . :any)
(backend . ((inf-clojure cider slime babashka nbb)))))
* lisp/ob-clojure.el: Add more ClojureScript src block support. * lisp/ob-clojure.el: Add ClojureScript src block tangle extension and header arguments support. * lisp/ob-clojure.el (org-babel-edit-prep:clojure): Auto inject src block :ns header argument into editing temporary src block buffer local. TINYCHANGE
2020-02-13 15:23:03 +00:00
(defvar org-babel-default-header-args:clojurescript '())
(defvar org-babel-header-args:clojurescript '((package . :any)))
ob-clojure.el: Auto detect backend * lisp/ob-clojure.el (org-babel-clojure-backend): Set the backend to an available cli program or elisp package.
2022-10-29 21:20:06 +00:00
(defcustom org-babel-clojure-backend (cond
((executable-find "bb") 'babashka)
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
((executable-find "clojure") 'clojure-cli)
ob-clojure.el: Auto detect backend * lisp/ob-clojure.el (org-babel-clojure-backend): Set the backend to an available cli program or elisp package.
2022-10-29 21:20:06 +00:00
((featurep 'cider) 'cider)
((featurep 'inf-clojure) 'inf-clojure)
((featurep 'slime) 'slime)
(t nil))
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
"Backend used to evaluate Clojure code blocks."
:group 'org-babel
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
:package-version '(Org . "9.7")
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
:type '(choice
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(const :tag "babashka" babashka)
(const :tag "clojure-cli" clojure-cli)
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
(const :tag "cider" cider)
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(const :tag "inf-clojure" inf-clojure)
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
(const :tag "slime" slime)
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(const :tag "Not configured yet" nil)))
(defcustom org-babel-clojurescript-backend
(cond
((or (executable-find "nbb") (executable-find "npx")) 'nbb)
((featurep 'cider) 'cider)
(t nil))
"Backend used to evaluate ClojureScript code blocks."
:group 'org-babel
:package-version '(Org . "9.7")
:type '(choice
ob-clojure.el: Add support for babashka and nbb backend * lisp/ob-clojure.el: Add support for babashka and nbb backend.
2021-11-13 21:51:56 +00:00
(const :tag "nbb" nbb)
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(const :tag "cider" cider)
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
(const :tag "Not configured yet" nil)))
* ob-clojure: Support :ns header argument * lisp/ob-clojure.el (org-babel-clojure-default-ns): New variable. (org-babel-clojure-cider-current-ns): New function. (org-babel-expand-body:clojure): (org-babel-execute:clojure): Support :ns header argument. Remove optional parameter (cider-current-ns) to better handle namespaces.
2018-03-26 03:35:21 +00:00
(defcustom org-babel-clojure-default-ns "user"
"src block" -> "source block" in documentation and comments * etc/ORG-NEWS (Maxima: new headers ~:prologue~ and ~:epilogue~): (Texinfo exports inline source blocks as ~@code{}~): (Default lexical evaluation of emacs-lisp source blocks): * lisp/ob-clojure.el (org-babel-clojure-default-ns): * lisp/ob-core.el (org-babel-named-src-block-regexp-for-name): (org-babel-current-src-block-location): (org-babel-mark-block): (org-babel-insert-result): * lisp/ob-emacs-lisp.el (org-babel-default-header-args:emacs-lisp): * lisp/ob-exp.el (org-babel-exp-process-buffer): * lisp/ob-lob.el (org-babel-lob-ingest): * lisp/ob-ref.el: * lisp/org-element.el (org-element-object-restrictions): (org-element-src-block-parser): (org-element-inline-src-block-parser): * lisp/org-lint.el: (org-lint--checkers): * lisp/org-pcomplete.el (pcomplete/org-mode/block-option/src): * lisp/org-src.el (org-edit-inline-src-code): * lisp/org.el (org-ctrl-c-ctrl-c): (org-in-src-block-p): (org-fill-element): * lisp/ox-html.el (org-html--textarea-block): (org-html-format-code): * lisp/ox-latex.el (org-latex-minted-options): (org-latex-custom-lang-environments): * lisp/ox-md.el: * lisp/ox-odt.el (org-odt-format-code): * lisp/ox.el (org-export-collect-listings): * testing/lisp/test-ob-exp.el (ob-exp/src-block-with-affiliated-keyword): * testing/lisp/test-ob.el (test-ob/preserve-results-indentation): Correct "src block" occurrences when they do not specifically refer to the element type `src-block'.
2018-09-20 09:23:49 +00:00
"Default Clojure namespace for source block when finding ns failed."
* ob-clojure: Support :ns header argument * lisp/ob-clojure.el (org-babel-clojure-default-ns): New variable. (org-babel-clojure-cider-current-ns): New function. (org-babel-expand-body:clojure): (org-babel-execute:clojure): Support :ns header argument. Remove optional parameter (cider-current-ns) to better handle namespaces.
2018-03-26 03:35:21 +00:00
:type 'string
:group 'org-babel)
ob-clojure.el: Add support for babashka and nbb backend * lisp/ob-clojure.el: Add support for babashka and nbb backend.
2021-11-13 21:51:56 +00:00
(defcustom ob-clojure-babashka-command (executable-find "bb")
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
"Babashka command used by the Clojure `babashka' backend."
Backport commit 4b2f5425d from Emacs * lisp/ob-clojure.el (ob-clojure-babashka-command, ob-clojure-nbb-command): Account for the possibility of nil (commands absent). * lisp/org.el (org-safe-remote-resources): * lisp/ox-md.el (org-md-toplevel-hlevel): Fix incorrect or invalid types. Fix types in various defcustom declarations 4b2f5425d7af1a6f992ad8ce0a4452a2e778815a Mattias Engdegård Thu Dec 1 13:03:19 2022 +0100 [km] The natnum change will be adjusted in an upcoming commit because natnum not available until Emacs 28.
2022-12-01 11:40:28 +00:00
:type '(choice file (const nil))
Add missing :package-version tags in changed `defcustom' * lisp/ob-clojure.el (ob-clojure-babashka-command): (ob-clojure-nbb-command): * lisp/ob-exp.el (org-babel-exp-code-template): * lisp/ob-latex.el (org-babel-latex-pdf-svg-process): * lisp/org-agenda.el (org-agenda-show-outline-path): * lisp/org-capture.el (org-capture-templates): * lisp/org-clock.el (org-clocktable-defaults): * lisp/org-persist.el (org-persist-directory): (org-persist-remote-files): (org-persist-default-expiry): * lisp/org-refile.el (org-refile-use-outline-path): * lisp/org-src.el (org-src-lang-modes): * lisp/org.el (org-resource-download-policy): (org-safe-remote-resources): (org-time-stamp-custom-formats): (org-property-separators): (org-preview-latex-process-alist): (org-structure-template-alist): * lisp/ox-latex.el (org-latex-inline-image-rules): (org-latex-src-block-backend): (org-latex-engraved-options): (org-latex-engraved-theme): * lisp/ox-md.el (org-md-toplevel-hlevel): * lisp/ox-texinfo.el (org-texinfo-with-latex): Add :package-version keywords to the new custom options, and those with the value or meaning changed.
2022-11-13 07:29:15 +00:00
:group 'org-babel
:package-version '(Org . "9.6"))
ob-clojure.el: Add support for babashka and nbb backend * lisp/ob-clojure.el: Add support for babashka and nbb backend.
2021-11-13 21:51:56 +00:00
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(defcustom ob-clojure-nbb-command (or (executable-find "nbb")
Replace use of if-let and when-let, obsolete in Emacs 31.0.50 * lisp/ob-R.el (org-babel-R-associate-session): * lisp/ob-clojure.el (ob-clojure-nbb-command, ob-clojure-cli-command): * lisp/ob-core.el (org-babel-execute-src-block): * lisp/ob-exp.el (org-babel-exp-code): * lisp/ob-julia.el (org-babel-julia-associate-session): * lisp/ob-python.el (org-babel-python--python-util-comint-end-of-output-p): * lisp/ol.el (org-insert-link): * lisp/org-attach.el (org-attach): * lisp/org-clock.el (org-clock-select-task): * lisp/org-compat.el (fboundp): * lisp/org-element-ast.el (org-element-property-raw) (org-element-put-property, org-element-copy): * lisp/org-element.el (org-element-timestamp-interpreter) (org-element--cache-key): * lisp/org-goto.el (org-goto-location): * lisp/org-lint.el (org-lint-suspicious-language-in-src-block) (org-lint-export-option-keywords): * lisp/org-macs.el (org-mks): * lisp/org-persist.el: (org-persist-write:elisp): * lisp/org-table.el (org-table-fedit-finish, orgtbl--skip) (orgtbl--skipcols): * lisp/org.el (org-entry-get-with-inheritance): * lisp/ox-beamer.el (org-beamer--format-frame): * lisp/ox-html.el (org-html--reference, org-html--build-mathjax-config) (org-html-example-block): * lisp/ox-latex.el (org-latex-table-row): * lisp/ox.el (org-export--prune-tree) (org-export--blindly-expand-include): * testing/lisp/test-duplicates-detector.el (test-duplicates-detector--find-duplicates): * testing/lisp/test-ob-haskell-ghci.el (test-ob-haskell-ghci-checking-buffers): * testing/lisp/test-ob-python.el (test-ob-python/async-local-python-shell): * testing/lisp/test-ob-shell.el (test-ob-shell/bash-uses-assoc-arrays) (test-ob-shell/bash-uses-assoc-arrays-with-lists) (test-ob-shell/remote-with-stdin-or-cmdline): Replace use of if-let and when-let, obsolete in Emacs 31.0.50.
2024-10-24 09:04:40 +00:00
(when-let* ((npx (executable-find "npx")))
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(concat npx " nbb")))
"Nbb command used by the ClojureScript `nbb' backend."
:type '(choice string (const nil))
Add missing :package-version tags in changed `defcustom' * lisp/ob-clojure.el (ob-clojure-babashka-command): (ob-clojure-nbb-command): * lisp/ob-exp.el (org-babel-exp-code-template): * lisp/ob-latex.el (org-babel-latex-pdf-svg-process): * lisp/org-agenda.el (org-agenda-show-outline-path): * lisp/org-capture.el (org-capture-templates): * lisp/org-clock.el (org-clocktable-defaults): * lisp/org-persist.el (org-persist-directory): (org-persist-remote-files): (org-persist-default-expiry): * lisp/org-refile.el (org-refile-use-outline-path): * lisp/org-src.el (org-src-lang-modes): * lisp/org.el (org-resource-download-policy): (org-safe-remote-resources): (org-time-stamp-custom-formats): (org-property-separators): (org-preview-latex-process-alist): (org-structure-template-alist): * lisp/ox-latex.el (org-latex-inline-image-rules): (org-latex-src-block-backend): (org-latex-engraved-options): (org-latex-engraved-theme): * lisp/ox-md.el (org-md-toplevel-hlevel): * lisp/ox-texinfo.el (org-texinfo-with-latex): Add :package-version keywords to the new custom options, and those with the value or meaning changed.
2022-11-13 07:29:15 +00:00
:group 'org-babel
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
:package-version '(Org . "9.7"))
ob-clojure.el: Add support for babashka and nbb backend * lisp/ob-clojure.el: Add support for babashka and nbb backend.
2021-11-13 21:51:56 +00:00
Replace use of if-let and when-let, obsolete in Emacs 31.0.50 * lisp/ob-R.el (org-babel-R-associate-session): * lisp/ob-clojure.el (ob-clojure-nbb-command, ob-clojure-cli-command): * lisp/ob-core.el (org-babel-execute-src-block): * lisp/ob-exp.el (org-babel-exp-code): * lisp/ob-julia.el (org-babel-julia-associate-session): * lisp/ob-python.el (org-babel-python--python-util-comint-end-of-output-p): * lisp/ol.el (org-insert-link): * lisp/org-attach.el (org-attach): * lisp/org-clock.el (org-clock-select-task): * lisp/org-compat.el (fboundp): * lisp/org-element-ast.el (org-element-property-raw) (org-element-put-property, org-element-copy): * lisp/org-element.el (org-element-timestamp-interpreter) (org-element--cache-key): * lisp/org-goto.el (org-goto-location): * lisp/org-lint.el (org-lint-suspicious-language-in-src-block) (org-lint-export-option-keywords): * lisp/org-macs.el (org-mks): * lisp/org-persist.el: (org-persist-write:elisp): * lisp/org-table.el (org-table-fedit-finish, orgtbl--skip) (orgtbl--skipcols): * lisp/org.el (org-entry-get-with-inheritance): * lisp/ox-beamer.el (org-beamer--format-frame): * lisp/ox-html.el (org-html--reference, org-html--build-mathjax-config) (org-html-example-block): * lisp/ox-latex.el (org-latex-table-row): * lisp/ox.el (org-export--prune-tree) (org-export--blindly-expand-include): * testing/lisp/test-duplicates-detector.el (test-duplicates-detector--find-duplicates): * testing/lisp/test-ob-haskell-ghci.el (test-ob-haskell-ghci-checking-buffers): * testing/lisp/test-ob-python.el (test-ob-python/async-local-python-shell): * testing/lisp/test-ob-shell.el (test-ob-shell/bash-uses-assoc-arrays) (test-ob-shell/bash-uses-assoc-arrays-with-lists) (test-ob-shell/remote-with-stdin-or-cmdline): Replace use of if-let and when-let, obsolete in Emacs 31.0.50.
2024-10-24 09:04:40 +00:00
(defcustom ob-clojure-cli-command (when-let* ((cmd (executable-find "clojure")))
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(concat cmd " -M"))
"Clojure CLI command used by the Clojure `clojure-cli' backend."
ob-clojure-cli-command: Fix :type declaration * lisp/ob-clojure.el (ob-clojure-cli-command): Allow nil value. It can happen, even though it will yield error (which is a different issue). But let's follow other defcustoms in the file. Reported-by: Mattias Engdegård <mattias.engdegard@gmail.com> Link: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71566
2024-06-15 14:45:54 +00:00
:type '(choice string (const nil))
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
:group 'org-babel
:package-version '(Org . "9.7"))
(defun org-babel-expand-body:clojure (body params &optional cljs-p)
"Expand BODY according to PARAMS, return the expanded body.
When CLJS-P is non-nil, expand in a cljs context instead of clj."
babel: small change in API. * lisp/ob-core.el (org-babel--get-vars): New function. (org-babel-get-header): Delete. * lisp/ob-C.el (org-babel-C-expand-C): (org-babel-C-expand-D): * lisp/ob-R.el (org-babel-variable-assignments:R): * lisp/ob-abc.el (org-babel-expand-body:abc): * lisp/ob-asymptote.el (org-babel-variable-assignments:asymptote): * lisp/ob-awk.el (org-babel-execute:awk): * lisp/ob-calc.el (org-babel-execute:calc): * lisp/ob-clojure.el (org-babel-expand-body:clojure): * lisp/ob-dot.el (org-babel-expand-body:dot): * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): * lisp/ob-fortran.el (org-babel-expand-body:fortran): (org-babel-fortran-ensure-main-wrap): * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): * lisp/ob-haskell.el (org-babel-variable-assignments:haskell): * lisp/ob-js.el (org-babel-variable-assignments:js): * lisp/ob-latex.el (org-babel-expand-body:latex): * lisp/ob-lilypond.el (org-babel-expand-body:lilypond): * lisp/ob-lisp.el (org-babel-expand-body:lisp): * lisp/ob-maxima.el (org-babel-maxima-expand): * lisp/ob-ocaml.el (org-babel-variable-assignments:ocaml): * lisp/ob-octave.el (org-babel-variable-assignments:octave): * lisp/ob-org.el (org-babel-expand-body:org): * lisp/ob-perl.el (org-babel-variable-assignments:perl): * lisp/ob-picolisp.el (org-babel-expand-body:picolisp): * lisp/ob-processing.el (org-babel-variable-assignments:processing): * lisp/ob-python.el (org-babel-variable-assignments:python): * lisp/ob-ruby.el (org-babel-variable-assignments:ruby): * lisp/ob-scheme.el (org-babel-expand-body:scheme): * lisp/ob-shell.el (org-babel-variable-assignments:shell): * lisp/ob-shen.el (org-babel-expand-body:shen): * lisp/ob-sql.el (org-babel-expand-body:sql): * lisp/ob-sqlite.el (org-babel-expand-body:sqlite): Adapt to change. * etc/ORG-NEWS: Document change.
2015-10-29 19:26:11 +00:00
(let* ((vars (org-babel--get-vars params))
lisp/ob-clojure.el: Fix :backend override not work with `org-babel-clojure-backend' * lisp/ob-clojure.el (org-babel-expand-body:clojure): When The source block specified header argument :backend, the global option `org-babel-clojure-backend' value is default 'cider, the `cider-buffer-ns` is not void error.
2022-10-12 09:27:58 +00:00
(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"))))
* ob-clojure: Support :ns header argument * lisp/ob-clojure.el (org-babel-clojure-default-ns): New variable. (org-babel-clojure-cider-current-ns): New function. (org-babel-expand-body:clojure): (org-babel-execute:clojure): Support :ns header argument. Remove optional parameter (cider-current-ns) to better handle namespaces.
2018-03-26 03:35:21 +00:00
(ns (or (cdr (assq :ns params))
ob-clojure.el: More minor refinements * lisp/ob-clojure.el (org-babel-expand-body:clojure): Inline namespace setting. (org-babel-clojure-cider-current-ns): Delete. (ob-clojure-inf-clojure-filter-out): New variable. (ob-clojure-inf-clojure-output): Use it. (ob-clojure-eval-with-inf-clojure): Update the filter variable depending on the current namespace.
2020-02-17 01:37:55 +00:00
(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)))
Use assq instead of assoc for :keywords * lisp/ob-C.el (org-babel-C-execute): * lisp/ob-J.el (org-babel-execute:J): * lisp/ob-R.el (org-babel-edit-prep:R): (org-babel-expand-body:R): (org-babel-execute:R): (org-babel-variable-assignments:R): (org-babel-R-initiate-session): * lisp/ob-abc.el (org-babel-execute:abc): * lisp/ob-asymptote.el (org-babel-execute:asymptote): * lisp/ob-awk.el (org-babel-execute:awk): * lisp/ob-clojure.el (org-babel-expand-body:clojure): (org-babel-execute:clojure): * lisp/ob-core.el (org-babel-expand-body:generic): (org-babel-load-in-session): (org-babel-initiate-session): (org-babel-open-src-block-result): (org-babel-process-params): (org-babel-insert-result): (org-babel-expand-noweb-references): * lisp/ob-ditaa.el (org-babel-execute:ditaa): * lisp/ob-dot.el (org-babel-execute:dot): * lisp/ob-ebnf.el (org-babel-execute:ebnf): * lisp/ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): (org-babel-execute:emacs-lisp): * lisp/ob-exp.el (org-babel-exp-process-buffer): (org-babel-exp-do-export): (org-babel-exp-code): * lisp/ob-forth.el (org-babel-execute:forth): * lisp/ob-fortran.el (org-babel-execute:fortran): * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): (org-babel-expand-body:gnuplot): (org-babel-execute:gnuplot): * lisp/ob-groovy.el (org-babel-execute:groovy): * lisp/ob-haskell.el (org-babel-execute:haskell): * lisp/ob-io.el (org-babel-execute:io): * lisp/ob-java.el (org-babel-execute:java): * lisp/ob-js.el (org-babel-execute:js): * lisp/ob-latex.el (org-babel-execute:latex): * lisp/ob-ledger.el (org-babel-execute:ledger): * lisp/ob-lilypond.el (org-babel-lilypond-process-basic): * lisp/ob-lisp.el (org-babel-expand-body:lisp): (org-babel-execute:lisp): * lisp/ob-lua.el (org-babel-execute:lua): * lisp/ob-maxima.el (org-babel-execute:maxima): * lisp/ob-mscgen.el (org-babel-execute:mscgen): * lisp/ob-ocaml.el (org-babel-execute:ocaml): * lisp/ob-octave.el (org-babel-execute:octave): * lisp/ob-org.el (org-babel-execute:org): * lisp/ob-perl.el (org-babel-execute:perl): * lisp/ob-picolisp.el (org-babel-execute:picolisp): * lisp/ob-plantuml.el (org-babel-execute:plantuml): * lisp/ob-python.el (org-babel-execute:python): * lisp/ob-ruby.el (org-babel-execute:ruby): * lisp/ob-sass.el (org-babel-execute:sass): * lisp/ob-scala.el (org-babel-execute:scala): * lisp/ob-scheme.el (org-babel-execute:scheme): * lisp/ob-screen.el (org-babel-execute:screen): (org-babel-prep-session:screen): * lisp/ob-shell.el (org-babel-execute:shell): (org-babel-variable-assignments:shell): (org-babel-sh-evaluate): * lisp/ob-shen.el (org-babel-execute:shen): * lisp/ob-sql.el (org-babel-execute:sql): * lisp/ob-sqlite.el (org-babel-execute:sqlite): * lisp/ob-tangle.el (org-babel-tangle): (org-babel-tangle-single-block): * lisp/org-src.el (org-src-associate-babel-session): * lisp/org.el (org-next-link): Use `assq' instead of `assoc' with :keyword keys.
2016-09-22 17:45:15 +00:00
(result-params (cdr (assq :result-params params)))
* ob-clojure: Support :ns header argument * lisp/ob-clojure.el (org-babel-clojure-default-ns): New variable. (org-babel-clojure-cider-current-ns): New function. (org-babel-expand-body:clojure): (org-babel-execute:clojure): Support :ns header argument. Remove optional parameter (cider-current-ns) to better handle namespaces.
2018-03-26 03:35:21 +00:00
(print-level nil)
(print-length nil)
ob-clojure: Don't tangle with auto prepend ns statement * lisp/ob-clojure.el: (org-babel-expand-body:clojure, org-babel-header-args:clojure): whether auto prepend Clojure (ns ..) statement depend on whether have :ns header argument specified. * testing/test-ob-clojure.el: Add a test.
2019-01-10 01:34:39 +00:00
(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)
ob-clojure.el: Fix comments getting deleted on tangling of clojure source blocks * lisp/ob-clojure.el (org-babel-expand-body:clojure): Leave the comments intact if the code block does not have :var. Reported-by: "Anoop G R" <anoopemacs@gmail.com> Link: https://list.orgmode.org/874j5azk2p.fsf@localhost/T/#t TINYCHANGE
2024-10-18 10:00:54 +00:00
;; Remove comments, they break (let [...] ...) bindings
(let ((body (replace-regexp-in-string "^[ ]*;+.*$" "" body)))
(format "(let [%s]\n%s)"
ob-clojure: Don't tangle with auto prepend ns statement * lisp/ob-clojure.el: (org-babel-expand-body:clojure, org-babel-header-args:clojure): whether auto prepend Clojure (ns ..) statement depend on whether have :ns header argument specified. * testing/test-ob-clojure.el: Add a test.
2019-01-10 01:34:39 +00:00
(mapconcat
(lambda (var)
lisp/ob-clojure.el: Fix header argument :var binding * lisp/ob-clojure.el (org-babel-expand-body:clojure): Always quote the variables passed from org-mode in Clojure let binding. When a variable is a table or list, it's value is "(..data..)" and without quotes, Clojure would try to execute the first value as a function.
2022-10-27 14:04:02 +00:00
(format "%S '%S" (car var) (cdr var)))
ob-clojure: Don't tangle with auto prepend ns statement * lisp/ob-clojure.el: (org-babel-expand-body:clojure, org-babel-header-args:clojure): whether auto prepend Clojure (ns ..) statement depend on whether have :ns header argument specified. * testing/test-ob-clojure.el: Add a test.
2019-01-10 01:34:39 +00:00
vars
"\n ")
ob-clojure.el: Fix comments getting deleted on tangling of clojure source blocks * lisp/ob-clojure.el (org-babel-expand-body:clojure): Leave the comments intact if the code block does not have :var. Reported-by: "Anoop G R" <anoopemacs@gmail.com> Link: https://list.orgmode.org/874j5azk2p.fsf@localhost/T/#t TINYCHANGE
2024-10-18 10:00:54 +00:00
body)))))))
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
;; If the result param is set to "output" we don't have to do
;; anything special and just let the backend handle everything
(if (member "output" result-params)
body
;; If the result is not "output" (i.e. it's "value"), disable
;; stdout output and print the last returned value. Use pprint
;; instead of prn when results param is "pp" or "code".
(concat
(if (or (member "code" result-params)
(member "pp" result-params))
(concat (if cljs-p
"(require '[cljs.pprint :refer [pprint]])"
"(require '[clojure.pprint :refer [pprint]])")
" (pprint ")
"(prn ")
(if cljs-p
"(binding [cljs.core/*print-fn* (constantly nil)]"
"(binding [*out* (java.io.StringWriter.)]")
body "))"))))
org-babel-expand-body:clojure
2010-04-11 20:29:24 +00:00
ob-clojure.el: More minor refinements * lisp/ob-clojure.el (org-babel-expand-body:clojure): Inline namespace setting. (org-babel-clojure-cider-current-ns): Delete. (ob-clojure-inf-clojure-filter-out): New variable. (ob-clojure-inf-clojure-output): Use it. (ob-clojure-eval-with-inf-clojure): Update the filter variable depending on the current namespace.
2020-02-17 01:37:55 +00:00
(defvar ob-clojure-inf-clojure-filter-out)
(defvar ob-clojure-inf-clojure-tmp-output)
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
(defun ob-clojure-inf-clojure-output (s)
"Store a trimmed version of S in a variable and return S."
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(let ((s0 (org-trim
(replace-regexp-in-string
ob-clojure.el: More minor refinements * lisp/ob-clojure.el (org-babel-expand-body:clojure): Inline namespace setting. (org-babel-clojure-cider-current-ns): Delete. (ob-clojure-inf-clojure-filter-out): New variable. (ob-clojure-inf-clojure-output): Use it. (ob-clojure-eval-with-inf-clojure): Update the filter variable depending on the current namespace.
2020-02-17 01:37:55 +00:00
ob-clojure-inf-clojure-filter-out "" s))))
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
(push s0 ob-clojure-inf-clojure-tmp-output))
s)
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(defmacro ob-clojure-with-temp-expanded (expanded params &rest body)
"Run BODY on EXPANDED code block with PARAMS."
(declare (debug (body)) (indent 2))
`(with-temp-buffer
(insert ,expanded)
(goto-char (point-min))
(while (not (looking-at "\\s-*\\'"))
(let* ((beg (point))
(end (progn (forward-sexp) (point)))
(exp (org-babel-expand-body:clojure
(buffer-substring beg end) ,params)))
(sit-for .1)
,@body))))
(defsubst ob-clojure-string-or-list (l)
"Convert list L into a string or a list of list."
(if (and (listp l) (= (length l) 1))
(car l)
(mapcar #'list l)))
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
(defvar inf-clojure-buffer)
ob-clojure.el: More minor refinements * lisp/ob-clojure.el (org-babel-expand-body:clojure): Inline namespace setting. (org-babel-clojure-cider-current-ns): Delete. (ob-clojure-inf-clojure-filter-out): New variable. (ob-clojure-inf-clojure-output): Use it. (ob-clojure-eval-with-inf-clojure): Update the filter variable depending on the current namespace.
2020-02-17 01:37:55 +00:00
(defvar comint-prompt-regexp)
ob-clojure.el: Support using inf-clojure.el * lisp/ob-clojure.el (org-babel-clojure-backend): Allow to use inf-clojure.el and set to nil by default. (ob-clojure-inf-clojure-output): New function. (org-babel-execute:clojure): Support using inf-clojure.el. Remove the :show-process parameter. (org-babel-execute:clojurescript) (org-babel-edit-prep:clojure): Fix docstrings. (org-babel-clojure-initiate-session): Make the session parameter mandatory. Initiate a cider session if needed.
2020-02-16 10:16:00 +00:00
(defvar inf-clojure-comint-prompt-regexp)
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(defun ob-clojure-eval-with-inf-clojure (expanded params)
"Evaluate EXPANDED code block with PARAMS using inf-clojure."
Provide a uniform way to inform users about missing third-party packages * lisp/org-macs.el (org-require-package): New macro trying to load a library and displaying custom error message or warning on failure. The actual package (not library) name can be provided as optional argument. * lisp/ob-R.el (org-babel-R-initiate-session): * lisp/ob-clojure.el (ob-clojure-eval-with-inf-clojure): (ob-clojure-eval-with-cider): (ob-clojure-eval-with-slime): * lisp/ob-forth.el (org-babel-forth-session-execute): * lisp/ob-gnuplot.el (org-babel-execute:gnuplot): (org-babel-gnuplot-initiate-session): * lisp/ob-haskell.el (org-babel-interpret-haskell): (org-babel-haskell-initiate-session): * lisp/ob-js.el (org-babel-execute:js): (org-babel-js-initiate-session): * lisp/ob-julia.el (org-babel-julia-initiate-session): * lisp/ob-lisp.el (org-babel-execute:lisp): * lisp/ob-ocaml.el (org-babel-prep-session:ocaml): * lisp/ob-octave.el (org-babel-octave-initiate-session): * lisp/ob-processing.el (org-babel-processing-view-sketch): * lisp/ob-ruby.el (org-babel-execute:ruby): (org-babel-ruby-initiate-session): * lisp/ol-bbdb.el (org-bbdb-open): (org-bbdb-complete-link): (org-bbdb-anniv-export-ical): * lisp/org-agenda.el: * lisp/org-plot.el (org-plot/gnuplot): * lisp/org.el: * lisp/ox-ascii.el (org-ascii-table): * lisp/ox-html.el (org-html-htmlize-generate-css): * lisp/ox-org.el: Use the new macro. * lisp/oc-csl.el: Add FIXME. oc-csl uses a custom function doing similar job. * lisp/ob-js.el (org-babel-js-initiate-session): Add FIXME noting that the third-party package is outdated.
2023-01-23 15:06:46 +00:00
(org-require-package 'inf-clojure)
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
;; Maybe initiate the inf-clojure session
(unless (and inf-clojure-buffer
(buffer-live-p (get-buffer inf-clojure-buffer)))
(save-window-excursion
(let* ((alias (cdr (assq :alias params)))
(cmd0 (inf-clojure-cmd (inf-clojure-project-type)))
(cmd (if alias (replace-regexp-in-string
"clojure" (format "clojure -A%s" alias)
cmd0)
cmd0)))
Rename `org-babel-comint-prompt-regexp-old' to `...-fallback' * lisp/ob-comint.el (org-babel-comint-prompt-regexp-fallback): Rename to more accurate name. Leave the old name as an alias. (org-babel-comint--set-fallback-prompt): Use the new name. (org-babel-comint-with-output): (org-babel-comint-wait-for-output): * lisp/ob-clojure.el (ob-clojure-eval-with-inf-clojure): * lisp/ob-haskell.el (org-babel-interpret-haskell): * lisp/ob-ruby.el (org-babel-ruby-initiate-session): * lisp/ob-shell.el (org-babel-sh-initiate-session):
2024-06-30 18:36:25 +00:00
(setq-local
org-babel-comint-prompt-regexp-fallback comint-prompt-regexp
lisp/ob-comint.el: Introduce a fallback prompt regexp * lisp/ob-comint.el (org-babel-comint-prompt-regexp-old): New variable storing the default value of `comint-prompt-regexp' to be used when the prompt set by Org mode changes for some reason. (org-babel-comint-fallback-regexp-threshold): New customization to set the time Org babel waits for comint command to finish until trying fallback prompt regexp. (org-babel-comint--set-fallback-prompt): New internal function that sets the fallback prompt regexp, if there is any available. (org-babel-comint-with-output): (org-babel-comint-wait-for-output): Try fallback prompt regexp when we cannot find comint command end for too long. * lisp/ob-haskell.el (org-babel-interpret-haskell): * lisp/ob-ruby.el (org-babel-ruby-initiate-session): * lisp/ob-shell.el (org-babel-sh-initiate-session): * lisp/ob-clojure.el (ob-clojure-eval-with-inf-clojure): Set `org-babel-comint-prompt-regexp-old' when initializing the inferior shell. * etc/ORG-NEWS (New option ~org-babel-comint-fallback-regexp-threshold~): Document the new customization. Reported-by: Jack Kamm <jackkamm@tatersworld.org> Link: https://orgmode.org/list/87sf2q9ubd.fsf@gmail.com
2024-01-22 11:55:09 +00:00
comint-prompt-regexp inf-clojure-comint-prompt-regexp)
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(funcall-interactively #'inf-clojure cmd)
(goto-char (point-max))))
ob-clojure.el: More minor refinements * lisp/ob-clojure.el (org-babel-expand-body:clojure): Inline namespace setting. (org-babel-clojure-cider-current-ns): Delete. (ob-clojure-inf-clojure-filter-out): New variable. (ob-clojure-inf-clojure-output): Use it. (ob-clojure-eval-with-inf-clojure): Update the filter variable depending on the current namespace.
2020-02-17 01:37:55 +00:00
(sit-for 1))
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
;; Now evaluate the code
ob-clojure.el: More minor refinements * lisp/ob-clojure.el (org-babel-expand-body:clojure): Inline namespace setting. (org-babel-clojure-cider-current-ns): Delete. (ob-clojure-inf-clojure-filter-out): New variable. (ob-clojure-inf-clojure-output): Use it. (ob-clojure-eval-with-inf-clojure): Update the filter variable depending on the current namespace.
2020-02-17 01:37:55 +00:00
(setq ob-clojure-inf-clojure-filter-out
(concat "^nil\\|nil$\\|\\s-*"
(or (cdr (assq :ns params))
org-babel-clojure-default-ns)
"=>\\s-*"))
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(add-hook 'comint-preoutput-filter-functions
#'ob-clojure-inf-clojure-output)
(setq ob-clojure-inf-clojure-tmp-output nil)
(ob-clojure-with-temp-expanded expanded nil
(inf-clojure-eval-string exp))
(sit-for .5)
(remove-hook 'comint-preoutput-filter-functions
#'ob-clojure-inf-clojure-output)
;; And return the result
(ob-clojure-string-or-list
(delete nil
(mapcar
(lambda (s)
(unless (or (equal "" s)
(string-match-p "^Clojure" s))
s))
(reverse ob-clojure-inf-clojure-tmp-output)))))
ob-clojure.el: Fix compiler warning * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Silence compiler warning about unused argument 'params'.
2023-03-19 20:39:07 +00:00
(defun ob-clojure-eval-with-cider (expanded _params &optional cljs-p)
ob-clojure.el: Reword docstring for ob-clojure-eval-with-cider * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Mention in the docstring that the Babel params argument is not used anymore.
2023-03-23 12:25:15 +00:00
"Evaluate EXPANDED code block using cider.
When CLJS-P is non-nil, use a cljs connection instead of clj.
The PARAMS from Babel are not used in this function."
Provide a uniform way to inform users about missing third-party packages * lisp/org-macs.el (org-require-package): New macro trying to load a library and displaying custom error message or warning on failure. The actual package (not library) name can be provided as optional argument. * lisp/ob-R.el (org-babel-R-initiate-session): * lisp/ob-clojure.el (ob-clojure-eval-with-inf-clojure): (ob-clojure-eval-with-cider): (ob-clojure-eval-with-slime): * lisp/ob-forth.el (org-babel-forth-session-execute): * lisp/ob-gnuplot.el (org-babel-execute:gnuplot): (org-babel-gnuplot-initiate-session): * lisp/ob-haskell.el (org-babel-interpret-haskell): (org-babel-haskell-initiate-session): * lisp/ob-js.el (org-babel-execute:js): (org-babel-js-initiate-session): * lisp/ob-julia.el (org-babel-julia-initiate-session): * lisp/ob-lisp.el (org-babel-execute:lisp): * lisp/ob-ocaml.el (org-babel-prep-session:ocaml): * lisp/ob-octave.el (org-babel-octave-initiate-session): * lisp/ob-processing.el (org-babel-processing-view-sketch): * lisp/ob-ruby.el (org-babel-execute:ruby): (org-babel-ruby-initiate-session): * lisp/ol-bbdb.el (org-bbdb-open): (org-bbdb-complete-link): (org-bbdb-anniv-export-ical): * lisp/org-agenda.el: * lisp/org-plot.el (org-plot/gnuplot): * lisp/org.el: * lisp/ox-ascii.el (org-ascii-table): * lisp/ox-html.el (org-html-htmlize-generate-css): * lisp/ox-org.el: Use the new macro. * lisp/oc-csl.el: Add FIXME. oc-csl uses a custom function doing similar job. * lisp/ob-js.el (org-babel-js-initiate-session): Add FIXME noting that the third-party package is outdated.
2023-01-23 15:06:46 +00:00
(org-require-package 'cider "Cider")
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(let ((connection (cider-current-connection (if cljs-p "cljs" "clj"))))
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(unless connection (sesman-start-session 'CIDER))
(if (not connection)
;; Display in the result instead of using `user-error'
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
"Please reevaluate when nREPL is connected"
(let ((response (nrepl-sync-request:eval expanded connection)))
(or (nrepl-dict-get response "root-ex")
(nrepl-dict-get response "ex")
(nrepl-dict-get response "out"))))))
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(defun ob-clojure-eval-with-slime (expanded params)
"Evaluate EXPANDED code block with PARAMS using slime."
Provide a uniform way to inform users about missing third-party packages * lisp/org-macs.el (org-require-package): New macro trying to load a library and displaying custom error message or warning on failure. The actual package (not library) name can be provided as optional argument. * lisp/ob-R.el (org-babel-R-initiate-session): * lisp/ob-clojure.el (ob-clojure-eval-with-inf-clojure): (ob-clojure-eval-with-cider): (ob-clojure-eval-with-slime): * lisp/ob-forth.el (org-babel-forth-session-execute): * lisp/ob-gnuplot.el (org-babel-execute:gnuplot): (org-babel-gnuplot-initiate-session): * lisp/ob-haskell.el (org-babel-interpret-haskell): (org-babel-haskell-initiate-session): * lisp/ob-js.el (org-babel-execute:js): (org-babel-js-initiate-session): * lisp/ob-julia.el (org-babel-julia-initiate-session): * lisp/ob-lisp.el (org-babel-execute:lisp): * lisp/ob-ocaml.el (org-babel-prep-session:ocaml): * lisp/ob-octave.el (org-babel-octave-initiate-session): * lisp/ob-processing.el (org-babel-processing-view-sketch): * lisp/ob-ruby.el (org-babel-execute:ruby): (org-babel-ruby-initiate-session): * lisp/ol-bbdb.el (org-bbdb-open): (org-bbdb-complete-link): (org-bbdb-anniv-export-ical): * lisp/org-agenda.el: * lisp/org-plot.el (org-plot/gnuplot): * lisp/org.el: * lisp/ox-ascii.el (org-ascii-table): * lisp/ox-html.el (org-html-htmlize-generate-css): * lisp/ox-org.el: Use the new macro. * lisp/oc-csl.el: Add FIXME. oc-csl uses a custom function doing similar job. * lisp/ob-js.el (org-babel-js-initiate-session): Add FIXME noting that the third-party package is outdated.
2023-01-23 15:06:46 +00:00
(org-require-package 'slime "SLIME")
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
(with-temp-buffer
(insert expanded)
(slime-eval
`(swank:eval-and-grab-output
,(buffer-substring-no-properties (point-min) (point-max)))
(cdr (assq :package params)))))
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(defun ob-clojure-eval-with-cmd (cmd expanded)
"Evaluate EXPANDED code block using CMD (babashka, clojure or nbb)."
(let ((script-file (org-babel-temp-file "clojure-cmd-script-" ".clj")))
ob-clojure.el: Add support for babashka and nbb backend * lisp/ob-clojure.el: Add support for babashka and nbb backend.
2021-11-13 21:51:56 +00:00
(with-temp-file script-file
(insert expanded))
(org-babel-eval
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(format "%s %s" cmd (org-babel-process-file-name script-file))
ob-clojure.el: Add support for babashka and nbb backend * lisp/ob-clojure.el: Add support for babashka and nbb backend.
2021-11-13 21:51:56 +00:00
"")))
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(defun org-babel-execute:clojure (body params &optional cljs-p)
"Execute the BODY block of Clojure code with PARAMS using Babel.
When CLJS-P is non-nil, execute with a ClojureScript backend
instead of Clojure."
ob-clojure.el: Add a :backend header arg to clojure code blocks * ob-clojure.el (org-babel-header-args:clojure, org-babel-execute:clojure): Add a :backend header arg that can override the configured `org-babel-clojure-backend'. TINYCHANGE
2022-10-08 09:41:20 +00:00
(let* ((backend-override (cdr (assq :backend params)))
(org-babel-clojure-backend
(cond
(backend-override (intern backend-override))
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(org-babel-clojure-backend (if cljs-p
org-babel-clojurescript-backend
org-babel-clojure-backend))
(t (user-error "You need to customize `%S'
or set the `:backend' header argument"
(if cljs-p
org-babel-clojurescript-backend
org-babel-clojure-backend)))))
;; We allow a Clojure source block to be evaluated with the
;; nbb backend and therefore have to expand the body with
;; ClojureScript syntax when we either evaluate a
;; ClojureScript source block or use the nbb backend.
(cljs-p (or cljs-p (eq org-babel-clojure-backend 'nbb))))
(let* ((expanded (org-babel-expand-body:clojure body params cljs-p))
ob-clojure.el: Add a :backend header arg to clojure code blocks * ob-clojure.el (org-babel-header-args:clojure, org-babel-execute:clojure): Add a :backend header arg that can override the configured `org-babel-clojure-backend'. TINYCHANGE
2022-10-08 09:41:20 +00:00
(result-params (cdr (assq :result-params params)))
result)
(setq result
(cond
((eq org-babel-clojure-backend 'inf-clojure)
(ob-clojure-eval-with-inf-clojure expanded params))
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
((eq org-babel-clojure-backend 'clojure-cli)
(ob-clojure-eval-with-cmd ob-clojure-cli-command expanded))
ob-clojure.el: Add a :backend header arg to clojure code blocks * ob-clojure.el (org-babel-header-args:clojure, org-babel-execute:clojure): Add a :backend header arg that can override the configured `org-babel-clojure-backend'. TINYCHANGE
2022-10-08 09:41:20 +00:00
((eq org-babel-clojure-backend 'babashka)
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(ob-clojure-eval-with-cmd ob-clojure-babashka-command expanded))
ob-clojure.el: Add a :backend header arg to clojure code blocks * ob-clojure.el (org-babel-header-args:clojure, org-babel-execute:clojure): Add a :backend header arg that can override the configured `org-babel-clojure-backend'. TINYCHANGE
2022-10-08 09:41:20 +00:00
((eq org-babel-clojure-backend 'nbb)
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(ob-clojure-eval-with-cmd ob-clojure-nbb-command expanded))
ob-clojure.el: Add a :backend header arg to clojure code blocks * ob-clojure.el (org-babel-header-args:clojure, org-babel-execute:clojure): Add a :backend header arg that can override the configured `org-babel-clojure-backend'. TINYCHANGE
2022-10-08 09:41:20 +00:00
((eq org-babel-clojure-backend 'cider)
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(ob-clojure-eval-with-cider expanded params cljs-p))
ob-clojure.el: Add a :backend header arg to clojure code blocks * ob-clojure.el (org-babel-header-args:clojure, org-babel-execute:clojure): Add a :backend header arg that can override the configured `org-babel-clojure-backend'. TINYCHANGE
2022-10-08 09:41:20 +00:00
((eq org-babel-clojure-backend 'slime)
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(ob-clojure-eval-with-slime expanded params))
(t (user-error "Invalid backend"))))
ob-clojure.el: Add a :backend header arg to clojure code blocks * ob-clojure.el (org-babel-header-args:clojure, org-babel-execute:clojure): Add a :backend header arg that can override the configured `org-babel-clojure-backend'. TINYCHANGE
2022-10-08 09:41:20 +00:00
(org-babel-result-cond result-params
result
(condition-case nil (org-babel-script-escape result)
(error result))))))
ob-clojure.el: switch to nREPL as the main method of evaluating Clojure. Get the old behavior with: (defalias 'org-babel-execute:clojure 'org-babel--execute-clojure-slime)
2013-10-03 16:23:16 +00:00
* lisp/ob-clojure.el: Support for clojurescript src block execution. * lisp/ob-clojure.el (org-babel-execute:clojurescript): New function to Execute ClojureScript src block. TINYCHANGE
2020-02-13 15:18:32 +00:00
(defun org-babel-execute:clojurescript (body params)
ob-clojure.el: Enhancements and refactoring, removed session code * lisp/ob-clojure.el (ob-clojure-inf-clojure-output): Filter out spurious strings. (ob-clojure-with-temp-expanded): New macro. (ob-clojure-string-or-list, ob-clojure-eval-with-inf-clojure) (ob-clojure-eval-with-cider, ob-clojure-eval-with-slime): New functions. (org-babel-execute:clojure): Use new functions. (org-babel-execute:clojurescript): Fix docstring. (org-babel-edit-prep:clojure) (org-babel-clojure-initiate-session) (org-babel-prep-session:clojure) (org-babel-clojure-var-to-clojure) (org-babel-variable-assignments:clojure): Delete function.
2020-02-16 22:43:56 +00:00
"Evaluate BODY with PARAMS as ClojureScript code."
ob-clojure.el: Fix results output, support clojure-cli * lisp/ob-clojure.el (org-babel-clojure-backend): Add support for clojure-cli. * lisp/ob-clojure.el (org-babel-clojurescript-backend): Move nbb to clojurescript. * lisp/ob-clojure.el (org-babel-expand-body:clojure) * lisp/ob-clojure.el (ob-clojure-eval-with-cider): Return only the last expression when :results is not set or value, and return only stdout when :results is set to output. * lisp/ob-clojure.el (ob-clojure-eval-with-cmd): Rename function as it is not only for babashka. * lisp/ob-clojure.el (org-babel-execute:clojure): Differentiate between Clojure and ClojureScript source blocks. The problem was that the ob-clojure results where not correctly taking the results parameter into account. E.g. with the cider backend, you would get all printed or returned values for each line in your block: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) | #'user/small-map | | {:some :map} | | 4 | or for babashka you would only get the printed values but not the last return value: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : :xx Now when you specify :results value, the result is only the last returned value, and with :results output you get all values printed to stdout. So the examples above would all result in the same: (def small-map {:a 2 :b 4 :c 8}) {:some :map} (prn :xx) (:b small-map) : 4
2023-03-09 15:11:27 +00:00
(org-babel-execute:clojure body params t))
* lisp/ob-clojure.el: Support for clojurescript src block execution. * lisp/ob-clojure.el (org-babel-execute:clojurescript): New function to Execute ClojureScript src block. TINYCHANGE
2020-02-13 15:18:32 +00:00
updating require and provide boilerplate for new ob* files
2010-06-11 23:02:42 +00:00
(provide 'ob-clojure)
babel: assigning copyright to the FSF for babel language files
2010-06-25 16:32:35 +00:00
updating require and provide boilerplate for new ob* files
2010-06-11 23:02:42 +00:00
;;; ob-clojure.el ends here
Copy Permalink