summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2015-06-22 03:03:41 (GMT)
committerKaz Kylheku <kaz@kylheku.com>2015-06-22 03:03:41 (GMT)
commit7ea836f4f883e02447323a94728ff0f155acf337 (patch)
tree9cb5fecaa83c38e3d0d76dbca700aa47c64d12b7
parentff9db4f3a6ee2a2bb5c821b73d59ffe792cbbc27 (diff)
downloadtxr-master.zip
txr-master.tar.gz
txr-master.tar.bz2
Version 109.HEADtxr-109master
-rw-r--r--ChangeLog12
-rw-r--r--RELNOTES49
-rwxr-xr-xconfigure2
-rw-r--r--share/txr/stdlib/ver.tl2
-rw-r--r--tl.vim254
-rw-r--r--txr.14
-rw-r--r--txr.vim254
7 files changed, 307 insertions, 270 deletions
diff --git a/ChangeLog b/ChangeLog
index fa9d9d7..4e91e6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,18 @@
2015-06-20 Kaz Kylheku <kaz@kylheku.com>
+ Version 109.
+
+ * RELNOTES: Updated.
+
+ * configure, txr.1: Bumped version and date.
+
+ * share/txr/stdlib/ver.tl: Likewise.
+
+ * tl.vim, txr.vim: Regenerated.
+
+2015-06-20 Kaz Kylheku <kaz@kylheku.com>
+
* genman.txr: Rewrite the man2html-generated inner name links with hash
values derived from the title text, so that when sections are inserted
or deleted, the URL's remain stable. The PREAMBLE is gone, and
diff --git a/RELNOTES b/RELNOTES
index bad7f5f..54dcf2f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,28 @@
+ TXR 109
+ 2015-06-21
+
+
+ Features
+
+ - New anaphoric macros ifa and conda.
+
+ - New function have, synonym of true. Usefully expressive with anaphoric ifa.
+
+ Bugs
+
+ - equal-based hashing function is improved so list and vector permutations
+ do not collide to the same value.
+
+ - cat-str function detects overflow in the calculation of the total
+ string length to allocate, and throws an exception.
+
+ - Fixed neglected null termination in mkstring function.
+
+ - Fixed garbage collector crash introduced in TXR 108, when traversing
+ syntax_tree member of the parser_t structure.
+
+
+
TXR 108
2015-06-13
@@ -37,6 +62,18 @@
- New functions catenated-stream-p and catenated-stream-push.
+ - New function: load for loading TXR Lisp files. TXR Lisp programming can
+ now take place using multiple files containing code that doesn't have
+ to be wrapped with @(do ...).
+
+ - @(load) and @(include) directives can also load TXR Lisp now.
+
+ - TXR files which have a .txr suffix can be invoked without the suffix now;
+ this is automatically resolved.
+
+ - New --lisp command line option makes TXR source files which have no
+ filename suffix be treated as TXR Lisp code rather than TXR Pattern Language.
+
Bugs
- Fixed exception being thrown when trying to print (lambda . atom).
@@ -65,18 +102,6 @@
- Critical bugfix in handling of hashes having both weak keys and values,
leading to memory corruption.
- - New function: load for loading TXR Lisp files. TXR Lisp programming can
- now take place using multiple files containing code that doesn't have
- to be wrapped with @(do ...).
-
- - @(load) and @(include) directives can also load TXR Lisp now.
-
- - TXR files which have a .txr suffix can be invoked without the suffix now;
- this is automatically resolved.
-
- - New --lisp command line option makes TXR source files which have no
- filename suffix be treated as TXR Lisp code rather than TXR Pattern Language.
-
TXR 107
diff --git a/configure b/configure
index 3b3cd41..ebcd27e 100755
--- a/configure
+++ b/configure
@@ -415,7 +415,7 @@ fi
#
-txr_ver=108
+txr_ver=109
#
# The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 85221ca..086effd 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1 +1 @@
-(defvar *lib-version* 108)
+(defvar *lib-version* 109)
diff --git a/tl.vim b/tl.vim
index e0daeba..d3ff835 100644
--- a/tl.vim
+++ b/tl.vim
@@ -87,133 +87,133 @@ syn keyword txl_keyword contained gun hash hash-alist hash-construct
syn keyword txl_keyword contained hash-count hash-diff hash-eql hash-equal
syn keyword txl_keyword contained hash-isec hash-keys hash-pairs hash-uni
syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
-syn keyword txl_keyword contained html-decode html-encode iapply identity
-syn keyword txl_keyword contained ido if iff iffi
-syn keyword txl_keyword contained iflet ignerr in inc
-syn keyword txl_keyword contained inhash int-flo int-str integerp
-syn keyword txl_keyword contained intern interp-fun-p interpose ip
-syn keyword txl_keyword contained ipf isqrt itimer-prov itimer-real
-syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
-syn keyword txl_keyword contained keywordp kill labels lambda
-syn keyword txl_keyword contained last lazy-str lazy-str-force lazy-str-force-upto
-syn keyword txl_keyword contained lazy-str-get-trailing-list lazy-stream-cons lazy-stringp lbind
-syn keyword txl_keyword contained lcm lcons lcons-fun lconsp
-syn keyword txl_keyword contained ldiff length length-list length-str
-syn keyword txl_keyword contained length-str-< length-str-<= length-str-> length-str->=
-syn keyword txl_keyword contained length-vec lequal less let
-syn keyword txl_keyword contained let* lexical-fun-p lexical-lisp1-binding lexical-var-p
-syn keyword txl_keyword contained link lisp-parse list list*
-syn keyword txl_keyword contained list-str list-vector listp load
-syn keyword txl_keyword contained log log-alert log-auth log-authpriv
-syn keyword txl_keyword contained log-cons log-crit log-daemon log-debug
-syn keyword txl_keyword contained log-emerg log-err log-info log-ndelay
-syn keyword txl_keyword contained log-notice log-nowait log-odelay log-perror
-syn keyword txl_keyword contained log-pid log-user log-warning log10
-syn keyword txl_keyword contained log2 logand logior lognot
-syn keyword txl_keyword contained logtest logtrunc logxor macro-form-p
-syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
-syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
-syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
-syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
-syn keyword txl_keyword contained make-strlist-output-stream make-sym make-time make-time-utc
-syn keyword txl_keyword contained make-trie makedev makunbound mapcar
-syn keyword txl_keyword contained mapcar* mapdo mapf maphash
-syn keyword txl_keyword contained mappend mappend* mask match-fun
-syn keyword txl_keyword contained match-regex match-regex-right match-regst match-regst-right
-syn keyword txl_keyword contained match-str match-str-tree max member
-syn keyword txl_keyword contained member-if memq memql memqual
-syn keyword txl_keyword contained merge min minor minusp
-syn keyword txl_keyword contained mkdir mknod mkstring mlet
-syn keyword txl_keyword contained mod multi multi-sort n-choose-k
-syn keyword txl_keyword contained n-perm-k nconc nilf none
-syn keyword txl_keyword contained not notf nreverse null
-syn keyword txl_keyword contained nullify num-chr num-str numberp
-syn keyword txl_keyword contained oand oddp op open-command
-syn keyword txl_keyword contained open-directory open-file open-fileno open-files
-syn keyword txl_keyword contained open-files* open-pipe open-process open-tail
-syn keyword txl_keyword contained openlog opip or orf
-syn keyword txl_keyword contained packagep pad partition partition*
-syn keyword txl_keyword contained partition-by perm pipe plusp
-syn keyword txl_keyword contained poll poll-err poll-in poll-nval
-syn keyword txl_keyword contained poll-out poll-pri poll-rdband poll-rdhup
-syn keyword txl_keyword contained poll-wrband pop pos pos-if
-syn keyword txl_keyword contained pos-max pos-min posq posql
-syn keyword txl_keyword contained posqual pppred ppred pprinl
-syn keyword txl_keyword contained pprint pprof pred prinl
-syn keyword txl_keyword contained print prof prog1 progn
-syn keyword txl_keyword contained prop proper-listp pset push
-syn keyword txl_keyword contained pushhash pushnew put-byte put-char
-syn keyword txl_keyword contained put-line put-lines put-string put-strings
-syn keyword txl_keyword contained pwd qquote quasi quasilist
-syn keyword txl_keyword contained quote rand random random-fixnum
-syn keyword txl_keyword contained random-state-p range range* range-regex
-syn keyword txl_keyword contained rcomb read readlink real-time-stream-p
-syn keyword txl_keyword contained reduce-left reduce-right ref refset
-syn keyword txl_keyword contained regex-compile regex-parse regexp regsub
-syn keyword txl_keyword contained rehome-sym remhash remove-if remove-if*
-syn keyword txl_keyword contained remove-path remq remq* remql
-syn keyword txl_keyword contained remql* remqual remqual* rename-path
-syn keyword txl_keyword contained repeat replace replace-list replace-str
-syn keyword txl_keyword contained replace-vec rest ret retf
-syn keyword txl_keyword contained return return-from reverse rlcp
-syn keyword txl_keyword contained rlet rotate rperm rplaca
-syn keyword txl_keyword contained rplacd run s-ifblk s-ifchr
-syn keyword txl_keyword contained s-ifdir s-ififo s-iflnk s-ifmt
-syn keyword txl_keyword contained s-ifreg s-ifsock s-irgrp s-iroth
-syn keyword txl_keyword contained s-irusr s-irwxg s-irwxo s-irwxu
-syn keyword txl_keyword contained s-isgid s-isuid s-isvtx s-iwgrp
-syn keyword txl_keyword contained s-iwoth s-iwusr s-ixgrp s-ixoth
-syn keyword txl_keyword contained s-ixusr search search-regex search-regst
-syn keyword txl_keyword contained search-str search-str-tree second seek-stream
-syn keyword txl_keyword contained select seqp set set-diff
-syn keyword txl_keyword contained set-hash-userdata set-sig-handler setenv sethash
-syn keyword txl_keyword contained setitimer setlogmask setq sh
-syn keyword txl_keyword contained shift sig-abrt sig-alrm sig-bus
-syn keyword txl_keyword contained sig-check sig-chld sig-cont sig-fpe
-syn keyword txl_keyword contained sig-hup sig-ill sig-int sig-io
-syn keyword txl_keyword contained sig-iot sig-kill sig-lost sig-pipe
-syn keyword txl_keyword contained sig-poll sig-prof sig-pwr sig-quit
-syn keyword txl_keyword contained sig-segv sig-stkflt sig-stop sig-sys
-syn keyword txl_keyword contained sig-term sig-trap sig-tstp sig-ttin
-syn keyword txl_keyword contained sig-ttou sig-urg sig-usr1 sig-usr2
-syn keyword txl_keyword contained sig-vtalrm sig-winch sig-xcpu sig-xfsz
-syn keyword txl_keyword contained sign-extend sin sixth size-vec
-syn keyword txl_keyword contained some sort sort-group source-loc
-syn keyword txl_keyword contained source-loc-str span-str splice split-str
-syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
-syn keyword txl_keyword contained stat stdlib str< str<=
-syn keyword txl_keyword contained str= str> str>= stream-get-prop
-syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
-syn keyword txl_keyword contained stringp sub sub-list sub-str
-syn keyword txl_keyword contained sub-vec succ swap symacrolet
-syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
-syn keyword txl_keyword contained symbolp symlink sys-qquote sys-splice
-syn keyword txl_keyword contained sys-unquote sys:*lisp1* sys:eval-err sys:get-fb
-syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander syslog tan
-syn keyword txl_keyword contained tb tc tf third
-syn keyword txl_keyword contained throw throwf time time-fields-local
-syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-usec
-syn keyword txl_keyword contained tofloat toint tok-str tok-where
-syn keyword txl_keyword contained tostring tostringp tprint transpose
-syn keyword txl_keyword contained tree-bind tree-case tree-find trie-add
-syn keyword txl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
-syn keyword txl_keyword contained trim-str true trunc trunc-rem
-syn keyword txl_keyword contained tuples txr-case txr-if txr-when
-syn keyword txl_keyword contained typeof unget-byte unget-char uniq
-syn keyword txl_keyword contained unique unless unquote unsetenv
-syn keyword txl_keyword contained until until* upcase-str update
-syn keyword txl_keyword contained url-decode url-encode usleep uw-protect
-syn keyword txl_keyword contained vec vec-push vec-set-length vecref
-syn keyword txl_keyword contained vector vector-list vectorp w-continued
-syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword txl_keyword contained w-termsig w-untraced wait weave
-syn keyword txl_keyword contained when whenlet where while
-syn keyword txl_keyword contained while* whilet width with-clobber-expander
-syn keyword txl_keyword contained with-delete-expander with-gensyms with-saved-vars with-update-expander
-syn keyword txl_keyword contained wrap wrap* zap zerop
-syn keyword txl_keyword contained zip
+syn keyword txl_keyword contained have html-decode html-encode iapply
+syn keyword txl_keyword contained identity ido if iff
+syn keyword txl_keyword contained iffi iflet ignerr in
+syn keyword txl_keyword contained inc inhash int-flo int-str
+syn keyword txl_keyword contained integerp intern interp-fun-p interpose
+syn keyword txl_keyword contained ip ipf isqrt itimer-prov
+syn keyword txl_keyword contained itimer-real itimer-virtual juxt keep-if
+syn keyword txl_keyword contained keep-if* keywordp kill labels
+syn keyword txl_keyword contained lambda last lazy-str lazy-str-force
+syn keyword txl_keyword contained lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp
+syn keyword txl_keyword contained lbind lcm lcons lcons-fun
+syn keyword txl_keyword contained lconsp ldiff length length-list
+syn keyword txl_keyword contained length-str length-str-< length-str-<= length-str->
+syn keyword txl_keyword contained length-str->= length-vec lequal less
+syn keyword txl_keyword contained let let* lexical-fun-p lexical-lisp1-binding
+syn keyword txl_keyword contained lexical-var-p link lisp-parse list
+syn keyword txl_keyword contained list* list-str list-vector listp
+syn keyword txl_keyword contained load log log-alert log-auth
+syn keyword txl_keyword contained log-authpriv log-cons log-crit log-daemon
+syn keyword txl_keyword contained log-debug log-emerg log-err log-info
+syn keyword txl_keyword contained log-ndelay log-notice log-nowait log-odelay
+syn keyword txl_keyword contained log-perror log-pid log-user log-warning
+syn keyword txl_keyword contained log10 log2 logand logior
+syn keyword txl_keyword contained lognot logtest logtrunc logxor
+syn keyword txl_keyword contained macro-form-p macro-time macroexpand macroexpand-1
+syn keyword txl_keyword contained macrolet major make-catenated-stream make-env
+syn keyword txl_keyword contained make-hash make-lazy-cons make-like make-package
+syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
+syn keyword txl_keyword contained make-string-output-stream make-strlist-output-stream make-sym make-time
+syn keyword txl_keyword contained make-time-utc make-trie makedev makunbound
+syn keyword txl_keyword contained mapcar mapcar* mapdo mapf
+syn keyword txl_keyword contained maphash mappend mappend* mask
+syn keyword txl_keyword contained match-fun match-regex match-regex-right match-regst
+syn keyword txl_keyword contained match-regst-right match-str match-str-tree max
+syn keyword txl_keyword contained member member-if memq memql
+syn keyword txl_keyword contained memqual merge min minor
+syn keyword txl_keyword contained minusp mkdir mknod mkstring
+syn keyword txl_keyword contained mlet mod multi multi-sort
+syn keyword txl_keyword contained n-choose-k n-perm-k nconc nilf
+syn keyword txl_keyword contained none not notf nreverse
+syn keyword txl_keyword contained null nullify num-chr num-str
+syn keyword txl_keyword contained numberp oand oddp op
+syn keyword txl_keyword contained open-command open-directory open-file open-fileno
+syn keyword txl_keyword contained open-files open-files* open-pipe open-process
+syn keyword txl_keyword contained open-tail openlog opip or
+syn keyword txl_keyword contained orf packagep pad partition
+syn keyword txl_keyword contained partition* partition-by perm pipe
+syn keyword txl_keyword contained plusp poll poll-err poll-in
+syn keyword txl_keyword contained poll-nval poll-out poll-pri poll-rdband
+syn keyword txl_keyword contained poll-rdhup poll-wrband pop pos
+syn keyword txl_keyword contained pos-if pos-max pos-min posq
+syn keyword txl_keyword contained posql posqual pppred ppred
+syn keyword txl_keyword contained pprinl pprint pprof pred
+syn keyword txl_keyword contained prinl print prof prog1
+syn keyword txl_keyword contained progn prop proper-listp pset
+syn keyword txl_keyword contained push pushhash pushnew put-byte
+syn keyword txl_keyword contained put-char put-line put-lines put-string
+syn keyword txl_keyword contained put-strings pwd qquote quasi
+syn keyword txl_keyword contained quasilist quote rand random
+syn keyword txl_keyword contained random-fixnum random-state-p range range*
+syn keyword txl_keyword contained range-regex rcomb read readlink
+syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
+syn keyword txl_keyword contained refset regex-compile regex-parse regexp
+syn keyword txl_keyword contained regsub rehome-sym remhash remove-if
+syn keyword txl_keyword contained remove-if* remove-path remq remq*
+syn keyword txl_keyword contained remql remql* remqual remqual*
+syn keyword txl_keyword contained rename-path repeat replace replace-list
+syn keyword txl_keyword contained replace-str replace-vec rest ret
+syn keyword txl_keyword contained retf return return-from reverse
+syn keyword txl_keyword contained rlcp rlet rotate rperm
+syn keyword txl_keyword contained rplaca rplacd run s-ifblk
+syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
+syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
+syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
+syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
+syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
+syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
+syn keyword txl_keyword contained search-regst search-str search-str-tree second
+syn keyword txl_keyword contained seek-stream select seqp set
+syn keyword txl_keyword contained set-diff set-hash-userdata set-sig-handler setenv
+syn keyword txl_keyword contained sethash setitimer setlogmask setq
+syn keyword txl_keyword contained sh shift sig-abrt sig-alrm
+syn keyword txl_keyword contained sig-bus sig-check sig-chld sig-cont
+syn keyword txl_keyword contained sig-fpe sig-hup sig-ill sig-int
+syn keyword txl_keyword contained sig-io sig-iot sig-kill sig-lost
+syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
+syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
+syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
+syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
+syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
+syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
+syn keyword txl_keyword contained size-vec some sort sort-group
+syn keyword txl_keyword contained source-loc source-loc-str span-str splice
+syn keyword txl_keyword contained split-str split-str-set sqrt sssucc
+syn keyword txl_keyword contained ssucc stat stdlib str<
+syn keyword txl_keyword contained str<= str= str> str>=
+syn keyword txl_keyword contained stream-get-prop stream-set-prop streamp string-extend
+syn keyword txl_keyword contained string-lt stringp sub sub-list
+syn keyword txl_keyword contained sub-str sub-vec succ swap
+syn keyword txl_keyword contained symacrolet symbol-function symbol-name symbol-package
+syn keyword txl_keyword contained symbol-value symbolp symlink sys-qquote
+syn keyword txl_keyword contained sys-splice sys-unquote sys:*lisp1* sys:eval-err
+syn keyword txl_keyword contained sys:get-fb sys:get-vb sys:l1-setq sys:l1-val
+syn keyword txl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander syslog
+syn keyword txl_keyword contained tan tb tc tf
+syn keyword txl_keyword contained third throw throwf time
+syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
+syn keyword txl_keyword contained time-usec tofloat toint tok-str
+syn keyword txl_keyword contained tok-where tostring tostringp tprint
+syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
+syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword txl_keyword contained trie-value-at trim-str true trunc
+syn keyword txl_keyword contained trunc-rem tuples txr-case txr-if
+syn keyword txl_keyword contained txr-when typeof unget-byte unget-char
+syn keyword txl_keyword contained uniq unique unless unquote
+syn keyword txl_keyword contained unsetenv until until* upcase-str
+syn keyword txl_keyword contained update url-decode url-encode usleep
+syn keyword txl_keyword contained uw-protect vec vec-push vec-set-length
+syn keyword txl_keyword contained vecref vector vector-list vectorp
+syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
+syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
+syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
+syn keyword txl_keyword contained weave when whenlet where
+syn keyword txl_keyword contained while while* whilet width
+syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-saved-vars
+syn keyword txl_keyword contained with-update-expander wrap wrap* zap
+syn keyword txl_keyword contained zerop zip
syn match txr_metanum "@[0-9]\+"
syn match txr_nested_error "[^\t `]\+" contained
diff --git a/txr.1 b/txr.1
index f043344..2f0408b 100644
--- a/txr.1
+++ b/txr.1
@@ -344,9 +344,9 @@
.ds TX \f[B]TXR\f[]
.ds TL \f[B]TXR Lisp\f[]
.\" Start of man page:
-.TH TXR 1 2015-06-13 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-06-21 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
.SH* NAME
-\*(TX \- text processing language (version 108)
+\*(TX \- text processing language (version 109)
.SH* SYNOPSIS
.cblk
.meti txr >> [ options ] < query-file < data-files ..
diff --git a/txr.vim b/txr.vim
index b177a2b..a49d9b5 100644
--- a/txr.vim
+++ b/txr.vim
@@ -87,133 +87,133 @@ syn keyword txl_keyword contained gun hash hash-alist hash-construct
syn keyword txl_keyword contained hash-count hash-diff hash-eql hash-equal
syn keyword txl_keyword contained hash-isec hash-keys hash-pairs hash-uni
syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
-syn keyword txl_keyword contained html-decode html-encode iapply identity
-syn keyword txl_keyword contained ido if iff iffi
-syn keyword txl_keyword contained iflet ignerr in inc
-syn keyword txl_keyword contained inhash int-flo int-str integerp
-syn keyword txl_keyword contained intern interp-fun-p interpose ip
-syn keyword txl_keyword contained ipf isqrt itimer-prov itimer-real
-syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
-syn keyword txl_keyword contained keywordp kill labels lambda
-syn keyword txl_keyword contained last lazy-str lazy-str-force lazy-str-force-upto
-syn keyword txl_keyword contained lazy-str-get-trailing-list lazy-stream-cons lazy-stringp lbind
-syn keyword txl_keyword contained lcm lcons lcons-fun lconsp
-syn keyword txl_keyword contained ldiff length length-list length-str
-syn keyword txl_keyword contained length-str-< length-str-<= length-str-> length-str->=
-syn keyword txl_keyword contained length-vec lequal less let
-syn keyword txl_keyword contained let* lexical-fun-p lexical-lisp1-binding lexical-var-p
-syn keyword txl_keyword contained link lisp-parse list list*
-syn keyword txl_keyword contained list-str list-vector listp load
-syn keyword txl_keyword contained log log-alert log-auth log-authpriv
-syn keyword txl_keyword contained log-cons log-crit log-daemon log-debug
-syn keyword txl_keyword contained log-emerg log-err log-info log-ndelay
-syn keyword txl_keyword contained log-notice log-nowait log-odelay log-perror
-syn keyword txl_keyword contained log-pid log-user log-warning log10
-syn keyword txl_keyword contained log2 logand logior lognot
-syn keyword txl_keyword contained logtest logtrunc logxor macro-form-p
-syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
-syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
-syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
-syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
-syn keyword txl_keyword contained make-strlist-output-stream make-sym make-time make-time-utc
-syn keyword txl_keyword contained make-trie makedev makunbound mapcar
-syn keyword txl_keyword contained mapcar* mapdo mapf maphash
-syn keyword txl_keyword contained mappend mappend* mask match-fun
-syn keyword txl_keyword contained match-regex match-regex-right match-regst match-regst-right
-syn keyword txl_keyword contained match-str match-str-tree max member
-syn keyword txl_keyword contained member-if memq memql memqual
-syn keyword txl_keyword contained merge min minor minusp
-syn keyword txl_keyword contained mkdir mknod mkstring mlet
-syn keyword txl_keyword contained mod multi multi-sort n-choose-k
-syn keyword txl_keyword contained n-perm-k nconc nilf none
-syn keyword txl_keyword contained not notf nreverse null
-syn keyword txl_keyword contained nullify num-chr num-str numberp
-syn keyword txl_keyword contained oand oddp op open-command
-syn keyword txl_keyword contained open-directory open-file open-fileno open-files
-syn keyword txl_keyword contained open-files* open-pipe open-process open-tail
-syn keyword txl_keyword contained openlog opip or orf
-syn keyword txl_keyword contained packagep pad partition partition*
-syn keyword txl_keyword contained partition-by perm pipe plusp
-syn keyword txl_keyword contained poll poll-err poll-in poll-nval
-syn keyword txl_keyword contained poll-out poll-pri poll-rdband poll-rdhup
-syn keyword txl_keyword contained poll-wrband pop pos pos-if
-syn keyword txl_keyword contained pos-max pos-min posq posql
-syn keyword txl_keyword contained posqual pppred ppred pprinl
-syn keyword txl_keyword contained pprint pprof pred prinl
-syn keyword txl_keyword contained print prof prog1 progn
-syn keyword txl_keyword contained prop proper-listp pset push
-syn keyword txl_keyword contained pushhash pushnew put-byte put-char
-syn keyword txl_keyword contained put-line put-lines put-string put-strings
-syn keyword txl_keyword contained pwd qquote quasi quasilist
-syn keyword txl_keyword contained quote rand random random-fixnum
-syn keyword txl_keyword contained random-state-p range range* range-regex
-syn keyword txl_keyword contained rcomb read readlink real-time-stream-p
-syn keyword txl_keyword contained reduce-left reduce-right ref refset
-syn keyword txl_keyword contained regex-compile regex-parse regexp regsub
-syn keyword txl_keyword contained rehome-sym remhash remove-if remove-if*
-syn keyword txl_keyword contained remove-path remq remq* remql
-syn keyword txl_keyword contained remql* remqual remqual* rename-path
-syn keyword txl_keyword contained repeat replace replace-list replace-str
-syn keyword txl_keyword contained replace-vec rest ret retf
-syn keyword txl_keyword contained return return-from reverse rlcp
-syn keyword txl_keyword contained rlet rotate rperm rplaca
-syn keyword txl_keyword contained rplacd run s-ifblk s-ifchr
-syn keyword txl_keyword contained s-ifdir s-ififo s-iflnk s-ifmt
-syn keyword txl_keyword contained s-ifreg s-ifsock s-irgrp s-iroth
-syn keyword txl_keyword contained s-irusr s-irwxg s-irwxo s-irwxu
-syn keyword txl_keyword contained s-isgid s-isuid s-isvtx s-iwgrp
-syn keyword txl_keyword contained s-iwoth s-iwusr s-ixgrp s-ixoth
-syn keyword txl_keyword contained s-ixusr search search-regex search-regst
-syn keyword txl_keyword contained search-str search-str-tree second seek-stream
-syn keyword txl_keyword contained select seqp set set-diff
-syn keyword txl_keyword contained set-hash-userdata set-sig-handler setenv sethash
-syn keyword txl_keyword contained setitimer setlogmask setq sh
-syn keyword txl_keyword contained shift sig-abrt sig-alrm sig-bus
-syn keyword txl_keyword contained sig-check sig-chld sig-cont sig-fpe
-syn keyword txl_keyword contained sig-hup sig-ill sig-int sig-io
-syn keyword txl_keyword contained sig-iot sig-kill sig-lost sig-pipe
-syn keyword txl_keyword contained sig-poll sig-prof sig-pwr sig-quit
-syn keyword txl_keyword contained sig-segv sig-stkflt sig-stop sig-sys
-syn keyword txl_keyword contained sig-term sig-trap sig-tstp sig-ttin
-syn keyword txl_keyword contained sig-ttou sig-urg sig-usr1 sig-usr2
-syn keyword txl_keyword contained sig-vtalrm sig-winch sig-xcpu sig-xfsz
-syn keyword txl_keyword contained sign-extend sin sixth size-vec
-syn keyword txl_keyword contained some sort sort-group source-loc
-syn keyword txl_keyword contained source-loc-str span-str splice split-str
-syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
-syn keyword txl_keyword contained stat stdlib str< str<=
-syn keyword txl_keyword contained str= str> str>= stream-get-prop
-syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
-syn keyword txl_keyword contained stringp sub sub-list sub-str
-syn keyword txl_keyword contained sub-vec succ swap symacrolet
-syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
-syn keyword txl_keyword contained symbolp symlink sys-qquote sys-splice
-syn keyword txl_keyword contained sys-unquote sys:*lisp1* sys:eval-err sys:get-fb
-syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander syslog tan
-syn keyword txl_keyword contained tb tc tf third
-syn keyword txl_keyword contained throw throwf time time-fields-local
-syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-usec
-syn keyword txl_keyword contained tofloat toint tok-str tok-where
-syn keyword txl_keyword contained tostring tostringp tprint transpose
-syn keyword txl_keyword contained tree-bind tree-case tree-find trie-add
-syn keyword txl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
-syn keyword txl_keyword contained trim-str true trunc trunc-rem
-syn keyword txl_keyword contained tuples txr-case txr-if txr-when
-syn keyword txl_keyword contained typeof unget-byte unget-char uniq
-syn keyword txl_keyword contained unique unless unquote unsetenv
-syn keyword txl_keyword contained until until* upcase-str update
-syn keyword txl_keyword contained url-decode url-encode usleep uw-protect
-syn keyword txl_keyword contained vec vec-push vec-set-length vecref
-syn keyword txl_keyword contained vector vector-list vectorp w-continued
-syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword txl_keyword contained w-termsig w-untraced wait weave
-syn keyword txl_keyword contained when whenlet where while
-syn keyword txl_keyword contained while* whilet width with-clobber-expander
-syn keyword txl_keyword contained with-delete-expander with-gensyms with-saved-vars with-update-expander
-syn keyword txl_keyword contained wrap wrap* zap zerop
-syn keyword txl_keyword contained zip
+syn keyword txl_keyword contained have html-decode html-encode iapply
+syn keyword txl_keyword contained identity ido if iff
+syn keyword txl_keyword contained iffi iflet ignerr in
+syn keyword txl_keyword contained inc inhash int-flo int-str
+syn keyword txl_keyword contained integerp intern interp-fun-p interpose
+syn keyword txl_keyword contained ip ipf isqrt itimer-prov
+syn keyword txl_keyword contained itimer-real itimer-virtual juxt keep-if
+syn keyword txl_keyword contained keep-if* keywordp kill labels
+syn keyword txl_keyword contained lambda last lazy-str lazy-str-force
+syn keyword txl_keyword contained lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp
+syn keyword txl_keyword contained lbind lcm lcons lcons-fun
+syn keyword txl_keyword contained lconsp ldiff length length-list
+syn keyword txl_keyword contained length-str length-str-< length-str-<= length-str->
+syn keyword txl_keyword contained length-str->= length-vec lequal less
+syn keyword txl_keyword contained let let* lexical-fun-p lexical-lisp1-binding
+syn keyword txl_keyword contained lexical-var-p link lisp-parse list
+syn keyword txl_keyword contained list* list-str list-vector listp
+syn keyword txl_keyword contained load log log-alert log-auth
+syn keyword txl_keyword contained log-authpriv log-cons log-crit log-daemon
+syn keyword txl_keyword contained log-debug log-emerg log-err log-info
+syn keyword txl_keyword contained log-ndelay log-notice log-nowait log-odelay
+syn keyword txl_keyword contained log-perror log-pid log-user log-warning
+syn keyword txl_keyword contained log10 log2 logand logior
+syn keyword txl_keyword contained lognot logtest logtrunc logxor
+syn keyword txl_keyword contained macro-form-p macro-time macroexpand macroexpand-1
+syn keyword txl_keyword contained macrolet major make-catenated-stream make-env
+syn keyword txl_keyword contained make-hash make-lazy-cons make-like make-package
+syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
+syn keyword txl_keyword contained make-string-output-stream make-strlist-output-stream make-sym make-time
+syn keyword txl_keyword contained make-time-utc make-trie makedev makunbound
+syn keyword txl_keyword contained mapcar mapcar* mapdo mapf
+syn keyword txl_keyword contained maphash mappend mappend* mask
+syn keyword txl_keyword contained match-fun match-regex match-regex-right match-regst
+syn keyword txl_keyword contained match-regst-right match-str match-str-tree max
+syn keyword txl_keyword contained member member-if memq memql
+syn keyword txl_keyword contained memqual merge min minor
+syn keyword txl_keyword contained minusp mkdir mknod mkstring
+syn keyword txl_keyword contained mlet mod multi multi-sort
+syn keyword txl_keyword contained n-choose-k n-perm-k nconc nilf
+syn keyword txl_keyword contained none not notf nreverse
+syn keyword txl_keyword contained null nullify num-chr num-str
+syn keyword txl_keyword contained numberp oand oddp op
+syn keyword txl_keyword contained open-command open-directory open-file open-fileno
+syn keyword txl_keyword contained open-files open-files* open-pipe open-process
+syn keyword txl_keyword contained open-tail openlog opip or
+syn keyword txl_keyword contained orf packagep pad partition
+syn keyword txl_keyword contained partition* partition-by perm pipe
+syn keyword txl_keyword contained plusp poll poll-err poll-in
+syn keyword txl_keyword contained poll-nval poll-out poll-pri poll-rdband
+syn keyword txl_keyword contained poll-rdhup poll-wrband pop pos
+syn keyword txl_keyword contained pos-if pos-max pos-min posq
+syn keyword txl_keyword contained posql posqual pppred ppred
+syn keyword txl_keyword contained pprinl pprint pprof pred
+syn keyword txl_keyword contained prinl print prof prog1
+syn keyword txl_keyword contained progn prop proper-listp pset
+syn keyword txl_keyword contained push pushhash pushnew put-byte
+syn keyword txl_keyword contained put-char put-line put-lines put-string
+syn keyword txl_keyword contained put-strings pwd qquote quasi
+syn keyword txl_keyword contained quasilist quote rand random
+syn keyword txl_keyword contained random-fixnum random-state-p range range*
+syn keyword txl_keyword contained range-regex rcomb read readlink
+syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
+syn keyword txl_keyword contained refset regex-compile regex-parse regexp
+syn keyword txl_keyword contained regsub rehome-sym remhash remove-if
+syn keyword txl_keyword contained remove-if* remove-path remq remq*
+syn keyword txl_keyword contained remql remql* remqual remqual*
+syn keyword txl_keyword contained rename-path repeat replace replace-list
+syn keyword txl_keyword contained replace-str replace-vec rest ret
+syn keyword txl_keyword contained retf return return-from reverse
+syn keyword txl_keyword contained rlcp rlet rotate rperm
+syn keyword txl_keyword contained rplaca rplacd run s-ifblk
+syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
+syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
+syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
+syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
+syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
+syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
+syn keyword txl_keyword contained search-regst search-str search-str-tree second
+syn keyword txl_keyword contained seek-stream select seqp set
+syn keyword txl_keyword contained set-diff set-hash-userdata set-sig-handler setenv
+syn keyword txl_keyword contained sethash setitimer setlogmask setq
+syn keyword txl_keyword contained sh shift sig-abrt sig-alrm
+syn keyword txl_keyword contained sig-bus sig-check sig-chld sig-cont
+syn keyword txl_keyword contained sig-fpe sig-hup sig-ill sig-int
+syn keyword txl_keyword contained sig-io sig-iot sig-kill sig-lost
+syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
+syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
+syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
+syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
+syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
+syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
+syn keyword txl_keyword contained size-vec some sort sort-group
+syn keyword txl_keyword contained source-loc source-loc-str span-str splice
+syn keyword txl_keyword contained split-str split-str-set sqrt sssucc
+syn keyword txl_keyword contained ssucc stat stdlib str<
+syn keyword txl_keyword contained str<= str= str> str>=
+syn keyword txl_keyword contained stream-get-prop stream-set-prop streamp string-extend
+syn keyword txl_keyword contained string-lt stringp sub sub-list
+syn keyword txl_keyword contained sub-str sub-vec succ swap
+syn keyword txl_keyword contained symacrolet symbol-function symbol-name symbol-package
+syn keyword txl_keyword contained symbol-value symbolp symlink sys-qquote
+syn keyword txl_keyword contained sys-splice sys-unquote sys:*lisp1* sys:eval-err
+syn keyword txl_keyword contained sys:get-fb sys:get-vb sys:l1-setq sys:l1-val
+syn keyword txl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander syslog
+syn keyword txl_keyword contained tan tb tc tf
+syn keyword txl_keyword contained third throw throwf time
+syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
+syn keyword txl_keyword contained time-usec tofloat toint tok-str
+syn keyword txl_keyword contained tok-where tostring tostringp tprint
+syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
+syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword txl_keyword contained trie-value-at trim-str true trunc
+syn keyword txl_keyword contained trunc-rem tuples txr-case txr-if
+syn keyword txl_keyword contained txr-when typeof unget-byte unget-char
+syn keyword txl_keyword contained uniq unique unless unquote
+syn keyword txl_keyword contained unsetenv until until* upcase-str
+syn keyword txl_keyword contained update url-decode url-encode usleep
+syn keyword txl_keyword contained uw-protect vec vec-push vec-set-length
+syn keyword txl_keyword contained vecref vector vector-list vectorp
+syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
+syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
+syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
+syn keyword txl_keyword contained weave when whenlet where
+syn keyword txl_keyword contained while while* whilet width
+syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-saved-vars
+syn keyword txl_keyword contained with-update-expander wrap wrap* zap
+syn keyword txl_keyword contained zerop zip
syn keyword txr_keyword contained accept all and assert
syn keyword txr_keyword contained bind block cases cat