From c5fcc6069a03a4f94a0aac595038d34798b823fb Mon Sep 17 00:00:00 2001 From: Steve Losh Date: Fri, 12 Apr 2013 03:35:52 +0100 Subject: [PATCH] lispyscript to alienscript --- .../alienscript/ftdetect/alienscript.vim | 1 + .../alienscript/ftplugin/alienscript.vim | 8 +++ .../indent/alienscript.vim} | 8 +-- vim/bundle/alienscript/syntax/alienscript.vim | 59 +++++++++++++++++++ .../lispyscript/ftdetect/lispyscript.vim | 1 - .../lispyscript/ftplugin/lispyscript.vim | 8 --- vim/bundle/lispyscript/syntax/lispyscript.vim | 58 ------------------ 7 files changed, 71 insertions(+), 72 deletions(-) create mode 100644 vim/bundle/alienscript/ftdetect/alienscript.vim create mode 100644 vim/bundle/alienscript/ftplugin/alienscript.vim rename vim/bundle/{lispyscript/indent/lispyscript.vim => alienscript/indent/alienscript.vim} (70%) create mode 100644 vim/bundle/alienscript/syntax/alienscript.vim delete mode 100644 vim/bundle/lispyscript/ftdetect/lispyscript.vim delete mode 100644 vim/bundle/lispyscript/ftplugin/lispyscript.vim delete mode 100644 vim/bundle/lispyscript/syntax/lispyscript.vim diff --git a/vim/bundle/alienscript/ftdetect/alienscript.vim b/vim/bundle/alienscript/ftdetect/alienscript.vim new file mode 100644 index 0000000..a94000d --- /dev/null +++ b/vim/bundle/alienscript/ftdetect/alienscript.vim @@ -0,0 +1 @@ +autocmd BufNewFile,BufRead *.alien set filetype=alienscript diff --git a/vim/bundle/alienscript/ftplugin/alienscript.vim b/vim/bundle/alienscript/ftplugin/alienscript.vim new file mode 100644 index 0000000..35a97c1 --- /dev/null +++ b/vim/bundle/alienscript/ftplugin/alienscript.vim @@ -0,0 +1,8 @@ +if exists("b:did_alienscript_ftplugin") + finish +endif + + +setlocal iskeyword+=-,>,?,=,!,<,>,+,*,/,%,&,| + +let b:did_alienscript_ftplugin = 1 diff --git a/vim/bundle/lispyscript/indent/lispyscript.vim b/vim/bundle/alienscript/indent/alienscript.vim similarity index 70% rename from vim/bundle/lispyscript/indent/lispyscript.vim rename to vim/bundle/alienscript/indent/alienscript.vim index e7200ca..603216a 100644 --- a/vim/bundle/lispyscript/indent/lispyscript.vim +++ b/vim/bundle/alienscript/indent/alienscript.vim @@ -23,13 +23,11 @@ setlocal indentexpr= setlocal lisp " Special words go here. -setlocal lispwords=function,macro,do,->,var -setlocal lispwords+=if,cond,when,unless -setlocal lispwords+=try -setlocal lispwords+=loop,each,each2d,eachKey,reduce,map,for +setlocal lispwords=def,fn,defn +setlocal lispwords+=if " Custom: -setlocal lispwords+=defn +" setlocal lispwords+=defn let &cpo = s:save_cpo diff --git a/vim/bundle/alienscript/syntax/alienscript.vim b/vim/bundle/alienscript/syntax/alienscript.vim new file mode 100644 index 0000000..80ce0f4 --- /dev/null +++ b/vim/bundle/alienscript/syntax/alienscript.vim @@ -0,0 +1,59 @@ +if exists("b:current_syntax") + finish +endif + +syntax keyword alienscriptDefFunction defn + +syntax keyword alienscriptDefMacro defmacro + +syntax keyword alienscriptKeyword fn +" syntax keyword alienscriptKeyword do -> new object str var +" syntax keyword alienscriptKeyword array arrayInit arrayInit2d +" syntax keyword alienscriptTesting assert testGroup testRunner +" syntax keyword alienscriptTemplating template template-repeat template-repeat-key + +" syntax keyword alienscriptOperator undefined? null? true? false? zero? boolean? +" syntax keyword alienscriptOperator number? string? object? array? function? +" syntax keyword alienscriptOperator = ! != > < <= >= + - * / % && +" syntax match alienscriptOperator "\v([ \t()]|^)\zs\|\|\ze([ \t()]|$)" + +syntax keyword alienscriptConstant null undefined + +syntax keyword alienscriptBoolean true false + +" syntax keyword alienscriptRepeat loop each each2d eachKey reduce map for + +syntax keyword alienscriptConditional if + +" syntax keyword alienscriptException try catch throw + +" syntax keyword alienscriptImport include + +syntax match alienscriptComment "\v;.*$" + +syntax match alienscriptNumber "\v<-?\d+(\.\d+)?>" + +syntax region alienscriptString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ + +" Custom words go here... +" syntax keyword alienscriptKeyword defn +" syntax keyword alienscriptKeyword onload + +highlight link alienscriptKeyword Keyword +" highlight link alienscriptTesting Keyword +" highlight link alienscriptTemplating Keyword +highlight link alienscriptDefFunction Keyword +highlight link alienscriptDefMacro Keyword +" highlight link alienscriptOperator Operator +highlight link alienscriptConditional Conditional +" highlight link alienscriptException Exception +" highlight link alienscriptImport Include +highlight link alienscriptBoolean Boolean +" highlight link alienscriptRepeat Repeat +highlight link alienscriptNumber Number +highlight link alienscriptComment Comment +highlight link alienscriptString String +highlight link alienscriptConstant Constant + +let b:current_syntax = "alienscript" + diff --git a/vim/bundle/lispyscript/ftdetect/lispyscript.vim b/vim/bundle/lispyscript/ftdetect/lispyscript.vim deleted file mode 100644 index 1a0aece..0000000 --- a/vim/bundle/lispyscript/ftdetect/lispyscript.vim +++ /dev/null @@ -1 +0,0 @@ -autocmd BufNewFile,BufRead *.ls set filetype=lispyscript diff --git a/vim/bundle/lispyscript/ftplugin/lispyscript.vim b/vim/bundle/lispyscript/ftplugin/lispyscript.vim deleted file mode 100644 index 2de9112..0000000 --- a/vim/bundle/lispyscript/ftplugin/lispyscript.vim +++ /dev/null @@ -1,8 +0,0 @@ -if exists("b:did_lispyscript_ftplugin") - finish -endif - - -setlocal iskeyword+=-,>,?,=,!,<,>,+,*,/,%,&,| - -let b:did_lispyscript_ftplugin = 1 diff --git a/vim/bundle/lispyscript/syntax/lispyscript.vim b/vim/bundle/lispyscript/syntax/lispyscript.vim deleted file mode 100644 index a655d12..0000000 --- a/vim/bundle/lispyscript/syntax/lispyscript.vim +++ /dev/null @@ -1,58 +0,0 @@ -if exists("b:current_syntax") - finish -endif - -syntax keyword lispyscriptDefFunction function - -syntax keyword lispyscriptDefMacro macro - -syntax keyword lispyscriptKeyword do -> new object str var -syntax keyword lispyscriptKeyword array arrayInit arrayInit2d -syntax keyword lispyscriptTesting assert testGroup testRunner -syntax keyword lispyscriptTemplating template template-repeat template-repeat-key - -syntax keyword lispyscriptOperator undefined? null? true? false? zero? boolean? -syntax keyword lispyscriptOperator number? string? object? array? function? -syntax keyword lispyscriptOperator = ! != > < <= >= + - * / % && -syntax match lispyscriptOperator "\v([ \t()]|^)\zs\|\|\ze([ \t()]|$)" - -syntax keyword lispyscriptConstant null undefined - -syntax keyword lispyscriptBoolean true false - -syntax keyword lispyscriptRepeat loop each each2d eachKey reduce map for - -syntax keyword lispyscriptConditional if cond when unless - -syntax keyword lispyscriptException try catch throw - -syntax keyword lispyscriptImport include - -syntax match lispyscriptComment "\v;.*$" - -syntax match lispyscriptNumber "\v<-?\d+(\.\d+)?>" - -syntax region lispyscriptString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ - -" Custom words go here... -syntax keyword lispyscriptKeyword defn -syntax keyword lispyscriptKeyword onload - -highlight link lispyscriptKeyword Keyword -highlight link lispyscriptTesting Keyword -highlight link lispyscriptTemplating Keyword -highlight link lispyscriptDefFunction Keyword -highlight link lispyscriptDefMacro Keyword -highlight link lispyscriptOperator Operator -highlight link lispyscriptConditional Conditional -highlight link lispyscriptException Exception -highlight link lispyscriptImport Include -highlight link lispyscriptBoolean Boolean -highlight link lispyscriptRepeat Repeat -highlight link lispyscriptNumber Number -highlight link lispyscriptComment Comment -highlight link lispyscriptString String -highlight link lispyscriptConstant Constant - -let b:current_syntax = "lispyscript" -