2015-10-25 20:56:00 -04:00
|
|
|
;;; ob-comint.el --- Babel Functions for Interaction with Comint Buffers -*- lexical-binding: t; -*-
|
2009-05-27 22:00:13 -04:00
|
|
|
|
2016-01-09 17:12:03 -05:00
|
|
|
;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
|
2009-05-27 22:00:13 -04:00
|
|
|
|
|
|
|
;; Author: Eric Schulte
|
|
|
|
;; Keywords: literate programming, reproducible research, comint
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
2010-06-25 12:20:39 -04:00
|
|
|
;; This file is part of GNU Emacs.
|
2009-05-27 22:00:13 -04:00
|
|
|
|
2010-06-25 12:20:39 -04:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2009-05-27 22:00:13 -04:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2010-06-25 12:20:39 -04: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-27 22:00:13 -04: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 12:20:39 -04:00
|
|
|
|
2009-05-27 22:00:13 -04:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2010-06-25 12:20:39 -04:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2009-05-27 22:00:13 -04:00
|
|
|
|
|
|
|
;;; 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.
|
2010-06-25 12:20:39 -04:00
|
|
|
|
2009-06-03 23:18:18 -04:00
|
|
|
;; 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:
|
2012-12-11 18:58:16 -05:00
|
|
|
(require 'ob-core)
|
2012-07-19 00:11:36 -04:00
|
|
|
(require 'org-compat)
|
2009-06-03 23:18:18 -04:00
|
|
|
(require 'comint)
|
2016-04-24 00:18:10 -04:00
|
|
|
(require 'tramp)
|
2009-06-03 23:18:18 -04:00
|
|
|
|
2009-06-09 18:02:01 -04:00
|
|
|
(defun org-babel-comint-buffer-livep (buffer)
|
2010-06-11 20:12:15 -04:00
|
|
|
"Check if BUFFER is a comint buffer with a live process."
|
2009-06-12 19:34:06 -04:00
|
|
|
(let ((buffer (if buffer (get-buffer buffer))))
|
2009-06-12 18:31:52 -04:00
|
|
|
(and buffer (buffer-live-p buffer) (get-buffer-process buffer) 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)
|
2010-07-13 18:56:17 -04:00
|
|
|
"Check BUFFER and execute BODY.
|
|
|
|
BUFFER is checked with `org-babel-comint-buffer-livep'. BODY is
|
2010-09-16 15:54:31 -04:00
|
|
|
executed inside the protection of `save-excursion' and
|
2009-06-11 10:32:31 -04:00
|
|
|
`save-match-data'."
|
|
|
|
(declare (indent 1))
|
2013-10-28 18:58:44 -04:00
|
|
|
`(progn
|
|
|
|
(unless (org-babel-comint-buffer-livep ,buffer)
|
|
|
|
(error "Buffer %s does not exist or has no process" ,buffer))
|
2009-06-03 23:18:18 -04:00
|
|
|
(save-match-data
|
2013-10-28 18:58:44 -04:00
|
|
|
(with-current-buffer ,buffer
|
2015-10-25 20:56:00 -04:00
|
|
|
(let ((comint-input-filter (lambda (_input) nil)))
|
2013-10-28 18:58:52 -04:00
|
|
|
,@body)))))
|
Provide edebug specifications for macros
* org-macs.el (org-with-gensyms, org-called-interactively-p)
(with-silent-modifications, org-bound-and-true-p)
(org-unmodified, org-re, org-preserve-lc)
(org-without-partial-completion, org-with-point-at)
(org-no-warnings, org-if-unprotected, org-if-unprotected-1)
(org-if-unprotected-at, org-with-remote-undo)
(org-no-read-only, org-save-outline-visibility)
(org-with-wide-buffer, org-with-limited-levels)
(org-eval-in-environment): Provide edebug specifications.
* org-src.el (org-src-do-at-code-block): Dto.
* org-publish.el (org-publish-with-aux-preprocess-maybe): Dto.
* org-compat.el (org-xemacs-without-invisibility): Dto.
* org-clock.el (org-with-clock-position, org-with-clock): Dto.
* org-agenda.el (org-agenda-with-point-at-orig-entry)
(org-batch-agenda, org-batch-agenda-csv)
(org-batch-store-agenda-views): Dto.
* ob.el (org-babel-do-in-edit-buffer)
(org-babel-map-src-blocks, org-babel-map-inline-src-blocks): Dto.
* ob-tangle.el (org-babel-with-temp-filebuffer): Dto.
* ob-table.el (sbe): Dto.
* ob-exp.el (org-babel-exp-in-export-file): Dto.
* ob-comint.el (org-babel-comint-in-buffer)
(org-babel-comint-with-output): Dto.
2011-08-11 02:57:25 -04:00
|
|
|
(def-edebug-spec org-babel-comint-in-buffer (form body))
|
2009-05-27 22:00:13 -04:00
|
|
|
|
2010-06-12 18:57:38 -04:00
|
|
|
(defmacro org-babel-comint-with-output (meta &rest body)
|
2010-07-13 18:56:17 -04:00
|
|
|
"Evaluate BODY in BUFFER and return process output.
|
|
|
|
Will wait until EOE-INDICATOR appears in the 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.
|
2010-06-12 18:57:38 -04:00
|
|
|
|
|
|
|
(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))
|
2013-10-28 18:58:44 -04:00
|
|
|
(let ((buffer (nth 0 meta))
|
|
|
|
(eoe-indicator (nth 1 meta))
|
|
|
|
(remove-echo (nth 2 meta))
|
|
|
|
(full-body (nth 3 meta)))
|
2010-06-12 18:57:38 -04:00
|
|
|
`(org-babel-comint-in-buffer ,buffer
|
2013-10-30 04:40:40 -04:00
|
|
|
(let* ((string-buffer "")
|
|
|
|
(comint-output-filter-functions
|
|
|
|
(cons (lambda (text) (setq string-buffer (concat string-buffer text)))
|
|
|
|
comint-output-filter-functions))
|
2015-10-25 20:56:00 -04:00
|
|
|
dangling-text)
|
2013-10-28 18:58:44 -04:00
|
|
|
;; 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
|
|
|
|
(regexp-quote ,eoe-indicator) nil t)
|
|
|
|
(re-search-forward
|
|
|
|
comint-prompt-regexp 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)
|
|
|
|
|
2010-06-12 18:57:38 -04:00
|
|
|
;; remove echo'd FULL-BODY from input
|
2015-10-25 20:56:00 -04:00
|
|
|
(when (and ,remove-echo ,full-body
|
|
|
|
(string-match
|
|
|
|
(replace-regexp-in-string
|
|
|
|
"\n" "[\r\n]+" (regexp-quote (or ,full-body "")))
|
|
|
|
string-buffer))
|
|
|
|
(setq string-buffer (substring string-buffer (match-end 0))))
|
2010-06-12 18:57:38 -04:00
|
|
|
(split-string string-buffer comint-prompt-regexp)))))
|
2013-06-06 14:29:37 -04:00
|
|
|
(def-edebug-spec org-babel-comint-with-output (sexp body))
|
2009-06-13 20:07:03 -04:00
|
|
|
|
2009-06-11 20:04:42 -04:00
|
|
|
(defun org-babel-comint-input-command (buffer cmd)
|
2010-07-13 18:56:17 -04:00
|
|
|
"Pass CMD to BUFFER.
|
|
|
|
The input will not be echoed."
|
2009-06-11 20:04:42 -04:00
|
|
|
(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-07-13 18:56:17 -04: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-11 20:04:42 -04: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-08-30 12:26:02 -04:00
|
|
|
(defun org-babel-comint-eval-invisibly-and-wait-for-file
|
|
|
|
(buffer file string &optional period)
|
|
|
|
"Evaluate STRING in BUFFER invisibly.
|
2012-08-11 13:10:44 -04:00
|
|
|
Don't return until FILE exists. Code in STRING must ensure that
|
2010-08-30 12:26:02 -04:00
|
|
|
FILE exists at end of evaluation."
|
|
|
|
(unless (org-babel-comint-buffer-livep buffer)
|
2012-08-12 23:59:44 -04:00
|
|
|
(error "Buffer %s does not exist or has no process" buffer))
|
2010-08-30 12:26:02 -04:00
|
|
|
(if (file-exists-p file) (delete-file file))
|
|
|
|
(process-send-string
|
|
|
|
(get-buffer-process buffer)
|
2014-09-01 00:49:03 -04:00
|
|
|
(if (= (aref string (1- (length string))) ?\n) string (concat string "\n")))
|
2010-08-30 12:26:02 -04:00
|
|
|
;; From Tramp 2.1.19 the following cache flush is not necessary
|
|
|
|
(if (file-remote-p default-directory)
|
2016-04-24 00:18:10 -04:00
|
|
|
(with-parsed-tramp-file-name default-directory nil
|
|
|
|
(tramp-flush-directory-property v "")))
|
2010-08-30 12:26:02 -04:00
|
|
|
(while (not (file-exists-p file)) (sit-for (or period 0.25))))
|
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
(provide 'ob-comint)
|
2010-06-25 12:20:39 -04:00
|
|
|
|
2011-08-15 14:04:38 -04:00
|
|
|
|
2010-06-25 12:20:39 -04:00
|
|
|
|
2010-06-11 19:02:42 -04:00
|
|
|
;;; ob-comint.el ends here
|