diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2014-01-30 18:09:29 -0800 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2014-01-30 18:09:29 -0800 |
| commit | 37d00fe0d64eef90318671fad2839fc552bfdc5d (patch) | |
| tree | 33aca74d5c0e332f3e1dbf898bfb6c410a250407 | |
| parent | 78f186f057733ac5c7ac2b524a31960f77935958 (diff) | |
| download | txr-37d00fe0d64eef90318671fad2839fc552bfdc5d.tar.gz txr-37d00fe0d64eef90318671fad2839fc552bfdc5d.tar.bz2 txr-37d00fe0d64eef90318671fad2839fc552bfdc5d.zip | |
* genvim.txr: Support floating-point constants.
Do not color embedded decimal integers in symbols as integers.
* txr.vim: Regenerated.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | genvim.txr | 12 | ||||
| -rw-r--r-- | txr.vim | 12 |
3 files changed, 21 insertions, 10 deletions
@@ -1,5 +1,12 @@ 2014-01-30 Kaz Kylheku <kaz@kylheku.com> + * genvim.txr: Support floating-point constants. + Do not color embedded decimal integers in symbols as integers. + + * txr.vim: Regenerated. + +2014-01-30 Kaz Kylheku <kaz@kylheku.com> + * eval.c (expand_op): When the variant is do, and the symbol is an operator, then suppress the addition of the rest parameter in the dotted cons position at the end of the form, @@ -83,16 +83,18 @@ syn match txr_regex "/\(\\/\|[^/]\|\\\n\)*/" contained syn match txl_regex "#/\(\\/\|[^/]\|\\\n\)*/" contained syn match txr_ncomment ";.*" contained -syn match txr_ident "[:@@]\?[A-Za-z0-9!$%&*+\-<=>?\\^_~]\+" contained -syn match txl_ident "[:@@]\?[A-Za-z0-9!$%&*+\-<=>?\\^_~/]\+" contained +syn match txr_dot "\." contained +syn match txr_num "#x[+\-]\?[0-9A-Fa-f]\+" contained +syn match txr_num "[+\-]\?[0-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!$%&*+\-<=>?\\^_~/]*[A-Za-z!$%&*+\-<=>?\\^_~/][A-Za-z0-9!$%&*+\-<=>?\\^_~/]*" contained +syn match txr_num "[+\-]\?[0-9]*[.][0-9]\+\([eE][+\-]\?[0-9]\+\)\?" contained +syn match txr_num "[+\-]\?[0-9]\+\([eE][+\-]\?[0-9]\+\)" contained syn match txl_ident ":" contained -syn match txr_num "[+-]\?[0-9]\+" contained -syn match txr_num "#x[+-]\?[0-9A-Fa-f]\+" contained syn match txr_unquote "," contained syn match txr_splice ",\*" contained syn match txr_quote "'" contained -syn match txr_dot "\." contained syn match txr_dotdot "\.\." contained syn match txr_metaat "@@" contained @@ -174,16 +174,18 @@ syn match txr_regex "/\(\\/\|[^/]\|\\\n\)*/" contained syn match txl_regex "#/\(\\/\|[^/]\|\\\n\)*/" contained syn match txr_ncomment ";.*" contained -syn match txr_ident "[:@]\?[A-Za-z0-9!$%&*+\-<=>?\\^_~]\+" contained -syn match txl_ident "[:@]\?[A-Za-z0-9!$%&*+\-<=>?\\^_~/]\+" contained +syn match txr_dot "\." contained +syn match txr_num "#x[+\-]\?[0-9A-Fa-f]\+" contained +syn match txr_num "[+\-]\?[0-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!$%&*+\-<=>?\\^_~/]*[A-Za-z!$%&*+\-<=>?\\^_~/][A-Za-z0-9!$%&*+\-<=>?\\^_~/]*" contained +syn match txr_num "[+\-]\?[0-9]*[.][0-9]\+\([eE][+\-]\?[0-9]\+\)\?" contained +syn match txr_num "[+\-]\?[0-9]\+\([eE][+\-]\?[0-9]\+\)" contained syn match txl_ident ":" contained -syn match txr_num "[+-]\?[0-9]\+" contained -syn match txr_num "#x[+-]\?[0-9A-Fa-f]\+" contained syn match txr_unquote "," contained syn match txr_splice ",\*" contained syn match txr_quote "'" contained -syn match txr_dot "\." contained syn match txr_dotdot "\.\." contained syn match txr_metaat "@" contained |