MatthiasQuintern/vim-ca65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: MatthiasQuintern:ac2c4f9329666936f865dbdef41e987a33dbd2f7
Branches Tags
MatthiasQuintern:main
..
compare: MatthiasQuintern:2105214518b8dfa5d8e2d884783336cc00fa435f
Branches Tags
MatthiasQuintern:main

2 Commits
ac2c4f9329 ... 2105214518

Author SHA1 Message Date
Matthias@Dell
2105214518 fix branch not after label 2023-12-27 13:59:15 +01:00
Matthias@Dell
f60085136a Add commentstring 2023-12-27 13:58:56 +01:00
2 changed files with 7 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
ftplugin/ca65.vim
View File

@ -21,3 +21,5 @@ let b:match_words = '\<ph[abdpkxy]\>:\<pl[abdpxy]\>,'
\ . '\.\<struct\>:\.\<endstruct\>,' \ . '\.\<struct\>:\.\<endstruct\>,'
\ . '\.\<rep(eat)?\>:\.\<endrep(eat)?\>,' \ . '\.\<rep(eat)?\>:\.\<endrep(eat)?\>,'
\ . '\.\<union\>:\.\<endunion\>' \ . '\.\<union\>:\.\<endunion\>'
setlocal commentstring=;%s

10
syntax/ca65.vim
View File

@ -33,7 +33,7 @@ syn keyword ca65Reg x y a
" 65xxx " 65xxx
" ******************************************************************************** " ********************************************************************************
syn keyword ca6502Opcode adc and asl bit brk clc cld cli clv cmp cpx cpy dec dex dey eor inc inx iny lda ldx ldy lsr nop ora pha php pla plp rol ror rti rts sbc sec sed sei sta stx sty tax tay tsx txa txs tya syn keyword ca6502Opcode adc and asl bit brk clc cld cli clv cmp cpx cpy dec dex dey eor inc inx iny lda ldx ldy lsr nop ora pha php pla plp rol ror rti rts sbc sec sed sei sta stx sty tax tay tsx txa txs tya
syn region ca6502BranchTarget matchgroup=ca6502Opcode start="\v(bcc|bcs|beq|bmi|bne|bpl|bvc|bvs|jmp|jsr)[ \t]+" end="$" contains=ca65Comment keepend syn region ca6502BranchTarget matchgroup=ca6502Opcode start="\v(^(.*:)?[ \t]*)@<=(bcc|bcs|beq|bmi|bne|bpl|bvc|bvs|jmp|jsr)[ \t]+" end="$" contains=ca65Comment keepend
" ******************************************************************************** " ********************************************************************************
" 6502 - Illegal/undocumented opcodes " 6502 - Illegal/undocumented opcodes
@ -49,7 +49,7 @@ if exists("b:ca65_65C02") || exists("b:ca65_65816")
syn keyword ca65C02Opcode phx phy plx ply stz trb tsb stp wai syn keyword ca65C02Opcode phx phy plx ply stz trb tsb stp wai
syn match ca65C02Opcode "bb[rs][0-7]" syn match ca65C02Opcode "bb[rs][0-7]"
syn region ca65C02BranchTarget matchgroup=ca65C02Opcode start="\(bra \)" end="$" contains=ca65Comment keepend syn region ca65C02BranchTarget matchgroup=ca65C02Opcode start="\(bra \)" end="$" contains=ca65Comment keepend
syn match ca65BitSetBranchTarget "\v(bb[rs][0-7][ \t]+[^,]+,[ \t]*)@<=[^;]+" syn match ca65BitSetBranchTarget "\v(^(.*:)?[ \t]*)@<=(bb[rs][0-7][ \t]+[^,]+,[ \t]*)@<=[^;]+"
endif endif
" ******************************************************************************** " ********************************************************************************
@ -58,7 +58,7 @@ endif
if exists("b:ca65_65816") if exists("b:ca65_65816")
syn keyword ca65816Opcode cop mvn mvp pea pei per phb phd phk plb pld rep rtl sep stp tcd tcs tdc tsc txy tyx wai xba xce syn keyword ca65816Opcode cop mvn mvp pea pei per phb phd phk plb pld rep rtl sep stp tcd tcs tdc tsc txy tyx wai xba xce
syn keyword ca65816OpcodeAlt cpa dea ina swa tad tas tda tsa syn keyword ca65816OpcodeAlt cpa dea ina swa tad tas tda tsa
syn region ca65816BranchTarget matchgroup=ca65816Opcode start="\v(brl|jml|jsl)[ \t]+" end="$" contains=ca65Comment keepend syn region ca65816BranchTarget matchgroup=ca65816Opcode start="\v(^(.*:)?[ \t]*)@<=(brl|jml|jsl)[ \t]+" end="$" contains=ca65Comment keepend
endif endif
" ******************************************************************************** " ********************************************************************************
@ -86,8 +86,8 @@ syn keyword ca65PseudoFunctions .addrsize .bank .bankbyte .blank .concat .const
syn region ca65ProcLabel matchgroup=ca65ControlCommands start="\(\.proc\)" end="$" contains=ca65Comment keepend syn region ca65ProcLabel matchgroup=ca65ControlCommands start="\(\.proc\)" end="$" contains=ca65Comment keepend
" macro packs " macro packs
syn keyword ca65MacGeneric add sub syn keyword ca65MacGeneric add sub
syn region ca65MacLongbranchTarget matchgroup=ca65MacLongbranch start="\v(jcc|jcs|jeq|jmi|jne|jpl|jvc)[ \t]+" end="$" contains=ca65Comment keepend syn region ca65MacLongbranchTarget matchgroup=ca65MacLongbranch start="\v(^(.*:)?[ \t]*)@<=(jcc|jcs|jeq|jmi|jne|jpl|jvc)[ \t]+" end="$" contains=ca65Comment keepend
syn region ca65MacGenericBranchTarget matchgroup=ca65MacGeneric start="\v(bge|blt|bgt|ble|bnz|bze)[ \t]+" end="$" contains=ca65Comment keepend syn region ca65MacGenericBranchTarget matchgroup=ca65MacGeneric start="\v(^(.*:)?[ \t]*)@<=(bge|blt|bgt|ble|bnz|bze)[ \t]+" end="$" contains=ca65Comment keepend
" The default methods for highlighting. Can be overridden later " The default methods for highlighting. Can be overridden later
" LABELS: " LABELS: