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

FUEL: makes accessors and tuple slots with backslashes highlight correctly

char-rename
Björn Lindqvist 2016-06-30 02:42:23 +02:00
parent e8a62460aa
commit a284660490
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,8 @@ these lines in your .emacs:
;;; Regexps galore: ;;; Regexps galore:
;; Utility regexp used by other regexps to match a Factor symbol name ;; Utility regexp used by other regexps to match a Factor symbol name
(setq-local symbol "\\(\\(?:\\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 ws+ "[ \n\t]+")
(setq-local symbols-to-semicolon "\\([^;\t]*\\)\\(;\\)") (setq-local symbols-to-semicolon "\\([^;\t]*\\)\\(;\\)")
@ -320,10 +321,10 @@ these lines in your .emacs:
(one-symbol "<[^ >]+>")) (one-symbol "<[^ >]+>"))
(defconst factor-getter-regex (defconst factor-getter-regex
(one-symbol "\\(?:\\sw\\|\\s_\\)+>>")) (one-symbol (concat symbol-nc ">>")))
(defconst factor-setter-regex (defconst factor-setter-regex
(one-symbol ">>\\(?:\\sw\\|\\s_\\)+\\|\\(?:\\sw\\|\\s_\\)+<<")) (one-symbol (format ">>%s\\|%s<<" symbol-nc symbol-nc)))
(defconst factor-stack-effect-regex (defconst factor-stack-effect-regex
"\\( ( [^)]* )\\)\\|\\( (( [^)]* ))\\)") "\\( ( [^)]* )\\)\\|\\( (( [^)]* ))\\)")
@ -502,7 +503,8 @@ these lines in your .emacs:
(4 'factor-font-lock-type-name nil t) (4 'factor-font-lock-type-name nil t)
;; A 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_\\)+\\)[^}]+\\)" (,(format
"\\(?:{[ \n]+%s[^}]+\\)}\\|%s" symbol symbol)
(factor-find-end-of-def) (factor-find-end-of-def)
nil nil
(1 'factor-font-lock-symbol nil t) (1 'factor-font-lock-symbol nil t)

24
misc/fuel/strange-syntax.factor
View File

@ -1,3 +1,8 @@
USING: accessors ;
IN: strange
TUPLE: oh\no { and/again initial: "meh" } ;
! FUEL Syntax Demo ! FUEL Syntax Demo
! !
! The purpose of this file is to test that corner cases are ! The purpose of this file is to test that corner cases are
@ -18,12 +23,21 @@ TUPLE: a-tuple slot1 slot2 { slot3 integer } ;
! ! Symbol names ! ! Symbol names
TUPLE: tup
ko
get\it
{ eh\ integer }
{ oh'ho } ;
! All slashes are symbol constituents. ! All slashes are symbol constituents.
: hack/slash ( -- x ) 10 ; : hack/slash ( t -- x ) ko>> ;
: slash\hack ( -- y ) 20 ; : um ( x y -- ) get\it<< ;
TUPLE: oh\no ; : slash\hack ( m -- y )
get\it>> dup >>get\it ;
TUPLE: oh\no { and/again initial: "meh" } ;
! As are quotes ! As are quotes
: don't-do-that ( x -- y ) ; : don't-do-that ( x -- y ) ;
@ -56,3 +70,7 @@ ID-SYNTAX ID-SYNTAX
! ! Numbers ! ! Numbers
{ -55 -0x10 100,00 1,000,000 0x2000,0000 0b01 } drop { -55 -0x10 100,00 1,000,000 0x2000,0000 0b01 } drop
! ! Containers
V{ 1 2 3 } drop
HS{ 9 8 3 } drop