FUEL: better font-locking of gl-related words

diff --git a/misc/fuel/factor-mode.el b/misc/fuel/factor-mode.el
index 4cd8e528e80357973539639fbb368d70aeff0f47..8e0cbd6a825a09b754af4f9fcb3dd18eda8cdc3a 100644 (file)
--- a/misc/fuel/factor-mode.el
+++ b/misc/fuel/factor-mode.el
@@ -219,15 +219,13 @@ these lines in your .emacs:
     "FOREIGN-ATOMIC-TYPE:" "FOREIGN-ENUM-TYPE:" "FOREIGN-RECORD-TYPE:" "FUNCTION-ALIAS:"
     ";FUNCTOR>"
     "GIR:"
-    "GLSL-SHADER:" "GLSL-PROGRAM:"
     "initial:" "IMPLEMENT-STRUCTS:"
     "MATH:"
     "METHOD:"
-    "PRIVATE>" "PROTOCOL:" "PROVIDE:"
+    "PRIVATE>" "PROTOCOL:"
     "read-only"
     "STRING:" "SYNTAX:"
-    "UNIFORM-TUPLE:"
-    "VARIANT:" "VERTEX-FORMAT:"))
+    "VARIANT:"))
 
 (defconst factor-parsing-words-regex
   (format "\\(?:^\\| \\)%s" (regexp-opt factor-parsing-words 'symbols)))
@@ -297,7 +295,8 @@ these lines in your .emacs:
 (defconst factor-symbol-definition-regex
   (syntax-and-1-symbol
    '("&" "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")))
 
 ;; [parsing-word] [symbol-word]* ;
@@ -309,9 +308,12 @@ these lines in your .emacs:
    (syntax-begin '("INTERSECTION" "SINGLETONS" "SPECIALIZED-ARRAYS"))
    ws+ symbols-to-semicolon))
 
+;; [parsing-word] [type-word]
 (defconst factor-type-definition-regex
   (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")))
 
 (defconst factor-constructor-regex
@@ -342,7 +344,7 @@ these lines in your .emacs:
                 "CONSTANT:" "C-GLOBAL:" "C-TYPE:"
                 "DEFER:" "DESTRUCTOR:"
                 "FORGET:"
-                "GAME:" "GENERIC:" "GENERIC#:" "GLSL-PROGRAM:"
+                "GAME:" "GENERIC:" "GENERIC#:"
                 "HOOK:"
                 "IN:" "INSTANCE:"
                 "LIBRARY:"
@@ -477,8 +479,10 @@ these lines in your .emacs:
                      "PROTOCOL"
                      "STRUCT"
                      "TUPLE"
+                     "UNIFORM-TUPLE"
                      "UNION"
-                     "UNION-STRUCT"))
+                     "UNION-STRUCT"
+                     "VERTEX-FORMAT"))
        symbol
        symbol)
      (1 'factor-font-lock-parsing-word)

diff --git a/misc/fuel/factor-smie.el b/misc/fuel/factor-smie.el
index 1aeb7e5f6db24458f3284132facf77ac242ca9d9..5151e2c2068edc31ed16c9234cde3ca4002affbb 100644 (file)
--- a/misc/fuel/factor-smie.el
+++ b/misc/fuel/factor-smie.el
@@ -24,8 +24,8 @@
     "COM-INTERFACE" "CONSULT"
     "ENUM" "ERROR"
     "FROM"
-    "IDENTITY-MEMO"
-    "INTERSECTION"
+    "GLSL-PROGRAM"
+    "IDENTITY-MEMO" "INTERSECTION"
     "M" "M:" "MACRO" "MACRO:"
     "MAIN-WINDOW" "MEMO" "MEMO:" "METHOD"
     "SYNTAX"