From 4322422242f7026a931d326813f6bace50de6fe5 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 3 Jul 2015 19:28:09 -0700 Subject: Syntax highlighting fixes: characters, variables, identifers. * genvim.txr (txr_variable, txr_splicevar, txr_bracevar): Weren't being generated into tl.vim. Moved to a common section. (txr_nested_error): Relocate above other matches. (txr_ident): Fixed not to match tokens starting with #. --- ChangeLog | 9 +++++++++ genvim.txr | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49b3c468..3279ae6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-07-03 Kaz Kylheku + + Syntax highlighting fixes: characters, variables, identifers. + + * genvim.txr (txr_variable, txr_splicevar, txr_bracevar): Weren't being + generated into tl.vim. Moved to a common section. + (txr_nested_error): Relocate above other matches. + (txr_ident): Fixed not to match tokens starting with #. + 2015-07-03 Kaz Kylheku * genman.txr: Simplify double plass over BODY into single pass. diff --git a/genvim.txr b/genvim.txr index 5aab351f..4e952844 100644 --- a/genvim.txr +++ b/genvim.txr @@ -81,13 +81,14 @@ syn match txr_char "@@[ \t]*\\." syn match txr_error "@@[ \t]*\\[xo]" syn match txr_char "@@[ \t]*\\x[0-9A-Fa-f]\+;\?" syn match txr_char "@@[ \t]*\\[0-7]\+;\?" -syn match txr_variable "@@[ \t]*[*]\?[ \t]*[A-Za-z_][A-Za-z0-9_]*" -syn match txr_splicevar "@@[ \t,*]*[A-Za-z_][A-Za-z0-9_]*" syn match txr_regdir "@@[ \t]*/\(\\/\|[^/]\|\\\n\)*/" syn match txr_hashbang "^#!.*" @ (end) @ (end) @ (output :continue out) +syn match txr_nested_error "[^\t ]\+" contained +syn match txr_variable "@@[ \t]*[*]\?[ \t]*[A-Za-z_][A-Za-z0-9_]*" +syn match txr_splicevar "@@[ \t,*]*[A-Za-z_][A-Za-z0-9_]*" syn match txr_metanum "@@[0-9]\+" syn match txr_badesc "\\." contained syn match txr_escat "\\@@" contained @@ -95,7 +96,6 @@ syn match txr_stresc "\\[abtnvfre \n"`'\\]" contained syn match txr_numesc "\\x[0-9A-Fa-f]\+;\?" contained syn match txr_numesc "\\[0-7]\+;\?" contained syn match txr_regesc "\\[abtnvfre\\ \n/sSdDwW()\|.*?+~&%\[\]\-]" contained -syn match txr_nested_error "[^\t `]\+" contained syn match txr_chr "#\\x[A-Fa-f0-9]\+"@(if txr-p " contained") syn match txr_chr "#\\o[0-7]\+"@(if txr-p " contained") @@ -107,10 +107,10 @@ syn match txr_dot "\." contained syn match txr_num "#x[+\-]\?[0-9A-Fa-f]\+"@(if txr-p " contained") syn match txr_num "#o[+\-]\?[0-7]\+"@(if txr-p " contained") syn match txr_num "#b[+\-]\?[0-1]\+"@(if txr-p " contained") -syn match txr_ident "[A-Za-z0-9!$%&*+\-<=>?\\_~]*[A-Za-z!$#%&*+\-<=>?\\^_~][A-Za-z0-9!$#%&*+\-<=>?\\^_~]*" contained +syn match txr_ident "[A-Za-z0-9!$%&*+\-<=>?\\_~]*[A-Za-z!$%&*+\-<=>?\\^_~][A-Za-z0-9!$#%&*+\-<=>?\\^_~]*" contained syn match txl_ident "[:@@][A-Za-z0-9!$%&*+\-<=>?\\\^_~/]\+"@(if txr-p " contained") syn match txr_braced_ident "[:][A-Za-z0-9!$%&*+\-<=>?\\\^_~/]\+" contained -syn match txl_ident "[A-Za-z0-9!$%&*+\-<=>?\\_~/]*[A-Za-z!$#%&*+\-<=>?\\^_~/][A-Za-z0-9!$#%&*+\-<=>?\\^_~/]*"@(if txr-p " contained") +syn match txl_ident "[A-Za-z0-9!$%&*+\-<=>?\\_~/]*[A-Za-z!$%&*+\-<=>?\\^_~/][A-Za-z0-9!$#%&*+\-<=>?\\^_~/]*"@(if txr-p " contained") syn match txr_num "[+\-]\?[0-9]\+\([^A-Za-z0-9!$#%&*+\-<=>?\\^_~/]\|\n\)"me=e-1@(if txr-p " contained") syn match txr_badnum "[+\-]\?[0-9]*[.][0-9]\+\([eE][+\-]\?[0-9]\+\)\?[A-Za-z!$#%&*+\-<=>?\\^_~/]\+"@(if txr-p " contained") syn match txr_num "[+\-]\?[0-9]*[.][0-9]\+\([eE][+\-]\?[0-9]\+\)\?\([^A-Za-z0-9!$#%&*+\-<=>?\\^_~/]\|\n\)"me=e-1@(if txr-p " contained") @@ -125,10 +125,10 @@ syn match txr_quote "\^" contained syn match txr_dotdot "\.\." contained syn match txr_metaat "@@" contained +syn region txr_bracevar matchgroup=Delimiter start="@@[ \t]*[*]\?{" matchgroup=Delimiter end="}" contains=txr_num,txr_ident,txr_braced_ident,txr_string,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_regex,txr_quasilit,txr_chr,txl_splice,txr_nested_error @ (end) @ (if txr-p) @ (output :continue out) -syn region txr_bracevar matchgroup=Delimiter start="@@[ \t]*[*]\?{" matchgroup=Delimiter end="}" contains=txr_num,txr_ident,txr_braced_ident,txr_string,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_regex,txr_quasilit,txr_chr,txl_splice,txr_nested_error syn region txr_directive matchgroup=Delimiter start="@@[ \t]*(" matchgroup=Delimiter end=")" contains=txr_keyword,txr_string,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_num,txr_badnum,txl_ident,txl_regex,txr_string,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error @ (end) @ (end) -- cgit v1.2.3