Merge pull request #2 from ricardoquesada/repeat

Merge PR #2, adds .repeat/.endrepeat syntax and indentation rules.
This commit is contained in:
Max Bane 2015-07-05 13:18:43 -04:00
commit b5ee54137a
2 changed files with 4 additions and 2 deletions

View File

@ -16,7 +16,7 @@ setlocal autoindent " indentexpr isn't much help otherwise
setlocal indentexpr=GetAsmCA65Indent(v:lnum)
"setlocal indentkeys+=<:>,=elif,=except
setlocal indentkeys+=<:>,=.else,=.elseif,=.endif,.endmacro,.endstruct,.endunion,.endenum,.endscope,.endproc
setlocal indentkeys+=<:>,=.else,=.elseif,=.endif,.endmacro,.endstruct,.endunion,.endenum,.endscope,.endproc,.endrepeat
" Only define the function once.
if exists("*GetAsmCA65Indent")
@ -131,7 +131,7 @@ function GetAsmCA65Indent(lnum)
" If the previous line began with a block/scope-opening command, indent
" this line
if pline =~ '^\s*\.\(if.*\|macro\|struct\|union\|scope\|proc\)\>'
if pline =~ '^\s*\.\(if.*\|macro\|struct\|union\|scope\|proc\|repeat\)\>'
return plindent + shiftwidth()
endif

View File

@ -135,6 +135,8 @@ syn match asm_ca65Cond "\.ifnref\>"
syn match asm_ca65Cond "\.else\>"
syn match asm_ca65Cond "\.elseif\>"
syn match asm_ca65Cond "\.endif\>"
syn match asm_ca65Cond "\.repeat\>"
syn match asm_ca65Cond "\.endrepeat\>"
" Macro stuff
syn match asm_ca65Macro "\.macro\s\+[a-z0-9_]*" contains=asm_ca65MacroName
syn match asm_ca65MacroName "\s[a-z_][a-z0-9_]*"hs=s+1 contained