summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--RELNOTES33
-rwxr-xr-xconfigure2
-rw-r--r--share/txr/stdlib/ver.tl2
-rw-r--r--tl.vim138
-rw-r--r--txr.14
-rw-r--r--txr.vim138
6 files changed, 175 insertions, 142 deletions
diff --git a/RELNOTES b/RELNOTES
index 0f376c98..4e5d5238 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,36 @@
+ TXR 164
+ 2017-01-01
+
+
+ Features
+
+
+ - Awk macro: new variable fw for delimiting records according to fixed field
+ widths.
+ - The last variable may now be omitted in the bindings list of iflet, whenlet
+ and condlet, leaving just the controlling expression, not bound to a
+ variable.
+ - Various syntax checks over function and macro parameter lists, and variable
+ bindings, have been moved out of run time and into expansion time.
+
+ Bugs
+
+ - Build: "make clean" now removes txr-win.exe
+ - Fixed a lingering bug in the handling of special variables in parallel
+ binding, not fixed in the work done in this area for the previous release.
+ - Fixed a bug in the handling of optional-argument presence indicating
+ arguments: not binding them dynamically when they are special variables.
+ - Fixed inconsistency in the regex-source function: the source of the
+ (compound "str") regex was reported as "str", which isn't the same thing
+ when fed to the compiler.
+ - Fixed completely broken quasi-quoting over #R range literal syntax.
+ - Fixed a read/print consistency problem in quasiliterals.
+ - Fixed a problem with catch operator form not being fixed-point stable
+ under repeated passes through the expander. To fix the problem, catch
+ has turned into a macro which expands to an internal sys:catch operator.
+
+
+
TXR 163
2016-12-20
diff --git a/configure b/configure
index 49222d27..22646b16 100755
--- a/configure
+++ b/configure
@@ -454,7 +454,7 @@ fi
#
-txr_ver=163
+txr_ver=164
#
# The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 68c2b945..82b5837b 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 163)
+(defvarl lib-version 164)
(defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 93a9e7a2..4226e3d3 100644
--- a/tl.vim
+++ b/tl.vim
@@ -342,74 +342,74 @@ syn keyword tl_keyword contained symbolp symlink sys:*lisp1* sys:*pl-env*
syn keyword tl_keyword contained sys:*trace-hash* sys:*trace-level* sys:abscond* sys:abscond-from
syn keyword tl_keyword contained sys:apply sys:awk-expander sys:awk-fun-let sys:awk-fun-shadowing-env
syn keyword tl_keyword contained sys:awk-mac-let sys:awk-redir sys:awk-test sys:bad-slot-syntax
-syn keyword tl_keyword contained sys:capture-cont sys:circref sys:compat sys:conv
-syn keyword tl_keyword contained sys:conv-expand sys:conv-let sys:cp-origin sys:defmeth
-syn keyword tl_keyword contained sys:do-conv sys:do-path-test sys:dvbind sys:dwim-del
-syn keyword tl_keyword contained sys:dwim-set sys:each-op sys:eval-err sys:expand
-syn keyword tl_keyword contained sys:expr sys:fbind sys:for-op sys:gc
-syn keyword tl_keyword contained sys:gc-set-delta sys:get-fun-getter-setter sys:get-mb sys:get-vb
-syn keyword tl_keyword contained sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text sys:l1-setq
-syn keyword tl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword tl_keyword contained sys:list-builder-macrolets sys:make-struct-lit sys:make-struct-type sys:mark-special
-syn keyword tl_keyword contained sys:name-str sys:obtain-impl sys:opt-dash sys:opt-err
-syn keyword tl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
-syn keyword tl_keyword contained sys:pl-expand sys:placelet-1 sys:prune-missing-inits sys:qquote
-syn keyword tl_keyword contained sys:quasi sys:quasilist sys:r-s-let-expander sys:reg-expand-nongreedy
-syn keyword tl_keyword contained sys:reg-optimize sys:register-simple-accessor sys:rplaca sys:rplacd
-syn keyword tl_keyword contained sys:rslotset sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor
-syn keyword tl_keyword contained sys:setq sys:setqf sys:splice sys:str-inaddr-net-impl
-syn keyword tl_keyword contained sys:struct-lit sys:switch sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:top-fb sys:top-mb sys:top-vb
-syn keyword tl_keyword contained sys:trace sys:trace-enter sys:trace-leave sys:unquote
-syn keyword tl_keyword contained sys:untrace sys:var sys:wdwrap sys:with-dyn-rebinds
-syn keyword tl_keyword contained syslog system-package t tab0
-syn keyword tl_keyword contained tab1 tab2 tab3 tabdly
-syn keyword tl_keyword contained tagbody take take-until take-while
-syn keyword tl_keyword contained tan tb tc tcdrain
-syn keyword tl_keyword contained tcflow tcflush tcgetattr tciflush
-syn keyword tl_keyword contained tcioff tcioflush tcion tcoflush
-syn keyword tl_keyword contained tcooff tcoon tcsadrain tcsaflush
-syn keyword tl_keyword contained tcsanow tcsendbreak tcsetattr tenth
-syn keyword tl_keyword contained test-clear test-clear-dirty test-dec test-dirty
-syn keyword tl_keyword contained test-inc test-set test-set-indent-mode tf
-syn keyword tl_keyword contained third throw throwf time
-syn keyword tl_keyword contained time-fields-local time-fields-utc time-parse time-string-local
-syn keyword tl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
-syn keyword tl_keyword contained to tofloat tofloatz toint
-syn keyword tl_keyword contained tointz tok-str tok-where tostop
-syn keyword tl_keyword contained tostring tostringp tprint trace
-syn keyword tl_keyword contained transpose tree-bind tree-case tree-find
-syn keyword tl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
-syn keyword tl_keyword contained trie-value-at trim-str true trunc
-syn keyword tl_keyword contained trunc-rem truncate-stream tuples txr-case
-syn keyword tl_keyword contained txr-case-impl txr-if txr-path txr-sym
-syn keyword tl_keyword contained txr-version txr-when typecase typeof
-syn keyword tl_keyword contained typep umask umeth umethod
-syn keyword tl_keyword contained uname unget-byte unget-char unintern
-syn keyword tl_keyword contained uniq unique unless unquote
-syn keyword tl_keyword contained unsetenv until until* untrace
-syn keyword tl_keyword contained unuse-package unuse-sym unwind-protect upcase-str
-syn keyword tl_keyword contained upd update url-decode url-encode
-syn keyword tl_keyword contained use use-package use-sym user-package
-syn keyword tl_keyword contained usl usleep uslot vdiscard
-syn keyword tl_keyword contained vec vec-list vec-push vec-set-length
-syn keyword tl_keyword contained vecref vector vector-list vectorp
-syn keyword tl_keyword contained veof veol veol2 verase
-syn keyword tl_keyword contained vintr vkill vlnext vmin
-syn keyword tl_keyword contained vquit vreprint vstart vstop
-syn keyword tl_keyword contained vsusp vswtc vt0 vt1
-syn keyword tl_keyword contained vtdly vtime vwerase w-continued
-syn keyword tl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword tl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword tl_keyword contained w-termsig w-untraced wait weave
-syn keyword tl_keyword contained when whenlet where while
-syn keyword tl_keyword contained while* whilet width width-check
-syn keyword tl_keyword contained window-map window-mappend with-clobber-expander with-delete-expander
-syn keyword tl_keyword contained with-gensyms with-hash-iter with-in-string-byte-stream with-in-string-stream
-syn keyword tl_keyword contained with-objects with-out-string-stream with-out-strlist-stream with-resources
-syn keyword tl_keyword contained with-slots with-stream with-update-expander wrap
-syn keyword tl_keyword contained wrap* xcase yield yield-from
-syn keyword tl_keyword contained zap zerop zip
+syn keyword tl_keyword contained sys:capture-cont sys:catch sys:circref sys:compat
+syn keyword tl_keyword contained sys:conv sys:conv-expand sys:conv-let sys:cp-origin
+syn keyword tl_keyword contained sys:defmeth sys:do-conv sys:do-path-test sys:dvbind
+syn keyword tl_keyword contained sys:dwim-del sys:dwim-set sys:each-op sys:eval-err
+syn keyword tl_keyword contained sys:expand sys:expr sys:fbind sys:for-op
+syn keyword tl_keyword contained sys:gc sys:gc-set-delta sys:get-fun-getter-setter sys:get-mb
+syn keyword tl_keyword contained sys:get-vb sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text
+syn keyword tl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
+syn keyword tl_keyword contained sys:lisp1-value sys:list-builder-macrolets sys:make-struct-lit sys:make-struct-type
+syn keyword tl_keyword contained sys:mark-special sys:name-str sys:obtain-impl sys:opt-dash
+syn keyword tl_keyword contained sys:opt-err sys:path-access sys:path-examine sys:path-test
+syn keyword tl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-missing-inits
+syn keyword tl_keyword contained sys:qquote sys:quasi sys:quasilist sys:r-s-let-expander
+syn keyword tl_keyword contained sys:reg-expand-nongreedy sys:reg-optimize sys:register-simple-accessor sys:rplaca
+syn keyword tl_keyword contained sys:rplacd sys:rslotset sys:set-hash-rec-limit sys:set-hash-str-limit
+syn keyword tl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:splice
+syn keyword tl_keyword contained sys:str-inaddr-net-impl sys:struct-lit sys:switch sys:sym-clobber-expander
+syn keyword tl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-mb
+syn keyword tl_keyword contained sys:top-vb sys:trace sys:trace-enter sys:trace-leave
+syn keyword tl_keyword contained sys:unquote sys:untrace sys:var sys:wdwrap
+syn keyword tl_keyword contained sys:with-dyn-rebinds syslog system-package t
+syn keyword tl_keyword contained tab0 tab1 tab2 tab3
+syn keyword tl_keyword contained tabdly tagbody take take-until
+syn keyword tl_keyword contained take-while tan tb tc
+syn keyword tl_keyword contained tcdrain tcflow tcflush tcgetattr
+syn keyword tl_keyword contained tciflush tcioff tcioflush tcion
+syn keyword tl_keyword contained tcoflush tcooff tcoon tcsadrain
+syn keyword tl_keyword contained tcsaflush tcsanow tcsendbreak tcsetattr
+syn keyword tl_keyword contained tenth test-clear test-clear-dirty test-dec
+syn keyword tl_keyword contained test-dirty test-inc test-set test-set-indent-mode
+syn keyword tl_keyword contained tf third throw throwf
+syn keyword tl_keyword contained time time-fields-local time-fields-utc time-parse
+syn keyword tl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword tl_keyword contained time-usec to tofloat tofloatz
+syn keyword tl_keyword contained toint tointz tok-str tok-where
+syn keyword tl_keyword contained tostop tostring tostringp tprint
+syn keyword tl_keyword contained trace transpose tree-bind tree-case
+syn keyword tl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword tl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
+syn keyword tl_keyword contained trunc trunc-rem truncate-stream tuples
+syn keyword tl_keyword contained txr-case txr-case-impl txr-if txr-path
+syn keyword tl_keyword contained txr-sym txr-version txr-when typecase
+syn keyword tl_keyword contained typeof typep umask umeth
+syn keyword tl_keyword contained umethod uname unget-byte unget-char
+syn keyword tl_keyword contained unintern uniq unique unless
+syn keyword tl_keyword contained unquote unsetenv until until*
+syn keyword tl_keyword contained untrace unuse-package unuse-sym unwind-protect
+syn keyword tl_keyword contained upcase-str upd update url-decode
+syn keyword tl_keyword contained url-encode use use-package use-sym
+syn keyword tl_keyword contained user-package usl usleep uslot
+syn keyword tl_keyword contained vdiscard vec vec-list vec-push
+syn keyword tl_keyword contained vec-set-length vecref vector vector-list
+syn keyword tl_keyword contained vectorp veof veol veol2
+syn keyword tl_keyword contained verase vintr vkill vlnext
+syn keyword tl_keyword contained vmin vquit vreprint vstart
+syn keyword tl_keyword contained vstop vsusp vswtc vt0
+syn keyword tl_keyword contained vt1 vtdly vtime vwerase
+syn keyword tl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
+syn keyword tl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
+syn keyword tl_keyword contained w-stopsig w-termsig w-untraced wait
+syn keyword tl_keyword contained weave when whenlet where
+syn keyword tl_keyword contained while while* whilet width
+syn keyword tl_keyword contained width-check window-map window-mappend with-clobber-expander
+syn keyword tl_keyword contained with-delete-expander with-gensyms with-hash-iter with-in-string-byte-stream
+syn keyword tl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
+syn keyword tl_keyword contained with-resources with-slots with-stream with-update-expander
+syn keyword tl_keyword contained wrap wrap* xcase yield
+syn keyword tl_keyword contained yield-from 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]*" contained
@@ -510,4 +510,4 @@ hi def link txr_ign_bkt Comment
let b:current_syntax = "lisp"
-set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,collect-each,collect-each*,compare-swap,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,equot,flet,flip,for,for*,fun,gen,go,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:conv,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:unquote,sys:var,sys:with-dyn-rebinds,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,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-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,collect-each,collect-each*,compare-swap,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,equot,flet,flip,for,for*,fun,gen,go,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:catch,sys:conv,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:unquote,sys:var,sys:with-dyn-rebinds,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,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-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
diff --git a/txr.1 b/txr.1
index 90d580e4..41b63c64 100644
--- a/txr.1
+++ b/txr.1
@@ -340,9 +340,9 @@
.ds TX \f[B]TXR\f[]
.ds TL \f[B]TXR Lisp\f[]
.\" Start of man page:
-.TH TXR 1 2016-12-20 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2017-01-01 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
.SH* NAME
-\*(TX \- text processing language (version 163)
+\*(TX \- text processing language (version 164)
.SH* SYNOPSIS
.cblk
diff --git a/txr.vim b/txr.vim
index 353dc344..193924cf 100644
--- a/txr.vim
+++ b/txr.vim
@@ -342,74 +342,74 @@ syn keyword tl_keyword contained symbolp symlink sys:*lisp1* sys:*pl-env*
syn keyword tl_keyword contained sys:*trace-hash* sys:*trace-level* sys:abscond* sys:abscond-from
syn keyword tl_keyword contained sys:apply sys:awk-expander sys:awk-fun-let sys:awk-fun-shadowing-env
syn keyword tl_keyword contained sys:awk-mac-let sys:awk-redir sys:awk-test sys:bad-slot-syntax
-syn keyword tl_keyword contained sys:capture-cont sys:circref sys:compat sys:conv
-syn keyword tl_keyword contained sys:conv-expand sys:conv-let sys:cp-origin sys:defmeth
-syn keyword tl_keyword contained sys:do-conv sys:do-path-test sys:dvbind sys:dwim-del
-syn keyword tl_keyword contained sys:dwim-set sys:each-op sys:eval-err sys:expand
-syn keyword tl_keyword contained sys:expr sys:fbind sys:for-op sys:gc
-syn keyword tl_keyword contained sys:gc-set-delta sys:get-fun-getter-setter sys:get-mb sys:get-vb
-syn keyword tl_keyword contained sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text sys:l1-setq
-syn keyword tl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword tl_keyword contained sys:list-builder-macrolets sys:make-struct-lit sys:make-struct-type sys:mark-special
-syn keyword tl_keyword contained sys:name-str sys:obtain-impl sys:opt-dash sys:opt-err
-syn keyword tl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
-syn keyword tl_keyword contained sys:pl-expand sys:placelet-1 sys:prune-missing-inits sys:qquote
-syn keyword tl_keyword contained sys:quasi sys:quasilist sys:r-s-let-expander sys:reg-expand-nongreedy
-syn keyword tl_keyword contained sys:reg-optimize sys:register-simple-accessor sys:rplaca sys:rplacd
-syn keyword tl_keyword contained sys:rslotset sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor
-syn keyword tl_keyword contained sys:setq sys:setqf sys:splice sys:str-inaddr-net-impl
-syn keyword tl_keyword contained sys:struct-lit sys:switch sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:top-fb sys:top-mb sys:top-vb
-syn keyword tl_keyword contained sys:trace sys:trace-enter sys:trace-leave sys:unquote
-syn keyword tl_keyword contained sys:untrace sys:var sys:wdwrap sys:with-dyn-rebinds
-syn keyword tl_keyword contained syslog system-package t tab0
-syn keyword tl_keyword contained tab1 tab2 tab3 tabdly
-syn keyword tl_keyword contained tagbody take take-until take-while
-syn keyword tl_keyword contained tan tb tc tcdrain
-syn keyword tl_keyword contained tcflow tcflush tcgetattr tciflush
-syn keyword tl_keyword contained tcioff tcioflush tcion tcoflush
-syn keyword tl_keyword contained tcooff tcoon tcsadrain tcsaflush
-syn keyword tl_keyword contained tcsanow tcsendbreak tcsetattr tenth
-syn keyword tl_keyword contained test-clear test-clear-dirty test-dec test-dirty
-syn keyword tl_keyword contained test-inc test-set test-set-indent-mode tf
-syn keyword tl_keyword contained third throw throwf time
-syn keyword tl_keyword contained time-fields-local time-fields-utc time-parse time-string-local
-syn keyword tl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
-syn keyword tl_keyword contained to tofloat tofloatz toint
-syn keyword tl_keyword contained tointz tok-str tok-where tostop
-syn keyword tl_keyword contained tostring tostringp tprint trace
-syn keyword tl_keyword contained transpose tree-bind tree-case tree-find
-syn keyword tl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
-syn keyword tl_keyword contained trie-value-at trim-str true trunc
-syn keyword tl_keyword contained trunc-rem truncate-stream tuples txr-case
-syn keyword tl_keyword contained txr-case-impl txr-if txr-path txr-sym
-syn keyword tl_keyword contained txr-version txr-when typecase typeof
-syn keyword tl_keyword contained typep umask umeth umethod
-syn keyword tl_keyword contained uname unget-byte unget-char unintern
-syn keyword tl_keyword contained uniq unique unless unquote
-syn keyword tl_keyword contained unsetenv until until* untrace
-syn keyword tl_keyword contained unuse-package unuse-sym unwind-protect upcase-str
-syn keyword tl_keyword contained upd update url-decode url-encode
-syn keyword tl_keyword contained use use-package use-sym user-package
-syn keyword tl_keyword contained usl usleep uslot vdiscard
-syn keyword tl_keyword contained vec vec-list vec-push vec-set-length
-syn keyword tl_keyword contained vecref vector vector-list vectorp
-syn keyword tl_keyword contained veof veol veol2 verase
-syn keyword tl_keyword contained vintr vkill vlnext vmin
-syn keyword tl_keyword contained vquit vreprint vstart vstop
-syn keyword tl_keyword contained vsusp vswtc vt0 vt1
-syn keyword tl_keyword contained vtdly vtime vwerase w-continued
-syn keyword tl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword tl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword tl_keyword contained w-termsig w-untraced wait weave
-syn keyword tl_keyword contained when whenlet where while
-syn keyword tl_keyword contained while* whilet width width-check
-syn keyword tl_keyword contained window-map window-mappend with-clobber-expander with-delete-expander
-syn keyword tl_keyword contained with-gensyms with-hash-iter with-in-string-byte-stream with-in-string-stream
-syn keyword tl_keyword contained with-objects with-out-string-stream with-out-strlist-stream with-resources
-syn keyword tl_keyword contained with-slots with-stream with-update-expander wrap
-syn keyword tl_keyword contained wrap* xcase yield yield-from
-syn keyword tl_keyword contained zap zerop zip
+syn keyword tl_keyword contained sys:capture-cont sys:catch sys:circref sys:compat
+syn keyword tl_keyword contained sys:conv sys:conv-expand sys:conv-let sys:cp-origin
+syn keyword tl_keyword contained sys:defmeth sys:do-conv sys:do-path-test sys:dvbind
+syn keyword tl_keyword contained sys:dwim-del sys:dwim-set sys:each-op sys:eval-err
+syn keyword tl_keyword contained sys:expand sys:expr sys:fbind sys:for-op
+syn keyword tl_keyword contained sys:gc sys:gc-set-delta sys:get-fun-getter-setter sys:get-mb
+syn keyword tl_keyword contained sys:get-vb sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text
+syn keyword tl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
+syn keyword tl_keyword contained sys:lisp1-value sys:list-builder-macrolets sys:make-struct-lit sys:make-struct-type
+syn keyword tl_keyword contained sys:mark-special sys:name-str sys:obtain-impl sys:opt-dash
+syn keyword tl_keyword contained sys:opt-err sys:path-access sys:path-examine sys:path-test
+syn keyword tl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-missing-inits
+syn keyword tl_keyword contained sys:qquote sys:quasi sys:quasilist sys:r-s-let-expander
+syn keyword tl_keyword contained sys:reg-expand-nongreedy sys:reg-optimize sys:register-simple-accessor sys:rplaca
+syn keyword tl_keyword contained sys:rplacd sys:rslotset sys:set-hash-rec-limit sys:set-hash-str-limit
+syn keyword tl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:splice
+syn keyword tl_keyword contained sys:str-inaddr-net-impl sys:struct-lit sys:switch sys:sym-clobber-expander
+syn keyword tl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-mb
+syn keyword tl_keyword contained sys:top-vb sys:trace sys:trace-enter sys:trace-leave
+syn keyword tl_keyword contained sys:unquote sys:untrace sys:var sys:wdwrap
+syn keyword tl_keyword contained sys:with-dyn-rebinds syslog system-package t
+syn keyword tl_keyword contained tab0 tab1 tab2 tab3
+syn keyword tl_keyword contained tabdly tagbody take take-until
+syn keyword tl_keyword contained take-while tan tb tc
+syn keyword tl_keyword contained tcdrain tcflow tcflush tcgetattr
+syn keyword tl_keyword contained tciflush tcioff tcioflush tcion
+syn keyword tl_keyword contained tcoflush tcooff tcoon tcsadrain
+syn keyword tl_keyword contained tcsaflush tcsanow tcsendbreak tcsetattr
+syn keyword tl_keyword contained tenth test-clear test-clear-dirty test-dec
+syn keyword tl_keyword contained test-dirty test-inc test-set test-set-indent-mode
+syn keyword tl_keyword contained tf third throw throwf
+syn keyword tl_keyword contained time time-fields-local time-fields-utc time-parse
+syn keyword tl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword tl_keyword contained time-usec to tofloat tofloatz
+syn keyword tl_keyword contained toint tointz tok-str tok-where
+syn keyword tl_keyword contained tostop tostring tostringp tprint
+syn keyword tl_keyword contained trace transpose tree-bind tree-case
+syn keyword tl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword tl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
+syn keyword tl_keyword contained trunc trunc-rem truncate-stream tuples
+syn keyword tl_keyword contained txr-case txr-case-impl txr-if txr-path
+syn keyword tl_keyword contained txr-sym txr-version txr-when typecase
+syn keyword tl_keyword contained typeof typep umask umeth
+syn keyword tl_keyword contained umethod uname unget-byte unget-char
+syn keyword tl_keyword contained unintern uniq unique unless
+syn keyword tl_keyword contained unquote unsetenv until until*
+syn keyword tl_keyword contained untrace unuse-package unuse-sym unwind-protect
+syn keyword tl_keyword contained upcase-str upd update url-decode
+syn keyword tl_keyword contained url-encode use use-package use-sym
+syn keyword tl_keyword contained user-package usl usleep uslot
+syn keyword tl_keyword contained vdiscard vec vec-list vec-push
+syn keyword tl_keyword contained vec-set-length vecref vector vector-list
+syn keyword tl_keyword contained vectorp veof veol veol2
+syn keyword tl_keyword contained verase vintr vkill vlnext
+syn keyword tl_keyword contained vmin vquit vreprint vstart
+syn keyword tl_keyword contained vstop vsusp vswtc vt0
+syn keyword tl_keyword contained vt1 vtdly vtime vwerase
+syn keyword tl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
+syn keyword tl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
+syn keyword tl_keyword contained w-stopsig w-termsig w-untraced wait
+syn keyword tl_keyword contained weave when whenlet where
+syn keyword tl_keyword contained while while* whilet width
+syn keyword tl_keyword contained width-check window-map window-mappend with-clobber-expander
+syn keyword tl_keyword contained with-delete-expander with-gensyms with-hash-iter with-in-string-byte-stream
+syn keyword tl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
+syn keyword tl_keyword contained with-resources with-slots with-stream with-update-expander
+syn keyword tl_keyword contained wrap wrap* xcase yield
+syn keyword tl_keyword contained yield-from zap zerop zip
syn keyword txr_keyword contained accept all and assert
syn keyword txr_keyword contained bind block call cases
@@ -538,4 +538,4 @@ hi def link txr_ign_bkt Comment
let b:current_syntax = "lisp"
-set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,collect-each,collect-each*,compare-swap,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,equot,flet,flip,for,for*,fun,gen,go,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:conv,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:unquote,sys:var,sys:with-dyn-rebinds,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,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-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,collect-each,collect-each*,compare-swap,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,equot,flet,flip,for,for*,fun,gen,go,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:catch,sys:conv,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:unquote,sys:var,sys:with-dyn-rebinds,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,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-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini