summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2018-05-18 06:38:20 -0700
committerKaz Kylheku <kaz@kylheku.com>2018-05-18 06:38:20 -0700
commit5f7630186f81831d660310ef64984250e6eedc48 (patch)
treeccca01d75dd9302cb9dc4defc61b278b94bf9d08
parentc77dabaf277f663b9530038e8e897f5a3e53a8b0 (diff)
downloadtxr-5f7630186f81831d660310ef64984250e6eedc48.tar.gz
txr-5f7630186f81831d660310ef64984250e6eedc48.tar.bz2
txr-5f7630186f81831d660310ef64984250e6eedc48.zip
Version 196.txr-196
* RELNOTES: Updated. * configure, txr.1: Bumped version and date. * share/txr/stdlib/ver.tl: Likewise. * txr.vim, tl.vim: Regenerated.
-rw-r--r--RELNOTES58
-rwxr-xr-xconfigure2
-rw-r--r--share/txr/stdlib/ver.tl2
-rw-r--r--tl.vim118
-rw-r--r--txr.14
-rw-r--r--txr.vim118
6 files changed, 160 insertions, 142 deletions
diff --git a/RELNOTES b/RELNOTES
index 67ebccb4..ce1c20e4 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,17 +1,35 @@
+ TXR 196
+ 2018-05-18
+
+
+ Features
+
+ - Both the TXR Pattern Language and TXR Lisp now allow Unicode
+ in identifiers.
+ - Un-braced variables like @abc in the pattern language and
+ string quasiliterals are excluded from this change.
+ - Braced variables and Lisp symbols, including packag prefixes,
+ may use Unicode characters.
+ - Unicode spaces cannot be used in identifiers, and neither can
+ various invalid characters.
+ - The Interactive Listener now supports Unicode input.
+
+
+
TXR 195
2018-05-04
- Bugs
+ Bugs
- - Overhaul of handling of parameters that are special variables.
- - was not implemented at all in interpreted destructuring.
- - compiled destructuring implemented it by using let.
- - had subtly wrong scoping semantics, not affecting most code.
- - was broken completely due to a regression in TXR 190
- - MacOS and Solaris ports:
- - fixed broken method for getting TXR's executable path, which
- caused TXR not to work unless invoked via full path.
+ - Overhaul of handling of parameters that are special variables.
+ - was not implemented at all in interpreted destructuring.
+ - compiled destructuring implemented it by using let.
+ - had subtly wrong scoping semantics, not affecting most code.
+ - was broken completely due to a regression in TXR 190
+ - MacOS and Solaris ports:
+ - fixed broken method for getting TXR's executable path, which
+ caused TXR not to work unless invoked via full path.
@@ -19,18 +37,18 @@
2018-04-30
- Bugs
+ Bugs
- - FFI:
- - issue causing inability to to encode the most negative signed
- 32 bit integer on 32 bit platforms, and the 64 bit one on 64
- bit platforms.
- - compiler:
- - fixed situations when compiler generates immediate move instructions
- for integer operands that are too wide to be used as immdiate literals.
- - assembler:
- - fixed a situation in which a bignum integer was encoded as a literal
- using its bitwise pointer representation.
+ - FFI:
+ - issue causing inability to to encode the most negative signed
+ 32 bit integer on 32 bit platforms, and the 64 bit one on 64
+ bit platforms.
+ - compiler:
+ - fixed situations when compiler generates immediate move instructions
+ for integer operands that are too wide to be used as immdiate literals.
+ - assembler:
+ - fixed a situation in which a bignum integer was encoded as a literal
+ using its bitwise pointer representation.
diff --git a/configure b/configure
index 1244646f..f1ef8993 100755
--- a/configure
+++ b/configure
@@ -453,7 +453,7 @@ fi
#
-txr_ver=195
+txr_ver=196
#
# The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 802d4105..154d8b82 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 195)
+(defvarl lib-version 196)
(defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index fa38184b..bdc99599 100644
--- a/tl.vim
+++ b/tl.vim
@@ -469,64 +469,64 @@ syn keyword tl_keyword contained sys:trace-redefine-check sys:trfm sys:try-load
syn keyword tl_keyword contained sys:unquote sys:untrace sys:upenv sys:var
syn keyword tl_keyword contained sys:vm-closure-desc sys:vm-closure-entry sys:vm-desc-bytecode sys:vm-desc-datavec
syn keyword tl_keyword contained sys:vm-desc-funvec sys:vm-desc-nlevels sys:vm-desc-nregs sys:vm-execute-toplevel
-syn keyword tl_keyword contained sys:vm-make-desc sys:wdwrap sys:with-lev-idx syslog
-syn keyword tl_keyword contained system-package t tab0 tab1
-syn keyword tl_keyword contained tab2 tab3 tabdly tagbody
-syn keyword tl_keyword contained take take-until take-while tan
-syn keyword tl_keyword contained tb tc tcdrain tcflow
-syn keyword tl_keyword contained tcflush tcgetattr tciflush tcioff
-syn keyword tl_keyword contained tcioflush tcion tcoflush tcooff
-syn keyword tl_keyword contained tcoon tcsadrain tcsaflush tcsanow
-syn keyword tl_keyword contained tcsendbreak tcsetattr tentative-def-exists tenth
-syn keyword tl_keyword contained test-clear-dirty test-dirty 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-parse-local
-syn keyword tl_keyword contained time-parse-utc time-string-local time-string-utc time-struct-local
-syn keyword tl_keyword contained time-struct-utc time-t time-usec to
-syn keyword tl_keyword contained tofloat tofloatz toint tointz
-syn keyword tl_keyword contained tok 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-if txr-path txr-version txr-when
-syn keyword tl_keyword contained typecase typedef typeof typep
-syn keyword tl_keyword contained ubit uchar uid-t uint
-syn keyword tl_keyword contained uint-ptr-t uint16 uint32 uint64
-syn keyword tl_keyword contained uint8 ulong ulonglong umask
-syn keyword tl_keyword contained umeth umethod uname unget-byte
-syn keyword tl_keyword contained unget-char uni unintern union
-syn keyword tl_keyword contained union-get union-in union-members union-out
-syn keyword tl_keyword contained union-put uniq unique unless
-syn keyword tl_keyword contained unquote unsetenv until until*
-syn keyword tl_keyword contained untrace unum-carray unuse-package unuse-sym
-syn keyword tl_keyword contained unwind-protect upcase-str upd update
-syn keyword tl_keyword contained uref url-decode url-encode use
-syn keyword tl_keyword contained use-package use-sym user-package ushort
-syn keyword tl_keyword contained usl usleep uslot val
-syn keyword tl_keyword contained vdiscard vec vec-carray vec-list
-syn keyword tl_keyword contained vec-push vec-set-length vecref vector
-syn keyword tl_keyword contained vector-list vectorp veof veol
-syn keyword tl_keyword contained veol2 verase vintr vkill
-syn keyword tl_keyword contained vlnext vm-fun-p vmin void
-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 wchar
-syn keyword tl_keyword contained weave when whena whenlet
-syn keyword tl_keyword contained where while while* whilet
-syn keyword tl_keyword contained width width-check window-map window-mappend
-syn keyword tl_keyword contained wint-t with-clobber-expander with-compilation-unit with-delete-expander
-syn keyword tl_keyword contained with-dyn-lib with-gensyms with-hash-iter with-in-buf-stream
-syn keyword tl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-buf-stream
-syn keyword tl_keyword contained with-out-string-stream with-out-strlist-stream with-resources with-slots
-syn keyword tl_keyword contained with-stream with-update-expander wrap wrap*
-syn keyword tl_keyword contained wstr wstr-d xcase yield
-syn keyword tl_keyword contained yield-from zap zarray zero-fill
-syn keyword tl_keyword contained zerop zip znew
+syn keyword tl_keyword contained sys:vm-make-desc sys:wdwrap sys:with-dyn-rebinds sys:with-lev-idx
+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 tentative-def-exists
+syn keyword tl_keyword contained tenth test-clear-dirty test-dirty 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-parse-local time-parse-utc time-string-local time-string-utc
+syn keyword tl_keyword contained time-struct-local time-struct-utc time-t time-usec
+syn keyword tl_keyword contained to tofloat tofloatz toint
+syn keyword tl_keyword contained tointz tok 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-if txr-path txr-version
+syn keyword tl_keyword contained txr-when typecase typedef typeof
+syn keyword tl_keyword contained typep ubit uchar uid-t
+syn keyword tl_keyword contained uint uint-ptr-t uint16 uint32
+syn keyword tl_keyword contained uint64 uint8 ulong ulonglong
+syn keyword tl_keyword contained umask umeth umethod uname
+syn keyword tl_keyword contained unget-byte unget-char uni unintern
+syn keyword tl_keyword contained union union-get union-in union-members
+syn keyword tl_keyword contained union-out union-put uniq unique
+syn keyword tl_keyword contained unless unquote unsetenv until
+syn keyword tl_keyword contained until* untrace unum-carray unuse-package
+syn keyword tl_keyword contained unuse-sym unwind-protect upcase-str upd
+syn keyword tl_keyword contained update uref url-decode url-encode
+syn keyword tl_keyword contained use use-package use-sym user-package
+syn keyword tl_keyword contained ushort usl usleep uslot
+syn keyword tl_keyword contained val vdiscard vec vec-carray
+syn keyword tl_keyword contained vec-list vec-push vec-set-length vecref
+syn keyword tl_keyword contained vector vector-list vectorp veof
+syn keyword tl_keyword contained veol veol2 verase vintr
+syn keyword tl_keyword contained vkill vlnext vm-fun-p vmin
+syn keyword tl_keyword contained void 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 wchar weave when whena
+syn keyword tl_keyword contained whenlet where while while*
+syn keyword tl_keyword contained whilet width width-check window-map
+syn keyword tl_keyword contained window-mappend wint-t with-clobber-expander with-compilation-unit
+syn keyword tl_keyword contained with-delete-expander with-dyn-lib with-gensyms with-hash-iter
+syn keyword tl_keyword contained with-in-buf-stream with-in-string-byte-stream with-in-string-stream with-objects
+syn keyword tl_keyword contained with-out-buf-stream 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* wstr wstr-d xcase
+syn keyword tl_keyword contained yield yield-from zap zarray
+syn keyword tl_keyword contained zero-fill zerop zip znew
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
@@ -641,4 +641,4 @@ hi def link txr_ign_bkt Comment
let b:current_syntax = "lisp"
-set lispwords=ado,alet,align,alignof,ap,append-each,append-each*,aret,array,arraysize,awk,bit,block,block*,bool,buf,buf-d,build,carray,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,catch*,collect-each,collect-each*,compile-only,cond,conda,condlet,cptr,dec,defex,deffi,deffi-cb,deffi-sym,deffi-type,deffi-var,define-accessor,define-modify-macro,define-param-expander,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,doloop,doloop*,dotimes,each,each*,elemsize,elemtype,enum,enumed,equot,eval-only,ffi,flet,flip,for,for*,fun,gen,go,gun,handle,handle*,handler-bind,hlet,hlet*,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,load-time,lop,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,offsetof,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,progn,ptr,ptr-in,ptr-in-d,ptr-out,ptr-out-d,ptr-out-s,push,pushnew,ret,return,return-from,rlet,rslot,sbit,sizeof,slet,splice,struct,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:catch,sys:compare-swap,sys:compile-in-toplevel,sys:conv,sys:deffi-cb-unsafe,sys:defopcode,sys:defopcode-derived,sys:dlib-expr,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:lnew,sys:load-time-lit,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:test-clear,sys:test-dec,sys:test-inc,sys:test-set,sys:txr-case-impl,sys:unquote,sys:upenv,sys:var,sys:with-lev-idx,tagbody,tb,tc,trace,tree-bind,tree-case,txr-case,txr-if,txr-when,typecase,typedef,ubit,union,unless,unquote,until,until*,untrace,unwind-protect,upd,uref,when,whena,whenlet,while,while*,whilet,with-clobber-expander,with-compilation-unit,with-delete-expander,with-dyn-lib,with-gensyms,with-hash-iter,with-in-buf-stream,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-buf-stream,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,zarray,znew,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,align,alignof,ap,append-each,append-each*,aret,array,arraysize,awk,bit,block,block*,bool,buf,buf-d,build,carray,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,catch*,collect-each,collect-each*,compile-only,cond,conda,condlet,cptr,dec,defex,deffi,deffi-cb,deffi-sym,deffi-type,deffi-var,define-accessor,define-modify-macro,define-param-expander,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,doloop,doloop*,dotimes,each,each*,elemsize,elemtype,enum,enumed,equot,eval-only,ffi,flet,flip,for,for*,fun,gen,go,gun,handle,handle*,handler-bind,hlet,hlet*,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,load-time,lop,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,offsetof,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,progn,ptr,ptr-in,ptr-in-d,ptr-out,ptr-out-d,ptr-out-s,push,pushnew,ret,return,return-from,rlet,rslot,sbit,sizeof,slet,splice,struct,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:catch,sys:compare-swap,sys:compile-in-toplevel,sys:conv,sys:deffi-cb-unsafe,sys:defopcode,sys:defopcode-derived,sys:dlib-expr,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:lnew,sys:load-time-lit,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:test-clear,sys:test-dec,sys:test-inc,sys:test-set,sys:txr-case-impl,sys:unquote,sys:upenv,sys:var,sys:with-dyn-rebinds,sys:with-lev-idx,tagbody,tb,tc,trace,tree-bind,tree-case,txr-case,txr-if,txr-when,typecase,typedef,ubit,union,unless,unquote,until,until*,untrace,unwind-protect,upd,uref,when,whena,whenlet,while,while*,whilet,with-clobber-expander,with-compilation-unit,with-delete-expander,with-dyn-lib,with-gensyms,with-hash-iter,with-in-buf-stream,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-buf-stream,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,zarray,znew,:method,:function,:init,:postinit,:fini
diff --git a/txr.1 b/txr.1
index 1fc4ebb4..48a15060 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 2018-05-04 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
+.TH TXR 1 2018-05-18 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
.SH* NAME
-\*(TX \- Programming Language (Version 195)
+\*(TX \- Programming Language (Version 196)
.SH* SYNOPSIS
.cblk
diff --git a/txr.vim b/txr.vim
index 6665cb5e..49370c3f 100644
--- a/txr.vim
+++ b/txr.vim
@@ -469,64 +469,64 @@ syn keyword tl_keyword contained sys:trace-redefine-check sys:trfm sys:try-load
syn keyword tl_keyword contained sys:unquote sys:untrace sys:upenv sys:var
syn keyword tl_keyword contained sys:vm-closure-desc sys:vm-closure-entry sys:vm-desc-bytecode sys:vm-desc-datavec
syn keyword tl_keyword contained sys:vm-desc-funvec sys:vm-desc-nlevels sys:vm-desc-nregs sys:vm-execute-toplevel
-syn keyword tl_keyword contained sys:vm-make-desc sys:wdwrap sys:with-lev-idx syslog
-syn keyword tl_keyword contained system-package t tab0 tab1
-syn keyword tl_keyword contained tab2 tab3 tabdly tagbody
-syn keyword tl_keyword contained take take-until take-while tan
-syn keyword tl_keyword contained tb tc tcdrain tcflow
-syn keyword tl_keyword contained tcflush tcgetattr tciflush tcioff
-syn keyword tl_keyword contained tcioflush tcion tcoflush tcooff
-syn keyword tl_keyword contained tcoon tcsadrain tcsaflush tcsanow
-syn keyword tl_keyword contained tcsendbreak tcsetattr tentative-def-exists tenth
-syn keyword tl_keyword contained test-clear-dirty test-dirty 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-parse-local
-syn keyword tl_keyword contained time-parse-utc time-string-local time-string-utc time-struct-local
-syn keyword tl_keyword contained time-struct-utc time-t time-usec to
-syn keyword tl_keyword contained tofloat tofloatz toint tointz
-syn keyword tl_keyword contained tok 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-if txr-path txr-version txr-when
-syn keyword tl_keyword contained typecase typedef typeof typep
-syn keyword tl_keyword contained ubit uchar uid-t uint
-syn keyword tl_keyword contained uint-ptr-t uint16 uint32 uint64
-syn keyword tl_keyword contained uint8 ulong ulonglong umask
-syn keyword tl_keyword contained umeth umethod uname unget-byte
-syn keyword tl_keyword contained unget-char uni unintern union
-syn keyword tl_keyword contained union-get union-in union-members union-out
-syn keyword tl_keyword contained union-put uniq unique unless
-syn keyword tl_keyword contained unquote unsetenv until until*
-syn keyword tl_keyword contained untrace unum-carray unuse-package unuse-sym
-syn keyword tl_keyword contained unwind-protect upcase-str upd update
-syn keyword tl_keyword contained uref url-decode url-encode use
-syn keyword tl_keyword contained use-package use-sym user-package ushort
-syn keyword tl_keyword contained usl usleep uslot val
-syn keyword tl_keyword contained vdiscard vec vec-carray vec-list
-syn keyword tl_keyword contained vec-push vec-set-length vecref vector
-syn keyword tl_keyword contained vector-list vectorp veof veol
-syn keyword tl_keyword contained veol2 verase vintr vkill
-syn keyword tl_keyword contained vlnext vm-fun-p vmin void
-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 wchar
-syn keyword tl_keyword contained weave when whena whenlet
-syn keyword tl_keyword contained where while while* whilet
-syn keyword tl_keyword contained width width-check window-map window-mappend
-syn keyword tl_keyword contained wint-t with-clobber-expander with-compilation-unit with-delete-expander
-syn keyword tl_keyword contained with-dyn-lib with-gensyms with-hash-iter with-in-buf-stream
-syn keyword tl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-buf-stream
-syn keyword tl_keyword contained with-out-string-stream with-out-strlist-stream with-resources with-slots
-syn keyword tl_keyword contained with-stream with-update-expander wrap wrap*
-syn keyword tl_keyword contained wstr wstr-d xcase yield
-syn keyword tl_keyword contained yield-from zap zarray zero-fill
-syn keyword tl_keyword contained zerop zip znew
+syn keyword tl_keyword contained sys:vm-make-desc sys:wdwrap sys:with-dyn-rebinds sys:with-lev-idx
+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 tentative-def-exists
+syn keyword tl_keyword contained tenth test-clear-dirty test-dirty 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-parse-local time-parse-utc time-string-local time-string-utc
+syn keyword tl_keyword contained time-struct-local time-struct-utc time-t time-usec
+syn keyword tl_keyword contained to tofloat tofloatz toint
+syn keyword tl_keyword contained tointz tok 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-if txr-path txr-version
+syn keyword tl_keyword contained txr-when typecase typedef typeof
+syn keyword tl_keyword contained typep ubit uchar uid-t
+syn keyword tl_keyword contained uint uint-ptr-t uint16 uint32
+syn keyword tl_keyword contained uint64 uint8 ulong ulonglong
+syn keyword tl_keyword contained umask umeth umethod uname
+syn keyword tl_keyword contained unget-byte unget-char uni unintern
+syn keyword tl_keyword contained union union-get union-in union-members
+syn keyword tl_keyword contained union-out union-put uniq unique
+syn keyword tl_keyword contained unless unquote unsetenv until
+syn keyword tl_keyword contained until* untrace unum-carray unuse-package
+syn keyword tl_keyword contained unuse-sym unwind-protect upcase-str upd
+syn keyword tl_keyword contained update uref url-decode url-encode
+syn keyword tl_keyword contained use use-package use-sym user-package
+syn keyword tl_keyword contained ushort usl usleep uslot
+syn keyword tl_keyword contained val vdiscard vec vec-carray
+syn keyword tl_keyword contained vec-list vec-push vec-set-length vecref
+syn keyword tl_keyword contained vector vector-list vectorp veof
+syn keyword tl_keyword contained veol veol2 verase vintr
+syn keyword tl_keyword contained vkill vlnext vm-fun-p vmin
+syn keyword tl_keyword contained void 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 wchar weave when whena
+syn keyword tl_keyword contained whenlet where while while*
+syn keyword tl_keyword contained whilet width width-check window-map
+syn keyword tl_keyword contained window-mappend wint-t with-clobber-expander with-compilation-unit
+syn keyword tl_keyword contained with-delete-expander with-dyn-lib with-gensyms with-hash-iter
+syn keyword tl_keyword contained with-in-buf-stream with-in-string-byte-stream with-in-string-stream with-objects
+syn keyword tl_keyword contained with-out-buf-stream 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* wstr wstr-d xcase
+syn keyword tl_keyword contained yield yield-from zap zarray
+syn keyword tl_keyword contained zero-fill zerop zip znew
syn keyword txr_keyword contained accept all and assert
syn keyword txr_keyword contained bind block call cases
@@ -669,4 +669,4 @@ hi def link txr_ign_bkt Comment
let b:current_syntax = "lisp"
-set lispwords=ado,alet,align,alignof,ap,append-each,append-each*,aret,array,arraysize,awk,bit,block,block*,bool,buf,buf-d,build,carray,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,catch*,collect-each,collect-each*,compile-only,cond,conda,condlet,cptr,dec,defex,deffi,deffi-cb,deffi-sym,deffi-type,deffi-var,define-accessor,define-modify-macro,define-param-expander,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,doloop,doloop*,dotimes,each,each*,elemsize,elemtype,enum,enumed,equot,eval-only,ffi,flet,flip,for,for*,fun,gen,go,gun,handle,handle*,handler-bind,hlet,hlet*,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,load-time,lop,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,offsetof,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,progn,ptr,ptr-in,ptr-in-d,ptr-out,ptr-out-d,ptr-out-s,push,pushnew,ret,return,return-from,rlet,rslot,sbit,sizeof,slet,splice,struct,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:catch,sys:compare-swap,sys:compile-in-toplevel,sys:conv,sys:deffi-cb-unsafe,sys:defopcode,sys:defopcode-derived,sys:dlib-expr,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:lnew,sys:load-time-lit,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:test-clear,sys:test-dec,sys:test-inc,sys:test-set,sys:txr-case-impl,sys:unquote,sys:upenv,sys:var,sys:with-lev-idx,tagbody,tb,tc,trace,tree-bind,tree-case,txr-case,txr-if,txr-when,typecase,typedef,ubit,union,unless,unquote,until,until*,untrace,unwind-protect,upd,uref,when,whena,whenlet,while,while*,whilet,with-clobber-expander,with-compilation-unit,with-delete-expander,with-dyn-lib,with-gensyms,with-hash-iter,with-in-buf-stream,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-buf-stream,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,zarray,znew,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,align,alignof,ap,append-each,append-each*,aret,array,arraysize,awk,bit,block,block*,bool,buf,buf-d,build,carray,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,catch*,collect-each,collect-each*,compile-only,cond,conda,condlet,cptr,dec,defex,deffi,deffi-cb,deffi-sym,deffi-type,deffi-var,define-accessor,define-modify-macro,define-param-expander,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,doloop,doloop*,dotimes,each,each*,elemsize,elemtype,enum,enumed,equot,eval-only,ffi,flet,flip,for,for*,fun,gen,go,gun,handle,handle*,handler-bind,hlet,hlet*,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,load-time,lop,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,offsetof,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,progn,ptr,ptr-in,ptr-in-d,ptr-out,ptr-out-d,ptr-out-s,push,pushnew,ret,return,return-from,rlet,rslot,sbit,sizeof,slet,splice,struct,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:catch,sys:compare-swap,sys:compile-in-toplevel,sys:conv,sys:deffi-cb-unsafe,sys:defopcode,sys:defopcode-derived,sys:dlib-expr,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:lnew,sys:load-time-lit,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:test-clear,sys:test-dec,sys:test-inc,sys:test-set,sys:txr-case-impl,sys:unquote,sys:upenv,sys:var,sys:with-dyn-rebinds,sys:with-lev-idx,tagbody,tb,tc,trace,tree-bind,tree-case,txr-case,txr-if,txr-when,typecase,typedef,ubit,union,unless,unquote,until,until*,untrace,unwind-protect,upd,uref,when,whena,whenlet,while,while*,whilet,with-clobber-expander,with-compilation-unit,with-delete-expander,with-dyn-lib,with-gensyms,with-hash-iter,with-in-buf-stream,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-buf-stream,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,zarray,znew,:method,:function,:init,:postinit,:fini