mirror of
https://github.com/ksherlock/65816.tmbundle.git
synced 2024-06-19 08:29:29 +00:00
clean up orca some more.
This commit is contained in:
parent
8c301444cc
commit
28379552af
|
@ -10,33 +10,44 @@ variables:
|
||||||
|
|
||||||
contexts:
|
contexts:
|
||||||
|
|
||||||
|
prototype:
|
||||||
|
- include: comment
|
||||||
|
- include: eol
|
||||||
|
|
||||||
main:
|
main:
|
||||||
|
|
||||||
- meta_include_prototype: false
|
- meta_include_prototype: false
|
||||||
- match: '{{ws}}'
|
- match: '{{ws}}'
|
||||||
set: opcode
|
push: opcode
|
||||||
|
|
||||||
- match: '^({{ident}}){{ws}}((?i)START|PRIVATE|DATA|PRIVDATA)\b'
|
- match: '^({{ident}}){{ws}}((?i)START|PRIVATE|DATA|PRIVDATA)\b'
|
||||||
captures:
|
captures:
|
||||||
1: entity.name.function
|
1: entity.name.function
|
||||||
2: keyword.directive
|
2: keyword.directive
|
||||||
set: operand-segname
|
push: operand-segname
|
||||||
|
|
||||||
|
|
||||||
- match: '^{{ident}}'
|
- match: '^{{ident}}'
|
||||||
scope: entity.name.label
|
scope: entity.name.label
|
||||||
|
|
||||||
- match: ^[*;!.].*$
|
- match: ^[*;!.]
|
||||||
scope: comment.line
|
push:
|
||||||
|
- meta_scope: comment.line
|
||||||
|
- match: \n
|
||||||
|
pop: true
|
||||||
|
|
||||||
opcode:
|
opcode:
|
||||||
- include: comment
|
|
||||||
|
|
||||||
- include: scope:source.asm.65816#mnemonics-6502
|
- include: scope:source.asm.65816#mnemonics-6502
|
||||||
- include: scope:source.asm.65816#mnemonics-65c02
|
- include: scope:source.asm.65816#mnemonics-65c02
|
||||||
- include: scope:source.asm.65816#mnemonics-65816
|
- include: scope:source.asm.65816#mnemonics-65816
|
||||||
- include: mnemonics-65816-alt
|
- include: mnemonics-65816-alt
|
||||||
|
|
||||||
|
# toolbox macros
|
||||||
|
- match: \b_[A-Za-z0-9]+\b
|
||||||
|
scope: support.function.macro.toolbox
|
||||||
|
- match: ~[A-Za-z0-9]+\b
|
||||||
|
scope: support.function.macro.toolbox
|
||||||
|
|
||||||
- match: \b(?i:DC)\b
|
- match: \b(?i:DC)\b
|
||||||
scope: keyword.directive
|
scope: keyword.directive
|
||||||
set: operand-dc
|
set: operand-dc
|
||||||
|
@ -86,7 +97,6 @@ contexts:
|
||||||
set: operand
|
set: operand
|
||||||
|
|
||||||
operand:
|
operand:
|
||||||
- include: comment
|
|
||||||
- include: numbers
|
- include: numbers
|
||||||
- include: strings
|
- include: strings
|
||||||
|
|
||||||
|
@ -103,8 +113,6 @@ contexts:
|
||||||
scope: invalid.illegal.operand
|
scope: invalid.illegal.operand
|
||||||
|
|
||||||
operand-or-off:
|
operand-or-off:
|
||||||
- include: comment
|
|
||||||
|
|
||||||
- match: \b(?i:OFF)\b
|
- match: \b(?i:OFF)\b
|
||||||
scope: constant.language
|
scope: constant.language
|
||||||
set: expect-comment
|
set: expect-comment
|
||||||
|
@ -137,7 +145,6 @@ contexts:
|
||||||
|
|
||||||
|
|
||||||
operand-on-off:
|
operand-on-off:
|
||||||
- include: comment
|
|
||||||
- match: \b(?i:ON|OFF)\b
|
- match: \b(?i:ON|OFF)\b
|
||||||
scope: constant.language
|
scope: constant.language
|
||||||
set: expect-comment
|
set: expect-comment
|
||||||
|
@ -161,8 +168,6 @@ contexts:
|
||||||
|
|
||||||
operand-dc-format:
|
operand-dc-format:
|
||||||
|
|
||||||
- include: comment
|
|
||||||
|
|
||||||
- match: ([bB])
|
- match: ([bB])
|
||||||
scope: storage.type
|
scope: storage.type
|
||||||
set: operand-dc-b
|
set: operand-dc-b
|
||||||
|
@ -261,10 +266,17 @@ contexts:
|
||||||
|
|
||||||
|
|
||||||
comment:
|
comment:
|
||||||
- match: ;[^\n]*
|
- match: ;
|
||||||
scope: comment.line.partial
|
push:
|
||||||
|
- meta_scope: comment.line
|
||||||
|
- match: \n
|
||||||
|
pop: true
|
||||||
|
- include: eol
|
||||||
|
|
||||||
|
eol:
|
||||||
- match: '$'
|
- match: '$'
|
||||||
set: main
|
pop: true
|
||||||
|
|
||||||
|
|
||||||
numbers:
|
numbers:
|
||||||
- match: \d+
|
- match: \d+
|
||||||
|
|
Loading…
Reference in New Issue
Block a user