Version 148.txr-148

* RELNOTES: Updated.

* configure, txr.1: Bumped version and date.

* share/txr/stdlib/ver.tl: Likewise.

6 files changed, 99 insertions, 72 deletions

diff --git a/RELNOTES b/RELNOTES
index ceefee87..32b9eb8e 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,30 @@
+                                    TXR 148
+                                   2016-09-01
+
+
+  Features
+
+  - time-parse function
+  - time-string and time-parse methods on time struct
+  - optimization added to quasiquote expander to generate better code.
+
+  Bugs
+
+  - Broken defvarl and defparml marking variables special, thus behaving like
+    defvar and defparm, respectively.
+  - Put limit on numeric range of @<num> arguments in op/do syntax, because
+    this generates huge formal parameter
+    lists. Found by AFL(fast) fuzzing tool.
+  - Fixed generation of huge lists by trivial cases of nested quasiquote
+    like ^^^^^^^^^^x. Found by AFL(fast) fuzzing tool.
+  - Fixed runaway recursion that can occur in lazy struct initialization when
+    cycles are present.
+  - Fixed broken Lisp macro expansion in @(if) and output-side
+    @(repeat) directives.
+  - Rewrote poor, incorrect documentation of @(merge) directive.
+
+
+
                                     TXR 147
                                    2016-08-12
 
diff --git a/configure b/configure
index f3ec930b..83a597f6 100755
--- a/configure
+++ b/configure
@@ -444,7 +444,7 @@ fi
 #
 
 
-txr_ver=147
+txr_ver=148
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 52f6d252..8e821398 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 146)
+(defvarl lib-version 148)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index cd0a2b24..33edcaf8 100644
--- a/tl.vim
+++ b/tl.vim
@@ -337,40 +337,40 @@ syn keyword tl_keyword contained tcooff tcoon tcsadrain tcsaflush
 syn keyword tl_keyword contained tcsanow tcsendbreak tcsetattr tenth
 syn keyword tl_keyword contained test-set-indent-mode tf third throw
 syn keyword tl_keyword contained throwf time time-fields-local time-fields-utc
-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 toint
-syn keyword tl_keyword contained tok-str tok-where tostop tostring
-syn keyword tl_keyword contained tostringp tprint transpose tree-bind
-syn keyword tl_keyword contained tree-case tree-find trie-add trie-compress
-syn keyword tl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
-syn keyword tl_keyword contained true trunc trunc-rem truncate-stream
-syn keyword tl_keyword contained tuples txr-case txr-case-impl txr-if
-syn keyword tl_keyword contained txr-path txr-sym txr-version txr-when
-syn keyword tl_keyword contained typecase typeof typep umask
-syn keyword tl_keyword contained umeth umethod uname unget-byte
-syn keyword tl_keyword contained unget-char uniq unique unless
-syn keyword tl_keyword contained unquote unsetenv until until*
-syn keyword tl_keyword contained unwind-protect upcase-str update url-decode
-syn keyword tl_keyword contained url-encode use user-package usl
-syn keyword tl_keyword contained usleep uslot vdiscard vec
-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 vmin vquit
-syn keyword tl_keyword contained vreprint vstart vstop vsusp
-syn keyword tl_keyword contained vswtc vt0 vt1 vtdly
-syn keyword tl_keyword contained vtime vwerase w-continued w-coredump
-syn keyword tl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
-syn keyword tl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
-syn keyword tl_keyword contained w-untraced wait weave when
-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 with-clobber-expander with-delete-expander with-gensyms
-syn keyword tl_keyword contained with-hash-iter with-in-string-byte-stream with-in-string-stream with-objects
-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 xcase yield yield-from zap
-syn keyword tl_keyword contained zerop zip
+syn keyword tl_keyword contained time-parse time-string-local time-string-utc time-struct-local
+syn keyword tl_keyword contained time-struct-utc time-usec to tofloat
+syn keyword tl_keyword contained toint tok-str tok-where tostop
+syn keyword tl_keyword contained tostring tostringp tprint transpose
+syn keyword tl_keyword contained tree-bind tree-case tree-find trie-add
+syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
+syn keyword tl_keyword contained trim-str true trunc trunc-rem
+syn keyword tl_keyword contained truncate-stream tuples txr-case txr-case-impl
+syn keyword tl_keyword contained txr-if txr-path txr-sym txr-version
+syn keyword tl_keyword contained txr-when typecase typeof typep
+syn keyword tl_keyword contained umask umeth umethod uname
+syn keyword tl_keyword contained unget-byte unget-char uniq unique
+syn keyword tl_keyword contained unless unquote unsetenv until
+syn keyword tl_keyword contained until* unwind-protect upcase-str update
+syn keyword tl_keyword contained url-decode url-encode use 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 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
diff --git a/txr.1 b/txr.1
index 34e0bfae..b994ec8c 100644
--- a/txr.1
+++ b/txr.1
@@ -339,9 +339,9 @@
 .ds TX \f[B]TXR\f[]
 .ds TL \f[B]TXR Lisp\f[]
 .\" Start of man page:
-.TH TXR 1 2016-08-11 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2016-09-01 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 147)
+\*(TX \- text processing language (version 148)
 
 .SH* SYNOPSIS
 .cblk
diff --git a/txr.vim b/txr.vim
index f1833cfc..09385deb 100644
--- a/txr.vim
+++ b/txr.vim
@@ -337,40 +337,40 @@ syn keyword tl_keyword contained tcooff tcoon tcsadrain tcsaflush
 syn keyword tl_keyword contained tcsanow tcsendbreak tcsetattr tenth
 syn keyword tl_keyword contained test-set-indent-mode tf third throw
 syn keyword tl_keyword contained throwf time time-fields-local time-fields-utc
-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 toint
-syn keyword tl_keyword contained tok-str tok-where tostop tostring
-syn keyword tl_keyword contained tostringp tprint transpose tree-bind
-syn keyword tl_keyword contained tree-case tree-find trie-add trie-compress
-syn keyword tl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
-syn keyword tl_keyword contained true trunc trunc-rem truncate-stream
-syn keyword tl_keyword contained tuples txr-case txr-case-impl txr-if
-syn keyword tl_keyword contained txr-path txr-sym txr-version txr-when
-syn keyword tl_keyword contained typecase typeof typep umask
-syn keyword tl_keyword contained umeth umethod uname unget-byte
-syn keyword tl_keyword contained unget-char uniq unique unless
-syn keyword tl_keyword contained unquote unsetenv until until*
-syn keyword tl_keyword contained unwind-protect upcase-str update url-decode
-syn keyword tl_keyword contained url-encode use user-package usl
-syn keyword tl_keyword contained usleep uslot vdiscard vec
-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 vmin vquit
-syn keyword tl_keyword contained vreprint vstart vstop vsusp
-syn keyword tl_keyword contained vswtc vt0 vt1 vtdly
-syn keyword tl_keyword contained vtime vwerase w-continued w-coredump
-syn keyword tl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
-syn keyword tl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
-syn keyword tl_keyword contained w-untraced wait weave when
-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 with-clobber-expander with-delete-expander with-gensyms
-syn keyword tl_keyword contained with-hash-iter with-in-string-byte-stream with-in-string-stream with-objects
-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 xcase yield yield-from zap
-syn keyword tl_keyword contained zerop zip
+syn keyword tl_keyword contained time-parse time-string-local time-string-utc time-struct-local
+syn keyword tl_keyword contained time-struct-utc time-usec to tofloat
+syn keyword tl_keyword contained toint tok-str tok-where tostop
+syn keyword tl_keyword contained tostring tostringp tprint transpose
+syn keyword tl_keyword contained tree-bind tree-case tree-find trie-add
+syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
+syn keyword tl_keyword contained trim-str true trunc trunc-rem
+syn keyword tl_keyword contained truncate-stream tuples txr-case txr-case-impl
+syn keyword tl_keyword contained txr-if txr-path txr-sym txr-version
+syn keyword tl_keyword contained txr-when typecase typeof typep
+syn keyword tl_keyword contained umask umeth umethod uname
+syn keyword tl_keyword contained unget-byte unget-char uniq unique
+syn keyword tl_keyword contained unless unquote unsetenv until
+syn keyword tl_keyword contained until* unwind-protect upcase-str update
+syn keyword tl_keyword contained url-decode url-encode use 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 txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block call cases