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

FUEL: better symbol-capturing regexp and support for X-FUNCTION

char-rename
Björn Lindqvist 2016-07-02 03:28:19 +02:00
parent 114ced868a
commit 1e7e0e9876
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ these lines in your .emacs:
;;; Regexps galore: ;;; Regexps galore:
;; Utility regexp used by other regexps to match a Factor symbol name ;; Utility regexp used by other regexps to match a Factor symbol name
(setq-local symbol-nc "\\(?:\\sw\\|\\s_\\|\\s(\\|\\s)\\|\\s\\\\)+") (setq-local symbol-nc "\\(?:\\sw\\|\\s_\\|\"\\|\\s(\\|\\s)\\|\\s\\\\)+")
(setq-local symbol (format "\\(%s\\)" symbol-nc)) (setq-local symbol (format "\\(%s\\)" symbol-nc))
(setq-local ws+ "[ \n\t]+") (setq-local ws+ "[ \n\t]+")
(setq-local symbols-to-semicolon "\\([^;\t]*\\)\\(;\\)") (setq-local symbols-to-semicolon "\\([^;\t]*\\)\\(;\\)")
@ -390,7 +390,11 @@ these lines in your .emacs:
(concat (syntax-begin '("PREDICATE")) ws+ symbol ws+ "\\(<\\)" ws+ symbol)) (concat (syntax-begin '("PREDICATE")) ws+ symbol ws+ "\\(<\\)" ws+ symbol))
(defconst factor-alien-function-regex (defconst factor-alien-function-regex
(concat (syntax-begin '("GL-FUNCTION" "FUNCTION" "GL-CALLBACK" "CALLBACK")) (concat (syntax-begin '("CALLBACK"
"FUNCTION"
"GL-CALLBACK"
"GL-FUNCTION"
"X-FUNCTION"))
ws+ symbol ws+ symbol
ws+ symbol ws+)) ws+ symbol ws+))

4
misc/fuel/strange-syntax.factor
View File

@ -51,7 +51,9 @@ C-TYPE: cairo_snurface_t
! ! CHAR ! ! CHAR
: stuff-with-chars ( -- K \n ) : stuff-with-chars ( -- K \n )
CHAR: K CHAR: K
CHAR: \n ; CHAR: \n
CHAR: \" ! <- \" should be highlighted
drop ;
! ! MAIN ! ! MAIN
: majn ( -- ) ; : majn ( -- ) ;