FUEL: correct colorizing for FROM and EXCLUDE

db4
Björn Lindqvist 2013-11-30 22:15:24 +01:00 committed by John Benediktsson
parent 85098e0e49
commit 4d56a136a1
1 changed files with 7 additions and 4 deletions

View File

@ -206,8 +206,8 @@ source/docs/tests file. When set to false, you'll be asked only once."
"C:" "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:"
"FOREIGN-ATOMIC-TYPE:" "FOREIGN-RECORD-TYPE:" "FORGET:" "FROM:" "FUNCTION-ALIAS:" "FOREIGN-ATOMIC-TYPE:" "FOREIGN-RECORD-TYPE:" "FORGET:" "FUNCTION-ALIAS:"
"GAME:" "GENERIC#" "GENERIC:" "GIR:" "GAME:" "GENERIC#" "GENERIC:" "GIR:"
"GLSL-SHADER:" "GLSL-PROGRAM:" "GLSL-SHADER:" "GLSL-PROGRAM:"
"HELP:" "HINTS:" "HOOK:" "HELP:" "HINTS:" "HOOK:"
@ -288,7 +288,7 @@ source/docs/tests file. When set to false, you'll be asked only once."
(defconst factor-vocab-ref-regex (defconst factor-vocab-ref-regex
(factor-second-word-regex (factor-second-word-regex
'("IN:" "USE:" "FROM:" "EXCLUDE:" "QUALIFIED:" "QUALIFIED-WITH:"))) '("IN:" "USE:" "EXCLUDE:" "QUALIFIED:" "QUALIFIED-WITH:")))
(defconst factor-using-lines-regex "^\\(USING\\):[ \n]+\\([^;\t]*\\);") (defconst factor-using-lines-regex "^\\(USING\\):[ \n]+\\([^;\t]*\\);")
@ -420,7 +420,10 @@ source/docs/tests file. When set to false, you'll be asked only once."
(,factor-using-lines-regex (1 'factor-font-lock-parsing-word) (,factor-using-lines-regex (1 'factor-font-lock-parsing-word)
(2 'factor-font-lock-vocabulary-name)) (2 'factor-font-lock-vocabulary-name))
(,(format "^\\(FROM\\|EXCLUDE\\):[ \n]+%s[ \n]+=>+\\([^;\t]*\\);" symbol)
(1 'factor-font-lock-parsing-word)
(2 'factor-font-lock-vocabulary-name)
(3 'factor-font-lock-word))
(,factor-constructor-decl-regex (,factor-constructor-decl-regex
(1 'factor-font-lock-word) (1 'factor-font-lock-word)
(2 'factor-font-lock-type-name) (2 'factor-font-lock-type-name)