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

FUEL: highlight alien callbacks identical to functions

db4
Björn Lindqvist 2013-09-20 18:37:46 +02:00 committed by John Benediktsson
parent 05b18519f6
commit 9f8648e1e7
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ source/docs/tests file. When set to false, you'll be asked only once."
'(":" "::" ";" "&:" "<<" "<PRIVATE" ">>" '(":" "::" ";" "&:" "<<" "<PRIVATE" ">>"
"ABOUT:" "AFTER:" "ALIAS:" "ALIEN:" "ARTICLE:" "ABOUT:" "AFTER:" "ALIAS:" "ALIEN:" "ARTICLE:"
"B" "BEFORE:" "B" "BEFORE:"
"C:" "CALLBACK:" "C-GLOBAL:" "C-TYPE:" "CHAR:" "COLOR:" "COM-INTERFACE:" "CONSTANT:" "C:" "C-GLOBAL:" "C-TYPE:" "CHAR:" "COLOR:" "COM-INTERFACE:" "CONSTANT:"
"CONSULT:" "call-next-method" "CONSULT:" "call-next-method"
"DEFER:" "DESTRUCTOR:" "DEFER:" "DESTRUCTOR:"
"EBNF:" ";EBNF" "ENUM:" "ERROR:" "EXCLUDE:" "EBNF:" ";EBNF" "ENUM:" "ERROR:" "EXCLUDE:"
@ -324,12 +324,6 @@ source/docs/tests file. When set to false, you'll be asked only once."
(defconst factor-sub-vocab-regex "^<\\([^ \n]+\\) *$") (defconst factor-sub-vocab-regex "^<\\([^ \n]+\\) *$")
(defconst factor-alien-function-alias-regex
"\\_<FUNCTION-ALIAS: +\\(\\w+\\)[\n ]+\\(\\w+\\)[\n ]+\\(\\w+\\)")
(defconst factor-alien-callback-regex
"\\_<CALLBACK:[ \n]+\\(\\w+\\)[ \n]+\\(\\w+\\)")
(defconst factor-indent-def-starts (defconst factor-indent-def-starts
'("" ":" '("" ":"
"AFTER" "BEFORE" "AFTER" "BEFORE"
@ -422,11 +416,6 @@ source/docs/tests file. When set to false, you'll be asked only once."
(defconst factor-font-lock-keywords (defconst factor-font-lock-keywords
`((,factor-brace-words-regex 1 'factor-font-lock-parsing-word) `((,factor-brace-words-regex 1 'factor-font-lock-parsing-word)
(,factor-alien-function-alias-regex (1 'factor-font-lock-word)
(2 'factor-font-lock-type-name)
(3 'factor-font-lock-word))
(,factor-alien-callback-regex (1 'factor-font-lock-type-name)
(2 'factor-font-lock-word))
(,factor-vocab-ref-regex 2 'factor-font-lock-vocabulary-name) (,factor-vocab-ref-regex 2 'factor-font-lock-vocabulary-name)
(,factor-using-lines-regex (1 'factor-font-lock-parsing-word) (,factor-using-lines-regex (1 'factor-font-lock-parsing-word)
@ -489,7 +478,7 @@ source/docs/tests file. When set to false, you'll be asked only once."
;; Highlights alien function definitions. Types in stack effect ;; Highlights alien function definitions. Types in stack effect
;; declarations are given a bold face. ;; declarations are given a bold face.
(,(format "\\(\\(?:GL-\\)?FUNCTION\\):[ \n]+%s[ \n]+%s[ \n]+" symbol symbol) (,(format "\\(\\(?:GL-\\)?FUNCTION\\|CALLBACK\\):[ \n]+%s[ \n]+%s[ \n]+" symbol symbol)
(1 'factor-font-lock-parsing-word) (1 'factor-font-lock-parsing-word)
(2 'factor-font-lock-type-name) (2 'factor-font-lock-type-name)
(3 'factor-font-lock-word) (3 'factor-font-lock-word)