Merge branch 'master' of git://factorcode.org/git/factor
commit
7131882b32
|
@ -240,20 +240,19 @@
|
||||||
(modify-syntax-entry ?\r " " table)
|
(modify-syntax-entry ?\r " " table)
|
||||||
(modify-syntax-entry ?\ " " table)
|
(modify-syntax-entry ?\ " " table)
|
||||||
(modify-syntax-entry ?\n " " table)
|
(modify-syntax-entry ?\n " " table)
|
||||||
(modify-syntax-entry ?\( "()" table)
|
|
||||||
(modify-syntax-entry ?\) ")(" table)
|
|
||||||
table))
|
table))
|
||||||
|
|
||||||
(defconst fuel-syntax--syntactic-keywords
|
(defconst fuel-syntax--syntactic-keywords
|
||||||
`(;; CHARs:
|
`(;; Comments
|
||||||
("\\(CHAR:\\|POSTPONE:\\|\\\\\\) \\(.\\)\\( \\|$\\)" (2 "w"))
|
|
||||||
;; Comments:
|
|
||||||
("\\_<\\(#?!\\) .*\\(\n\\|$\\)" (1 "<") (2 ">"))
|
("\\_<\\(#?!\\) .*\\(\n\\|$\\)" (1 "<") (2 ">"))
|
||||||
("\\_<\\(#?!\\)\\(\n\\|$\\)" (1 "<") (2 ">"))
|
("\\_<\\(#?!\\)\\(\n\\|$\\)" (1 "<") (2 ">"))
|
||||||
;; Strings
|
;; Strings and chars
|
||||||
|
("CHAR: \\(\"\\) [^\\\"]*?\\(\"\\)\\([^\\\"]\\|\\\\.\\)*?\\(\"\\)"
|
||||||
|
(1 "w") (2 "\"") (4 "\""))
|
||||||
|
("\\(CHAR:\\|POSTPONE:\\|\\\\\\) \\(.\\)\\( \\|$\\)" (2 "w"))
|
||||||
("\\( \\|^\\)\\(DLL\\|P\\|SBUF\\)\\(\"\\)\\([^\n\r\f\\\"]\\|\\\\.\\)*?\\(\"\\)"
|
("\\( \\|^\\)\\(DLL\\|P\\|SBUF\\)\\(\"\\)\\([^\n\r\f\\\"]\\|\\\\.\\)*?\\(\"\\)"
|
||||||
(3 "\"") (5 "\""))
|
(3 "\"") (5 "\""))
|
||||||
("\\(\"\\)\\([^\n\r\f\\\"]\\|\\\\.\\)*?\\(\"\\)" (1 "\"") (3 "\""))
|
("\\_<\\(\"\\)\\([^\n\r\f\\\"]\\|\\\\.\\)*?\\(\"\\)" (1 "\"") (3 "\""))
|
||||||
("\\_<<\\(\"\\)\\_>" (1 "<b"))
|
("\\_<<\\(\"\\)\\_>" (1 "<b"))
|
||||||
("\\_<\\(\"\\)>\\_>" (1 ">b"))
|
("\\_<\\(\"\\)>\\_>" (1 ">b"))
|
||||||
;; Multiline constructs
|
;; Multiline constructs
|
||||||
|
@ -277,6 +276,8 @@
|
||||||
;; Parenthesis:
|
;; Parenthesis:
|
||||||
("\\_<\\((\\)\\_>" (1 "()"))
|
("\\_<\\((\\)\\_>" (1 "()"))
|
||||||
("\\_<\\()\\)\\_>" (1 ")("))
|
("\\_<\\()\\)\\_>" (1 ")("))
|
||||||
|
("\\_<(\\((\\)\\_>" (1 "()"))
|
||||||
|
("\\_<\\()\\))\\_>" (1 ")("))
|
||||||
;; Quotations:
|
;; Quotations:
|
||||||
("\\_<'\\(\\[\\)\\_>" (1 "(]")) ; fried
|
("\\_<'\\(\\[\\)\\_>" (1 "(]")) ; fried
|
||||||
("\\_<\\(\\[\\)\\_>" (1 "(]"))
|
("\\_<\\(\\[\\)\\_>" (1 "(]"))
|
||||||
|
|
Loading…
Reference in New Issue