diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2014-03-15 16:28:50 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2014-03-15 16:28:50 -0700 |
| commit | 610aaad39b888898003dbcc057055c95883918b3 (patch) | |
| tree | 09358b3f985f42029cc5cba7252b0148e541078d /genvim.txr | |
| parent | 122b39ad1a2404987157f78ff39a23a4ebb9bbad (diff) | |
| download | txr-610aaad39b888898003dbcc057055c95883918b3.tar.gz txr-610aaad39b888898003dbcc057055c95883918b3.tar.bz2 txr-610aaad39b888898003dbcc057055c95883918b3.zip | |
* parser.l: Bugfix. When handling a backslash-newline continuation
in the SPECIAL, NESTED and BRACED states, do not pop the state in all
three, only in SPECIAL (to terminate the @\ continuation).
* txr.1: Eliminate wrong claim that string literals do not split across lines,
which is directly contradicted two paragraphs later. Document that
quasiliterals also split.
* genvim.txr (txr_regex, txl_regex): These definitions change from "syn match"
to "syn region" so that the backslash-newline continuation can be properly
handled.
(txr_string, txr_quasilit): Correctly handle split literals.
* txr.vim: Regenerated.
Diffstat (limited to 'genvim.txr')
| -rw-r--r-- | genvim.txr | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -86,8 +86,8 @@ syn match txr_chr "#\\x[A-Fa-f0-9]\+" contained syn match txr_chr "#\\o[0-9]\+" contained syn match txr_chr "#\\[^ \t\nA-Za-z0-9_]" contained syn match txr_chr "#\\[A-Za-z0-9_]\+" contained -syn match txr_regex "/\(\\/\|[^/]\|\\\n\)*/" contained -syn match txl_regex "#/\(\\/\|[^/]\|\\\n\)*/" contained +"syn match txr_regex "/\(\\/\|[^/]\|\\\n\)*/" contained +"syn match txl_regex "#/\(\\/\|[^/]\|\\\n\)*/" contained syn match txr_ncomment ";.*" contained syn match txr_dot "\." contained @@ -122,8 +122,10 @@ syn region txr_mlist contained matchgroup=Delimiter start="@@[ \t]*(" matchgroup syn region txr_mbracket matchgroup=Delimiter start="@@[ \t]*\[" matchgroup=Delimiter end="\]" contains=txl_keyword,txr_string,txl_regex,txr_num,txl_ident,txr_metanum,txr_list,txr_bracket,txr_mlist,txr_mbracket,txr_quasilit,txr_chr,txr_quote,txr_unquote,txr_splice,txr_dot,txr_dotdot,txr_metaat,txr_ncomment,txr_nested_error -syn region txr_string contained oneline start=+"+ skip=+\\\\\|\\"+ end=+"+ -syn region txr_quasilit contained oneline start=+`+ skip=+\\\\\|\\`+ end=+`+ contains=txr_variable,txr_metanum,txr_bracevar,txr_mlist,txr_mbracket +syn region txr_string contained start=+"+ skip=+\\\\\|\\"\|\\\n+ end=+"\|\n+ +syn region txr_quasilit contained start=+`+ skip=+\\\\\|\\`\|\\\n+ end=+`\|\n+ contains=txr_variable,txr_metanum,txr_bracevar,txr_mlist,txr_mbracket +syn region txr_regex contained start="/" skip="\\\\\|\\/\|\\\n" end="/\|\n" +syn region txl_regex contained start="#/" skip="\\\\\|\\/\|\\\n" end="/\|\n" hi def link txr_at Special hi def link txr_atstar Special |