some final Nimrod to Nim renames

This commit is contained in:
Zahary Karadjov 2014-09-04 22:53:02 +03:00
commit 05fdf7eac6

View file

@ -7,182 +7,182 @@ elseif exists("b:current_syntax")
endif endif
" Keep user-supplied options " Keep user-supplied options
if !exists("nimrod_highlight_numbers") if !exists("nim_highlight_numbers")
let nimrod_highlight_numbers = 1 let nim_highlight_numbers = 1
endif endif
if !exists("nimrod_highlight_builtins") if !exists("nim_highlight_builtins")
let nimrod_highlight_builtins = 1 let nim_highlight_builtins = 1
endif endif
if !exists("nimrod_highlight_exceptions") if !exists("nim_highlight_exceptions")
let nimrod_highlight_exceptions = 1 let nim_highlight_exceptions = 1
endif endif
if !exists("nimrod_highlight_space_errors") if !exists("nim_highlight_space_errors")
let nimrod_highlight_space_errors = 1 let nim_highlight_space_errors = 1
endif endif
if exists("nimrod_highlight_all") if exists("nim_highlight_all")
let nimrod_highlight_numbers = 1 let nim_highlight_numbers = 1
let nimrod_highlight_builtins = 1 let nim_highlight_builtins = 1
let nimrod_highlight_exceptions = 1 let nim_highlight_exceptions = 1
let nimrod_highlight_space_errors = 1 let nim_highlight_space_errors = 1
endif endif
syn region nimrodBrackets contained extend keepend matchgroup=Bold start=+\(\\\)\@<!\[+ end=+]\|$+ skip=+\\\s*$\|\(\\\)\@<!\\]+ contains=@tclCommandCluster syn region nimBrackets contained extend keepend matchgroup=Bold start=+\(\\\)\@<!\[+ end=+]\|$+ skip=+\\\s*$\|\(\\\)\@<!\\]+ contains=@tclCommandCluster
syn keyword nimrodKeyword addr and as asm atomic syn keyword nimKeyword addr and as asm atomic
syn keyword nimrodKeyword bind block break syn keyword nimKeyword bind block break
syn keyword nimrodKeyword case cast const continue converter syn keyword nimKeyword case cast const continue converter
syn keyword nimrodKeyword discard distinct div do syn keyword nimKeyword discard distinct div do
syn keyword nimrodKeyword elif else end enum except export syn keyword nimKeyword elif else end enum except export
syn keyword nimrodKeyword finally for from syn keyword nimKeyword finally for from
syn keyword nimrodKeyword generic syn keyword nimKeyword generic
syn keyword nimrodKeyword if import in include interface is isnot iterator syn keyword nimKeyword if import in include interface is isnot iterator
syn keyword nimrodKeyword lambda let syn keyword nimKeyword lambda let
syn keyword nimrodKeyword mixin using mod syn keyword nimKeyword mixin using mod
syn keyword nimrodKeyword nil not notin syn keyword nimKeyword nil not notin
syn keyword nimrodKeyword object of or out syn keyword nimKeyword object of or out
syn keyword nimrodKeyword proc method macro template nextgroup=nimrodFunction skipwhite syn keyword nimKeyword proc method macro template nextgroup=nimFunction skipwhite
syn keyword nimrodKeyword ptr syn keyword nimKeyword ptr
syn keyword nimrodKeyword raise ref return syn keyword nimKeyword raise ref return
syn keyword nimrodKeyword shared shl shr static syn keyword nimKeyword shared shl shr static
syn keyword nimrodKeyword try tuple type syn keyword nimKeyword try tuple type
syn keyword nimrodKeyword var syn keyword nimKeyword var
syn keyword nimrodKeyword when while with without syn keyword nimKeyword when while with without
syn keyword nimrodKeyword xor syn keyword nimKeyword xor
syn keyword nimrodKeyword yield syn keyword nimKeyword yield
syn match nimrodFunction "[a-zA-Z_][a-zA-Z0-9_]*" contained syn match nimFunction "[a-zA-Z_][a-zA-Z0-9_]*" contained
syn match nimrodClass "[a-zA-Z_][a-zA-Z0-9_]*" contained syn match nimClass "[a-zA-Z_][a-zA-Z0-9_]*" contained
syn keyword nimrodRepeat for while syn keyword nimRepeat for while
syn keyword nimrodConditional if elif else case of syn keyword nimConditional if elif else case of
syn keyword nimrodOperator and in is not or xor shl shr div syn keyword nimOperator and in is not or xor shl shr div
syn match nimrodComment "#.*$" contains=nimrodTodo,@Spell syn match nimComment "#.*$" contains=nimTodo,@Spell
syn keyword nimrodTodo TODO FIXME XXX contained syn keyword nimTodo TODO FIXME XXX contained
syn keyword nimrodBoolean true false syn keyword nimBoolean true false
" Strings " Strings
syn region nimrodString start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=nimrodEscape,nimrodEscapeError,@Spell syn region nimString start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=nimEscape,nimEscapeError,@Spell
syn region nimrodString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=nimrodEscape,nimrodEscapeError,@Spell syn region nimString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=nimEscape,nimEscapeError,@Spell
syn region nimrodString start=+"""+ end=+"""+ keepend contains=nimrodEscape,nimrodEscapeError,@Spell syn region nimString start=+"""+ end=+"""+ keepend contains=nimEscape,nimEscapeError,@Spell
syn region nimrodRawString matchgroup=Normal start=+[rR]"+ end=+"+ skip=+\\\\\|\\"+ contains=@Spell syn region nimRawString matchgroup=Normal start=+[rR]"+ end=+"+ skip=+\\\\\|\\"+ contains=@Spell
syn match nimrodEscape +\\[abfnrtv'"\\]+ contained syn match nimEscape +\\[abfnrtv'"\\]+ contained
syn match nimrodEscape "\\\o\{1,3}" contained syn match nimEscape "\\\o\{1,3}" contained
syn match nimrodEscape "\\x\x\{2}" contained syn match nimEscape "\\x\x\{2}" contained
syn match nimrodEscape "\(\\u\x\{4}\|\\U\x\{8}\)" contained syn match nimEscape "\(\\u\x\{4}\|\\U\x\{8}\)" contained
syn match nimrodEscape "\\$" syn match nimEscape "\\$"
syn match nimrodEscapeError "\\x\x\=\X" display contained syn match nimEscapeError "\\x\x\=\X" display contained
if nimrod_highlight_numbers == 1 if nim_highlight_numbers == 1
" numbers (including longs and complex) " numbers (including longs and complex)
syn match nimrodNumber "\v<0x\x+(\'(i|I|f|F|u|U)(8|16|32|64))?>" syn match nimNumber "\v<0x\x+(\'(i|I|f|F|u|U)(8|16|32|64))?>"
syn match nimrodNumber "\v<[0-9_]+(\'(i|I|f|F|u|U)(8|16|32|64))?>" syn match nimNumber "\v<[0-9_]+(\'(i|I|f|F|u|U)(8|16|32|64))?>"
syn match nimrodNumber "\v\.[0-9_]+([eE][+-]=[0-9_]+)=>" syn match nimNumber "\v\.[0-9_]+([eE][+-]=[0-9_]+)=>"
syn match nimrodNumber "\v<[0-9_]+(\.[0-9_]+)?([eE][+-]?[0-9_]+)?(\'(f|F)(32|64))?>" syn match nimNumber "\v<[0-9_]+(\.[0-9_]+)?([eE][+-]?[0-9_]+)?(\'(f|F)(32|64))?>"
endif endif
if nimrod_highlight_builtins == 1 if nim_highlight_builtins == 1
" builtin functions, types and objects, not really part of the syntax " builtin functions, types and objects, not really part of the syntax
syn keyword nimrodBuiltin int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 bool syn keyword nimBuiltin int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64 bool
syn keyword nimrodBuiltin char string cstring pointer range array openarray seq syn keyword nimBuiltin char string cstring pointer range array openarray seq
syn keyword nimrodBuiltin set Byte Natural Positive TObject PObject Conversion TResult TAddress syn keyword nimBuiltin set Byte Natural Positive TObject PObject Conversion TResult TAddress
syn keyword nimrodBuiltin BiggestInt BiggestFloat cchar cschar cshort cint csize cuchar cushort syn keyword nimBuiltin BiggestInt BiggestFloat cchar cschar cshort cint csize cuchar cushort
syn keyword nimrodBuiltin clong clonglong cfloat cdouble clongdouble cuint culong culonglong cchar syn keyword nimBuiltin clong clonglong cfloat cdouble clongdouble cuint culong culonglong cchar
syn keyword nimrodBuiltin cstringArray TEndian PFloat32 PFloat64 PInt64 PInt32 syn keyword nimBuiltin cstringArray TEndian PFloat32 PFloat64 PInt64 PInt32
syn keyword nimrodBuiltin TGC_Strategy TFile TFileMode TFileHandle isMainModule syn keyword nimBuiltin TGC_Strategy TFile TFileMode TFileHandle isMainModule
syn keyword nimrodBuiltin CompileDate CompileTime NimrodVersion NimrodMajor syn keyword nimBuiltin CompileDate CompileTime nimVersion nimMajor
syn keyword nimrodBuiltin NimrodMinor NimrodPatch cpuEndian hostOS hostCPU inf syn keyword nimBuiltin nimMinor nimPatch cpuEndian hostOS hostCPU inf
syn keyword nimrodBuiltin neginf nan QuitSuccess QuitFailure dbgLineHook stdin syn keyword nimBuiltin neginf nan QuitSuccess QuitFailure dbgLineHook stdin
syn keyword nimrodBuiltin stdout stderr defined new high low sizeof succ pred syn keyword nimBuiltin stdout stderr defined new high low sizeof succ pred
syn keyword nimrodBuiltin inc dec newSeq len incl excl card ord chr ze ze64 syn keyword nimBuiltin inc dec newSeq len incl excl card ord chr ze ze64
syn keyword nimrodBuiltin toU8 toU16 toU32 abs min max add repr syn keyword nimBuiltin toU8 toU16 toU32 abs min max add repr
syn match nimrodBuiltin "\<contains\>" syn match nimBuiltin "\<contains\>"
syn keyword nimrodBuiltin toFloat toBiggestFloat toInt toBiggestInt addQuitProc syn keyword nimBuiltin toFloat toBiggestFloat toInt toBiggestInt addQuitProc
syn keyword nimrodBuiltin copy setLen newString zeroMem copyMem moveMem syn keyword nimBuiltin copy setLen newString zeroMem copyMem moveMem
syn keyword nimrodBuiltin equalMem alloc alloc0 realloc dealloc setLen assert syn keyword nimBuiltin equalMem alloc alloc0 realloc dealloc setLen assert
syn keyword nimrodBuiltin swap getRefcount getCurrentException Msg syn keyword nimBuiltin swap getRefcount getCurrentException Msg
syn keyword nimrodBuiltin getOccupiedMem getFreeMem getTotalMem isNil seqToPtr syn keyword nimBuiltin getOccupiedMem getFreeMem getTotalMem isNil seqToPtr
syn keyword nimrodBuiltin find pop GC_disable GC_enable GC_fullCollect syn keyword nimBuiltin find pop GC_disable GC_enable GC_fullCollect
syn keyword nimrodBuiltin GC_setStrategy GC_enableMarkAnd Sweep syn keyword nimBuiltin GC_setStrategy GC_enableMarkAnd Sweep
syn keyword nimrodBuiltin GC_disableMarkAnd Sweep GC_getStatistics GC_ref syn keyword nimBuiltin GC_disableMarkAnd Sweep GC_getStatistics GC_ref
syn keyword nimrodBuiltin GC_ref GC_ref GC_unref GC_unref GC_unref quit syn keyword nimBuiltin GC_ref GC_ref GC_unref GC_unref GC_unref quit
syn keyword nimrodBuiltin OpenFile OpenFile CloseFile EndOfFile readChar syn keyword nimBuiltin OpenFile OpenFile CloseFile EndOfFile readChar
syn keyword nimrodBuiltin FlushFile readFile write readLine writeln writeln syn keyword nimBuiltin FlushFile readFile write readLine writeln writeln
syn keyword nimrodBuiltin getFileSize ReadBytes ReadChars readBuffer writeBytes syn keyword nimBuiltin getFileSize ReadBytes ReadChars readBuffer writeBytes
syn keyword nimrodBuiltin writeChars writeBuffer setFilePos getFilePos syn keyword nimBuiltin writeChars writeBuffer setFilePos getFilePos
syn keyword nimrodBuiltin fileHandle countdown countup items lines syn keyword nimBuiltin fileHandle countdown countup items lines
endif endif
if nimrod_highlight_exceptions == 1 if nim_highlight_exceptions == 1
" builtin exceptions and warnings " builtin exceptions and warnings
syn keyword nimrodException E_Base EAsynch ESynch ESystem EIO EOS syn keyword nimException E_Base EAsynch ESynch ESystem EIO EOS
syn keyword nimrodException ERessourceExhausted EArithmetic EDivByZero syn keyword nimException ERessourceExhausted EArithmetic EDivByZero
syn keyword nimrodException EOverflow EAccessViolation EAssertionFailed syn keyword nimException EOverflow EAccessViolation EAssertionFailed
syn keyword nimrodException EControlC EInvalidValue EOutOfMemory EInvalidIndex syn keyword nimException EControlC EInvalidValue EOutOfMemory EInvalidIndex
syn keyword nimrodException EInvalidField EOutOfRange EStackOverflow syn keyword nimException EInvalidField EOutOfRange EStackOverflow
syn keyword nimrodException ENoExceptionToReraise EInvalidObjectAssignment syn keyword nimException ENoExceptionToReraise EInvalidObjectAssignment
syn keyword nimrodException EInvalidObject EInvalidLibrary EInvalidKey syn keyword nimException EInvalidObject EInvalidLibrary EInvalidKey
syn keyword nimrodException EInvalidObjectConversion EFloatingPoint syn keyword nimException EInvalidObjectConversion EFloatingPoint
syn keyword nimrodException EFloatInvalidOp EFloatDivByZero EFloatOverflow syn keyword nimException EFloatInvalidOp EFloatDivByZero EFloatOverflow
syn keyword nimrodException EFloatInexact EDeadThread EResourceExhausted syn keyword nimException EFloatInexact EDeadThread EResourceExhausted
syn keyword nimrodException EFloatUnderflow syn keyword nimException EFloatUnderflow
endif endif
if nimrod_highlight_space_errors == 1 if nim_highlight_space_errors == 1
" trailing whitespace " trailing whitespace
syn match nimrodSpaceError display excludenl "\S\s\+$"ms=s+1 syn match nimSpaceError display excludenl "\S\s\+$"ms=s+1
" any tabs are illegal in nimrod " any tabs are illegal in nim
syn match nimrodSpaceError display "\t" syn match nimSpaceError display "\t"
endif endif
syn sync match nimrodSync grouphere NONE "):$" syn sync match nimSync grouphere NONE "):$"
syn sync maxlines=200 syn sync maxlines=200
syn sync minlines=2000 syn sync minlines=2000
if version >= 508 || !exists("did_nimrod_syn_inits") if version >= 508 || !exists("did_nim_syn_inits")
if version <= 508 if version <= 508
let did_nimrod_syn_inits = 1 let did_nim_syn_inits = 1
command -nargs=+ HiLink hi link <args> command -nargs=+ HiLink hi link <args>
else else
command -nargs=+ HiLink hi def link <args> command -nargs=+ HiLink hi def link <args>
endif endif
" The default methods for highlighting. Can be overridden later " The default methods for highlighting. Can be overridden later
HiLink nimrodBrackets Operator HiLink nimBrackets Operator
HiLink nimrodKeyword Keyword HiLink nimKeyword Keyword
HiLink nimrodFunction Function HiLink nimFunction Function
HiLink nimrodConditional Conditional HiLink nimConditional Conditional
HiLink nimrodRepeat Repeat HiLink nimRepeat Repeat
HiLink nimrodString String HiLink nimString String
HiLink nimrodRawString String HiLink nimRawString String
HiLink nimrodBoolean Boolean HiLink nimBoolean Boolean
HiLink nimrodEscape Special HiLink nimEscape Special
HiLink nimrodOperator Operator HiLink nimOperator Operator
HiLink nimrodPreCondit PreCondit HiLink nimPreCondit PreCondit
HiLink nimrodComment Comment HiLink nimComment Comment
HiLink nimrodTodo Todo HiLink nimTodo Todo
HiLink nimrodDecorator Define HiLink nimDecorator Define
if nimrod_highlight_numbers == 1 if nim_highlight_numbers == 1
HiLink nimrodNumber Number HiLink nimNumber Number
endif endif
if nimrod_highlight_builtins == 1 if nim_highlight_builtins == 1
HiLink nimrodBuiltin Number HiLink nimBuiltin Number
endif endif
if nimrod_highlight_exceptions == 1 if nim_highlight_exceptions == 1
HiLink nimrodException Exception HiLink nimException Exception
endif endif
if nimrod_highlight_space_errors == 1 if nim_highlight_space_errors == 1
HiLink nimrodSpaceError Error HiLink nimSpaceError Error
endif endif
delcommand HiLink delcommand HiLink
endif endif
let b:current_syntax = "nimrod" let b:current_syntax = "nim"