comparison lisp/progmodes/python.el @ 55300:2db456741f80

(python-compilation-line-number): Remove. (python-compilation-regexp-alist): Don't use it any more. (python-orig-start, python-input-filter): Remove. (inferior-python-mode): Don't set up comint-input-filter-functions. (python-send-region): Use compilation-fake-loc.

55299:19ff0d2ea8e8

;; do the right thing.  If you run multiple processes, you can change
;; `python-buffer' to another process buffer with \\[set-variable]."
  )

(defconst python-compilation-regexp-alist
  `((,(rx (and line-start (1+ (any " \t")) "File \""
	       (group (1+ (not (any "\"<")))) ; avoid `<stdin>' &c
	       "\", line " (group (1+ digit))))
     1 python-compilation-line-number))
  "`compilation-error-regexp-alist' for inferior Python.")

;; Fixme: This should inherit some stuff from python-mode, but I'm not
;; sure how much: at least some keybindings, like C-c C-f; syntax?;
;; font-locking, e.g. for triple-quoted strings?

  (set-syntax-table python-mode-syntax-table)
  (setq mode-line-process '(":%s"))
  ;; Fixme: Maybe install some python-mode bindings too.
  (define-key inferior-python-mode-map "\C-c\C-l" 'python-load-file)
  (define-key inferior-python-mode-map "\C-c\C-z" 'python-switch-to-python)
  (add-hook 'comint-input-filter-functions 'python-input-filter nil t)
  (add-hook 'comint-preoutput-filter-functions #'python-preoutput-filter
	    nil t)
  ;; Still required by `comint-redirect-send-command', for instance
  ;; (and we need to match things like `>>> ... >>> '):
  (set (make-local-variable 'comint-prompt-regexp) "^\\([>.]\\{3\\} \\)+")

(defcustom inferior-python-filter-regexp "\\`\\s-*\\S-?\\S-?\\s-*\\'"
  "*Input matching this regexp is not saved on the history list.
Default ignores all inputs of 0, 1, or 2 non-blank characters."
  :type 'regexp
  :group 'python)

(defvar python-orig-start nil
  "Marker to the start of the region passed to the inferior Python.
It can also be a filename.")

(defun python-input-filter (str)
  "`comint-input-filter' function for inferior Python.
Don't save anything for STR matching `inferior-python-filter-regexp'.
Also resets variables for adjusting error messages."
  (setq python-orig-start nil)
  (not (string-match inferior-python-filter-regexp str)))

;; Fixme: Loses with quoted whitespace.
(defun python-args-to-list (string)
  (let ((where (string-match "[ \t]" string)))
    (cond ((null where) (list string))
	  ((not (= where 0))
	   (cons (substring string 0 where)
		 (python-args-to-list (substring string (+ 1 where)))))
	  (t (let ((pos (string-match "[^ \t]" string)))
	       (if pos (python-args-to-list (substring string pos))))))))

(defun python-compilation-line-number (file col)
  "Return error descriptor of error found for FILE, column COL.
Used as line-number hook function in `python-compilation-regexp-alist'."
  (let ((line (string-to-number (match-string 2))))
    (cons (point-marker)
	  (if (and (markerp python-orig-start)
		   (marker-buffer python-orig-start))
	      (let ((start python-orig-start))
		(with-current-buffer (marker-buffer python-orig-start)
		  (goto-char start)
		  (forward-line (1- line))
		  (point-marker)))
	    (list (if (stringp python-orig-start)
		      (list python-orig-start default-directory)
		    file)
		  line col)))))

(defvar python-preoutput-result nil
  "Data from output line last `_emacs_out' line seen by the preoutput filter.")

(defvar python-preoutput-continuation nil

	  (/= 0 (current-indentation)))	; need dummy block
	(write-region "if True:\n" nil f nil 'nomsg))
    (write-region start end f t 'nomsg)
    (when python-buffer
      (with-current-buffer python-buffer
	(set (make-local-variable 'python-orig-start) orig-start)
	(let ((comint-input-filter-functions
	       ;; Don't reset python-orig-start.
	       (remq 'python-input-filter comint-input-filter-functions)))
	  (python-send-command command))))))

(defun python-send-string (string)
  "Evaluate STRING in inferior Python process."
  (interactive "sPython command: ")
  (comint-send-string (python-proc) string)

55300:2db456741f80

;; do the right thing.  If you run multiple processes, you can change
;; `python-buffer' to another process buffer with \\[set-variable]."
  )

(defconst python-compilation-regexp-alist
  ;; FIXME: maybe this should be moved to compilation-error-regexp-alist-alist.
  `((,(rx (and line-start (1+ (any " \t")) "File \""
	       (group (1+ (not (any "\"<")))) ; avoid `<stdin>' &c
	       "\", line " (group (1+ digit))))
     1 2))
  "`compilation-error-regexp-alist' for inferior Python.")

;; Fixme: This should inherit some stuff from python-mode, but I'm not
;; sure how much: at least some keybindings, like C-c C-f; syntax?;
;; font-locking, e.g. for triple-quoted strings?

  (set-syntax-table python-mode-syntax-table)
  (setq mode-line-process '(":%s"))
  ;; Fixme: Maybe install some python-mode bindings too.
  (define-key inferior-python-mode-map "\C-c\C-l" 'python-load-file)
  (define-key inferior-python-mode-map "\C-c\C-z" 'python-switch-to-python)
  (add-hook 'comint-preoutput-filter-functions #'python-preoutput-filter
	    nil t)
  ;; Still required by `comint-redirect-send-command', for instance
  ;; (and we need to match things like `>>> ... >>> '):
  (set (make-local-variable 'comint-prompt-regexp) "^\\([>.]\\{3\\} \\)+")

(defcustom inferior-python-filter-regexp "\\`\\s-*\\S-?\\S-?\\s-*\\'"
  "*Input matching this regexp is not saved on the history list.
Default ignores all inputs of 0, 1, or 2 non-blank characters."
  :type 'regexp
  :group 'python)

;; Fixme: Loses with quoted whitespace.
(defun python-args-to-list (string)
  (let ((where (string-match "[ \t]" string)))
    (cond ((null where) (list string))
	  ((not (= where 0))
	   (cons (substring string 0 where)
		 (python-args-to-list (substring string (+ 1 where)))))
	  (t (let ((pos (string-match "[^ \t]" string)))
	       (if pos (python-args-to-list (substring string pos))))))))

(defvar python-preoutput-result nil
  "Data from output line last `_emacs_out' line seen by the preoutput filter.")

(defvar python-preoutput-continuation nil

	  (/= 0 (current-indentation)))	; need dummy block
	(write-region "if True:\n" nil f nil 'nomsg))
    (write-region start end f t 'nomsg)
    (when python-buffer
      (with-current-buffer python-buffer
	(python-send-command command)
	;; Tell compile.el to redirect error locations in file `f' to
	;; positions past marker `orig-start'.  It has to be done *after*
	;; python-send-command's call to compilation-forget-errors.
	(compilation-fake-loc orig-start f)))))

(defun python-send-string (string)
  "Evaluate STRING in inferior Python process."
  (interactive "sPython command: ")
  (comint-send-string (python-proc) string)