jflack/emacs-matlab
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

matlab.el:

Browse source 
(matlab-beginning-of-command): Remove searching for function/block to
restrict motion to.  The search and restrict just slowed down ppss.
(matlab-end-of-command): Remove optional input.
Stop restriting array-cont query.
(matlab-semicolon-on-return, matlab-mode-vf-quiesce-buffer):
Don't pass input to `matlab-end-of-command'.

matlab-syntax.el:
(matlab-up-list): Use `matlab-beginning-of-string-or-comment'
instead of asking for the string or commment bounds.
The beginning is part of ppss, but full bounds includes the end.
This commit is contained in:
Eric Ludlam 2021-03-08 21:58:25 -05:00
parent e9b66d32ab
commit a8229c28e0
2 changed files with 21 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
matlab-syntax.el
View file

@ -451,22 +451,18 @@ comment and string crossing.
Optional argument RESTRICT specifies max point to travel to."
(save-restriction
(when restrict (narrow-to-region restrict (point)))
(let* ((bounds nil)
(ctxt (matlab-cursor-comment-string-context 'bounds)))
(when ctxt
(goto-char (if (< 0 count) (car bounds) (cdr bounds))))
(if (< count 0)
(let ((pps (syntax-ppss)))
(when (or (not (numberp (nth 0 pps)))
(< (nth 0 pps) (abs count)))
(error "Cannot navigate up %d lists" (abs count)))
;; When travelling in reverse, we can just use pps'
;; parsed paren list in slot 9.
(let ((posn (reverse (nth 9 pps)))) ;; Location of parens
(goto-char (nth (1- (abs count)) posn))))
;; Else - travel forward
(up-list count nil t)) ;; will this correctly ignore comments, etc?
)))
(matlab-beginning-of-string-or-comment)
(if (< count 0)
(let ((pps (syntax-ppss)))
(when (< (nth 0 pps) (abs count))
(error "Cannot navigate up %d lists" (abs count)))
;; When travelling in reverse, we can just use pps'
;; parsed paren list in slot 9.
(let ((posn (reverse (nth 9 pps)))) ;; Location of parens
(goto-char (nth (1- (abs count)) posn))))
;; Else - travel forward
(up-list count nil t)) ;; will this correctly ignore comments, etc?
))
;;; Syntax Compat functions
;;

28
matlab.el
View file

@ -2095,23 +2095,13 @@ Travels across continuations."
(beginning-of-line)
(save-match-data
(let ((p nil)
;; This restriction is a wild guess where to end reverse
;; searching for array continuations. The reason is that
;; matlab up list is very slow, and most people would never
;; put a blank line in a matrix. Either way, it's worth the
;; trade off to speed this up for large files.
;; This list of keywords is NOT meant to be comprehensive.
(r (save-excursion
(re-search-backward
"^\\s-*\\(%\\|if\\|else\\(if\\)\\|while\\|\\(par\\)?for\\|$\\)\\>"
nil t)))
(bc (matlab-block-comment-bounds)))
(if bc
;; block comment - just go to the beginning.
;; block comment - just go to the beginning.
(if bc
(goto-char (car bc))
;; Scan across lines that are related.
(while (and (or (setq p (matlab-lattr-array-cont r)) ;; do this first b/c fast
;; ELSE : Scan across lines that are related.
(while (and (or (setq p (matlab-lattr-array-cont)) ;; do this first b/c fast
(matlab-prev-line-cont)
(matlab-ltype-continued-comm)
)
@ -2120,14 +2110,14 @@ Travels across continuations."
(setq p nil)))
(back-to-indentation))))
(defun matlab-end-of-command (&optional beginning)
(defun matlab-end-of-command ()
"Go to the end of an M command.
Optional BEGINNING is where the command starts from."
Travells a cross continuations"
(interactive)
(while (and (or (matlab-lattr-cont)
(save-excursion
(forward-line 1)
(or (matlab-lattr-array-cont beginning)
(or (matlab-lattr-array-cont)
(matlab-ltype-continued-comm))))
;; This hack is a short circuit. If a user did not
;; correctly end a matrix, this will short-circuit
@ -2880,7 +2870,7 @@ Must be one of:
(looking-at "\\s-*;")))
(save-excursion
(let ((p (point)))
(matlab-end-of-command (point))
(matlab-end-of-command)
(eq p (point))))
(save-excursion
(matlab-beginning-of-command)
@ -4108,7 +4098,7 @@ desired. Optional argument FAST is not used."
(setq msgpos (+ msgpos dir))
(if (or (> msgpos 5) (< msgpos 0)) (setq dir (- dir)
msgpos (+ (* 2 dir) msgpos)))
(matlab-end-of-command (point))
(matlab-end-of-command)
(if (matlab-cursor-in-comment)
(progn
(matlab-comment-on-line)