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

FUEL: improved highlighting of alien syntax; TYPEDEF, C-TYPE, STRUCT and UNION-STRUCT

db4
Björn Lindqvist 2013-09-20 14:09:10 +02:00 committed by John Benediktsson
parent 140252f6f4
commit 85c02e0e0d
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,6 +189,9 @@ source/docs/tests file. When set to false, you'll be asked only once."
;;; Regexps galore: ;;; Regexps galore:
;; Utility regexp used by other regexps to match a Factor symbol name
(setq-local symbol "\\(\\(?:\\sw\\|\\s_\\)+\\)")
;; Excludes parsing words that are handled by other regexps ;; Excludes parsing words that are handled by other regexps
(defconst factor-parsing-words (defconst factor-parsing-words
'(":" "::" ";" "&:" "<<" "<PRIVATE" ">>" '(":" "::" ";" "&:" "<<" "<PRIVATE" ">>"
@ -211,9 +214,9 @@ 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:" "STRUCT:" "SYMBOLS:" "SYNTAX:" "SPECIALIZED-ARRAYS:" "STRING:" "SYMBOLS:" "SYNTAX:"
"TYPEDEF:" "TYPED:" "TYPED::" "TYPEDEF:" "TYPED:" "TYPED::"
"UNIFORM-TUPLE:" "UNION:" "UNION-STRUCT:" "USE:" "UNIFORM-TUPLE:" "UNION:" "USE:"
"VARIANT:" "VERTEX-FORMAT:")) "VARIANT:" "VERTEX-FORMAT:"))
(defconst factor-parsing-words-regex (defconst factor-parsing-words-regex
@ -316,7 +319,7 @@ source/docs/tests file. When set to false, you'll be asked only once."
(defconst factor-sub-vocab-regex "^<\\([^ \n]+\\) *$") (defconst factor-sub-vocab-regex "^<\\([^ \n]+\\) *$")
(defconst factor-alien-function-regex (defconst factor-alien-function-regex
"\\_<FUNCTION: +\\(\\w+\\)[\n ]+\\(\\w+\\)") (format "\\_<FUNCTION: +%s[\n ]+%s" symbol symbol))
(defconst factor-alien-function-alias-regex (defconst factor-alien-function-alias-regex
"\\_<FUNCTION-ALIAS: +\\(\\w+\\)[\n ]+\\(\\w+\\)[\n ]+\\(\\w+\\)") "\\_<FUNCTION-ALIAS: +\\(\\w+\\)[\n ]+\\(\\w+\\)[\n ]+\\(\\w+\\)")
@ -400,13 +403,13 @@ source/docs/tests file. When set to false, you'll be asked only once."
"\\_<C: +\\(\\w+\\) +\\(\\w+\\)\\( .*\\)?$") "\\_<C: +\\(\\w+\\) +\\(\\w+\\)\\( .*\\)?$")
(defconst factor-typedef-regex (defconst factor-typedef-regex
"\\_<TYPEDEF: +\\(\\w+\\) +\\(\\w+\\)\\( .*\\)?$") (format "\\_<TYPEDEF: +%s %s\\( .*\\)?$" symbol symbol))
(defconst factor-c-global-regex (defconst factor-c-global-regex
"\\_<C-GLOBAL: +\\(\\w+\\) +\\(\\w+\\)\\( .*\\)?$") "\\_<C-GLOBAL: +\\(\\w+\\) +\\(\\w+\\)\\( .*\\)?$")
(defconst factor-c-type-regex (defconst factor-c-type-regex
"\\_<C-TYPE: +\\(\\w+\\)\\( .*\\)?$") (format "\\_<C-TYPE: +%s\\( .*\\)?$" symbol))
(defconst factor-rename-regex (defconst factor-rename-regex
"\\_<RENAME: +\\(\\w+\\) +\\(\\w+\\) +=> +\\(\\w+\\)\\( .*\\)?$") "\\_<RENAME: +\\(\\w+\\) +\\(\\w+\\) +=> +\\(\\w+\\)\\( .*\\)?$")
@ -462,16 +465,22 @@ source/docs/tests file. When set to false, you'll be asked only once."
(,factor-after-definition-regex (1 'factor-font-lock-type-name) (,factor-after-definition-regex (1 'factor-font-lock-type-name)
(2 'factor-font-lock-word)) (2 'factor-font-lock-word))
;; Highlights tuple definitions. The TUPLE parsing word, tuple ;; Highlights tuple and struct definitions. The TUPLE/STRUCT
;; name and optional parent tuple are matched in three ;; parsing word, class name and optional parent classes are
;; groups. Then the text up until the tuple definition is ;; matched in three groups. Then the text up until the end of the
;; terminated with ";" is searched for words that are slot names ;; definition that is terminated with ";" is searched for words
;; which are highlighted with the face factor-font-lock-symbol. ;; that are slot names which are highlighted with the face
(,"\\(TUPLE\\):[ \n]+\\(\\(?:\\sw\\|\\s_\\)+\\)\\(?:[ \n]+<[ \n]+\\(\\(?:\\sw\\|\\s_\\)+\\)\\)?" ;; factor-font-lock-symbol.
(,(format
"\\(%s\\):[ \n]+%s\\(?:[ \n]+<[ \n]+%s\\)?"
(regexp-opt '("STRUCT" "TUPLE" "UNION-STRUCT"))
symbol
symbol)
(1 'factor-font-lock-parsing-word) (1 'factor-font-lock-parsing-word)
(2 'factor-font-lock-type-name) (2 'factor-font-lock-type-name)
(3 'factor-font-lock-type-name nil t) (3 'factor-font-lock-type-name nil t)
;; A tuple slot is either a single symbol or a sequence along the ;; A slot is either a single symbol or a sequence along the
;; lines: { foo initial: "bar } ;; lines: { foo initial: "bar }
("\\(\\(?:\\sw\\|\\s_\\)+\\)\\|\\(?:{[ \n]+\\(\\(?:\\sw\\|\\s_\\)+\\)[^}]+\\)" ("\\(\\(?:\\sw\\|\\s_\\)+\\)\\|\\(?:{[ \n]+\\(\\(?:\\sw\\|\\s_\\)+\\)[^}]+\\)"
((lambda (&rest foo) ((lambda (&rest foo)