emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Add ob-J.el
@ 2013-12-20 13:51 Oleh
  2013-12-20 16:13 ` Bastien
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Oleh @ 2013-12-20 13:51 UTC (permalink / raw)
  To: org mode

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

Hi all,

Here's a patch to add babel support for J.
I couldn't figure out how to make ob-J.elc a target for make,
maybe someone can fix this.

regards,
Oleh

[-- Attachment #2: 0001-Add-org-babel-support-for-J.patch --]
[-- Type: text/x-patch, Size: 5170 bytes --]

From 0139af8534dc33911ed1a24a9702a156ae46c99d Mon Sep 17 00:00:00 2001
From: Oleh Krehel <ohwoeowho@gmail.com>
Date: Fri, 20 Dec 2013 14:43:59 +0100
Subject: [PATCH] Add org-babel support for J.

---
 lisp/ob-J.el | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 lisp/ob-J.el

diff --git a/lisp/ob-J.el b/lisp/ob-J.el
new file mode 100644
index 0000000..50c1a5a
--- /dev/null
+++ b/lisp/ob-J.el
@@ -0,0 +1,134 @@
+;;; ob-J.el --- org-babel functions for J evaluation
+
+;; Copyright (C) 2011-2013 Free Software Foundation, Inc.
+
+;; Author: Oleh Krehel
+;; Keywords: literate programming, reproducible research
+;; Homepage: http://orgmode.org
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; 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,
+;; 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.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Session interaction depends on `j-console'.
+
+;;; Code:
+(require 'ob)
+(require 'j-console)
+
+(defun org-babel-expand-body:J (body params &optional processed-params)
+  "Expand BODY according to PARAMS, return the expanded body.
+PROCESSED-PARAMS isn't used yet."
+  (org-babel-J-interleave-echos-except-functions body))
+
+(defun org-babel-J-interleave-echos (body)
+  "Interleave echo'' between each source line of BODY."
+  (mapconcat #'identity (split-string body "\n") "\necho''\n"))
+
+(defun org-babel-J-interleave-echos-except-functions (body)
+  "Interleave echo'' between source lines of BODY that aren't functions."
+  (if (string-match-m "\\(?:^\\|\n\\)[^\n]*\\(?:1\\|2\\|3\\|4\\) : 0\n.*)" body)
+      (let ((s1 (substring body 0 (match-beginning 0)))
+	    (s2 (match-string 0 body))
+	    (s3 (substring body (match-end 0))))
+	(concat
+	 (org-babel-J-interleave-echos s1)
+	 "\necho''\n"
+	 s2
+	 (org-babel-J-interleave-echos-except-functions s3)))
+    (org-babel-J-interleave-echos body)))
+
+(defun org-babel-execute:J (body params)
+  "Execute a block of J code BODY.
+PARAMS are given by org-babel.
+This function is called by `org-babel-execute-src-block'"
+  (message "executing J source code block")
+  (let* ((processed-params (org-babel-process-params params))
+	 (sessionp (cdr (assoc :session params)))
+         (session (org-babel-j-initiate-session sessionp))
+         (vars (second processed-params))
+         (result-params (third processed-params))
+         (result-type (fourth processed-params))
+         (full-body (org-babel-expand-body:J
+                     body params processed-params))
+	 (tmp-script-file (org-babel-temp-file "J-src")))
+    (org-babel-J-strip-whitespace
+     (if (string= sessionp "none")
+	 (progn
+	   (with-temp-file tmp-script-file
+	     (insert full-body))
+	   (org-babel-eval (format "jconsole < %s" tmp-script-file) ""))
+       (org-babel-J-eval-string full-body)))))
+
+(defun org-babel-J-eval-string (str)
+  "Sends STR to the `j-console-cmd' session and exectues it."
+  (let ((session (j-console-ensure-session)))
+    (with-current-buffer (process-buffer session)
+      (goto-char (point-max))
+      (insert (format "\n%s\n" str))
+      (let ((beg (point)))
+	(comint-send-input)
+	(sit-for .1)
+	(buffer-substring-no-properties
+	 beg (point-max))))))
+
+(defun org-babel-J-strip-whitespace (str)
+  "Remove whitespace from jconsole output STR."
+  (let ((strs (split-string str "\n" t))
+	out cur s)
+    (while (setq s (pop strs))
+      (if (string-match "^ *$" s)
+	  (progn (push (nreverse cur) out)
+		 (setq cur))
+	(push s cur)))
+    (mapconcat #'org-babel-J-print-block
+	       (delq nil (nreverse out))
+	       "\n\n")))
+
+(defun org-babel-J-print-block (x)
+  "Prettify jconsole output X."
+  (if (= 1 (length x))
+      (obj-strip-leading-ws (car x))
+    ;; assume only first row is misaligned
+    (let ((n1 (obj-match-second-space (car x)))
+	  (n2 (obj-match-second-space (cadr x))))
+      (setcar
+       x
+       (if (and n1 n2)
+	   (substring (car x) (- n1 n2))
+	 (obj-strip-leading-ws (car x))))
+      (mapconcat #'identity x "\n"))))
+
+(defun obj-match-second-space (s)
+  "Return position of second space in S or nil."
+  (and (string-match "^ *[^ ]+\\( \\)" s)
+       (match-beginning 1)))
+
+(defun obj-strip-leading-ws (s)
+  "String leading whitespace from S."
+  (and (string-match "^ *\\([^ ].*\\)" s)
+       (match-string 1 s)))
+
+(defun org-babel-j-initiate-session (&optional session)
+  "Initiate a J session.
+SESSION is a parameter given by org-babel."
+  (unless (string= session "none")
+    (require 'j-console)
+    (j-console-ensure-session)))
+
+(provide 'ob-J)
+
+;;; ob-J.el ends here
-- 
1.8.4


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2013-12-24 17:10 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-20 13:51 [PATCH] Add ob-J.el Oleh
2013-12-20 16:13 ` Bastien
2013-12-20 17:12 ` Eric Schulte
2013-12-21  9:05   ` Oleh
2013-12-21 16:14   ` [BUG] " Rick Frankel
2013-12-21 17:40     ` Oleh
2013-12-21 18:58       ` Eric Schulte
2013-12-20 17:22 ` [PATCH] " Thomas S. Dye
2013-12-21  8:07   ` Oleh
2013-12-24 11:37   ` Oleh
2013-12-24 17:10     ` Thomas S. Dye

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).