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

Merge branch 'emacs' of http://git.hacks-galore.org/jao/factor

db4
Slava Pestov 2008-11-25 16:51:14 -06:00
parent f3f3b3e769 a11453e458
commit 2434709dc4
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
misc/factor.el
View File

@ -160,10 +160,6 @@ buffer."
;;; Factor mode font lock: ;;; Factor mode font lock:
(defconst factor--regexp-word-start
(let ((sws '("" ":" "TUPLE" "MACRO" "MACRO:" "M")))
(format "^\\(%s\\)\\(:\\) " (mapconcat 'identity sws "\\|"))))
(defconst factor--parsing-words (defconst factor--parsing-words
'("{" "}" "^:" "^::" ";" "<<" "<PRIVATE" ">>" '("{" "}" "^:" "^::" ";" "<<" "<PRIVATE" ">>"
"BIN:" "BV{" "B{" "C:" "C-STRUCT:" "C-UNION:" "CHAR:" "CS{" "C{" "BIN:" "BV{" "B{" "C:" "C-STRUCT:" "C-UNION:" "CHAR:" "CS{" "C{"
@ -222,6 +218,10 @@ buffer."
;;; Factor mode syntax: ;;; Factor mode syntax:
(defconst factor--regexp-word-start
(let ((sws '("" ":" "TUPLE" "MACRO" "MACRO:" "M")))
(format "^\\(%s\\)\\(:\\) " (regexp-opt sws))))
(defconst factor--font-lock-syntactic-keywords (defconst factor--font-lock-syntactic-keywords
`(("^\\(:\\)\\(:\\)" (1 ".") (2 "(;")) `(("^\\(:\\)\\(:\\)" (1 ".") (2 "(;"))
(,factor--regexp-word-start (2 "(;")) (,factor--regexp-word-start (2 "(;"))
@ -321,7 +321,7 @@ buffer."
"PRIVATE>" "<PRIVATE" "SYMBOL:" "USE:")))) "PRIVATE>" "<PRIVATE" "SYMBOL:" "USE:"))))
(defsubst factor--at-begin-of-def () (defsubst factor--at-begin-of-def ()
(looking-at "\\([^ ]\\|^\\)+:")) (looking-at factor--regexp-word-start))
(defsubst factor--looking-at-emptiness () (defsubst factor--looking-at-emptiness ()
(looking-at "^[ \t]*$")) (looking-at "^[ \t]*$"))
@ -652,13 +652,12 @@ vocabularies which have been modified on disk."
;;; Key bindings: ;;; Key bindings:
(defmacro factor--define-key (key cmd &optional both) (defun factor--define-key (key cmd &optional both)
(let ((m (gensym)) (let ((ms (list factor-mode-map)))
(ms '(factor-mode-map))) (when both (push factor-help-mode-map ms))
(when both (push 'factor-help-mode-map ms)) (dolist (m ms)
`(dolist (,m (list ,@ms)) (define-key m (vector '(control ?c) key) cmd)
(define-key ,m [(control ?c) ,key] ,cmd) (define-key m (vector '(control ?c) `(control ,key)) cmd))))
(define-key ,m [(control ?c) (control ,key)] ,cmd))))
(factor--define-key ?f 'factor-run-file) (factor--define-key ?f 'factor-run-file)
(factor--define-key ?r 'factor-send-region) (factor--define-key ?r 'factor-send-region)
@ -671,7 +670,6 @@ vocabularies which have been modified on disk."
(define-key factor-mode-map "\C-ch" 'factor-help) (define-key factor-mode-map "\C-ch" 'factor-help)
(define-key factor-help-mode-map "\C-ch" 'factor-help) (define-key factor-help-mode-map "\C-ch" 'factor-help)
(define-key factor-mode-map "\C-m" 'newline-and-indent) (define-key factor-mode-map "\C-m" 'newline-and-indent)
(define-key factor-mode-map [tab] 'indent-for-tab-command)
(define-key factor-listener-mode-map [f8] 'factor-refresh-all) (define-key factor-listener-mode-map [f8] 'factor-refresh-all)