From 0e2de48c492d319ce93a488851a4e6c3699bef1a Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Mon, 4 Apr 2011 19:59:56 +0900 Subject: [PATCH 01/11] misc/vim/syntax/factor.vim: workaround for factorHook match issue --- misc/vim/syntax/factor.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 35b7a4c253..e2e2355436 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -115,7 +115,7 @@ syn match factorDefer /\/ syn match factorForget /\/ syn match factorMixin /\/ syn match factorInstance /\/ -syn match factorHook /\/ +syn match factorHook /\/ nextgroup=factorStackEffect skipwhite skipempty syn match factorMain /\/ syn match factorConstructor /\/ syn match factorAlien /\/ From e078094e060eefedd1b4a7ad707bf4c19e03a7a7 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Mon, 4 Apr 2011 20:34:43 +0900 Subject: [PATCH 02/11] Rename misc/vim/ftplugin/factor_settings.vim to misc/vim/ftplugin/factor.vim --- misc/vim/ftplugin/{factor_settings.vim => factor.vim} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename misc/vim/ftplugin/{factor_settings.vim => factor.vim} (100%) diff --git a/misc/vim/ftplugin/factor_settings.vim b/misc/vim/ftplugin/factor.vim similarity index 100% rename from misc/vim/ftplugin/factor_settings.vim rename to misc/vim/ftplugin/factor.vim From 4059eac351ad8e1c8f0b226993af2aac31d99233 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Mon, 4 Apr 2011 20:38:30 +0900 Subject: [PATCH 03/11] misc/vim/ftplugin/factor.vim: add b:did_ftplugin at the top --- misc/vim/ftplugin/factor.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/misc/vim/ftplugin/factor.vim b/misc/vim/ftplugin/factor.vim index ced9e85719..87002f98ed 100644 --- a/misc/vim/ftplugin/factor.vim +++ b/misc/vim/ftplugin/factor.vim @@ -1,3 +1,9 @@ +" Only do this when not done yet for this buffer +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + " Code formatting settings loosely adapted from: " http://concatenative.org/wiki/view/Factor/Coding%20Style From 91a41aa0084bb84f461e45bb6e07747617cc91c1 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Mon, 4 Apr 2011 21:01:20 +0900 Subject: [PATCH 04/11] misc/factor.vim.fgen: update --- misc/factor.vim.fgen | 4 ++-- misc/vim/syntax/factor.vim | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 7dcf59142d..e119edcf3d 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 21 +" Last Change: 2011 Apr 04 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -128,7 +128,7 @@ syn match factorDefer /\/ syn match factorForget /\/ syn match factorMixin /\/ syn match factorInstance /\/ -syn match factorHook /\/ +syn match factorHook /\/ nextgroup=factorStackEffect skipwhite skipempty syn match factorMain /\/ syn match factorConstructor /\/ syn match factorAlien /\/ diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index e2e2355436..ef648f8209 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 21 +" Last Change: 2011 Apr 04 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items From bb1c6c60c2f2d66a183d9634e7783b45d6ccf939 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 5 Apr 2011 02:30:14 +0900 Subject: [PATCH 05/11] misc/vim/syntax/factor.vim: add support for M\ 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 e119edcf3d..272fb64114 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,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorError,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorMBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorError,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\\s.*/ contains=factorTodo,@Spell @@ -101,6 +101,7 @@ syn match factorUnuse /\/ syn match factorChar /\/ syn match factorBackslash /\<\\\>\s\+\S\+\>/ +syn match factorMBackslash /\\s\+\S\+\s\+\S\+\>/ syn match factorLiteral /\<\$\>\s\+\S\+\>/ syn region factorLiteralBlock start=/\<\$\[\>/ end=/\<\]\>/ @@ -266,6 +267,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorChar Character HiLink factorDelimiter Delimiter HiLink factorBackslash Special + HiLink factorMBackslash Special HiLink factorLiteral Special HiLink factorLiteralBlock Special HiLink factorDeclaration Typedef diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index ef648f8209..7d9e483792 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,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorError,factorStruct +syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorMBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorError,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\\s.*/ contains=factorTodo,@Spell @@ -88,6 +88,7 @@ syn match factorUnuse /\/ syn match factorChar /\/ syn match factorBackslash /\<\\\>\s\+\S\+\>/ +syn match factorMBackslash /\\s\+\S\+\s\+\S\+\>/ syn match factorLiteral /\<\$\>\s\+\S\+\>/ syn region factorLiteralBlock start=/\<\$\[\>/ end=/\<\]\>/ @@ -253,6 +254,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorChar Character HiLink factorDelimiter Delimiter HiLink factorBackslash Special + HiLink factorMBackslash Special HiLink factorLiteral Special HiLink factorLiteralBlock Special HiLink factorDeclaration Typedef From 811cab4f60ccb718d6625c0dd7501961bd852aba Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 5 Apr 2011 03:38:21 +0900 Subject: [PATCH 06/11] misc/vim/syntax/factor.vim: re-fix factorStackEffect, factorLiteralStackEffect match --- 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 272fb64114..d6b2557a04 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -162,8 +162,8 @@ syn match factorMultiStringContents /.*/ contained "syn match factorStackEffectErr /\<)\>/ "syn region factorStackEffectErr start=/\<(\>/ end=/\<)\>/ "syn region factorStackEffect start=/\<(\>/ end=/\<)\>/ contained -syn match factorStackEffect /\<(\s\(.*\s\)\?--\(\s.*\)\?\s)\>/ contained -syn match factorLiteralStackEffect /\<((\s\(.*\s\)\?--\(\s.*\)\?\s))\>/ +syn match factorStackEffect /\<(\s\(\S*\s\)\?--\(\s\S*\)\?\s)\>/ contained +syn match factorLiteralStackEffect /\<((\s\(\S*\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 7d9e483792..793439ebcd 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -149,8 +149,8 @@ syn match factorMultiStringContents /.*/ contained "syn match factorStackEffectErr /\<)\>/ "syn region factorStackEffectErr start=/\<(\>/ end=/\<)\>/ "syn region factorStackEffect start=/\<(\>/ end=/\<)\>/ contained -syn match factorStackEffect /\<(\s\(.*\s\)\?--\(\s.*\)\?\s)\>/ contained -syn match factorLiteralStackEffect /\<((\s\(.*\s\)\?--\(\s.*\)\?\s))\>/ +syn match factorStackEffect /\<(\s\(\S*\s\)\?--\(\s\S*\)\?\s)\>/ contained +syn match factorLiteralStackEffect /\<((\s\(\S*\s\)\?--\(\s\S*\)\?\s))\>/ "adapted from lisp.vim if exists("g:factor_norainbow") From 9f6f498cb653dd77ac1879bbcbda0bf770be9082 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 5 Apr 2011 03:44:45 +0900 Subject: [PATCH 07/11] misc/vim/syntax/factor.vim: update comments --- 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 d6b2557a04..7eaddc2673 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -23,10 +23,10 @@ elseif exists("b:current_syntax") finish endif -" factor is case sensitive. +" Factor is case sensitive. syn case match -" make all of these characters part of a word (useful for skipping over words with w, e, and b) +" Make all of these characters part of a word (useful for skipping over words with w, e, and b) if version >= 600 setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 else diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 793439ebcd..53ff48358c 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -12,10 +12,10 @@ elseif exists("b:current_syntax") finish endif -" factor is case sensitive. +" Factor is case sensitive. syn case match -" make all of these characters part of a word (useful for skipping over words with w, e, and b) +" Make all of these characters part of a word (useful for skipping over words with w, e, and b) if version >= 600 setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 else From 9884a73664abc13dbcff708ff796987e27957c57 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 5 Apr 2011 04:03:17 +0900 Subject: [PATCH 08/11] misc/vim/syntax/factor.vim: fix factorCallQuotation, factorExecute 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 7eaddc2673..346e4164a9 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -60,8 +60,8 @@ syn keyword factorBoolean f t 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 match factorCallQuotation /\/ +syn match factorExecute /\/ syn keyword factorCallNextMethod call-next-method <% diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 53ff48358c..28bcad901a 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -49,8 +49,8 @@ syn keyword factorBoolean f t 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 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 From 0f64c5ae58b2695b34b52e33d8884160761a27df Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 5 Apr 2011 10:46:06 +0900 Subject: [PATCH 09/11] misc/vim/ftplugin/factor.vim: add copyright header --- misc/vim/ftplugin/factor.vim | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/misc/vim/ftplugin/factor.vim b/misc/vim/ftplugin/factor.vim index 87002f98ed..bb34b3a60d 100644 --- a/misc/vim/ftplugin/factor.vim +++ b/misc/vim/ftplugin/factor.vim @@ -1,3 +1,8 @@ +" Vim filetype plugin file +" Language: Factor +" Maintainer: Tim Allen +" Last Change: 2011 Apr 05 + " Only do this when not done yet for this buffer if exists("b:did_ftplugin") finish From f2528568bc9627a1f7fcbcae3dc9aaec0acb92c5 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Tue, 5 Apr 2011 12:37:10 +0900 Subject: [PATCH 10/11] misc/vim/README.md: update filename --- misc/vim/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/vim/README.md b/misc/vim/README.md index e75d02ab8c..12cd1a51f6 100644 --- a/misc/vim/README.md +++ b/misc/vim/README.md @@ -16,7 +16,7 @@ into `~/.vim/` or the equivalent path on other platforms (Open Vim and type The current set of files is as follows: * ftdetect/factor.vim - Teach Vim when to load Factor support files. -* ftplugin/factor_settings.vim - Teach Vim to follow the Factor Coding Style guidelines. +* ftplugin/factor.vim - Teach Vim to follow the Factor Coding Style guidelines. * plugin/factor.vim - Teach Vim some commands for navigating Factor source code. See below. * syntax/factor.vim - Syntax highlighting for Factor code. From 945d5f5c492570f9b71d06622aac9659649367f1 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Wed, 6 Apr 2011 15:28:14 +0900 Subject: [PATCH 11/11] misc/vim/syntax/factor.vim: merge two factorComment highlight groups together into one --- misc/factor.vim.fgen | 7 +++---- misc/vim/syntax/factor.vim | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 346e4164a9..110eadfd3a 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 Apr 04 +" Last Change: 2011 Apr 06 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -36,9 +36,8 @@ endif syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorMBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorError,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained -syn match factorComment /\\s.*/ contains=factorTodo,@Spell -syn match factorComment /\<#!\>\s.*/ contains=factorTodo,@Spell -syn match factorShebang /\%\^#!\s.*/ display +syn match factorComment /\<#\?!\>.*/ contains=factorTodo,@Spell +syn match factorShebang /\%\^#!.*/ display syn match factorShebangErr /\%\^#!\S\+/ syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorLiteralStackEffect,factorArray0,factorQuotation0 diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 28bcad901a..5cea099f45 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 Apr 04 +" Last Change: 2011 Apr 06 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -25,9 +25,8 @@ endif syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeyword,factorRepeat,factorConditional,factorBoolean,factorBreakpoint,factorDeclaration,factorCallQuotation,factorExecute,factorCallNextMethod,factorString,factorTriString,factorSbuf,@factorNumber,@factorNumErr,factorDelimiter,factorChar,factorBackslash,factorMBackslash,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorError,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained -syn match factorComment /\\s.*/ contains=factorTodo,@Spell -syn match factorComment /\<#!\>\s.*/ contains=factorTodo,@Spell -syn match factorShebang /\%\^#!\s.*/ display +syn match factorComment /\<#\?!\>.*/ contains=factorTodo,@Spell +syn match factorShebang /\%\^#!.*/ display syn match factorShebangErr /\%\^#!\S\+/ syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorLiteralStackEffect,factorArray0,factorQuotation0