From 5ac122d03044adbf03005f72bb8887ee441035d2 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Wed, 9 Mar 2011 20:34:00 +0900 Subject: [PATCH 01/18] misc/vim/syntax/factor.vim: capitalize the first letter of "Language" header line --- misc/factor.vim.fgen | 4 ++-- misc/vim/syntax/factor.vim | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index c000145506..554268892e 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -10,9 +10,9 @@ IN: factor.vim.fgen %> " Vim syntax file -" Language: factor +" Language: Factor " Maintainer: Alex Chapman -" Last Change: 2009 May 19 +" Last Change: 2011 Mar 09 " To run: USE: html.templates.fhtml "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index ec17dec330..7c0ddd553b 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -1,8 +1,8 @@ " Vim syntax file -" Language: factor +" Language: Factor " Maintainer: Alex Chapman -" Last Change: 2009 May 19 +" Last Change: 2011 Mar 09 " To run: USE: html.templates.fhtml "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items From 4629d7b51b49cbc16a6e3cbc50a3ecaf66753447 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Wed, 9 Mar 2011 23:05:14 +0900 Subject: [PATCH 02/18] misc/vim/syntax/factor.vim: a few minor changes: - delete first line - rename factorCompileDirective to factorDeclaration - support for more declarations --- misc/factor.vim.fgen | 6 +++--- misc/vim/syntax/factor.vim | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) 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 From 4468f1e2e061f23eb1b5a9f8519c4cc68e9ae9d3 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 00:14:34 +0900 Subject: [PATCH 03/18] misc/vim/syntax/factor.vim: add support for ALIAS: syntax --- misc/factor.vim.fgen | 5 +++-- misc/vim/syntax/factor.vim | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index cb0b1fc09d..c61861c9b6 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -12,7 +12,7 @@ IN: factor.vim.fgen " Vim syntax file " Language: Factor " Maintainer: Alex Chapman -" Last Change: 2011 Mar 09 +" Last Change: 2011 Mar 10 " To run: USE: html.templates.fhtml "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -110,7 +110,7 @@ syn region factorTuple start=/\/ end=/\<;\>/ syn region factorStruct start=/\<\(UNION-STRUCT:\|STRUCT:\)\>/ end=/\<;\>/ syn match factorConstant /\/ -syn match factorAlias /\/ +syn match factorAlias /\/ syn match factorSingleton /\/ syn match factorPostpone /\/ syn match factorDefer /\/ @@ -249,6 +249,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorDeclaration Typedef HiLink factorSymbol Define HiLink factorConstant Define + HiLink factorAlias Define HiLink factorSingleton Define HiLink factorSingletons Define HiLink factorMixin Typedef diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 3bba6eb4b1..e7a881d6fb 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Factor " Maintainer: Alex Chapman -" Last Change: 2011 Mar 09 +" Last Change: 2011 Mar 10 " To run: USE: html.templates.fhtml "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -97,7 +97,7 @@ syn region factorTuple start=/\/ end=/\<;\>/ syn region factorStruct start=/\<\(UNION-STRUCT:\|STRUCT:\)\>/ end=/\<;\>/ syn match factorConstant /\/ -syn match factorAlias /\/ +syn match factorAlias /\/ syn match factorSingleton /\/ syn match factorPostpone /\/ syn match factorDefer /\/ @@ -236,6 +236,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorDeclaration Typedef HiLink factorSymbol Define HiLink factorConstant Define + HiLink factorAlias Define HiLink factorSingleton Define HiLink factorSingletons Define HiLink factorMixin Typedef From 3bf15931fc78c36e6a4f835fc685f523da7e2ccd Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 00:30:07 +0900 Subject: [PATCH 04/18] misc/vim/syntax/factor.vim: rename factorFryDirective to factorFrySpecifier --- misc/factor.vim.fgen | 6 +++--- misc/vim/syntax/factor.vim | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index c61861c9b6..3cf4319f21 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,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,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 @@ -55,7 +55,7 @@ syn region None matchgroup=factorPrivate start=/\</ end=/\\>/ syn keyword factorBoolean f t -syn match factorFryDirective /\<\(@\|_\)\>/ contained +syn match factorFrySpecifier /\<\(@\|_\)\>/ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive <% @@ -204,7 +204,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorConditional Conditional HiLink factorKeyword Keyword HiLink factorOperator Operator - HiLink factorFryDirective Operator + HiLink factorFrySpecifier Operator HiLink factorBoolean Boolean HiLink factorDefnDelims Typedef HiLink factorMethodDelims Typedef diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index e7a881d6fb..c21199dcc1 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -22,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,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,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 @@ -44,7 +44,7 @@ syn region None matchgroup=factorPrivate start=/\</ end=/\\>/ syn keyword factorBoolean f t -syn match factorFryDirective /\<\(@\|_\)\>/ contained +syn match factorFrySpecifier /\<\(@\|_\)\>/ contained 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 @@ -191,7 +191,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorConditional Conditional HiLink factorKeyword Keyword HiLink factorOperator Operator - HiLink factorFryDirective Operator + HiLink factorFrySpecifier Operator HiLink factorBoolean Boolean HiLink factorDefnDelims Typedef HiLink factorMethodDelims Typedef From b25c605563210138a529c9c20c4f697517308910 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 02:26:28 +0900 Subject: [PATCH 05/18] misc/vim/syntax/factor.vim: add support for EXCLUDE: syntax --- misc/factor.vim.fgen | 2 ++ misc/vim/syntax/factor.vim | 2 ++ 2 files changed, 4 insertions(+) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 3cf4319f21..92d1e34d9d 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -101,6 +101,7 @@ syn region factorLiteralBlock start=/\<\$\[\>/ end=/\<\]\>/ syn region factorUsing start=/\/ end=/;/ syn match factorQualified /\/ syn match factorQualifiedWith /\/ +syn region factorExclude start=/\/ end=/;/ syn region factorFrom start=/\/ end=/;/ syn region factorSingletons start=/\/ end=/;/ syn match factorSymbol /\/ @@ -237,6 +238,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorUsing Include HiLink factorQualified Include HiLink factorQualifiedWith Include + HiLink factorExclude Include HiLink factorFrom Include HiLink factorUse Include HiLink factorUnuse Include diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index c21199dcc1..2d37dbb219 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -88,6 +88,7 @@ syn region factorLiteralBlock start=/\<\$\[\>/ end=/\<\]\>/ syn region factorUsing start=/\/ end=/;/ syn match factorQualified /\/ syn match factorQualifiedWith /\/ +syn region factorExclude start=/\/ end=/;/ syn region factorFrom start=/\/ end=/;/ syn region factorSingletons start=/\/ end=/;/ syn match factorSymbol /\/ @@ -224,6 +225,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorUsing Include HiLink factorQualified Include HiLink factorQualifiedWith Include + HiLink factorExclude Include HiLink factorFrom Include HiLink factorUse Include HiLink factorUnuse Include From a7ed4c8c458c7c2c0aa78bd1ffccdf6038121a54 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 02:31:08 +0900 Subject: [PATCH 06/18] misc/vim/syntax/factor.vim: add support for RENAME: syntax --- misc/factor.vim.fgen | 2 ++ misc/vim/syntax/factor.vim | 2 ++ 2 files changed, 4 insertions(+) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 92d1e34d9d..9498367382 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -103,6 +103,7 @@ syn match factorQualified /\/ syn match factorQualifiedWith /\/ syn region factorExclude start=/\/ end=/;/ syn region factorFrom start=/\/ end=/;/ +syn region factorRename start=/\/ end=/;/ syn region factorSingletons start=/\/ end=/;/ syn match factorSymbol /\/ syn region factorSymbols start=/\/ end=/;/ @@ -240,6 +241,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorQualifiedWith Include HiLink factorExclude Include HiLink factorFrom Include + HiLink factorRename Include HiLink factorUse Include HiLink factorUnuse Include HiLink factorIn Define diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 2d37dbb219..9f7a0cc4af 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -90,6 +90,7 @@ syn match factorQualified /\/ syn match factorQualifiedWith /\/ syn region factorExclude start=/\/ end=/;/ syn region factorFrom start=/\/ end=/;/ +syn region factorRename start=/\/ end=/;/ syn region factorSingletons start=/\/ end=/;/ syn match factorSymbol /\/ syn region factorSymbols start=/\/ end=/;/ @@ -227,6 +228,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorQualifiedWith Include HiLink factorExclude Include HiLink factorFrom Include + HiLink factorRename Include HiLink factorUse Include HiLink factorUnuse Include HiLink factorIn Define From e4bd8e98fcc68bdb3216e304bd0e809ef4d6cd8e Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 19:20:01 +0900 Subject: [PATCH 07/18] Update factorSbuf in misc/factor.vim.fgen --- misc/factor.vim.fgen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 9498367382..195f251ca6 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -142,7 +142,7 @@ syn cluster factorWordOps contains=factorConstant,factorAlias,factorSingle syn region factorString start=/\<"/ skip=/\\"/ end=/"/ syn region factorTriString start=/\<"""/ skip=/\\"/ end=/"""/ -syn region factorSbuf start=/\/ skip=/\\"/ end=/"/ +syn region factorSbuf start=/\<[-a-zA-Z0-9]\+"\>/ skip=/\\"/ end=/"/ syn region factorMultiString matchgroup=factorMultiStringDelims start=/\/ end=/^;$/ contains=factorMultiStringContents syn match factorMultiStringContents /.*/ contained From 9a8c717cba2518075ebff5ab80b9d4a13e222efe Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 19:30:42 +0900 Subject: [PATCH 08/18] misc/vim/syntax/factor.vim: add support for SYMBOLS: syntax --- misc/factor.vim.fgen | 1 + misc/vim/syntax/factor.vim | 1 + 2 files changed, 2 insertions(+) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 195f251ca6..ddf3f07fd3 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -252,6 +252,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorLiteralBlock Special HiLink factorDeclaration Typedef HiLink factorSymbol Define + HiLink factorSymbols Define HiLink factorConstant Define HiLink factorAlias Define HiLink factorSingleton Define diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 9f7a0cc4af..4865d96e46 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -239,6 +239,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorLiteralBlock Special HiLink factorDeclaration Typedef HiLink factorSymbol Define + HiLink factorSymbols Define HiLink factorConstant Define HiLink factorAlias Define HiLink factorSingleton Define From d76cc21f1f4beb6c86d7017e80ac78728f767a6e Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 19:35:19 +0900 Subject: [PATCH 09/18] misc/vim/syntax/factor.vim: update "To run" --- misc/factor.vim.fgen | 2 +- misc/vim/syntax/factor.vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index ddf3f07fd3..7b56356550 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -13,7 +13,7 @@ IN: factor.vim.fgen " Language: Factor " Maintainer: Alex Chapman " Last Change: 2011 Mar 10 -" To run: USE: html.templates.fhtml "resource:misc/factor.vim.fgen" call-template +" To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 4865d96e46..2e602794fc 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -2,7 +2,7 @@ " Language: Factor " Maintainer: Alex Chapman " Last Change: 2011 Mar 10 -" To run: USE: html.templates.fhtml "resource:misc/factor.vim.fgen" call-template +" To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded From fdc562c8f3d4175ecfb59d30e84cc61b88642266 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 20:22:44 +0900 Subject: [PATCH 10/18] misc/vim/syntax/factor.vim: add support for UNION: syntax --- misc/factor.vim.fgen | 2 ++ misc/vim/syntax/factor.vim | 2 ++ 2 files changed, 4 insertions(+) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 7b56356550..26ca1e78e4 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -109,6 +109,7 @@ syn match factorSymbol /\/ syn region factorSymbols start=/\/ end=/;/ syn region factorConstructor2 start=/\/ end=/\<;\>/ +syn region factorUnion start=/\/ end=/\<;\>/ syn region factorStruct start=/\<\(UNION-STRUCT:\|STRUCT:\)\>/ end=/\<;\>/ syn match factorConstant /\/ @@ -266,6 +267,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorForget Define HiLink factorAlien Define HiLink factorTuple Typedef + HiLink factorUnion Typedef HiLink factorStruct Typedef if &bg == "dark" diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 2e602794fc..703ad6d07f 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -96,6 +96,7 @@ syn match factorSymbol /\/ syn region factorSymbols start=/\/ end=/;/ syn region factorConstructor2 start=/\/ end=/\<;\>/ +syn region factorUnion start=/\/ end=/\<;\>/ syn region factorStruct start=/\<\(UNION-STRUCT:\|STRUCT:\)\>/ end=/\<;\>/ syn match factorConstant /\/ @@ -253,6 +254,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorForget Define HiLink factorAlien Define HiLink factorTuple Typedef + HiLink factorUnion Typedef HiLink factorStruct Typedef if &bg == "dark" From 55840ae6a15a309c0dd07ea8d143d7afc4ecf702 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 20:24:23 +0900 Subject: [PATCH 11/18] misc/vim/syntax/factor.vim: highlighting of breakpoint --- misc/factor.vim.fgen | 4 +++- misc/vim/syntax/factor.vim | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 26ca1e78e4..16e589140e 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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,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 @@ -55,6 +55,7 @@ syn region None matchgroup=factorPrivate start=/\</ end=/\\>/ syn keyword factorBoolean f t +syn keyword factorBreakpoint B syn match factorFrySpecifier /\<\(@\|_\)\>/ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive @@ -209,6 +210,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorOperator Operator HiLink factorFrySpecifier Operator HiLink factorBoolean Boolean + HiLink factorBreakpoint Debug HiLink factorDefnDelims Typedef HiLink factorMethodDelims Typedef HiLink factorGenericDelims Typedef diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 703ad6d07f..3e52fbf9d0 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -22,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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,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 @@ -44,6 +44,7 @@ syn region None matchgroup=factorPrivate start=/\</ end=/\\>/ syn keyword factorBoolean f t +syn keyword factorBreakpoint B syn match factorFrySpecifier /\<\(@\|_\)\>/ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive @@ -196,6 +197,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorOperator Operator HiLink factorFrySpecifier Operator HiLink factorBoolean Boolean + HiLink factorBreakpoint Debug HiLink factorDefnDelims Typedef HiLink factorMethodDelims Typedef HiLink factorGenericDelims Typedef From 38eb0bd17efaba8a1bf0c65edc7841dad7e4dff4 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 10 Mar 2011 22:55:36 +0900 Subject: [PATCH 12/18] misc/vim/syntax/factor.vim: add support for SLOT: syntax --- misc/factor.vim.fgen | 4 +++- misc/vim/syntax/factor.vim | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 16e589140e..c7814c854f 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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -125,6 +125,7 @@ syn match factorHook /\/ syn match factorMain /\/ syn match factorConstructor /\/ syn match factorAlien /\/ +syn match factorSlot /\/ syn cluster factorWordOps contains=factorConstant,factorAlias,factorSingleton,factorSingletons,factorSymbol,factorSymbols,factorPostpone,factorDefer,factorForget,factorMixin,factorInstance,factorHook,factorMain,factorConstructor @@ -268,6 +269,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorDefer Define HiLink factorForget Define HiLink factorAlien Define + HiLink factorSlot Define HiLink factorTuple Typedef HiLink factorUnion Typedef HiLink factorStruct Typedef diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 3e52fbf9d0..3f4e5bec7a 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -22,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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -112,6 +112,7 @@ syn match factorHook /\/ syn match factorMain /\/ syn match factorConstructor /\/ syn match factorAlien /\/ +syn match factorSlot /\/ syn cluster factorWordOps contains=factorConstant,factorAlias,factorSingleton,factorSingletons,factorSymbol,factorSymbols,factorPostpone,factorDefer,factorForget,factorMixin,factorInstance,factorHook,factorMain,factorConstructor @@ -255,6 +256,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorDefer Define HiLink factorForget Define HiLink factorAlien Define + HiLink factorSlot Define HiLink factorTuple Typedef HiLink factorUnion Typedef HiLink factorStruct Typedef From 51d49f03cacc02d3ffb6f113781a67010375d3e0 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Sun, 13 Mar 2011 20:09:11 +0900 Subject: [PATCH 13/18] misc/vim/syntax/factor.vim: add support for INTERSECTION: syntax --- misc/factor.vim.fgen | 2 ++ misc/vim/syntax/factor.vim | 2 ++ 2 files changed, 4 insertions(+) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index c7814c854f..79b8287b99 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -109,6 +109,7 @@ syn region factorSingletons start=/\/ end=/;/ syn match factorSymbol /\/ syn region factorSymbols start=/\/ end=/;/ syn region factorConstructor2 start=/\/ end=/\<;\>/ syn region factorTuple start=/\/ end=/\<;\>/ syn region factorUnion start=/\/ end=/\<;\>/ syn region factorStruct start=/\<\(UNION-STRUCT:\|STRUCT:\)\>/ end=/\<;\>/ @@ -270,6 +271,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorForget Define HiLink factorAlien Define HiLink factorSlot Define + HiLink factorIntersection Typedef HiLink factorTuple Typedef HiLink factorUnion Typedef HiLink factorStruct Typedef diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 3f4e5bec7a..97ef8f38bb 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -96,6 +96,7 @@ syn region factorSingletons start=/\/ end=/;/ syn match factorSymbol /\/ syn region factorSymbols start=/\/ end=/;/ syn region factorConstructor2 start=/\/ end=/\<;\>/ syn region factorTuple start=/\/ end=/\<;\>/ syn region factorUnion start=/\/ end=/\<;\>/ syn region factorStruct start=/\<\(UNION-STRUCT:\|STRUCT:\)\>/ end=/\<;\>/ @@ -257,6 +258,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorForget Define HiLink factorAlien Define HiLink factorSlot Define + HiLink factorIntersection Typedef HiLink factorTuple Typedef HiLink factorUnion Typedef HiLink factorStruct Typedef From d79dba57e36a5bb543a7d810f8de796dd0b5ae44 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 15 Mar 2011 00:41:22 +0900 Subject: [PATCH 14/18] misc/vim/syntax/factor.vim: highlighting of 'call-next-method' --- misc/factor.vim.fgen | 6 ++++-- misc/vim/syntax/factor.vim | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 79b8287b99..e74755f6d1 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -12,7 +12,7 @@ IN: factor.vim.fgen " Vim syntax file " Language: Factor " Maintainer: Alex Chapman -" Last Change: 2011 Mar 10 +" Last Change: 2011 Mar 15 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -58,6 +58,7 @@ syn keyword factorBoolean f t syn keyword factorBreakpoint B syn match factorFrySpecifier /\<\(@\|_\)\>/ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive +syn keyword factorCallNextMethod call-next-method <% @@ -209,6 +210,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorRepeat Repeat HiLink factorConditional Conditional HiLink factorKeyword Keyword + HiLink factorCallNextMethod Keyword HiLink factorOperator Operator HiLink factorFrySpecifier Operator HiLink factorBoolean Boolean diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 97ef8f38bb..004cb4d33b 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Factor " Maintainer: Alex Chapman -" Last Change: 2011 Mar 10 +" Last Change: 2011 Mar 15 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -22,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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -47,6 +47,7 @@ syn keyword factorBoolean f t syn keyword factorBreakpoint B syn match factorFrySpecifier /\<\(@\|_\)\>/ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive +syn keyword factorCallNextMethod call-next-method 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 @@ -196,6 +197,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorRepeat Repeat HiLink factorConditional Conditional HiLink factorKeyword Keyword + HiLink factorCallNextMethod Keyword HiLink factorOperator Operator HiLink factorFrySpecifier Operator HiLink factorBoolean Boolean From 771577c5a3b404af7a363f57b6f643a9bc716ab2 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 15 Mar 2011 00:58:52 +0900 Subject: [PATCH 15/18] misc/vim/syntax/factor.vim: add support for 'call( stack -- effect )' syntax --- misc/factor.vim.fgen | 4 +++- misc/vim/syntax/factor.vim | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index e74755f6d1..3df14b56d6 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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -58,6 +58,7 @@ syn keyword factorBoolean f t syn keyword factorBreakpoint B syn match factorFrySpecifier /\<\(@\|_\)\>/ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive +syn match factorCallQuotation /\/ syn keyword factorCallNextMethod call-next-method <% @@ -210,6 +211,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorRepeat Repeat HiLink factorConditional Conditional HiLink factorKeyword Keyword + HiLink factorCallQuotation Keyword HiLink factorCallNextMethod Keyword HiLink factorOperator Operator HiLink factorFrySpecifier Operator diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 004cb4d33b..34153b6f86 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -22,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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -47,6 +47,7 @@ syn keyword factorBoolean f t syn keyword factorBreakpoint B syn match factorFrySpecifier /\<\(@\|_\)\>/ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive +syn match factorCallQuotation /\/ syn keyword factorCallNextMethod call-next-method 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 @@ -197,6 +198,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorRepeat Repeat HiLink factorConditional Conditional HiLink factorKeyword Keyword + HiLink factorCallQuotation Keyword HiLink factorCallNextMethod Keyword HiLink factorOperator Operator HiLink factorFrySpecifier Operator From 334b2b57e08393f4af1ade262f99ee0785f98a4b Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 15 Mar 2011 01:04:08 +0900 Subject: [PATCH 16/18] misc/vim/syntax/factor.vim: fix factorStackEffect, factorLiteralStackEffect match patterns --- misc/factor.vim.fgen | 4 ++-- misc/vim/syntax/factor.vim | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 3df14b56d6..3f16aa8d9e 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -156,8 +156,8 @@ syn match factorMultiStringContents /.*/ contained "syn match factorStackEffectErr /\<)\>/ "syn region factorStackEffectErr start=/\<(\>/ end=/\<)\>/ "syn region factorStackEffect start=/\<(\>/ end=/\<)\>/ contained -syn match factorStackEffect /\<( .*--.* )\>/ contained -syn match factorLiteralStackEffect /\<(( .*--.* ))\>/ +syn match factorStackEffect /\<(\s.*\s--\s.*\s)\>/ contained +syn match factorLiteralStackEffect /\<((\s.*\s--\s.*\s))\>/ "adapted from lisp.vim if exists("g:factor_norainbow") diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 34153b6f86..a02d3b4f5f 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -143,8 +143,8 @@ syn match factorMultiStringContents /.*/ contained "syn match factorStackEffectErr /\<)\>/ "syn region factorStackEffectErr start=/\<(\>/ end=/\<)\>/ "syn region factorStackEffect start=/\<(\>/ end=/\<)\>/ contained -syn match factorStackEffect /\<( .*--.* )\>/ contained -syn match factorLiteralStackEffect /\<(( .*--.* ))\>/ +syn match factorStackEffect /\<(\s.*\s--\s.*\s)\>/ contained +syn match factorLiteralStackEffect /\<((\s.*\s--\s.*\s))\>/ "adapted from lisp.vim if exists("g:factor_norainbow") From eac693ee17eff4faf8ffedc3f59206ee847aeb8e Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 15 Mar 2011 01:13:48 +0900 Subject: [PATCH 17/18] misc/vim/syntax/factor.vim: factorFrySpecifier cleanup --- misc/factor.vim.fgen | 2 +- misc/vim/syntax/factor.vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 3f16aa8d9e..6b2b602053 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -56,7 +56,7 @@ syn region None matchgroup=factorPrivate start=/\</ end=/\\>/ syn keyword factorBoolean f t syn keyword factorBreakpoint B -syn match factorFrySpecifier /\<\(@\|_\)\>/ contained +syn keyword factorFrySpecifier @ _ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive syn match factorCallQuotation /\/ syn keyword factorCallNextMethod call-next-method diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index a02d3b4f5f..26352ca59b 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -45,7 +45,7 @@ syn region None matchgroup=factorPrivate start=/\</ end=/\\>/ syn keyword factorBoolean f t syn keyword factorBreakpoint B -syn match factorFrySpecifier /\<\(@\|_\)\>/ contained +syn keyword factorFrySpecifier @ _ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive syn match factorCallQuotation /\/ syn keyword factorCallNextMethod call-next-method From bac4add3a8b0408c7b18c58ff43556540257d65a Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 15 Mar 2011 01:27:13 +0900 Subject: [PATCH 18/18] misc/vim/syntax/factor.vim: add support for 'execute( stack -- effect )' syntax --- misc/factor.vim.fgen | 4 +++- misc/vim/syntax/factor.vim | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 6b2b602053..0a27578a31 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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -59,6 +59,7 @@ syn keyword factorBreakpoint B syn keyword factorFrySpecifier @ _ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive syn match factorCallQuotation /\/ +syn match factorExecute /\/ syn keyword factorCallNextMethod call-next-method <% @@ -212,6 +213,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorConditional Conditional HiLink factorKeyword Keyword HiLink factorCallQuotation Keyword + HiLink factorExecute Keyword HiLink factorCallNextMethod Keyword HiLink factorOperator Operator HiLink factorFrySpecifier Operator diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 26352ca59b..cad221c690 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -22,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,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo @@ -48,6 +48,7 @@ syn keyword factorBreakpoint B syn keyword factorFrySpecifier @ _ contained syn keyword factorDeclaration delimiter deprecated final flushable foldable inline recursive syn match factorCallQuotation /\/ +syn match factorExecute /\/ syn keyword factorCallNextMethod call-next-method 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 @@ -199,6 +200,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorConditional Conditional HiLink factorKeyword Keyword HiLink factorCallQuotation Keyword + HiLink factorExecute Keyword HiLink factorCallNextMethod Keyword HiLink factorOperator Operator HiLink factorFrySpecifier Operator