From b2306e0c7fc6c773e4e85b0f4b6a90fb348ce246 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 27 Jul 2017 21:18:00 -0700 Subject: genvim: bugfix for #x, #o and #b integer tokens * genvim.txr (txr_num): Move the syn match definitions for hex, octal and binary integer tokens after tl_ident, which is a more general match that matches them also, and causes them to be colorized as symbols rather than numbers. --- genvim.txr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/genvim.txr b/genvim.txr index 0f3068a6..dde595cf 100644 --- a/genvim.txr +++ b/genvim.txr @@ -116,13 +116,13 @@ syn match txr_chr "#\\[@alnum]\+"@(if txr-p " contained") syn match txr_ncomment ";.*"@(if txr-p " contained") syn match txr_dot "\." contained -syn match txr_num "#x[+\-]\?[@hex]\+"@(if txr-p " contained") -syn match txr_num "#o[+\-]\?[@oct]\+"@(if txr-p " contained") -syn match txr_num "#b[+\-]\?[01]\+"@(if txr-p " contained") syn match txr_ident "[@alnum@glyph]*[@alpha@glyph^][@alnum@glyph^]*" contained syn match tl_ident "[:@@][@alnum@glyph^/]\+"@(if txr-p " contained") syn match txr_braced_ident "[:][@alnum@glyph^/]\+" contained syn match tl_ident "[@alnum@glyph/]*[@alpha@glyph^/#][@alnum@glyph^/#]*"@(if txr-p " contained") +syn match txr_num "#x[+\-]\?[@hex]\+"@(if txr-p " contained") +syn match txr_num "#o[+\-]\?[@oct]\+"@(if txr-p " contained") +syn match txr_num "#b[+\-]\?[01]\+"@(if txr-p " contained") syn match txr_num "[+\-]\?[@dig]\+\([^@alnum@glyph^/#]\|\n\)"me=e-1@(if txr-p " contained") syn match txr_badnum "[+\-]\?[@dig]*[.][@dig]\+\([eE][+\-]\?[@dig]\+\)\?[@alpha@glyph^/#]\+"@(if txr-p " contained") syn match txr_num "[+\-]\?[@dig]*[.][@dig]\+\([eE][+\-]\?[@dig]\+\)\?\([^@alnum@glyph^/#]\|\n\)"me=e-1@(if txr-p " contained") -- cgit v1.2.3