From 5fb7962b3b54cbd140104b254c6c2e3019fb9d8d Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 30 Aug 2022 07:54:33 -0700 Subject: vim: deal with bvars and square brackets. The last round of changs. The txr_bracevar group is still handling bracket vars in their entirety, including the @. Also square bracket lists are not handled right. * genvim.txr (txr-elem): Add txr_bracket and txr_bracevar. (txr_bracevar): Don't match @ sigil, and mark as contained group. --- genvim.txr | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/genvim.txr b/genvim.txr index 8d108d23..2b12647c 100644 --- a/genvim.txr +++ b/genvim.txr @@ -63,7 +63,8 @@ static void dir_tables_init(void) @(bind comments #"\\;\\;\\; \\;\\; \\;") @(bind txr-elem "txr_error,txr_atat,txr_comment,txr_contin,\ txr_char,txr_error,txr_char,txr_regdir,txr_variable,\ - txr_splicevar,txr_metanum,txr_directive") + txr_splicevar,txr_metanum,txr_directive,txr_bracevar,\ + txr_bracket") @(bind txr-qelem "txr_splicevar,txr_metanum,txr_qbracevar,txr_list,\ txr_bracket,txr_escat,txr_stresc,txr_numesc,txr_badesc") @(bind bvar "txr_num,txr_pnum,tl_ident,tl_splice,tl_metanum,\ @@ -176,7 +177,7 @@ syn match txr_metaat "@@"@(if txr-p " contained") syn match txr_buf_error "[^']" contained syn match txr_buf_interior "\([@hex][\n\t ]*[@hex]\|[\n\t ]\+\)" contained -syn region txr_bracevar matchgroup=Delimiter start="@@[ \t]*[*]\?{" matchgroup=Delimiter end="}" contains=@bvar +syn region txr_bracevar contained matchgroup=Delimiter start="[*]\?{" matchgroup=Delimiter end="}" contains=@bvar syn region txr_qbracevar contained matchgroup=Delimiter start="[*]\?{" matchgroup=Delimiter end="}" contains=@bvar @ (if txr-p) syn region txr_directive contained matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=@dir -- cgit v1.2.3