summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--RELNOTES44
-rwxr-xr-xconfigure2
-rw-r--r--share/txr/stdlib/ver.tl2
-rw-r--r--tl.vim384
-rw-r--r--txr.14
-rw-r--r--txr.vim407
6 files changed, 482 insertions, 361 deletions
diff --git a/RELNOTES b/RELNOTES
index 43409f67..07eca132 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,47 @@
+ TXR 129
+ 2015-12-30
+
+
+ Features
+
+ - TXR pattern language:
+ - @(line) directive now works in horizontal mode
+ - New @(data) and @(name) directives for capturing/matching
+ raw data, and name of data source.
+ - :counter in @(repeat)/@(rep) can now be given a starting value.
+ - Quasiliterals in the pattern language are now evaluated as Lisp
+ quasiliterals.
+ - the compatibility mechanism provides the previous evaluation mode.
+ - The same applies to @(output): variables now follow Lisp rules,
+ similarly to variables in quasiliterals.
+ - @(repeat) and @(rep) now "see" Lisp globals; no need to list these
+ using :vars.
+ - Lisp library:
+ - chr-isdigit and chr-isxdigit now return the integer digit value
+ when the test is true, rather than just t.
+ - Object printing:
+ - Lazy strings are now printed in a reasonable way, not shortened
+ to the #<lazy-string ...> notation.
+ - New special variales for global control over how floating-point
+ objects are rendered: *print-flo-format* and *print-fo-format*.
+ - OOP:
+ - with-slots macro added.
+ - Yet improved location and macro ancestry tracing in unhandled
+ exception diagnostics.
+
+ Bugs
+
+ - Vim syntax highlighting files: fixed regression in genvim.txr
+ causing missing identifiers.
+ - Four-year-old bug in @(collect)/@(coll) fixed, causing the
+ @(last)/@(until) clauses to be evaluated with an empty list
+ of variable bindings whenever the main clause fails.
+ - Fixed exception in @(freeform) directive when scanning from
+ an interactive input stream.
+ - Bugfixes in pattern language debug tracing (-v).
+
+
+
TXR 128
2015-12-19
diff --git a/configure b/configure
index b98a95bd..88f35341 100755
--- a/configure
+++ b/configure
@@ -442,7 +442,7 @@ fi
#
-txr_ver=128
+txr_ver=129
#
# The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index b54322b5..1d2354d9 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 128)
+(defvarl lib-version 129)
(defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 6029198f..2566a6d3 100644
--- a/tl.vim
+++ b/tl.vim
@@ -55,107 +55,123 @@ syn keyword txl_keyword contained :weak-keys :weak-vals :whole :word-char
syn keyword txl_keyword contained :wrap < <= =
syn keyword txl_keyword contained > >= abort abs
syn keyword txl_keyword contained abs-path-p acons acons-new aconsql-new
-syn keyword txl_keyword contained acos alist-nremove alist-remove all
-syn keyword txl_keyword contained and andf apf append
-syn keyword txl_keyword contained append* apply ash asin
-syn keyword txl_keyword contained assoc assql atan atan2
-syn keyword txl_keyword contained atom bignump bindable bit
-syn keyword txl_keyword contained boundp break-str butlast caaaaar
-syn keyword txl_keyword contained caaaadr caaaar caaadar caaaddr
-syn keyword txl_keyword contained caaadr caaar caadaar caadadr
-syn keyword txl_keyword contained caadar caaddar caadddr caaddr
-syn keyword txl_keyword contained caadr caar cadaaar cadaadr
-syn keyword txl_keyword contained cadaar cadadar cadaddr cadadr
-syn keyword txl_keyword contained cadar caddaar caddadr caddar
-syn keyword txl_keyword contained cadddar caddddr cadddr caddr
-syn keyword txl_keyword contained cadr call call-clobber-expander call-delete-expander
-syn keyword txl_keyword contained call-finalizers call-super-fun call-super-method call-update-expander
-syn keyword txl_keyword contained callf car cat-str cat-streams
-syn keyword txl_keyword contained cat-vec catenated-stream-p catenated-stream-push cdaaaar
-syn keyword txl_keyword contained cdaaadr cdaaar cdaadar cdaaddr
-syn keyword txl_keyword contained cdaadr cdaar cdadaar cdadadr
-syn keyword txl_keyword contained cdadar cdaddar cdadddr cdaddr
-syn keyword txl_keyword contained cdadr cdar cddaaar cddaadr
-syn keyword txl_keyword contained cddaar cddadar cddaddr cddadr
-syn keyword txl_keyword contained cddar cdddaar cdddadr cdddar
-syn keyword txl_keyword contained cddddar cdddddr cddddr cdddr
-syn keyword txl_keyword contained cddr cdr ceil chain
-syn keyword txl_keyword contained chand chdir chmod chr-int
-syn keyword txl_keyword contained chr-isalnum chr-isalpha chr-isascii chr-isblank
-syn keyword txl_keyword contained chr-iscntrl chr-isdigit chr-isgraph chr-islower
-syn keyword txl_keyword contained chr-isprint chr-ispunct chr-isspace chr-isunisp
-syn keyword txl_keyword contained chr-isupper chr-isxdigit chr-num chr-str
-syn keyword txl_keyword contained chr-str-set chr-tolower chr-toupper chrp
-syn keyword txl_keyword contained clamp clear-error clear-struct close-stream
-syn keyword txl_keyword contained closelog cmp-str comb compl-span-str
+syn keyword txl_keyword contained acos ado alist-nremove alist-remove
+syn keyword txl_keyword contained all and andf ap
+syn keyword txl_keyword contained apf append append* append-each
+syn keyword txl_keyword contained append-each* apply aret ash
+syn keyword txl_keyword contained asin assoc assql atan
+syn keyword txl_keyword contained atan2 atom bignump bindable
+syn keyword txl_keyword contained bit block block* boundp
+syn keyword txl_keyword contained break-str butlast caaaaar caaaadr
+syn keyword txl_keyword contained caaaar caaadar caaaddr caaadr
+syn keyword txl_keyword contained caaar caadaar caadadr caadar
+syn keyword txl_keyword contained caaddar caadddr caaddr caadr
+syn keyword txl_keyword contained caar cadaaar cadaadr cadaar
+syn keyword txl_keyword contained cadadar cadaddr cadadr cadar
+syn keyword txl_keyword contained caddaar caddadr caddar cadddar
+syn keyword txl_keyword contained caddddr cadddr caddr cadr
+syn keyword txl_keyword contained call call-clobber-expander call-delete-expander call-finalizers
+syn keyword txl_keyword contained call-super-fun call-super-method call-update-expander callf
+syn keyword txl_keyword contained car caseq caseql casequal
+syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
+syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdaaaar cdaaadr
+syn keyword txl_keyword contained cdaaar cdaadar cdaaddr cdaadr
+syn keyword txl_keyword contained cdaar cdadaar cdadadr cdadar
+syn keyword txl_keyword contained cdaddar cdadddr cdaddr cdadr
+syn keyword txl_keyword contained cdar cddaaar cddaadr cddaar
+syn keyword txl_keyword contained cddadar cddaddr cddadr cddar
+syn keyword txl_keyword contained cdddaar cdddadr cdddar cddddar
+syn keyword txl_keyword contained cdddddr cddddr cdddr cddr
+syn keyword txl_keyword contained cdr ceil chain chand
+syn keyword txl_keyword contained chdir chmod chr-int chr-isalnum
+syn keyword txl_keyword contained chr-isalpha chr-isascii chr-isblank chr-iscntrl
+syn keyword txl_keyword contained chr-isdigit chr-isgraph chr-islower chr-isprint
+syn keyword txl_keyword contained chr-ispunct chr-isspace chr-isunisp chr-isupper
+syn keyword txl_keyword contained chr-isxdigit chr-num chr-str chr-str-set
+syn keyword txl_keyword contained chr-tolower chr-toupper chrp clamp
+syn keyword txl_keyword contained clear-error clear-struct close-stream closelog
+syn keyword txl_keyword contained cmp-str collect-each collect-each* comb
+syn keyword txl_keyword contained compl-span-str cond conda condlet
syn keyword txl_keyword contained cons conses conses* consp
syn keyword txl_keyword contained constantp copy copy-alist copy-cons
syn keyword txl_keyword contained copy-hash copy-list copy-str copy-struct
syn keyword txl_keyword contained copy-vec cos count-if countq
syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
-syn keyword txl_keyword contained delete-package display-width downcase-str drop
+syn keyword txl_keyword contained dec defex define-accessor define-modify-macro
+syn keyword txl_keyword contained define-place-macro defmacro defmeth defparm
+syn keyword txl_keyword contained defparml defplace defstruct defsymacro
+syn keyword txl_keyword contained defun defvar defvarl del
+syn keyword txl_keyword contained delay delete-package display-width do
+syn keyword txl_keyword contained dohash dotimes downcase-str drop
syn keyword txl_keyword contained drop-until drop-while dup dupfd
-syn keyword txl_keyword contained eighth empty endgrent endpwent
-syn keyword txl_keyword contained ensure-dir env env-fbind env-hash
-syn keyword txl_keyword contained env-vbind eq eql equal
-syn keyword txl_keyword contained errno error eval evenp
-syn keyword txl_keyword contained exception-subtype-p exec exit exit*
-syn keyword txl_keyword contained exp expand-right expt exptmod
-syn keyword txl_keyword contained false fboundp fifth fileno
-syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
-syn keyword txl_keyword contained find-frame find-if find-max find-min
-syn keyword txl_keyword contained find-package find-struct-type first fixnump
-syn keyword txl_keyword contained flatcar flatcar* flatten flatten*
-syn keyword txl_keyword contained flipargs flo-dig flo-epsilon flo-int
-syn keyword txl_keyword contained flo-max flo-max-dig flo-min flo-str
-syn keyword txl_keyword contained floatp floor flush-stream fmakunbound
-syn keyword txl_keyword contained force fork format fourth
-syn keyword txl_keyword contained from fstat func-get-env func-get-form
+syn keyword txl_keyword contained dwim each each* eighth
+syn keyword txl_keyword contained empty endgrent endpwent ensure-dir
+syn keyword txl_keyword contained env env-fbind env-hash env-vbind
+syn keyword txl_keyword contained eq eql equal errno
+syn keyword txl_keyword contained error eval evenp exception-subtype-p
+syn keyword txl_keyword contained exec exit exit* exp
+syn keyword txl_keyword contained expand-right expt exptmod false
+syn keyword txl_keyword contained fboundp fifth fileno filter-equal
+syn keyword txl_keyword contained filter-string-tree finalize find find-frame
+syn keyword txl_keyword contained find-if find-max find-min find-package
+syn keyword txl_keyword contained find-struct-type first fixnump flatcar
+syn keyword txl_keyword contained flatcar* flatten flatten* flet
+syn keyword txl_keyword contained flip flipargs flo-dig flo-epsilon
+syn keyword txl_keyword contained flo-int flo-max flo-max-dig flo-min
+syn keyword txl_keyword contained flo-str floatp floor flush-stream
+syn keyword txl_keyword contained fmakunbound for for* force
+syn keyword txl_keyword contained fork format fourth from
+syn keyword txl_keyword contained fstat fun func-get-env func-get-form
syn keyword txl_keyword contained func-get-name func-set-env functionp gcd
-syn keyword txl_keyword contained generate gensym gequal get-byte
-syn keyword txl_keyword contained get-char get-clobber-expander get-delete-expander get-error
-syn keyword txl_keyword contained get-error-str get-frames get-hash-userdata get-indent
-syn keyword txl_keyword contained get-indent-mode get-line get-lines get-list-from-stream
-syn keyword txl_keyword contained get-sig-handler get-string get-string-from-stream get-update-expander
-syn keyword txl_keyword contained getegid getenv geteuid getgid
-syn keyword txl_keyword contained getgrent getgrgid getgrnam getgroups
-syn keyword txl_keyword contained gethash getitimer getpid getppid
-syn keyword txl_keyword contained getpwent getpwnam getpwuid getuid
-syn keyword txl_keyword contained ginterate giterate glob glob-altdirfunc
-syn keyword txl_keyword contained glob-brace glob-err glob-mark glob-nocheck
-syn keyword txl_keyword contained glob-noescape glob-nomagic glob-nosort glob-onlydir
-syn keyword txl_keyword contained glob-period glob-tilde glob-tilde-check greater
-syn keyword txl_keyword contained group-by group-reduce hash hash-alist
+syn keyword txl_keyword contained gen generate gensym gequal
+syn keyword txl_keyword contained get-byte get-char get-clobber-expander get-delete-expander
+syn keyword txl_keyword contained get-error get-error-str get-frames get-hash-userdata
+syn keyword txl_keyword contained get-indent get-indent-mode get-line get-lines
+syn keyword txl_keyword contained get-list-from-stream get-sig-handler get-string get-string-from-stream
+syn keyword txl_keyword contained get-update-expander getegid getenv geteuid
+syn keyword txl_keyword contained getgid getgrent getgrgid getgrnam
+syn keyword txl_keyword contained getgroups gethash getitimer getpid
+syn keyword txl_keyword contained getppid getpwent getpwnam getpwuid
+syn keyword txl_keyword contained getuid ginterate giterate glob
+syn keyword txl_keyword contained glob-altdirfunc glob-brace glob-err glob-mark
+syn keyword txl_keyword contained glob-nocheck glob-noescape glob-nomagic glob-nosort
+syn keyword txl_keyword contained glob-onlydir glob-period glob-tilde glob-tilde-check
+syn keyword txl_keyword contained greater group-by group-reduce gun
+syn keyword txl_keyword contained handle handler-bind hash hash-alist
syn keyword txl_keyword contained hash-begin hash-construct hash-count hash-diff
syn keyword txl_keyword contained hash-eql hash-equal hash-from-pairs hash-isec
syn keyword txl_keyword contained hash-keys hash-list hash-next hash-pairs
syn keyword txl_keyword contained hash-proper-subset hash-revget hash-subset hash-uni
syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
syn keyword txl_keyword contained have html-decode html-encode html-encode*
-syn keyword txl_keyword contained iapply identity if iff
-syn keyword txl_keyword contained iffi in inc-indent indent-code
-syn keyword txl_keyword contained indent-data indent-off inhash int-chr
-syn keyword txl_keyword contained int-flo int-str integerp intern
-syn keyword txl_keyword contained interp-fun-p interpose invoke-catch ipf
-syn keyword txl_keyword contained iread isqrt itimer-prov itimer-real
-syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
-syn keyword txl_keyword contained keyword-package keywordp kill last
+syn keyword txl_keyword contained iapply identity ido if
+syn keyword txl_keyword contained ifa iff iffi iflet
+syn keyword txl_keyword contained ignerr in inc inc-indent
+syn keyword txl_keyword contained indent-code indent-data indent-off inhash
+syn keyword txl_keyword contained int-chr int-flo int-str integerp
+syn keyword txl_keyword contained intern interp-fun-p interpose invoke-catch
+syn keyword txl_keyword contained ip ipf iread isqrt
+syn keyword txl_keyword contained itimer-prov itimer-real itimer-virtual juxt
+syn keyword txl_keyword contained keep-if keep-if* keyword-package keywordp
+syn keyword txl_keyword contained kill labels lambda last
syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
-syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lcm 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 lexical-fun-p lexical-lisp1-binding lexical-var-p lib-version
-syn keyword txl_keyword contained link lisp-parse list list*
-syn keyword txl_keyword contained list-str list-vec list-vector listp
-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 lstat
-syn keyword txl_keyword contained macro-ancestor macro-form-p macroexpand macroexpand-1
+syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lcm lcons
+syn keyword txl_keyword contained lcons-fun lconsp ldiff length
+syn keyword txl_keyword contained length-list length-str length-str-< length-str-<=
+syn keyword txl_keyword contained length-str-> length-str->= length-vec lequal
+syn keyword txl_keyword contained less let let* lexical-fun-p
+syn keyword txl_keyword contained lexical-lisp1-binding lexical-var-p lib-version link
+syn keyword txl_keyword contained lisp-parse list list* list-str
+syn keyword txl_keyword contained list-vec list-vector listp lnew
+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 lstat mac-param-bind macro-ancestor 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-lazy-struct make-like make-package
syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
@@ -167,16 +183,18 @@ syn keyword txl_keyword contained mappend* mask match-fun match-regex
syn keyword txl_keyword contained match-regex-right match-regst match-regst-right match-str
syn keyword txl_keyword contained match-str-tree max mboundp member
syn keyword txl_keyword contained member-if memq memql memqual
-syn keyword txl_keyword contained merge method min minor
-syn keyword txl_keyword contained minusp mkdir mknod mkstring
-syn keyword txl_keyword contained mmakunbound mod multi multi-sort
-syn keyword txl_keyword contained n-choose-k n-perm-k nconc nil
-syn keyword txl_keyword contained nilf ninth none not
-syn keyword txl_keyword contained notf nreconc nreverse nthcdr
-syn keyword txl_keyword contained null nullify num-chr num-str
-syn keyword txl_keyword contained numberp oddp open-command open-directory
-syn keyword txl_keyword contained open-file open-fileno open-files open-files*
-syn keyword txl_keyword contained open-pipe open-process open-tail openlog
+syn keyword txl_keyword contained merge meth method min
+syn keyword txl_keyword contained minor minusp mkdir mknod
+syn keyword txl_keyword contained mkstring mlet mmakunbound mod
+syn keyword txl_keyword contained multi multi-sort n-choose-k n-perm-k
+syn keyword txl_keyword contained nconc new nil nilf
+syn keyword txl_keyword contained ninth none not notf
+syn keyword txl_keyword contained nreconc nreverse nthcdr null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand obtain obtain-block oddp
+syn keyword txl_keyword contained op open-command open-directory open-file
+syn keyword txl_keyword contained open-fileno open-files open-files* open-pipe
+syn keyword txl_keyword contained open-process open-tail openlog opip
syn keyword txl_keyword contained or orf package-alist package-name
syn keyword txl_keyword contained package-symbols packagep pad partition
syn keyword txl_keyword contained partition* partition-by path-blkdev-p path-chrdev-p
@@ -185,40 +203,45 @@ syn keyword txl_keyword contained path-mine-p path-my-group-p path-newer path-ol
syn keyword txl_keyword contained path-pipe-p path-private-to-me-p path-same-object path-setgid-p
syn keyword txl_keyword contained path-setuid-p path-sock-p path-sticky-p path-symlink-p
syn keyword txl_keyword contained path-writable-to-me-p perm pipe place-form-p
-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-wrband pos pos-if pos-max
-syn keyword txl_keyword contained pos-min posq posql posqual
-syn keyword txl_keyword contained pppred ppred pprinl pprint
-syn keyword txl_keyword contained pred prinl print promisep
-syn keyword txl_keyword contained prop proper-listp pushhash put-byte
-syn keyword txl_keyword contained put-char put-line put-lines put-string
-syn keyword txl_keyword contained put-strings pwd raise rand
-syn keyword txl_keyword contained random random-fixnum random-state-p range
-syn keyword txl_keyword contained range* range-regex rangep rcomb
-syn keyword txl_keyword contained rcons 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 register-exception-subtypes
-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-struct replace-vec reset-struct
-syn keyword txl_keyword contained rest retf return* revappend
-syn keyword txl_keyword contained reverse rlcp 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 self-path seqp set-diff
-syn keyword txl_keyword contained set-hash-userdata set-indent set-indent-mode set-sig-handler
-syn keyword txl_keyword contained setegid setenv seteuid setgid
-syn keyword txl_keyword contained setgrent sethash setitimer setlogmask
-syn keyword txl_keyword contained setpwent setuid seventh sh
+syn keyword txl_keyword contained placelet placelet* plusp poll
+syn keyword txl_keyword contained poll-err poll-in poll-nval poll-out
+syn keyword txl_keyword contained poll-pri poll-rdband poll-wrband pop
+syn keyword txl_keyword contained pos pos-if pos-max pos-min
+syn keyword txl_keyword contained posq posql posqual pppred
+syn keyword txl_keyword contained ppred pprinl pprint pprof
+syn keyword txl_keyword contained pred prinl print prof
+syn keyword txl_keyword contained prog1 progn promisep prop
+syn keyword txl_keyword contained proper-listp pset push pushhash
+syn keyword txl_keyword contained pushnew put-byte put-char put-line
+syn keyword txl_keyword contained put-lines put-string put-strings pwd
+syn keyword txl_keyword contained qquote qref quote raise
+syn keyword txl_keyword contained rand random random-fixnum random-state-p
+syn keyword txl_keyword contained range range* range-regex rangep
+syn keyword txl_keyword contained rcomb rcons 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 register-exception-subtypes regsub rehome-sym remhash
+syn keyword txl_keyword contained remove-if remove-if* remove-path remq
+syn keyword txl_keyword contained remq* remql remql* remqual
+syn keyword txl_keyword contained remqual* rename-path repeat replace
+syn keyword txl_keyword contained replace-list replace-str replace-struct replace-vec
+syn keyword txl_keyword contained reset-struct rest ret retf
+syn keyword txl_keyword contained return return* return-from revappend
+syn keyword txl_keyword contained reverse rlcp rlet rotate
+syn keyword txl_keyword contained rperm rplaca rplacd run
+syn keyword txl_keyword contained s-ifblk s-ifchr s-ifdir s-ififo
+syn keyword txl_keyword contained s-iflnk s-ifmt s-ifreg s-ifsock
+syn keyword txl_keyword contained s-irgrp s-iroth s-irusr s-irwxg
+syn keyword txl_keyword contained s-irwxo s-irwxu s-isgid s-isuid
+syn keyword txl_keyword contained s-isvtx s-iwgrp s-iwoth s-iwusr
+syn keyword txl_keyword contained s-ixgrp s-ixoth s-ixusr search
+syn keyword txl_keyword contained search-regex search-regst search-str search-str-tree
+syn keyword txl_keyword contained second seek-stream select self-path
+syn keyword txl_keyword contained seqp set set-diff set-hash-userdata
+syn keyword txl_keyword contained set-indent set-indent-mode set-sig-handler setegid
+syn keyword txl_keyword contained setenv seteuid setgid setgrent
+syn keyword txl_keyword contained sethash setitimer setlogmask setpwent
+syn keyword txl_keyword contained setuid seventh sh shift
syn keyword txl_keyword contained shuffle 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
@@ -231,49 +254,64 @@ syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
syn keyword txl_keyword contained sin sixth size-vec slot
syn keyword txl_keyword contained slotp slotset some sort
syn keyword txl_keyword contained sort-group source-loc source-loc-str span-str
-syn keyword txl_keyword contained special-operator-p special-var-p split split-str
-syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
-syn keyword txl_keyword contained stat static-slot static-slot-ensure static-slot-p
-syn keyword txl_keyword contained static-slot-set 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 struct-type struct-type-p structp
-syn keyword txl_keyword contained sub sub-list sub-str sub-vec
-syn keyword txl_keyword contained subtypep succ super super-method
+syn keyword txl_keyword contained special-operator-p special-var-p splice split
+syn keyword txl_keyword contained split-str split-str-set sqrt sssucc
+syn keyword txl_keyword contained ssucc stat static-slot static-slot-ensure
+syn keyword txl_keyword contained static-slot-p static-slot-set 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 struct-type struct-type-p
+syn keyword txl_keyword contained structp sub sub-list sub-str
+syn keyword txl_keyword contained sub-vec subtypep succ super
+syn keyword txl_keyword contained super-method suspend swap symacrolet
syn keyword txl_keyword contained symbol-function symbol-macro symbol-name symbol-package
syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
-syn keyword txl_keyword contained sys:abscond* sys:bad-slot-syntax sys:capture-cont sys:cp-origin
-syn keyword txl_keyword contained sys:defmeth sys:do-path-test sys:dwim-del sys:dwim-set
-syn keyword txl_keyword contained sys:eval-err sys:expand sys:gc sys:gc-set-delta
-syn keyword txl_keyword contained sys:get-fb sys:get-mb sys:get-vb sys:handle-bad-syntax
-syn keyword txl_keyword contained sys:if-to-cond sys:load sys:make-struct-type sys:mark-special
-syn keyword txl_keyword contained sys:obtain-impl sys:path-access sys:path-test-mode sys:pl-expand
-syn keyword txl_keyword contained sys:prune-nil-inits sys:reg-expand-nongreedy sys:reg-optimize sys:register-simple-accessor
-syn keyword txl_keyword contained sys:rplaca sys:rplacd sys:set-macro-ancestor sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-mb
-syn keyword txl_keyword contained sys:top-vb syslog system-package t
-syn keyword txl_keyword contained take take-until take-while tan
-syn keyword txl_keyword contained tenth test-set-indent-mode 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-struct-local
-syn keyword txl_keyword contained time-struct-utc time-usec to tofloat
-syn keyword txl_keyword contained toint tok-str tok-where tostring
-syn keyword txl_keyword contained tostringp tprint transpose 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 truncate-stream tuples txr-sym
-syn keyword txl_keyword contained txr-version typeof typep umethod
-syn keyword txl_keyword contained unget-byte unget-char uniq unique
-syn keyword txl_keyword contained unsetenv upcase-str update url-decode
-syn keyword txl_keyword contained url-encode user-package usleep uslot
-syn keyword txl_keyword contained vec vec-list 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 where width width-check
-syn keyword txl_keyword contained window-map window-mappend wrap wrap*
-syn keyword txl_keyword contained zerop zip
+syn keyword txl_keyword contained sys:abscond* sys:abscond-from sys:bad-slot-syntax sys:capture-cont
+syn keyword txl_keyword contained sys:cp-origin sys:defmeth sys:do-path-test sys:dwim-del
+syn keyword txl_keyword contained sys:dwim-set sys:eval-err sys:expand sys:expr
+syn keyword txl_keyword contained sys:fbind sys:gc sys:gc-set-delta sys:get-fb
+syn keyword txl_keyword contained sys:get-mb sys:get-vb sys:handle-bad-syntax sys:if-to-cond
+syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
+syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
+syn keyword txl_keyword contained sys:obtain-impl sys:path-access sys:path-examine sys:path-test
+syn keyword txl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-nil-inits
+syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:reg-expand-nongreedy
+syn keyword txl_keyword contained sys:reg-optimize sys:register-simple-accessor sys:rplaca sys:rplacd
+syn keyword txl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:splice
+syn keyword txl_keyword contained sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
+syn keyword txl_keyword contained sys:top-fb sys:top-mb sys:top-vb sys:unquote
+syn keyword txl_keyword contained sys:var sys:with-saved-vars syslog system-package
+syn keyword txl_keyword contained t take take-until take-while
+syn keyword txl_keyword contained tan tb tc tenth
+syn keyword txl_keyword contained test-set-indent-mode tf third throw
+syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
+syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword txl_keyword contained time-usec to tofloat toint
+syn keyword txl_keyword contained tok-str tok-where tostring tostringp
+syn keyword txl_keyword contained tprint transpose tree-bind tree-case
+syn keyword txl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword txl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
+syn keyword txl_keyword contained trunc trunc-rem truncate-stream tuples
+syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-sym
+syn keyword txl_keyword contained txr-version txr-when typecase typeof
+syn keyword txl_keyword contained typep umeth umethod unget-byte
+syn keyword txl_keyword contained unget-char uniq unique unless
+syn keyword txl_keyword contained unquote unsetenv until until*
+syn keyword txl_keyword contained unwind-protect upcase-str update url-decode
+syn keyword txl_keyword contained url-encode user-package usl usleep
+syn keyword txl_keyword contained uslot vec vec-list vec-push
+syn keyword txl_keyword contained vec-set-length vecref vector vector-list
+syn keyword txl_keyword contained vectorp w-continued w-coredump w-exitstatus
+syn keyword txl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
+syn keyword txl_keyword contained w-nohang w-stopsig w-termsig w-untraced
+syn keyword txl_keyword contained wait weave when whenlet
+syn keyword txl_keyword contained where while while* whilet
+syn keyword txl_keyword contained width width-check window-map window-mappend
+syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-hash-iter
+syn keyword txl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-string-stream
+syn keyword txl_keyword contained with-out-strlist-stream with-resources with-stream with-update-expander
+syn keyword txl_keyword contained wrap wrap* yield yield-from
+syn keyword txl_keyword contained zap zerop zip
syn match txr_nested_error "[^\t ]\+" contained
syn match txr_variable "\(@[ \t]*\)[*]\?[ \t]*[A-Za-z_][A-Za-z_0-9]*"
syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*"
@@ -364,4 +402,4 @@ hi def link txr_nested_error Error
let b:current_syntax = "lisp"
-set lispwords=if,:method,:function,:init,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,unwind-protect,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
diff --git a/txr.1 b/txr.1
index 0458ebd7..bff5c833 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-12-19 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-12-30 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
.SH* NAME
-\*(TX \- text processing language (version 128)
+\*(TX \- text processing language (version 129)
.SH* SYNOPSIS
.cblk
diff --git a/txr.vim b/txr.vim
index c92c8e4b..832f9a38 100644
--- a/txr.vim
+++ b/txr.vim
@@ -55,107 +55,123 @@ syn keyword txl_keyword contained :weak-keys :weak-vals :whole :word-char
syn keyword txl_keyword contained :wrap < <= =
syn keyword txl_keyword contained > >= abort abs
syn keyword txl_keyword contained abs-path-p acons acons-new aconsql-new
-syn keyword txl_keyword contained acos alist-nremove alist-remove all
-syn keyword txl_keyword contained and andf apf append
-syn keyword txl_keyword contained append* apply ash asin
-syn keyword txl_keyword contained assoc assql atan atan2
-syn keyword txl_keyword contained atom bignump bindable bit
-syn keyword txl_keyword contained boundp break-str butlast caaaaar
-syn keyword txl_keyword contained caaaadr caaaar caaadar caaaddr
-syn keyword txl_keyword contained caaadr caaar caadaar caadadr
-syn keyword txl_keyword contained caadar caaddar caadddr caaddr
-syn keyword txl_keyword contained caadr caar cadaaar cadaadr
-syn keyword txl_keyword contained cadaar cadadar cadaddr cadadr
-syn keyword txl_keyword contained cadar caddaar caddadr caddar
-syn keyword txl_keyword contained cadddar caddddr cadddr caddr
-syn keyword txl_keyword contained cadr call call-clobber-expander call-delete-expander
-syn keyword txl_keyword contained call-finalizers call-super-fun call-super-method call-update-expander
-syn keyword txl_keyword contained callf car cat-str cat-streams
-syn keyword txl_keyword contained cat-vec catenated-stream-p catenated-stream-push cdaaaar
-syn keyword txl_keyword contained cdaaadr cdaaar cdaadar cdaaddr
-syn keyword txl_keyword contained cdaadr cdaar cdadaar cdadadr
-syn keyword txl_keyword contained cdadar cdaddar cdadddr cdaddr
-syn keyword txl_keyword contained cdadr cdar cddaaar cddaadr
-syn keyword txl_keyword contained cddaar cddadar cddaddr cddadr
-syn keyword txl_keyword contained cddar cdddaar cdddadr cdddar
-syn keyword txl_keyword contained cddddar cdddddr cddddr cdddr
-syn keyword txl_keyword contained cddr cdr ceil chain
-syn keyword txl_keyword contained chand chdir chmod chr-int
-syn keyword txl_keyword contained chr-isalnum chr-isalpha chr-isascii chr-isblank
-syn keyword txl_keyword contained chr-iscntrl chr-isdigit chr-isgraph chr-islower
-syn keyword txl_keyword contained chr-isprint chr-ispunct chr-isspace chr-isunisp
-syn keyword txl_keyword contained chr-isupper chr-isxdigit chr-num chr-str
-syn keyword txl_keyword contained chr-str-set chr-tolower chr-toupper chrp
-syn keyword txl_keyword contained clamp clear-error clear-struct close-stream
-syn keyword txl_keyword contained closelog cmp-str comb compl-span-str
+syn keyword txl_keyword contained acos ado alist-nremove alist-remove
+syn keyword txl_keyword contained all and andf ap
+syn keyword txl_keyword contained apf append append* append-each
+syn keyword txl_keyword contained append-each* apply aret ash
+syn keyword txl_keyword contained asin assoc assql atan
+syn keyword txl_keyword contained atan2 atom bignump bindable
+syn keyword txl_keyword contained bit block block* boundp
+syn keyword txl_keyword contained break-str butlast caaaaar caaaadr
+syn keyword txl_keyword contained caaaar caaadar caaaddr caaadr
+syn keyword txl_keyword contained caaar caadaar caadadr caadar
+syn keyword txl_keyword contained caaddar caadddr caaddr caadr
+syn keyword txl_keyword contained caar cadaaar cadaadr cadaar
+syn keyword txl_keyword contained cadadar cadaddr cadadr cadar
+syn keyword txl_keyword contained caddaar caddadr caddar cadddar
+syn keyword txl_keyword contained caddddr cadddr caddr cadr
+syn keyword txl_keyword contained call call-clobber-expander call-delete-expander call-finalizers
+syn keyword txl_keyword contained call-super-fun call-super-method call-update-expander callf
+syn keyword txl_keyword contained car caseq caseql casequal
+syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
+syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdaaaar cdaaadr
+syn keyword txl_keyword contained cdaaar cdaadar cdaaddr cdaadr
+syn keyword txl_keyword contained cdaar cdadaar cdadadr cdadar
+syn keyword txl_keyword contained cdaddar cdadddr cdaddr cdadr
+syn keyword txl_keyword contained cdar cddaaar cddaadr cddaar
+syn keyword txl_keyword contained cddadar cddaddr cddadr cddar
+syn keyword txl_keyword contained cdddaar cdddadr cdddar cddddar
+syn keyword txl_keyword contained cdddddr cddddr cdddr cddr
+syn keyword txl_keyword contained cdr ceil chain chand
+syn keyword txl_keyword contained chdir chmod chr-int chr-isalnum
+syn keyword txl_keyword contained chr-isalpha chr-isascii chr-isblank chr-iscntrl
+syn keyword txl_keyword contained chr-isdigit chr-isgraph chr-islower chr-isprint
+syn keyword txl_keyword contained chr-ispunct chr-isspace chr-isunisp chr-isupper
+syn keyword txl_keyword contained chr-isxdigit chr-num chr-str chr-str-set
+syn keyword txl_keyword contained chr-tolower chr-toupper chrp clamp
+syn keyword txl_keyword contained clear-error clear-struct close-stream closelog
+syn keyword txl_keyword contained cmp-str collect-each collect-each* comb
+syn keyword txl_keyword contained compl-span-str cond conda condlet
syn keyword txl_keyword contained cons conses conses* consp
syn keyword txl_keyword contained constantp copy copy-alist copy-cons
syn keyword txl_keyword contained copy-hash copy-list copy-str copy-struct
syn keyword txl_keyword contained copy-vec cos count-if countq
syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
-syn keyword txl_keyword contained delete-package display-width downcase-str drop
+syn keyword txl_keyword contained dec defex define-accessor define-modify-macro
+syn keyword txl_keyword contained define-place-macro defmacro defmeth defparm
+syn keyword txl_keyword contained defparml defplace defstruct defsymacro
+syn keyword txl_keyword contained defun defvar defvarl del
+syn keyword txl_keyword contained delay delete-package display-width do
+syn keyword txl_keyword contained dohash dotimes downcase-str drop
syn keyword txl_keyword contained drop-until drop-while dup dupfd
-syn keyword txl_keyword contained eighth empty endgrent endpwent
-syn keyword txl_keyword contained ensure-dir env env-fbind env-hash
-syn keyword txl_keyword contained env-vbind eq eql equal
-syn keyword txl_keyword contained errno error eval evenp
-syn keyword txl_keyword contained exception-subtype-p exec exit exit*
-syn keyword txl_keyword contained exp expand-right expt exptmod
-syn keyword txl_keyword contained false fboundp fifth fileno
-syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
-syn keyword txl_keyword contained find-frame find-if find-max find-min
-syn keyword txl_keyword contained find-package find-struct-type first fixnump
-syn keyword txl_keyword contained flatcar flatcar* flatten flatten*
-syn keyword txl_keyword contained flipargs flo-dig flo-epsilon flo-int
-syn keyword txl_keyword contained flo-max flo-max-dig flo-min flo-str
-syn keyword txl_keyword contained floatp floor flush-stream fmakunbound
-syn keyword txl_keyword contained force fork format fourth
-syn keyword txl_keyword contained from fstat func-get-env func-get-form
+syn keyword txl_keyword contained dwim each each* eighth
+syn keyword txl_keyword contained empty endgrent endpwent ensure-dir
+syn keyword txl_keyword contained env env-fbind env-hash env-vbind
+syn keyword txl_keyword contained eq eql equal errno
+syn keyword txl_keyword contained error eval evenp exception-subtype-p
+syn keyword txl_keyword contained exec exit exit* exp
+syn keyword txl_keyword contained expand-right expt exptmod false
+syn keyword txl_keyword contained fboundp fifth fileno filter-equal
+syn keyword txl_keyword contained filter-string-tree finalize find find-frame
+syn keyword txl_keyword contained find-if find-max find-min find-package
+syn keyword txl_keyword contained find-struct-type first fixnump flatcar
+syn keyword txl_keyword contained flatcar* flatten flatten* flet
+syn keyword txl_keyword contained flip flipargs flo-dig flo-epsilon
+syn keyword txl_keyword contained flo-int flo-max flo-max-dig flo-min
+syn keyword txl_keyword contained flo-str floatp floor flush-stream
+syn keyword txl_keyword contained fmakunbound for for* force
+syn keyword txl_keyword contained fork format fourth from
+syn keyword txl_keyword contained fstat fun func-get-env func-get-form
syn keyword txl_keyword contained func-get-name func-set-env functionp gcd
-syn keyword txl_keyword contained generate gensym gequal get-byte
-syn keyword txl_keyword contained get-char get-clobber-expander get-delete-expander get-error
-syn keyword txl_keyword contained get-error-str get-frames get-hash-userdata get-indent
-syn keyword txl_keyword contained get-indent-mode get-line get-lines get-list-from-stream
-syn keyword txl_keyword contained get-sig-handler get-string get-string-from-stream get-update-expander
-syn keyword txl_keyword contained getegid getenv geteuid getgid
-syn keyword txl_keyword contained getgrent getgrgid getgrnam getgroups
-syn keyword txl_keyword contained gethash getitimer getpid getppid
-syn keyword txl_keyword contained getpwent getpwnam getpwuid getuid
-syn keyword txl_keyword contained ginterate giterate glob glob-altdirfunc
-syn keyword txl_keyword contained glob-brace glob-err glob-mark glob-nocheck
-syn keyword txl_keyword contained glob-noescape glob-nomagic glob-nosort glob-onlydir
-syn keyword txl_keyword contained glob-period glob-tilde glob-tilde-check greater
-syn keyword txl_keyword contained group-by group-reduce hash hash-alist
+syn keyword txl_keyword contained gen generate gensym gequal
+syn keyword txl_keyword contained get-byte get-char get-clobber-expander get-delete-expander
+syn keyword txl_keyword contained get-error get-error-str get-frames get-hash-userdata
+syn keyword txl_keyword contained get-indent get-indent-mode get-line get-lines
+syn keyword txl_keyword contained get-list-from-stream get-sig-handler get-string get-string-from-stream
+syn keyword txl_keyword contained get-update-expander getegid getenv geteuid
+syn keyword txl_keyword contained getgid getgrent getgrgid getgrnam
+syn keyword txl_keyword contained getgroups gethash getitimer getpid
+syn keyword txl_keyword contained getppid getpwent getpwnam getpwuid
+syn keyword txl_keyword contained getuid ginterate giterate glob
+syn keyword txl_keyword contained glob-altdirfunc glob-brace glob-err glob-mark
+syn keyword txl_keyword contained glob-nocheck glob-noescape glob-nomagic glob-nosort
+syn keyword txl_keyword contained glob-onlydir glob-period glob-tilde glob-tilde-check
+syn keyword txl_keyword contained greater group-by group-reduce gun
+syn keyword txl_keyword contained handle handler-bind hash hash-alist
syn keyword txl_keyword contained hash-begin hash-construct hash-count hash-diff
syn keyword txl_keyword contained hash-eql hash-equal hash-from-pairs hash-isec
syn keyword txl_keyword contained hash-keys hash-list hash-next hash-pairs
syn keyword txl_keyword contained hash-proper-subset hash-revget hash-subset hash-uni
syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
syn keyword txl_keyword contained have html-decode html-encode html-encode*
-syn keyword txl_keyword contained iapply identity if iff
-syn keyword txl_keyword contained iffi in inc-indent indent-code
-syn keyword txl_keyword contained indent-data indent-off inhash int-chr
-syn keyword txl_keyword contained int-flo int-str integerp intern
-syn keyword txl_keyword contained interp-fun-p interpose invoke-catch ipf
-syn keyword txl_keyword contained iread isqrt itimer-prov itimer-real
-syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
-syn keyword txl_keyword contained keyword-package keywordp kill last
+syn keyword txl_keyword contained iapply identity ido if
+syn keyword txl_keyword contained ifa iff iffi iflet
+syn keyword txl_keyword contained ignerr in inc inc-indent
+syn keyword txl_keyword contained indent-code indent-data indent-off inhash
+syn keyword txl_keyword contained int-chr int-flo int-str integerp
+syn keyword txl_keyword contained intern interp-fun-p interpose invoke-catch
+syn keyword txl_keyword contained ip ipf iread isqrt
+syn keyword txl_keyword contained itimer-prov itimer-real itimer-virtual juxt
+syn keyword txl_keyword contained keep-if keep-if* keyword-package keywordp
+syn keyword txl_keyword contained kill labels lambda last
syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
-syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lcm 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 lexical-fun-p lexical-lisp1-binding lexical-var-p lib-version
-syn keyword txl_keyword contained link lisp-parse list list*
-syn keyword txl_keyword contained list-str list-vec list-vector listp
-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 lstat
-syn keyword txl_keyword contained macro-ancestor macro-form-p macroexpand macroexpand-1
+syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lcm lcons
+syn keyword txl_keyword contained lcons-fun lconsp ldiff length
+syn keyword txl_keyword contained length-list length-str length-str-< length-str-<=
+syn keyword txl_keyword contained length-str-> length-str->= length-vec lequal
+syn keyword txl_keyword contained less let let* lexical-fun-p
+syn keyword txl_keyword contained lexical-lisp1-binding lexical-var-p lib-version link
+syn keyword txl_keyword contained lisp-parse list list* list-str
+syn keyword txl_keyword contained list-vec list-vector listp lnew
+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 lstat mac-param-bind macro-ancestor 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-lazy-struct make-like make-package
syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
@@ -167,16 +183,18 @@ syn keyword txl_keyword contained mappend* mask match-fun match-regex
syn keyword txl_keyword contained match-regex-right match-regst match-regst-right match-str
syn keyword txl_keyword contained match-str-tree max mboundp member
syn keyword txl_keyword contained member-if memq memql memqual
-syn keyword txl_keyword contained merge method min minor
-syn keyword txl_keyword contained minusp mkdir mknod mkstring
-syn keyword txl_keyword contained mmakunbound mod multi multi-sort
-syn keyword txl_keyword contained n-choose-k n-perm-k nconc nil
-syn keyword txl_keyword contained nilf ninth none not
-syn keyword txl_keyword contained notf nreconc nreverse nthcdr
-syn keyword txl_keyword contained null nullify num-chr num-str
-syn keyword txl_keyword contained numberp oddp open-command open-directory
-syn keyword txl_keyword contained open-file open-fileno open-files open-files*
-syn keyword txl_keyword contained open-pipe open-process open-tail openlog
+syn keyword txl_keyword contained merge meth method min
+syn keyword txl_keyword contained minor minusp mkdir mknod
+syn keyword txl_keyword contained mkstring mlet mmakunbound mod
+syn keyword txl_keyword contained multi multi-sort n-choose-k n-perm-k
+syn keyword txl_keyword contained nconc new nil nilf
+syn keyword txl_keyword contained ninth none not notf
+syn keyword txl_keyword contained nreconc nreverse nthcdr null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand obtain obtain-block oddp
+syn keyword txl_keyword contained op open-command open-directory open-file
+syn keyword txl_keyword contained open-fileno open-files open-files* open-pipe
+syn keyword txl_keyword contained open-process open-tail openlog opip
syn keyword txl_keyword contained or orf package-alist package-name
syn keyword txl_keyword contained package-symbols packagep pad partition
syn keyword txl_keyword contained partition* partition-by path-blkdev-p path-chrdev-p
@@ -185,40 +203,45 @@ syn keyword txl_keyword contained path-mine-p path-my-group-p path-newer path-ol
syn keyword txl_keyword contained path-pipe-p path-private-to-me-p path-same-object path-setgid-p
syn keyword txl_keyword contained path-setuid-p path-sock-p path-sticky-p path-symlink-p
syn keyword txl_keyword contained path-writable-to-me-p perm pipe place-form-p
-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-wrband pos pos-if pos-max
-syn keyword txl_keyword contained pos-min posq posql posqual
-syn keyword txl_keyword contained pppred ppred pprinl pprint
-syn keyword txl_keyword contained pred prinl print promisep
-syn keyword txl_keyword contained prop proper-listp pushhash put-byte
-syn keyword txl_keyword contained put-char put-line put-lines put-string
-syn keyword txl_keyword contained put-strings pwd raise rand
-syn keyword txl_keyword contained random random-fixnum random-state-p range
-syn keyword txl_keyword contained range* range-regex rangep rcomb
-syn keyword txl_keyword contained rcons 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 register-exception-subtypes
-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-struct replace-vec reset-struct
-syn keyword txl_keyword contained rest retf return* revappend
-syn keyword txl_keyword contained reverse rlcp 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 self-path seqp set-diff
-syn keyword txl_keyword contained set-hash-userdata set-indent set-indent-mode set-sig-handler
-syn keyword txl_keyword contained setegid setenv seteuid setgid
-syn keyword txl_keyword contained setgrent sethash setitimer setlogmask
-syn keyword txl_keyword contained setpwent setuid seventh sh
+syn keyword txl_keyword contained placelet placelet* plusp poll
+syn keyword txl_keyword contained poll-err poll-in poll-nval poll-out
+syn keyword txl_keyword contained poll-pri poll-rdband poll-wrband pop
+syn keyword txl_keyword contained pos pos-if pos-max pos-min
+syn keyword txl_keyword contained posq posql posqual pppred
+syn keyword txl_keyword contained ppred pprinl pprint pprof
+syn keyword txl_keyword contained pred prinl print prof
+syn keyword txl_keyword contained prog1 progn promisep prop
+syn keyword txl_keyword contained proper-listp pset push pushhash
+syn keyword txl_keyword contained pushnew put-byte put-char put-line
+syn keyword txl_keyword contained put-lines put-string put-strings pwd
+syn keyword txl_keyword contained qquote qref quote raise
+syn keyword txl_keyword contained rand random random-fixnum random-state-p
+syn keyword txl_keyword contained range range* range-regex rangep
+syn keyword txl_keyword contained rcomb rcons 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 register-exception-subtypes regsub rehome-sym remhash
+syn keyword txl_keyword contained remove-if remove-if* remove-path remq
+syn keyword txl_keyword contained remq* remql remql* remqual
+syn keyword txl_keyword contained remqual* rename-path repeat replace
+syn keyword txl_keyword contained replace-list replace-str replace-struct replace-vec
+syn keyword txl_keyword contained reset-struct rest ret retf
+syn keyword txl_keyword contained return return* return-from revappend
+syn keyword txl_keyword contained reverse rlcp rlet rotate
+syn keyword txl_keyword contained rperm rplaca rplacd run
+syn keyword txl_keyword contained s-ifblk s-ifchr s-ifdir s-ififo
+syn keyword txl_keyword contained s-iflnk s-ifmt s-ifreg s-ifsock
+syn keyword txl_keyword contained s-irgrp s-iroth s-irusr s-irwxg
+syn keyword txl_keyword contained s-irwxo s-irwxu s-isgid s-isuid
+syn keyword txl_keyword contained s-isvtx s-iwgrp s-iwoth s-iwusr
+syn keyword txl_keyword contained s-ixgrp s-ixoth s-ixusr search
+syn keyword txl_keyword contained search-regex search-regst search-str search-str-tree
+syn keyword txl_keyword contained second seek-stream select self-path
+syn keyword txl_keyword contained seqp set set-diff set-hash-userdata
+syn keyword txl_keyword contained set-indent set-indent-mode set-sig-handler setegid
+syn keyword txl_keyword contained setenv seteuid setgid setgrent
+syn keyword txl_keyword contained sethash setitimer setlogmask setpwent
+syn keyword txl_keyword contained setuid seventh sh shift
syn keyword txl_keyword contained shuffle 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
@@ -231,64 +254,80 @@ syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
syn keyword txl_keyword contained sin sixth size-vec slot
syn keyword txl_keyword contained slotp slotset some sort
syn keyword txl_keyword contained sort-group source-loc source-loc-str span-str
-syn keyword txl_keyword contained special-operator-p special-var-p split split-str
-syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
-syn keyword txl_keyword contained stat static-slot static-slot-ensure static-slot-p
-syn keyword txl_keyword contained static-slot-set 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 struct-type struct-type-p structp
-syn keyword txl_keyword contained sub sub-list sub-str sub-vec
-syn keyword txl_keyword contained subtypep succ super super-method
+syn keyword txl_keyword contained special-operator-p special-var-p splice split
+syn keyword txl_keyword contained split-str split-str-set sqrt sssucc
+syn keyword txl_keyword contained ssucc stat static-slot static-slot-ensure
+syn keyword txl_keyword contained static-slot-p static-slot-set 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 struct-type struct-type-p
+syn keyword txl_keyword contained structp sub sub-list sub-str
+syn keyword txl_keyword contained sub-vec subtypep succ super
+syn keyword txl_keyword contained super-method suspend swap symacrolet
syn keyword txl_keyword contained symbol-function symbol-macro symbol-name symbol-package
syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
-syn keyword txl_keyword contained sys:abscond* sys:bad-slot-syntax sys:capture-cont sys:cp-origin
-syn keyword txl_keyword contained sys:defmeth sys:do-path-test sys:dwim-del sys:dwim-set
-syn keyword txl_keyword contained sys:eval-err sys:expand sys:gc sys:gc-set-delta
-syn keyword txl_keyword contained sys:get-fb sys:get-mb sys:get-vb sys:handle-bad-syntax
-syn keyword txl_keyword contained sys:if-to-cond sys:load sys:make-struct-type sys:mark-special
-syn keyword txl_keyword contained sys:obtain-impl sys:path-access sys:path-test-mode sys:pl-expand
-syn keyword txl_keyword contained sys:prune-nil-inits sys:reg-expand-nongreedy sys:reg-optimize sys:register-simple-accessor
-syn keyword txl_keyword contained sys:rplaca sys:rplacd sys:set-macro-ancestor sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-mb
-syn keyword txl_keyword contained sys:top-vb syslog system-package t
-syn keyword txl_keyword contained take take-until take-while tan
-syn keyword txl_keyword contained tenth test-set-indent-mode 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-struct-local
-syn keyword txl_keyword contained time-struct-utc time-usec to tofloat
-syn keyword txl_keyword contained toint tok-str tok-where tostring
-syn keyword txl_keyword contained tostringp tprint transpose 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 truncate-stream tuples txr-sym
-syn keyword txl_keyword contained txr-version typeof typep umethod
-syn keyword txl_keyword contained unget-byte unget-char uniq unique
-syn keyword txl_keyword contained unsetenv upcase-str update url-decode
-syn keyword txl_keyword contained url-encode user-package usleep uslot
-syn keyword txl_keyword contained vec vec-list 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 where width width-check
-syn keyword txl_keyword contained window-map window-mappend wrap wrap*
-syn keyword txl_keyword contained zerop zip
+syn keyword txl_keyword contained sys:abscond* sys:abscond-from sys:bad-slot-syntax sys:capture-cont
+syn keyword txl_keyword contained sys:cp-origin sys:defmeth sys:do-path-test sys:dwim-del
+syn keyword txl_keyword contained sys:dwim-set sys:eval-err sys:expand sys:expr
+syn keyword txl_keyword contained sys:fbind sys:gc sys:gc-set-delta sys:get-fb
+syn keyword txl_keyword contained sys:get-mb sys:get-vb sys:handle-bad-syntax sys:if-to-cond
+syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
+syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
+syn keyword txl_keyword contained sys:obtain-impl sys:path-access sys:path-examine sys:path-test
+syn keyword txl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-nil-inits
+syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:reg-expand-nongreedy
+syn keyword txl_keyword contained sys:reg-optimize sys:register-simple-accessor sys:rplaca sys:rplacd
+syn keyword txl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:splice
+syn keyword txl_keyword contained sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
+syn keyword txl_keyword contained sys:top-fb sys:top-mb sys:top-vb sys:unquote
+syn keyword txl_keyword contained sys:var sys:with-saved-vars syslog system-package
+syn keyword txl_keyword contained t take take-until take-while
+syn keyword txl_keyword contained tan tb tc tenth
+syn keyword txl_keyword contained test-set-indent-mode tf third throw
+syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
+syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword txl_keyword contained time-usec to tofloat toint
+syn keyword txl_keyword contained tok-str tok-where tostring tostringp
+syn keyword txl_keyword contained tprint transpose tree-bind tree-case
+syn keyword txl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword txl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
+syn keyword txl_keyword contained trunc trunc-rem truncate-stream tuples
+syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-sym
+syn keyword txl_keyword contained txr-version txr-when typecase typeof
+syn keyword txl_keyword contained typep umeth umethod unget-byte
+syn keyword txl_keyword contained unget-char uniq unique unless
+syn keyword txl_keyword contained unquote unsetenv until until*
+syn keyword txl_keyword contained unwind-protect upcase-str update url-decode
+syn keyword txl_keyword contained url-encode user-package usl usleep
+syn keyword txl_keyword contained uslot vec vec-list vec-push
+syn keyword txl_keyword contained vec-set-length vecref vector vector-list
+syn keyword txl_keyword contained vectorp w-continued w-coredump w-exitstatus
+syn keyword txl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
+syn keyword txl_keyword contained w-nohang w-stopsig w-termsig w-untraced
+syn keyword txl_keyword contained wait weave when whenlet
+syn keyword txl_keyword contained where while while* whilet
+syn keyword txl_keyword contained width width-check window-map window-mappend
+syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-hash-iter
+syn keyword txl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-string-stream
+syn keyword txl_keyword contained with-out-strlist-stream with-resources with-stream with-update-expander
+syn keyword txl_keyword contained wrap wrap* yield yield-from
+syn keyword txl_keyword contained zap zerop zip
syn keyword txr_keyword contained accept all and assert
syn keyword txr_keyword contained bind block cases cat
syn keyword txr_keyword contained catch choose chr close
-syn keyword txr_keyword contained coll collect defex deffilter
-syn keyword txr_keyword contained define do elif else
-syn keyword txr_keyword contained end eof eol fail
-syn keyword txr_keyword contained filter finally flatten forget
-syn keyword txr_keyword contained freeform fuzz gather if
-syn keyword txr_keyword contained include last line load
-syn keyword txr_keyword contained local maybe merge next
-syn keyword txr_keyword contained none or output rebind
-syn keyword txr_keyword contained rep repeat require set
-syn keyword txr_keyword contained skip some text throw
-syn keyword txr_keyword contained trailer try until var
+syn keyword txr_keyword contained coll collect data defex
+syn keyword txr_keyword contained deffilter define do elif
+syn keyword txr_keyword contained else end eof eol
+syn keyword txr_keyword contained fail filter finally flatten
+syn keyword txr_keyword contained forget freeform fuzz gather
+syn keyword txr_keyword contained if include last line
+syn keyword txr_keyword contained load local maybe merge
+syn keyword txr_keyword contained name next none or
+syn keyword txr_keyword contained output rebind rep repeat
+syn keyword txr_keyword contained require set skip some
+syn keyword txr_keyword contained text throw trailer try
+syn keyword txr_keyword contained until var
syn match txr_error "\(@[ \t]*\)[*]\?[\t ]*."
syn match txr_atat "\(@[ \t]*\)@"
syn match txr_comment "\(@[ \t]*\)[#;].*"
@@ -390,4 +429,4 @@ hi def link txr_nested_error Error
let b:current_syntax = "lisp"
-set lispwords=if,:method,:function,:init,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,unwind-protect,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini