FUEL: better symbol-capturing regexp and support for X-FUNCTION

diff --git a/misc/fuel/factor-mode.el b/misc/fuel/factor-mode.el
index 95ec91bd0d5176d2aa21c18e3f54720dc6358d12..c810d0d293e97c5764cd881b3e2caf25ac3bcd0e 100644 (file)
--- a/misc/fuel/factor-mode.el
+++ b/misc/fuel/factor-mode.el
@@ -178,7 +178,7 @@ these lines in your .emacs:
 ;;; Regexps galore:
 
 ;; Utility regexp used by other regexps to match a Factor symbol name
-(setq-local symbol-nc "\\(?:\\sw\\|\\s_\\|\\s(\\|\\s)\\|\\s\\\\)+")
+(setq-local symbol-nc "\\(?:\\sw\\|\\s_\\|\"\\|\\s(\\|\\s)\\|\\s\\\\)+")
 (setq-local symbol (format "\\(%s\\)" symbol-nc))
 (setq-local ws+ "[ \n\t]+")
 (setq-local symbols-to-semicolon "\\([^;\t]*\\)\\(;\\)")
@@ -390,7 +390,11 @@ these lines in your .emacs:
   (concat (syntax-begin '("PREDICATE")) ws+ symbol ws+ "\\(<\\)" ws+ symbol))
 
 (defconst factor-alien-function-regex
-  (concat (syntax-begin '("GL-FUNCTION" "FUNCTION" "GL-CALLBACK" "CALLBACK"))
+  (concat (syntax-begin '("CALLBACK"
+                          "FUNCTION"
+                          "GL-CALLBACK"
+                          "GL-FUNCTION"
+                          "X-FUNCTION"))
           ws+ symbol
           ws+ symbol ws+))
 

diff --git a/misc/fuel/strange-syntax.factor b/misc/fuel/strange-syntax.factor
index 7a13ffd681fdb40b50046aa7d10e893137b4183d..40e608f92b7cd8045ff292afade1b6767ca93714 100644 (file)
--- a/misc/fuel/strange-syntax.factor
+++ b/misc/fuel/strange-syntax.factor
@@ -51,7 +51,9 @@ C-TYPE: cairo_snurface_t
 ! ! CHAR
 : stuff-with-chars ( -- K \n )
     CHAR: K
-    CHAR: \n ;
+    CHAR: \n
+    CHAR: \"        ! <- \" should be highlighted
+    drop ;
 
 ! ! MAIN
 : majn ( -- ) ;