Fix hex numbers with suffix 'h'

This commit is contained in:
Georg Ziegler 2018-06-07 17:15:47 +02:00
parent 52375b7e6e
commit 28079336e1
4 changed files with 14 additions and 13 deletions

View File

@ -49,7 +49,7 @@ repository:
} }
# hex, suffixed with h(h) # hex, suffixed with h(h)
{ {
match: '-?([0-9]+)h' match: '-?([a-fA-F0-9]+)h'
name: 'constant.numeric.hex.65816-generic' name: 'constant.numeric.hex.65816-generic'
} }
# binary # binary

View File

@ -49,7 +49,7 @@ repository:
} }
# hex, suffixed with h(h) # hex, suffixed with h(h)
{ {
match: '-?([0-9]+)h' match: '-?([a-fA-F0-9]+)h'
name: 'constant.numeric.hex.65c02-generic' name: 'constant.numeric.hex.65c02-generic'
} }
# binary # binary

View File

@ -24,6 +24,7 @@ repository:
# symbols # symbols
symbols: symbols:
patterns: [ patterns: [
# strings
{ {
begin: '"' begin: '"'
beginCaptures: beginCaptures:
@ -35,19 +36,19 @@ repository:
name: 'punctuation.definition.string.end.cc65-directives' name: 'punctuation.definition.string.end.cc65-directives'
name: 'string.quoted.double.assembly.cc65-directives' name: 'string.quoted.double.assembly.cc65-directives'
} }
# absolut address/number # absolut addressing/numbers
{ {
match: '\\#(\'.\'|[^\\s\']+)' match: '\\#(\'.\'|[^\\s\']+)'
name: 'constant.numeric.hex.cc65-directives' name: 'constant.numeric.hex.cc65-directives'
} }
# hex, prefixed with ampersand($) # hex, prefixed with dollar sign($)
{ {
match: '-?\\$[A-Fa-f0-9]+' match: '-?\\$[a-fA-F0-9]+'
name: 'constant.numeric.hex.cc65-directives' name: 'constant.numeric.hex.cc65-directives'
} }
# hex, suffixed with h(h) # hex, suffixed with h(h)
{ {
match: '-?([0-9]+)h' match: '-?\\b([a-fA-F0-9]+)h'
name: 'constant.numeric.hex.cc65-directives' name: 'constant.numeric.hex.cc65-directives'
} }
# binary # binary

View File

@ -36,19 +36,19 @@ repository:
name: 'punctuation.definition.string.end.wdc-toolchain' name: 'punctuation.definition.string.end.wdc-toolchain'
name: 'string.quoted.double.assembly.wdc-toolchain' name: 'string.quoted.double.assembly.wdc-toolchain'
} }
# absolut addressing/numbering # absolut addressing/numbers
{ {
match: '\\#(\'.\'|[^\\s\']+)' match: '\\#(\'.\'|[^\\s\']+)'
name: 'constant.numeric.hex.wdc-toolchain' name: 'constant.numeric.hex.wdc-toolchain'
} }
# hex, prefixed with ampersand($) # hex, prefixed with dollar sign($)
{ {
match: '-?\\$[A-Fa-f0-9]+' match: '-?\\$\\b[a-fA-F0-9]+'
name: 'constant.numeric.hex.wdc-toolchain' name: 'constant.numeric.hex.wdc-toolchain'
} }
# hex, suffixed with h(h) # hex, suffixed with h(h)
{ {
match: '-?([0-9]+)h' match: '-?\\b([a-fA-F0-9]+)h'
name: 'constant.numeric.hex.wdc-toolchain' name: 'constant.numeric.hex.wdc-toolchain'
} }
# binary prefixed with % # binary prefixed with %
@ -63,7 +63,7 @@ repository:
} }
# octal and decimal # octal and decimal
{ {
match: '\\b([0-9]+(d|o|q)?)\\b' match: '\\b([0-9]+[doq]?)\\b'
name: 'constant.numeric.decimal.wdc-toolchain' name: 'constant.numeric.decimal.wdc-toolchain'
} }
] ]
@ -73,7 +73,7 @@ repository:
patterns: [ patterns: [
# File and Symbol control # File and Symbol control
{ {
match: '\\b(?i:append|include|insert|end(s|mod)?|exit|module|section|org|origin|equ(al)?|gequ|defl|set|var|extern(al|s)?|xref|globals?|public|xdef|message|messg|efunc|incdebug)\\b' match: '\\b(?i:append|include|insert|end(s|mod)?|exit|module|section|ref_only|org|origin|equ(al)?|gequ|defl|set|var|extern(al|s)?|xref|globals?|public|xdef|message|messg|efunc|incdebug)\\b'
name: 'support.function.pseudo.wdc-toolchain' name: 'support.function.pseudo.wdc-toolchain'
} }
# Parsing control # Parsing control
@ -108,7 +108,7 @@ repository:
} }
# Operators II # Operators II
{ {
match: '\\b(?i:and|not|mod|sh[lr]|x?or|eq|u?[gl]t)\\b' match: '\\.\\b(?i:and|not|mod|sh[lr]|x?or|eq|u?[gl]t)\\b\\.'
name: 'keyword.operator.wdc-toolchain' name: 'keyword.operator.wdc-toolchain'
} }
] ]