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

FUEL: fixed font-locking of SYMBOLS

db4
Björn Lindqvist 2013-12-03 15:28:21 +01:00 committed by John Benediktsson
parent 71ad43c0ab
commit b1b146e709
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,7 +225,7 @@ source/docs/tests file. When set to false, you'll be asked only once."
"QUALIFIED-WITH:" "QUALIFIED:" "QUALIFIED-WITH:" "QUALIFIED:"
"read-only" "RENAME:" "REQUIRE:" "REQUIRES:" "read-only" "RENAME:" "REQUIRE:" "REQUIRES:"
"SINGLETON:" "SINGLETONS:" "SLOT:" "SPECIALIZED-ARRAY:" "SINGLETON:" "SINGLETONS:" "SLOT:" "SPECIALIZED-ARRAY:"
"SPECIALIZED-ARRAYS:" "STRING:" "SYMBOLS:" "SYNTAX:" "SPECIALIZED-ARRAYS:" "STRING:" "SYNTAX:"
"TYPEDEF:" "TYPED:" "TYPED::" "TYPEDEF:" "TYPED:" "TYPED::"
"UNIFORM-TUPLE:" "UNION:" "USE:" "UNIFORM-TUPLE:" "UNION:" "USE:"
"VARIANT:" "VERTEX-FORMAT:")) "VARIANT:" "VERTEX-FORMAT:"))
@ -291,12 +291,20 @@ source/docs/tests file. When set to false, you'll be asked only once."
(defconst factor-alias-definition-regex (defconst factor-alias-definition-regex
"^ALIAS: +\\(\\_<.+?\\_>\\) +\\(\\_<.+?\\_>\\)") "^ALIAS: +\\(\\_<.+?\\_>\\) +\\(\\_<.+?\\_>\\)")
;; Vocabulary patterns
(defconst factor-vocab-ref-regex (defconst factor-vocab-ref-regex
(factor-second-word-regex (factor-second-word-regex
'("IN:" "USE:" "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]*\\);")
;; Symbols
(defconst factor-symbol-definition-regex
(factor-second-word-regex
'("&:" "CONSTANT:" "DESTRUCTOR:" "FORGET:" "SYMBOL:" "VAR:")))
(defconst factor-symbols-lines-regex "^\\(SYMBOLS\\):[ \n]+\\([^;\t]*\\);")
(defconst factor-int-constant-def-regex (defconst factor-int-constant-def-regex
(factor-second-word-regex '("ALIEN:" "CHAR:" "NAN:"))) (factor-second-word-regex '("ALIEN:" "CHAR:" "NAN:")))
@ -317,10 +325,6 @@ source/docs/tests file. When set to false, you'll be asked only once."
(defconst factor-setter-regex (defconst factor-setter-regex
"\\_<>>\\(?:\\sw\\|\\s_\\)+\\_>") "\\_<>>\\(?:\\sw\\|\\s_\\)+\\_>")
(defconst factor-symbol-definition-regex
(factor-second-word-regex
'("&:" "CONSTANT:" "DESTRUCTOR:" "FORGET:" "SYMBOL:" "VAR:")))
(defconst factor-stack-effect-regex (defconst factor-stack-effect-regex
"\\( ( [^)]* )\\)\\|\\( (( [^)]* ))\\)") "\\( ( [^)]* )\\)\\|\\( (( [^)]* ))\\)")
@ -426,6 +430,8 @@ 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))
(,factor-symbols-lines-regex (1 'factor-font-lock-parsing-word)
(2 'factor-font-lock-word))
(,(format "^\\(FROM\\|EXCLUDE\\):[ \n]+%s[ \n]+=>+\\([^;\t]*\\);" symbol) (,(format "^\\(FROM\\|EXCLUDE\\):[ \n]+%s[ \n]+=>+\\([^;\t]*\\);" symbol)
(1 'factor-font-lock-parsing-word) (1 'factor-font-lock-parsing-word)
(2 'factor-font-lock-vocabulary-name) (2 'factor-font-lock-vocabulary-name)