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

FUEL: better font-locking of gl-related words

factor-shell
Björn Lindqvist 2018-01-24 14:27:31 +01:00
parent 3a7c1ead3b
commit dbf21ca102
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,15 +219,13 @@ these lines in your .emacs:
"FOREIGN-ATOMIC-TYPE:" "FOREIGN-ENUM-TYPE:" "FOREIGN-RECORD-TYPE:" "FUNCTION-ALIAS:" "FOREIGN-ATOMIC-TYPE:" "FOREIGN-ENUM-TYPE:" "FOREIGN-RECORD-TYPE:" "FUNCTION-ALIAS:"
";FUNCTOR>" ";FUNCTOR>"
"GIR:" "GIR:"
"GLSL-SHADER:" "GLSL-PROGRAM:"
"initial:" "IMPLEMENT-STRUCTS:" "initial:" "IMPLEMENT-STRUCTS:"
"MATH:" "MATH:"
"METHOD:" "METHOD:"
"PRIVATE>" "PROTOCOL:" "PROVIDE:" "PRIVATE>" "PROTOCOL:"
"read-only" "read-only"
"STRING:" "SYNTAX:" "STRING:" "SYNTAX:"
"UNIFORM-TUPLE:" "VARIANT:"))
"VARIANT:" "VERTEX-FORMAT:"))
(defconst factor-parsing-words-regex (defconst factor-parsing-words-regex
(format "\\(?:^\\| \\)%s" (regexp-opt factor-parsing-words 'symbols))) (format "\\(?:^\\| \\)%s" (regexp-opt factor-parsing-words 'symbols)))
@ -297,7 +295,8 @@ these lines in your .emacs:
(defconst factor-symbol-definition-regex (defconst factor-symbol-definition-regex
(syntax-and-1-symbol (syntax-and-1-symbol
'("&" "CONSTANT" "DESTRUCTOR" "EBNF" "FORGET" "FUNCTOR" '("&" "CONSTANT" "DESTRUCTOR" "EBNF" "FORGET" "FUNCTOR"
"GAME" "HELP" "LIBRARY" "MAIN" "MAIN-WINDOW" "SLOT" "STRING" "GAME" "GLSL-PROGRAM" "GLSL-SHADER"
"HELP" "LIBRARY" "MAIN" "MAIN-WINDOW" "SLOT" "STRING"
"SYMBOL" "VAR"))) "SYMBOL" "VAR")))
;; [parsing-word] [symbol-word]* ; ;; [parsing-word] [symbol-word]* ;
@ -309,9 +308,12 @@ these lines in your .emacs:
(syntax-begin '("INTERSECTION" "SINGLETONS" "SPECIALIZED-ARRAYS")) (syntax-begin '("INTERSECTION" "SINGLETONS" "SPECIALIZED-ARRAYS"))
ws+ symbols-to-semicolon)) ws+ symbols-to-semicolon))
;; [parsing-word] [type-word]
(defconst factor-type-definition-regex (defconst factor-type-definition-regex
(syntax-and-1-symbol (syntax-and-1-symbol
'("COM-INTERFACE" "C-TYPE" "MIXIN" "SINGLETON" "SPECIALIZED-ARRAY" '("COM-INTERFACE" "C-TYPE" "MIXIN"
"GLSL-SHADER-FILE"
"SINGLETON" "SPECIALIZED-ARRAY" "SPECIALIZED-VECTOR"
"TUPLE-ARRAY"))) "TUPLE-ARRAY")))
(defconst factor-constructor-regex (defconst factor-constructor-regex
@ -342,7 +344,7 @@ these lines in your .emacs:
"CONSTANT:" "C-GLOBAL:" "C-TYPE:" "CONSTANT:" "C-GLOBAL:" "C-TYPE:"
"DEFER:" "DESTRUCTOR:" "DEFER:" "DESTRUCTOR:"
"FORGET:" "FORGET:"
"GAME:" "GENERIC:" "GENERIC#:" "GLSL-PROGRAM:" "GAME:" "GENERIC:" "GENERIC#:"
"HOOK:" "HOOK:"
"IN:" "INSTANCE:" "IN:" "INSTANCE:"
"LIBRARY:" "LIBRARY:"
@ -477,8 +479,10 @@ these lines in your .emacs:
"PROTOCOL" "PROTOCOL"
"STRUCT" "STRUCT"
"TUPLE" "TUPLE"
"UNIFORM-TUPLE"
"UNION" "UNION"
"UNION-STRUCT")) "UNION-STRUCT"
"VERTEX-FORMAT"))
symbol symbol
symbol) symbol)
(1 'factor-font-lock-parsing-word) (1 'factor-font-lock-parsing-word)

4
misc/fuel/factor-smie.el
View File

@ -24,8 +24,8 @@
"COM-INTERFACE" "CONSULT" "COM-INTERFACE" "CONSULT"
"ENUM" "ERROR" "ENUM" "ERROR"
"FROM" "FROM"
"IDENTITY-MEMO" "GLSL-PROGRAM"
"INTERSECTION" "IDENTITY-MEMO" "INTERSECTION"
"M" "M:" "MACRO" "MACRO:" "M" "M:" "MACRO" "MACRO:"
"MAIN-WINDOW" "MEMO" "MEMO:" "METHOD" "MAIN-WINDOW" "MEMO" "MEMO:" "METHOD"
"SYNTAX" "SYNTAX"