FUEL: highlighting and indentation of more syntax elements

diff --git a/misc/fuel/factor-mode.el b/misc/fuel/factor-mode.el
index 773c4f888ec0e0c198ec54442c155ac5ba565a10..5eefe127878e576e7f7c7b1e9f909db4ed03400f 100644 (file)
--- a/misc/fuel/factor-mode.el
+++ b/misc/fuel/factor-mode.el
@@ -216,8 +216,9 @@ these lines in your .emacs:
     "ABOUT:" "ARTICLE:"
     "B"
     "CONSULT:" "call-next-method"
-    "EBNF:" ";EBNF"
+    ";EBNF"
     "FOREIGN-ATOMIC-TYPE:" "FOREIGN-ENUM-TYPE:" "FOREIGN-RECORD-TYPE:" "FUNCTION-ALIAS:"
+    ";FUNCTOR"
     "GIR:"
     "GLSL-SHADER:" "GLSL-PROGRAM:"
     "HINTS:"
@@ -280,7 +281,7 @@ these lines in your .emacs:
   (concat
    (one-symbol (regexp-opt
                 '(":" "::" "GENERIC:" "GENERIC#" "DEFER:" "HOOK:"
-                  "MACRO:" "MACRO::" "MATH:" "MEMO:" "MEMO::"
+                  "IDENTITY-MEMO:" "MACRO:" "MACRO::" "MATH:" "MEMO:" "MEMO::"
                   "POSTPONE:" "PRIMITIVE:" "SYNTAX:" "TYPED:" "TYPED::")))
    ws+ symbol))
 
@@ -297,8 +298,9 @@ these lines in your .emacs:
 ;; [parsing-word] [symbol-word]
 (defconst factor-symbol-definition-regex
   (syntax-and-1-symbol
-   '("&" "CONSTANT" "DESTRUCTOR" "FORGET" "GAME" "HELP" "LIBRARY"
-     "MAIN" "MAIN-WINDOW" "SLOT" "STRING" "SYMBOL" "VAR")))
+   '("&" "CONSTANT" "DESTRUCTOR" "EBNF" "FORGET" "FUNCTOR"
+     "GAME" "HELP" "LIBRARY" "MAIN" "MAIN-WINDOW" "SLOT" "STRING"
+     "SYMBOL" "VAR")))
 
 ;; [parsing-word] [symbol-word]* ;
 (defconst factor-symbols-lines-regex

diff --git a/misc/fuel/factor-smie.el b/misc/fuel/factor-smie.el
index af89a6c61bf9745eec8c980c860beb31943898ea..54371835e90e71f9e5e77157e7ca525a77e6ecb4 100644 (file)
--- a/misc/fuel/factor-smie.el
+++ b/misc/fuel/factor-smie.el
@@ -22,6 +22,7 @@
     "COM-INTERFACE" "CONSULT"
     "ENUM" "ERROR"
     "FROM" "FUNCTION:" "FUNCTION-ALIAS:"
+    "IDENTITY-MEMO"
     "INTERSECTION:"
     "M" "M:" "MACRO" "MACRO:"
     "MAIN-WINDOW" "MEMO" "MEMO:" "METHOD"