2010-06-11 23:02:42 +00:00
|
|
|
;;; ob-comint.el --- org-babel functions for interaction with comint buffers
|
2009-05-28 02:00:13 +00:00
|
|
|
|
2010-06-25 16:20:39 +00:00
|
|
|
;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
|
2009-05-28 02:00:13 +00:00
|
|
|
|
|
|
|
;; Author: Eric Schulte
|
|
|
|
;; Keywords: literate programming, reproducible research, comint
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;; Version: 0.01
|
|
|
|
|
2010-06-25 16:20:39 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
2009-05-28 02:00:13 +00:00
|
|
|
|
2010-06-25 16:20:39 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2009-05-28 02:00:13 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2010-06-25 16:20:39 +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,
|
2009-05-28 02:00:13 +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.
|
2010-06-25 16:20:39 +00:00
|
|
|
|
2009-05-28 02:00:13 +00:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2010-06-25 16:20:39 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2009-05-28 02:00:13 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2009-06-04 03:18:18 +00:00
|
|
|
;; These functions build on comint to ease the sending and receiving
|
|
|
|
;; of commands and results from comint buffers.
|
2010-06-25 16:20:39 +00:00
|
|
|
|
2009-06-04 03:18:18 +00:00
|
|
|
;; Note that the buffers in this file are analogous to sessions in
|
|
|
|
;; org-babel at large.
|
2009-05-28 02:00:13 +00:00
|
|
|
|
|
|
|
;;; Code:
|
2010-06-11 23:02:42 +00:00
|
|
|
(require 'ob)
|
2009-06-04 03:18:18 +00:00
|
|
|
(require 'comint)
|
2010-07-03 02:21:31 +00:00
|
|
|
(eval-when-compile (require 'cl))
|
2009-06-04 03:18:18 +00:00
|
|
|
|
2009-06-09 22:02:01 +00:00
|
|
|
(defun org-babel-comint-buffer-livep (buffer)
|
2010-06-12 00:12:15 +00:00
|
|
|
"Check if BUFFER is a comint buffer with a live process."
|
2009-06-12 23:34:06 +00:00
|
|
|
(let ((buffer (if buffer (get-buffer buffer))))
|
2009-06-12 22:31:52 +00:00
|
|
|
(and buffer (buffer-live-p buffer) (get-buffer-process buffer) buffer)))
|
2009-06-04 03:18:18 +00:00
|
|
|
|
2009-06-04 03:51:36 +00:00
|
|
|
(defmacro org-babel-comint-in-buffer (buffer &rest body)
|
2009-06-11 14:32:31 +00:00
|
|
|
"Check BUFFER with `org-babel-comint-buffer-livep' then execute
|
|
|
|
body inside the protection of `save-window-excursion' and
|
|
|
|
`save-match-data'."
|
|
|
|
(declare (indent 1))
|
2010-02-22 18:37:16 +00:00
|
|
|
`(save-excursion
|
2009-06-04 03:18:18 +00:00
|
|
|
(save-match-data
|
2009-06-14 18:08:12 +00:00
|
|
|
(unless (org-babel-comint-buffer-livep ,buffer)
|
|
|
|
(error (format "buffer %s doesn't exist or has no process" ,buffer)))
|
|
|
|
(set-buffer ,buffer)
|
2009-06-04 03:18:18 +00:00
|
|
|
,@body)))
|
2009-05-28 02:00:13 +00:00
|
|
|
|
2010-06-12 22:57:38 +00:00
|
|
|
(defmacro org-babel-comint-with-output (meta &rest body)
|
2009-06-14 00:07:03 +00:00
|
|
|
"Evaluate BODY in BUFFER, wait until EOE-INDICATOR appears in
|
2010-06-12 22:57:38 +00:00
|
|
|
output, then return all process output. If REMOVE-ECHO and
|
|
|
|
FULL-BODY are present and non-nil, then strip echo'd body from
|
|
|
|
the returned output. META should be a list containing the
|
|
|
|
following where the last two elements are optional.
|
|
|
|
|
|
|
|
(BUFFER EOE-INDICATOR REMOVE-ECHO FULL-BODY)
|
|
|
|
|
|
|
|
This macro ensures that the filter is removed in case of an error
|
|
|
|
or user `keyboard-quit' during execution of body."
|
|
|
|
(declare (indent 1))
|
|
|
|
(let ((buffer (car meta))
|
|
|
|
(eoe-indicator (cadr meta))
|
2010-06-17 00:12:21 +00:00
|
|
|
(remove-echo (cadr (cdr meta)))
|
|
|
|
(full-body (cadr (cdr (cdr meta)))))
|
2010-06-12 22:57:38 +00:00
|
|
|
`(org-babel-comint-in-buffer ,buffer
|
2010-07-03 02:21:31 +00:00
|
|
|
(let ((string-buffer "") dangling-text raw)
|
2010-06-12 22:57:38 +00:00
|
|
|
(flet ((my-filt (text)
|
|
|
|
(setq string-buffer (concat string-buffer text))))
|
|
|
|
;; setup filter
|
|
|
|
(add-hook 'comint-output-filter-functions 'my-filt)
|
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
;; got located, and save dangling text
|
|
|
|
(goto-char (process-mark (get-buffer-process (current-buffer))))
|
|
|
|
(let ((start (point))
|
|
|
|
(end (point-max)))
|
|
|
|
(setq dangling-text (buffer-substring start end))
|
|
|
|
(delete-region start end))
|
|
|
|
;; pass FULL-BODY to process
|
|
|
|
,@body
|
|
|
|
;; wait for end-of-evaluation indicator
|
|
|
|
(while (progn
|
|
|
|
(goto-char comint-last-input-end)
|
|
|
|
(not (save-excursion
|
|
|
|
(and (re-search-forward
|
|
|
|
comint-prompt-regexp nil t)
|
|
|
|
(re-search-forward
|
|
|
|
(regexp-quote ,eoe-indicator) nil t)))))
|
|
|
|
(accept-process-output (get-buffer-process (current-buffer)))
|
|
|
|
;; thought the following this would allow async
|
|
|
|
;; background running, but I was wrong...
|
|
|
|
;; (run-with-timer .5 .5 'accept-process-output
|
|
|
|
;; (get-buffer-process (current-buffer)))
|
|
|
|
)
|
|
|
|
;; replace cut dangling text
|
|
|
|
(goto-char (process-mark (get-buffer-process (current-buffer))))
|
|
|
|
(insert dangling-text))
|
|
|
|
;; remove filter
|
|
|
|
(remove-hook 'comint-output-filter-functions 'my-filt)))
|
|
|
|
;; remove echo'd FULL-BODY from input
|
|
|
|
(if (and ,remove-echo ,full-body
|
|
|
|
(string-match
|
|
|
|
(replace-regexp-in-string
|
|
|
|
"\n" "[\r\n]+" (regexp-quote ,full-body))
|
|
|
|
string-buffer))
|
|
|
|
(setq raw (substring string-buffer (match-end 0))))
|
|
|
|
(split-string string-buffer comint-prompt-regexp)))))
|
2009-06-14 00:07:03 +00:00
|
|
|
|
2009-06-12 00:04:42 +00:00
|
|
|
(defun org-babel-comint-input-command (buffer cmd)
|
|
|
|
"Pass CMD to BUFFER The input will not be echoed."
|
|
|
|
(org-babel-comint-in-buffer buffer
|
|
|
|
(goto-char (process-mark (get-buffer-process buffer)))
|
|
|
|
(insert cmd)
|
|
|
|
(comint-send-input)
|
|
|
|
(org-babel-comint-wait-for-output buffer)))
|
|
|
|
|
|
|
|
(defun org-babel-comint-wait-for-output (buffer)
|
2010-06-12 00:12:15 +00:00
|
|
|
"Wait until output arrives from BUFFER. Note: this is only
|
|
|
|
safe when waiting for the result of a single statement (not large
|
|
|
|
blocks of code)."
|
2009-06-12 00:04:42 +00:00
|
|
|
(org-babel-comint-in-buffer buffer
|
|
|
|
(while (progn
|
|
|
|
(goto-char comint-last-input-end)
|
|
|
|
(not (and (re-search-forward comint-prompt-regexp nil t)
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(string= (face-name (face-at-point))
|
|
|
|
"comint-highlight-prompt"))))
|
|
|
|
(accept-process-output (get-buffer-process buffer)))))
|
|
|
|
|
2010-06-11 23:02:42 +00:00
|
|
|
(provide 'ob-comint)
|
2010-06-25 16:20:39 +00:00
|
|
|
|
|
|
|
;; arch-tag: 9adddce6-0864-4be3-b0b5-6c5157dc7889
|
|
|
|
|
2010-06-11 23:02:42 +00:00
|
|
|
;;; ob-comint.el ends here
|