From 4122d4aa30a61e5cc1c3f98ae046f5ef9f178742 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Wed, 16 Mar 2011 20:14:42 +0900 Subject: [PATCH 1/9] misc/vim/syntax/factor.vim: fix factorRename 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 0a27578a31..2db6ffa764 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 15 +" Last Change: 2011 Mar 16 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -107,7 +107,7 @@ syn match factorQualified /\/ syn match factorQualifiedWith /\/ syn region factorExclude start=/\/ end=/;/ syn region factorFrom start=/\/ end=/;/ -syn region factorRename start=/\/ end=/;/ +syn match factorRename /\\s\+\S\+\>/ syn region factorSingletons start=/\/ end=/;/ syn match factorSymbol /\/ syn region factorSymbols start=/\/ end=/;/ diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index cad221c690..62004df82d 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 15 +" Last Change: 2011 Mar 16 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -94,7 +94,7 @@ syn match factorQualified /\/ syn match factorQualifiedWith /\/ syn region factorExclude start=/\/ end=/;/ syn region factorFrom start=/\/ end=/;/ -syn region factorRename start=/\/ end=/;/ +syn match factorRename /\\s\+\S\+\>/ syn region factorSingletons start=/\/ end=/;/ syn match factorSymbol /\/ syn region factorSymbols start=/\/ end=/;/ From 1ef928b5086fea3ba7204e8502620ed75b654a75 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 17 Mar 2011 04:01:47 +0900 Subject: [PATCH 2/9] misc/vim/syntax/factor.vim: highlight factorCallQuotation, factorExecute, factorStackEffect, and factorLiteralStackEffect definitions correctly --- misc/factor.vim.fgen | 10 +++++----- misc/vim/syntax/factor.vim | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 2db6ffa764..21bab78e86 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 16 +" Last Change: 2011 Mar 17 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -58,8 +58,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 <% @@ -157,8 +157,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)\>/ 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 62004df82d..19d8cd2f40 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 16 +" Last Change: 2011 Mar 17 " To run: USING: html.templates html.templates.fhtml ; "resource:misc/factor.vim.fgen" call-template " For version 5.x: Clear all syntax items @@ -47,8 +47,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 @@ -144,8 +144,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)\>/ contained +syn match factorLiteralStackEffect /\<((\s\(.*\s\)\?--\(\s.*\)\?\s))\>/ "adapted from lisp.vim if exists("g:factor_norainbow") From c9542b5a1543622bc67d8c25d30b0eb06a974252 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 17 Mar 2011 05:18:58 +0900 Subject: [PATCH 3/9] misc/vim/syntax/factor.vim: highlight the shebang --- misc/factor.vim.fgen | 4 ++++ misc/vim/syntax/factor.vim | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 21bab78e86..489a74863d 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -38,6 +38,8 @@ syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeywor syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo syn match factorComment /\\s.*/ contains=factorTodo +syn match factorShebang /\%\^#!\s.*/ +syn match factorShebangErr /\%\^#!\S\+/ syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorLiteralStackEffect,factorArray0,factorQuotation0 @@ -205,6 +207,8 @@ if version >= 508 || !exists("did_factor_syn_inits") endif HiLink factorComment Comment + HiLink factorShebang Special + HiLink factorShebangErr Error HiLink factorStackEffect Typedef HiLink factorLiteralStackEffect Typedef HiLink factorTodo Todo diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 19d8cd2f40..b7d5d9f4e8 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -27,6 +27,8 @@ syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeywor syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\<#!\>\s.*/ contains=factorTodo syn match factorComment /\\s.*/ contains=factorTodo +syn match factorShebang /\%\^#!\s.*/ +syn match factorShebangErr /\%\^#!\S\+/ syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorLiteralStackEffect,factorArray0,factorQuotation0 @@ -192,6 +194,8 @@ if version >= 508 || !exists("did_factor_syn_inits") endif HiLink factorComment Comment + HiLink factorShebang Special + HiLink factorShebangErr Error HiLink factorStackEffect Typedef HiLink factorLiteralStackEffect Typedef HiLink factorTodo Todo From 579ca7d898a7ad57ca35594996fd69213e13b2f5 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 17 Mar 2011 05:38:28 +0900 Subject: [PATCH 4/9] misc/vim/syntax/factor.vim: swapping factorComment definition lines and contain @Spell in factorComment --- 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 489a74863d..35d16a9ad9 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -36,8 +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,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained -syn match factorComment /\<#!\>\s.*/ contains=factorTodo -syn match factorComment /\\s.*/ contains=factorTodo +syn match factorComment /\\s.*/ contains=factorTodo,@Spell +syn match factorComment /\<#!\>\s.*/ contains=factorTodo,@Spell syn match factorShebang /\%\^#!\s.*/ syn match factorShebangErr /\%\^#!\S\+/ diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index b7d5d9f4e8..539ec6037f 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -25,8 +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,factorLiteral,factorLiteralBlock,@factorWordOps,factorAlien,factorSlot,factorTuple,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained -syn match factorComment /\<#!\>\s.*/ contains=factorTodo -syn match factorComment /\\s.*/ contains=factorTodo +syn match factorComment /\\s.*/ contains=factorTodo,@Spell +syn match factorComment /\<#!\>\s.*/ contains=factorTodo,@Spell syn match factorShebang /\%\^#!\s.*/ syn match factorShebangErr /\%\^#!\S\+/ From 29e69f5a68e51cde7ff3274c1f68ae5e318e3556 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 17 Mar 2011 08:28:15 +0900 Subject: [PATCH 5/9] misc/vim/syntax/factor.vim: fix indentation --- 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 35d16a9ad9..33b18566dd 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -166,7 +166,7 @@ syn match factorLiteralStackEffect /\<((\s\(.*\s\)\?--\(\s.*\)\?\s))\>/ if exists("g:factor_norainbow") syn region factorQuotation matchgroup=factorDelimiter start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ matchgroup=factorDelimiter end=/\<\]\>/ contains=ALL else - syn region factorQuotation0 matchgroup=hlLevel0 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation1,factorArray1 + syn region factorQuotation0 matchgroup=hlLevel0 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation1,factorArray1 syn region factorQuotation1 contained matchgroup=hlLevel1 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation2,factorArray2 syn region factorQuotation2 contained matchgroup=hlLevel2 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation3,factorArray3 syn region factorQuotation3 contained matchgroup=hlLevel3 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation4,factorArray4 diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 539ec6037f..0e61b001c2 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -153,7 +153,7 @@ syn match factorLiteralStackEffect /\<((\s\(.*\s\)\?--\(\s.*\)\?\s))\>/ if exists("g:factor_norainbow") syn region factorQuotation matchgroup=factorDelimiter start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ matchgroup=factorDelimiter end=/\<\]\>/ contains=ALL else - syn region factorQuotation0 matchgroup=hlLevel0 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation1,factorArray1 + syn region factorQuotation0 matchgroup=hlLevel0 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation1,factorArray1 syn region factorQuotation1 contained matchgroup=hlLevel1 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation2,factorArray2 syn region factorQuotation2 contained matchgroup=hlLevel2 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation3,factorArray3 syn region factorQuotation3 contained matchgroup=hlLevel3 start=/\<\(\(\('\|\$\|\)\[\)\|\[\(let\||\)\)\>/ end=/\<\]\>/ contains=@factorCluster,factorQuotation4,factorArray4 From 34ae717598ecf46423d4312c315912fe0176a0e6 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 17 Mar 2011 09:32:49 +0900 Subject: [PATCH 6/9] misc/vim/syntax/factor.vim: don't set 'shiftwidth', 'softtabstop', etc. --- misc/factor.vim.fgen | 5 ----- misc/vim/syntax/factor.vim | 6 ------ 2 files changed, 11 deletions(-) diff --git a/misc/factor.vim.fgen b/misc/factor.vim.fgen index 33b18566dd..2403d64474 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -315,9 +315,4 @@ endif let b:current_syntax = "factor" -set sw=4 -set sts=4 -set expandtab -set autoindent " annoying? - " vim: syntax=vim diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 0e61b001c2..4d6144635b 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -302,10 +302,4 @@ endif let b:current_syntax = "factor" -set sw=4 -set sts=4 -set expandtab -set autoindent " annoying? - " vim: syntax=vim - From d91d3f2c01ba4bae3c92b6842fe5784b6895ff95 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Thu, 17 Mar 2011 10:10:38 +0900 Subject: [PATCH 7/9] misc/vim/syntax/factor.vim: in factorShebang, add 'display' argument and switch to PreProc highlight group --- 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 2403d64474..f3e1dbc99a 100644 --- a/misc/factor.vim.fgen +++ b/misc/factor.vim.fgen @@ -38,7 +38,7 @@ syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeywor 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.*/ +syn match factorShebang /\%\^#!\s.*/ display syn match factorShebangErr /\%\^#!\S\+/ syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorLiteralStackEffect,factorArray0,factorQuotation0 @@ -207,7 +207,7 @@ if version >= 508 || !exists("did_factor_syn_inits") endif HiLink factorComment Comment - HiLink factorShebang Special + HiLink factorShebang PreProc HiLink factorShebangErr Error HiLink factorStackEffect Typedef HiLink factorLiteralStackEffect Typedef diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 4d6144635b..4a8c66b221 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -27,7 +27,7 @@ syn cluster factorCluster contains=factorComment,factorFrySpecifier,factorKeywor 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.*/ +syn match factorShebang /\%\^#!\s.*/ display syn match factorShebangErr /\%\^#!\S\+/ syn cluster factorDefnContents contains=@factorCluster,factorStackEffect,factorLiteralStackEffect,factorArray0,factorQuotation0 @@ -194,7 +194,7 @@ if version >= 508 || !exists("did_factor_syn_inits") endif HiLink factorComment Comment - HiLink factorShebang Special + HiLink factorShebang PreProc HiLink factorShebangErr Error HiLink factorStackEffect Typedef HiLink factorLiteralStackEffect Typedef From 372312948ea7ace7016dc822a2a3fb5d355a8347 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Fri, 18 Mar 2011 00:25:12 +0900 Subject: [PATCH 8/9] misc/vim/syntax/factor.vim: add support for 'ERROR: class slots...' syntax --- 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 f3e1dbc99a..57a518ae11 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 17 +" Last Change: 2011 Mar 18 " 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,factorCallQuotation,factorExecute,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,factorError,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\\s.*/ contains=factorTodo,@Spell @@ -116,6 +116,7 @@ syn region factorSymbols start=/\/ end=/;/ syn region factorConstructor2 start=/\/ end=/\<;\>/ syn region factorTuple start=/\/ end=/\<;\>/ +syn region factorError start=/\/ end=/\<;\>/ syn region factorUnion start=/\/ end=/\<;\>/ syn region factorStruct start=/\<\(UNION-STRUCT:\|STRUCT:\)\>/ end=/\<;\>/ @@ -283,6 +284,7 @@ if version >= 508 || !exists("did_factor_syn_inits") HiLink factorSlot Define HiLink factorIntersection Typedef HiLink factorTuple Typedef + HiLink factorError Typedef HiLink factorUnion Typedef HiLink factorStruct Typedef diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 4a8c66b221..df4e249af2 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 17 +" Last Change: 2011 Mar 18 " 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,factorCallQuotation,factorExecute,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,factorError,factorStruct syn match factorTodo /\(TODO\|FIXME\|XXX\):\=/ contained syn match factorComment /\\s.*/ contains=factorTodo,@Spell @@ -103,6 +103,7 @@ syn region factorSymbols start=/\/ end=/;/ syn region factorConstructor2 start=/\/ end=/\<;\>/ syn region factorTuple start=/\/ end=/\<;\>/ +syn region factorError 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 factorSlot Define HiLink factorIntersection Typedef HiLink factorTuple Typedef + HiLink factorError Typedef HiLink factorUnion Typedef HiLink factorStruct Typedef From 07ed91f476f0f603d9d16eb920ab247d7a4046b1 Mon Sep 17 00:00:00 2001 From: Keita Haga Date: Fri, 18 Mar 2011 01:40:28 +0900 Subject: [PATCH 9/9] misc/vim/plugin/factor.vim: remove trailing whitespace --- misc/vim/plugin/factor.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/vim/plugin/factor.vim b/misc/vim/plugin/factor.vim index ad6f92f3c0..1a27b5a1ca 100644 --- a/misc/vim/plugin/factor.vim +++ b/misc/vim/plugin/factor.vim @@ -59,7 +59,7 @@ endfunction function! FactorVocabFile(root, vocab, mustexist) let vocabpath = substitute(a:vocab, "\\.", "/", "g") let vocabfile = FactorVocabRoot(a:root) . vocabpath . "/" . fnamemodify(vocabpath, ":t") . ".factor" - + if !a:mustexist || getftype(vocabfile) != "" return vocabfile else