steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FUEL: fix highlighting of FUNCTIONs 

The final ; was dropped from the syntax, so FUEL looks for the finishing
bracket instead
db4
Björn Lindqvist 2015-08-05 02:35:09 +02:00 committed by John Benediktsson
parent da69a6c329
commit 74e8b881db
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
misc/fuel/factor-mode.el
View File

@ -540,7 +540,7 @@ these lines in your .emacs:
;; Regexp from hell that puts every type name in the first group, ;; Regexp from hell that puts every type name in the first group,
;; names and brackets in the second and third. ;; names and brackets in the second and third.
("\\(?:\\(\\(?:\\sw\\|\\s_\\)+\\)[ \n]+\\(\\(?:\\sw\\|\\s_\\)+,?\\(?:[ \n]+)\\)?\\)\\|\\([()]\\)\\)" ("\\(?:\\(\\(?:\\sw\\|\\s_\\)+\\)[ \n]+\\(\\(?:\\sw\\|\\s_\\)+,?\\(?:[ \n]+)\\)?\\)\\|\\([()]\\)\\)"
(factor-find-end-of-def) (factor-find-ending-bracket)
nil nil
(1 'factor-font-lock-type-in-stack-effect nil t) (1 'factor-font-lock-type-in-stack-effect nil t)
(2 'factor-font-lock-stack-effect nil t) (2 'factor-font-lock-stack-effect nil t)
@ -554,7 +554,7 @@ these lines in your .emacs:
(3 'factor-font-lock-type-name) (3 'factor-font-lock-type-name)
(4 'factor-font-lock-word) (4 'factor-font-lock-word)
("\\(?:\\(\\(?:\\sw\\|\\s_\\)+\\)[ \n]+\\(\\(?:\\sw\\|\\s_\\)+,?\\(?:[ \n]+)\\)?\\)\\|\\([()]\\)\\)" ("\\(?:\\(\\(?:\\sw\\|\\s_\\)+\\)[ \n]+\\(\\(?:\\sw\\|\\s_\\)+,?\\(?:[ \n]+)\\)?\\)\\|\\([()]\\)\\)"
(factor-find-end-of-def) (factor-find-ending-bracket)
nil nil
(1 'factor-font-lock-type-in-stack-effect nil t) (1 'factor-font-lock-type-in-stack-effect nil t)
(2 'factor-font-lock-stack-effect nil t) (2 'factor-font-lock-stack-effect nil t)
@ -670,6 +670,16 @@ these lines in your .emacs:
(re-search-forward factor-end-of-def-regex nil t) (re-search-forward factor-end-of-def-regex nil t)
(point))) (point)))
(defun factor-find-end-of-def (&rest foo)
(save-excursion
(re-search-forward "[ \n];" nil t)
(1- (point))))
(defun factor-find-ending-bracket (&rest foo)
(save-excursion
(re-search-forward "[ \n]\)" nil t)
(point)))
(defun factor-beginning-of-body () (defun factor-beginning-of-body ()
(let ((p (point))) (let ((p (point)))
(and (factor-beginning-of-defun) (and (factor-beginning-of-defun)
@ -684,11 +694,6 @@ these lines in your .emacs:
(defsubst factor-beginning-of-sexp-pos () (defsubst factor-beginning-of-sexp-pos ()
(save-excursion (factor-beginning-of-sexp) (point))) (save-excursion (factor-beginning-of-sexp) (point)))
(defun factor-find-end-of-def (&rest foo)
(save-excursion
(re-search-forward " ;" nil t)
(1- (point))))
;;; USING/IN: ;;; USING/IN: