diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 554268892e..cb0b1fc09d 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -33,7 +33,7 @@ else set iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 endif -syn cluster factorCluster contains=factorComment,factorFryDirective,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorCompileDirective,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFryDirective,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -56,7 +56,7 @@ syn region None matchgroup=factorPrivate start=/\</ end=/\\>/ syn keyword factorBoolean f t syn match factorFryDirective /\<\(@\|_\)\>/ contained -syn keyword factorCompileDirective inline foldable recursive +syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive <% @@ -246,7 +246,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorBackslash Special HiLink factorLiteral Special HiLink factorLiteralBlock Special - HiLink factorCompileDirective Typedef + HiLink factorDeclaration Typedef HiLink factorSymbol Define HiLink factorConstant Define HiLink factorSingleton Define diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 7c0ddd553b..3bba6eb4b1 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -1,4 +1,3 @@ - " Vim syntax file " Language: Factor " Maintainer: Alex Chapman @@ -23,7 +22,7 @@ else set iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 endif -syn cluster factorCluster contains=factorComment,factorFryDirective,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorCompileDirective,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFryDirective,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -46,7 +45,7 @@ syn region None matchgroup=factorPrivate start=/\</ end=/\\>/ syn keyword factorBoolean f t syn match factorFryDirective /\<\(@\|_\)\>/ contained -syn keyword factorCompileDirective inline foldable recursive +syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive syn keyword factorKeyword or 2bi 2tri while wrapper nip 4dip wrapper? bi* callstack>array both? hashcode die dupd callstack callstack? 3dup tri@ pick curry build ?execute 3bi prepose >boolean ?if clone eq? tri* ? = swapd 2over 2keep 3keep clear 2dup when not tuple? dup 2bi* 2tri* call tri-curry object bi@ do unless* if* loop bi-curry* drop when* assert= retainstack assert? -rot execute 2bi@ 2tri@ boa with either? 3drop bi curry? datastack until 3dip over 3curry tri-curry* tri-curry@ swap and 2nip throw bi-curry (clone) hashcode* compose 2dip if 3tri unless compose? tuple keep 2curry equal? assert tri 2drop most boolean? identity-hashcode identity-tuple? null new dip bi-curry@ rot xor identity-tuple boolean syn keyword factorKeyword ?at assoc? assoc-clone-like assoc= delete-at* assoc-partition extract-keys new-assoc value? assoc-size map>assoc push-at assoc-like key? assoc-intersect assoc-refine update assoc-union assoc-combine at* assoc-empty? at+ set-at assoc-all? assoc-subset? assoc-hashcode change-at assoc-each assoc-diff zip values value-at rename-at inc-at enum? at cache assoc>map assoc assoc-map enum value-at* assoc-map-as >alist assoc-filter-as clear-assoc assoc-stack maybe-set-at substitute assoc-filter 2cache delete-at assoc-find keys assoc-any? unzip @@ -234,7 +233,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorBackslash Special HiLink factorLiteral Special HiLink factorLiteralBlock Special - HiLink factorCompileDirective Typedef + HiLink factorDeclaration Typedef HiLink factorSymbol Define HiLink factorConstant Define HiLink factorSingleton Define