* lisp/loadup.el: Count byte-code functions as well.

[gnu-emacs] / lisp / org / ob-clojure.el

diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index f9087e8358e4f47a0f698398b6a8a0d4a1e7bdb8..69d3db86de40c2fb54795bd35d3ccb78a4e3c959 100644 (file)
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -1,11 +1,11 @@
 ;;; ob-clojure.el --- org-babel functions for clojure evaluation
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
-;; Author: Joel Boehland, Eric Schulte
+;; Author: Joel Boehland
+;;     Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
 
 ;; This file is part of GNU Emacs.
 
@@ -31,7 +31,6 @@
 ;;; - clojure (at least 1.2.0)
 ;;; - clojure-mode
 ;;; - slime
-;;; - swank-clojure
 
 ;;; By far, the best way to install these components is by following
 ;;; the directions as set out by Phil Hagelberg (Technomancy) on the
@@ -42,6 +41,7 @@
 
 (declare-function slime-eval "ext:slime" (sexp &optional package))
 
+(defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("clojure" . "clj"))
 
 (defvar org-babel-default-header-args:clojure '())
@@ -61,27 +61,36 @@
                             vars "\n      ")
                            "]\n" body ")")
                  body))))
-    (if (or (member "code" result-params)
-           (member "pp" result-params))
-       (format (concat "(let [org-mode-print-catcher (java.io.StringWriter.)]"
-                       "(clojure.pprint/with-pprint-dispatch %s-dispatch"
-                       "(clojure.pprint/pprint %s org-mode-print-catcher)"
-                       "(str org-mode-print-catcher)))")
-               (if (member "code" result-params) "code" "simple") body)
-      body)))
+    (cond ((or (member "code" result-params) (member "pp" result-params))
+          (format (concat "(let [org-mode-print-catcher (java.io.StringWriter.)] "
+                          "(clojure.pprint/with-pprint-dispatch clojure.pprint/%s-dispatch "
+                          "(clojure.pprint/pprint (do %s) org-mode-print-catcher) "
+                          "(str org-mode-print-catcher)))")
+                  (if (member "code" result-params) "code" "simple") body))
+         ;; if (:results output), collect printed output
+         ((member "output" result-params)
+          (format "(clojure.core/with-out-str %s)" body))
+         (t body))))
 
 (defun org-babel-execute:clojure (body params)
   "Execute a block of Clojure code with Babel."
-  (require 'slime) (require 'swank-clojure)
+  (require 'slime)
   (with-temp-buffer
     (insert (org-babel-expand-body:clojure body params))
-    (read
+    ((lambda (result)
+       (let ((result-params (cdr (assoc :result-params params))))
+        (if (or (member "scalar" result-params)
+                (member "verbatim" result-params))
+            result
+          (condition-case nil (org-babel-script-escape result)
+            (error result)))))
      (slime-eval
-      `(swank:interactive-eval-region
-        ,(buffer-substring-no-properties (point-min) (point-max)))
+      `(swank:eval-and-grab-output
+       ,(buffer-substring-no-properties (point-min) (point-max)))
       (cdr (assoc :package params))))))
 
 (provide 'ob-clojure)
 
 
+
 ;;; ob-clojure.el ends here