comparison lisp/progmodes/python.el @ 54888:89ed55db7532

(python-orig-start-line, python-orig-file): Remove. (python-orig-start): New var. (python-input-filter, python-compilation-line-number) (python-send-region, python-load-file): Use it.

54887:a19fbbfac280

start of buffer."
  (let ((ci (current-indentation))
	(def-re (rx (and line-start (0+ space) (or "def" "class")
			 (1+ space)
			 (group (1+ (or word (syntax symbol)))))))
	point found lep def-line)
    (if (python-comment-line-p)
	(setq ci most-positive-fixnum))
    (while (and (not (bobp)) (not found))
      ;; Treat bol at beginning of function as outside function so
      ;; that successive C-M-a makes progress backwards.

    (setq arg (1- arg)))
  (zerop arg))

;;;; Imenu.

(defun python-imenu-create-index ()
  "`imenu-create-index-function' for Python.

Makes nested Imenu menus from nested `class' and `def' statements.
The nested menus are headed by an item referencing the outer
definition; it has a space prepended to the name so that it sorts
first with `imenu--sort-by-name'."
  (unless (boundp 'recursing)		; dynamically bound below
    (goto-char (point-min)))		; normal call from Imenu
  (let (index-alist			; accumulated value to return
	name is-class pos)
    (while (re-search-forward
	    (rx (and line-start (0+ space) ; leading space
		     (or (group "def") (group "class"))	    ; type
		     (1+ space) (group (1+ (or word ?_))))) ; name
	    nil t)

	      (name (match-string-no-properties 3)))
	  (if (match-beginning 2)	; def or class?
	      (setq name (concat "class " name)))
	  (save-restriction
	    (narrow-to-defun)
	    (let* ((recursing t)
		   (sublist (python-imenu-create-index)))
	      (if sublist
		  (progn (push (cons (concat " " name) pos) sublist)
			 (push (cons name sublist) index-alist))
		(push (cons name pos) index-alist)))))))

  "*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-line nil
  "Line number at start of region sent to inferior Python.")

(defvar python-orig-file nil
  "File name to associate with errors found in inferior Python.")

(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-file nil
	python-orig-start-line 1)
  (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)))

	       (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 (save-excursion
		(goto-char (match-beginning 2))
		(read (current-buffer)))))
    (list (point-marker) (if python-orig-file
			     (list python-orig-file default-directory)
			   file)
	  (+ line (1- python-orig-start-line))
	  nil)))

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

(defvar python-preoutput-continuation nil

  ;; reference to the temporary file to the source.  Fixme:
  ;; comint-filter the first two lines of the traceback?
  (interactive "r")
  (let* ((f (make-temp-file "py"))
	 (command (format "_emacs_execfile(%S)" f))
	 (orig-file (buffer-file-name))
	 (orig-line (save-restriction
		      (widen)
		      (line-number-at-pos start))))
    (if (save-excursion
	  (goto-char start)
	  (/= 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
	(let ((end (marker-position (process-mark (python-proc)))))
	  (set (make-local-variable 'python-orig-file) orig-file)
	  (set (make-local-variable 'python-orig-start-line) orig-line)
	  (set (make-local-variable 'compilation-error-list) nil)
	  (let ((comint-input-filter-functions
		 (delete 'python-input-filter comint-input-filter-functions)))
	    (python-send-string command))
	  (set-marker compilation-parsing-end end)

	  (python-send-string
	   (if (string-match "\\.py\\'" file-name)
	       ;; Fixme: make sure the directory is in the path list
	       (let ((module (file-name-sans-extension
			      (file-name-nondirectory file-name))))
		 (set (make-local-variable 'python-orig-file) nil)
		 (set (make-local-variable 'python-orig-start-line) nil)
		 (format "\
if globals().has_key(%S): reload(%s)
else: import %s
" module module module))
	     (set (make-local-variable 'python-orig-file) file-name)
	     (set (make-local-variable 'python-orig-start-line) 1)
	     (format "execfile('%s')" file-name))))
	(set-marker compilation-parsing-end end)
	(setq compilation-last-buffer (current-buffer))))))

;; Fixme: Should this start a process if there isn't one?  (Unlike cmuscheme.)

  (let* ((version (let ((s (shell-command-to-string (concat python-command
							    " -V"))))
		    (string-match "^Python \\([0-9]+\\.[0-9]+\\>\\)" s)
		    (match-string 1 s)))
	 ;; Whether info files have a Python version suffix, e.g. in Debian.
	 (versioned 
	  (with-temp-buffer
	    (Info-mode)
	    (condition-case ()
		(Info-goto-node (format "(python%s-lib)Miscellaneous Index"
					version))
	      (error nil)))))
    (info-lookup-maybe-add-help
     :mode 'python-mode


;;;; Modes.

(defvar outline-heading-end-regexp)
(defvar eldoc-print-current-symbol-info-function)

;;;###autoload
(define-derived-mode python-mode fundamental-mode "Python"
  "Major mode for editing Python files.
Turns on Font Lock mode unconditionally since it is required for correct
parsing of the source.

54888:89ed55db7532

start of buffer."
  (let ((ci (current-indentation))
	(def-re (rx (and line-start (0+ space) (or "def" "class")
			 (1+ space)
			 (group (1+ (or word (syntax symbol)))))))
	found lep def-line)
    (if (python-comment-line-p)
	(setq ci most-positive-fixnum))
    (while (and (not (bobp)) (not found))
      ;; Treat bol at beginning of function as outside function so
      ;; that successive C-M-a makes progress backwards.

    (setq arg (1- arg)))
  (zerop arg))

;;;; Imenu.

(defvar python-recursing)
(defun python-imenu-create-index ()
  "`imenu-create-index-function' for Python.

Makes nested Imenu menus from nested `class' and `def' statements.
The nested menus are headed by an item referencing the outer
definition; it has a space prepended to the name so that it sorts
first with `imenu--sort-by-name'."
  (unless (boundp 'python-recursing)		; dynamically bound below
    (goto-char (point-min)))		; normal call from Imenu
  (let (index-alist			; accumulated value to return
	name)
    (while (re-search-forward
	    (rx (and line-start (0+ space) ; leading space
		     (or (group "def") (group "class"))	    ; type
		     (1+ space) (group (1+ (or word ?_))))) ; name
	    nil t)

	      (name (match-string-no-properties 3)))
	  (if (match-beginning 2)	; def or class?
	      (setq name (concat "class " name)))
	  (save-restriction
	    (narrow-to-defun)
	    (let* ((python-recursing t)
		   (sublist (python-imenu-create-index)))
	      (if sublist
		  (progn (push (cons (concat " " name) pos) sublist)
			 (push (cons name sublist) index-alist))
		(push (cons name pos) index-alist)))))))

  "*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)))

	       (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))
	      (with-current-buffer (marker-buffer python-orig-start)
		(goto-char python-orig-start)
		(forward-line (1- line)))
	    (list (if (stringp python-orig-start) python-orig-start file)
		  line nil)))))

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

(defvar python-preoutput-continuation nil

  ;; reference to the temporary file to the source.  Fixme:
  ;; comint-filter the first two lines of the traceback?
  (interactive "r")
  (let* ((f (make-temp-file "py"))
	 (command (format "_emacs_execfile(%S)" f))
	 (orig-start (copy-marker start)))
    (if (save-excursion
	  (goto-char start)
	  (/= 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
	(let ((end (marker-position (process-mark (python-proc)))))
	  (set (make-local-variable 'python-orig-start) orig-start)
	  (set (make-local-variable 'compilation-error-list) nil)
	  (let ((comint-input-filter-functions
		 (delete 'python-input-filter comint-input-filter-functions)))
	    (python-send-string command))
	  (set-marker compilation-parsing-end end)

	  (python-send-string
	   (if (string-match "\\.py\\'" file-name)
	       ;; Fixme: make sure the directory is in the path list
	       (let ((module (file-name-sans-extension
			      (file-name-nondirectory file-name))))
		 (set (make-local-variable 'python-orig-start) nil)
		 (format "\
if globals().has_key(%S): reload(%s)
else: import %s
" module module module))
	     (set (make-local-variable 'python-orig-start) file-name)
	     (format "execfile('%s')" file-name))))
	(set-marker compilation-parsing-end end)
	(setq compilation-last-buffer (current-buffer))))))

;; Fixme: Should this start a process if there isn't one?  (Unlike cmuscheme.)

  (let* ((version (let ((s (shell-command-to-string (concat python-command
							    " -V"))))
		    (string-match "^Python \\([0-9]+\\.[0-9]+\\>\\)" s)
		    (match-string 1 s)))
	 ;; Whether info files have a Python version suffix, e.g. in Debian.
	 (versioned
	  (with-temp-buffer
	    (Info-mode)
	    (condition-case ()
		;; Don't use `info' because it would pop-up a *info* buffer.
		(Info-goto-node (format "(python%s-lib)Miscellaneous Index"
					version))
	      (error nil)))))
    (info-lookup-maybe-add-help
     :mode 'python-mode


;;;; Modes.

(defvar outline-heading-end-regexp)
(defvar eldoc-print-current-symbol-info-function)
(defvar python-mode-running)
;;;###autoload
(define-derived-mode python-mode fundamental-mode "Python"
  "Major mode for editing Python files.
Turns on Font Lock mode unconditionally since it is required for correct
parsing of the source.