2009-05-27 22:00:13 -04:00
|
|
|
;;; org-babel-comint.el --- org-babel functions for interaction with comint buffers
|
|
|
|
|
|
|
|
;; Copyright (C) 2009 Eric Schulte
|
|
|
|
|
|
|
|
;; Author: Eric Schulte
|
|
|
|
;; Keywords: literate programming, reproducible research, comint
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;; Version: 0.01
|
|
|
|
|
|
|
|
;;; License:
|
|
|
|
|
|
|
|
;; This program 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, or (at your option)
|
|
|
|
;; any later version.
|
|
|
|
;;
|
|
|
|
;; This program 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; see the file COPYING. If not, write to the
|
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2009-06-03 23:18:18 -04:00
|
|
|
;; These functions build on comint to ease the sending and receiving
|
|
|
|
;; of commands and results from comint buffers.
|
|
|
|
;;
|
|
|
|
;; Note that the buffers in this file are analogous to sessions in
|
|
|
|
;; org-babel at large.
|
2009-05-27 22:00:13 -04:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
(require 'org-babel)
|
2009-06-03 23:18:18 -04:00
|
|
|
(require 'comint)
|
|
|
|
|
2009-06-03 23:51:36 -04:00
|
|
|
(defun org-babel-ensure-buffer-livep (buffer)
|
|
|
|
(unless (and (buffer-live-p buffer) (get-buffer buffer) (get-buffer-process buffer))
|
|
|
|
(error (format "buffer %s doesn't exist or has no process" buffer))))
|
2009-06-03 23:18:18 -04:00
|
|
|
|
2009-06-03 23:51:36 -04:00
|
|
|
(defmacro org-babel-comint-in-buffer (buffer &rest body)
|
2009-06-03 23:18:18 -04:00
|
|
|
`(save-window-excursion
|
|
|
|
(save-match-data
|
2009-06-03 23:51:36 -04:00
|
|
|
(org-babel-ensure-buffer-livep buffer)
|
|
|
|
(set-buffer buffer)
|
2009-06-03 23:18:18 -04:00
|
|
|
,@body)))
|
2009-05-27 22:00:13 -04:00
|
|
|
|
2009-06-03 23:51:36 -04:00
|
|
|
(defun org-babel-comint-wait-for-output (buffer)
|
2009-05-27 22:00:13 -04:00
|
|
|
"Wait until output arrives"
|
2009-06-03 23:51:36 -04:00
|
|
|
(org-babel-comint-in-buffer buffer
|
2009-06-03 23:18:18 -04:00
|
|
|
(while (progn
|
|
|
|
(goto-char comint-last-input-end)
|
|
|
|
(not (re-search-forward comint-prompt-regexp nil t)))
|
2009-06-03 23:51:36 -04:00
|
|
|
(accept-process-output (get-buffer-process buffer)))))
|
2009-06-03 23:18:18 -04:00
|
|
|
|
2009-06-03 23:51:36 -04: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)))
|
2009-06-03 23:18:18 -04:00
|
|
|
(insert cmd)
|
|
|
|
(comint-send-input)
|
2009-06-03 23:51:36 -04:00
|
|
|
(org-babel-comint-wait-for-output buffer)))
|
2009-06-03 23:18:18 -04:00
|
|
|
|
|
|
|
(defun org-babel-comint-command-to-string (buffer cmd)
|
2009-06-03 23:51:36 -04:00
|
|
|
"Pass CMD to BUFFER using `org-babel-comint-input-command', and
|
|
|
|
then return the result as a string using
|
|
|
|
`org-babel-comint-last-value'."
|
|
|
|
(org-babel-comint-input-command buffer cmd)
|
|
|
|
(org-babel-comint-last-value buffer))
|
|
|
|
|
|
|
|
(defun org-babel-comint-last-value (buffer)
|
|
|
|
"Return the last comint output in BUFFER as a string."
|
|
|
|
(org-babel-comint-in-buffer buffer
|
|
|
|
(goto-char (process-mark (get-buffer-process buffer)))
|
2009-06-03 23:18:18 -04:00
|
|
|
(forward-line 0)
|
2009-06-03 23:51:36 -04:00
|
|
|
(org-babel-clean-text-properties
|
|
|
|
(buffer-substring (+ comint-last-input-end
|
|
|
|
;; because comint insists on echoing input
|
|
|
|
(- comint-last-input-end
|
|
|
|
comint-last-input-start))
|
|
|
|
(- (point) 1)))))
|
|
|
|
|
2009-06-03 23:52:01 -04:00
|
|
|
(provide 'org-babel-comint)
|
2009-05-27 22:00:13 -04:00
|
|
|
;;; org-babel-comint.el ends here
|