Version 83txr-83

* txr.c (version): Bumped.

* txr.1: Bumped version, set date.

* configure (txr_ver): Bumped.

* RELNOTES: Updated

* dep.mk: Updated.

6 files changed, 57 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 34709343..d20328c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2014-03-02  Kaz Kylheku  <kaz@kylheku.com>
 
+	Version 83
+
+	* txr.c (version): Bumped.
+
+	* txr.1: Bumped version, set date.
+
+	* configure (txr_ver): Bumped.
+
+	* RELNOTES: Updated
+
+	* dep.mk: Updated.
+
+2014-03-02  Kaz Kylheku  <kaz@kylheku.com>
+
 	* eval.c (expand): Bugfix. When processing a defvar, should mark
 	the variable as special at expansion time. Without this, binding
 	forms in other parts of the tree won't be expanded properly
diff --git a/RELNOTES b/RELNOTES
index f6c396f1..7842a720 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,38 @@
+                                     TXR 83
+                                   2014-03-02
+
+
+  Features
+  
+  - The qquote macro is now in the regular user namespace, while the 
+    quasiquoting read syntax uses a different macro based on private symbols.
+    So when the read syntax is used, the template can contain the symbols
+    qquote, unquote and splice, even though these are the basis for
+    a quasiquote macro.
+
+  - Diagnosis of attempt to redefine a special operator as a function or macro.
+    Remove the macro when a function of the same name is defined and vice-versa.
+
+  Bugs
+
+  - Fixed bugs in the implementation lexical variable shadowing by symbol
+    macros.
+
+  - Fixed incorrect handling of trailing atoms in quasiquote.
+
+  - Redesigned the implementaton of special variables, and how they integrate
+    with internal C global variables in the interpreter, in order to fix the
+    broken dynamic overriding of the predefined globals.
+
+  - The Lisp-1 style evaluation of the dwim operator or square brackets was not
+    resolving over-ridden special variables correctly, using a lookup method
+    that saw only the global bindings.
+
+  - Fixed missing integration between catenated stream objects and the
+    garbage collector.
+
+
+
                                      TXR 82
                                    2014-02-27
 
diff --git a/configure b/configure
index 1c1e401d..cc72f03a 100755
--- a/configure
+++ b/configure
@@ -387,7 +387,7 @@ fi
 #
 
 
-txr_ver=82
+txr_ver=83
 
 #
 # The all important banner.
diff --git a/dep.mk b/dep.mk
index 2a52eeb5..f1523388 100644
--- a/dep.mk
+++ b/dep.mk
@@ -6,16 +6,16 @@
 ./regex.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./parser.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./txr.h $(top_srcdir)/./gc.h
 ./gc.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h $(top_srcdir)/./txr.h $(top_srcdir)/./eval.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h
 ./unwind.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./stream.h $(top_srcdir)/./txr.h $(top_srcdir)/./signal.h $(top_srcdir)/./eval.h $(top_srcdir)/./parser.h $(top_srcdir)/./unwind.h
-./stream.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./utf8.h
+./stream.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./utf8.h $(top_srcdir)/./eval.h
 ./arith.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h
 ./hash.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h
 ./utf8.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./utf8.h
 ./filter.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./hash.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./match.h $(top_srcdir)/./filter.h $(top_srcdir)/./gc.h $(top_srcdir)/./stream.h
-./eval.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./hash.h $(top_srcdir)/./debug.h $(top_srcdir)/./match.h $(top_srcdir)/./rand.h $(top_srcdir)/./filter.h $(top_srcdir)/./txr.h $(top_srcdir)/./syslog.h $(top_srcdir)/./combi.h $(top_srcdir)/./eval.h
-./rand.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./rand.h
+./eval.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./hash.h $(top_srcdir)/./debug.h $(top_srcdir)/./match.h $(top_srcdir)/./rand.h $(top_srcdir)/./filter.h $(top_srcdir)/./txr.h $(top_srcdir)/./combi.h $(top_srcdir)/./eval.h
+./rand.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./rand.h $(top_srcdir)/./eval.h
 ./combi.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./eval.h $(top_srcdir)/./hash.h $(top_srcdir)/./combi.h
 mpi-1.8.6/mpi.o: config.h $(top_srcdir)/mpi-1.8.6/mpi.h $(top_srcdir)/mpi-1.8.6/logtab.h
 mpi-1.8.6/mplogic.o: config.h $(top_srcdir)/mpi-1.8.6/mplogic.h
 ./debug.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./debug.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./txr.h
-./syslog.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./utf8.h $(top_srcdir)/./syslog.h
-./signal.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h
+./syslog.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./utf8.h $(top_srcdir)/./eval.h $(top_srcdir)/./syslog.h
+./signal.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h $(top_srcdir)/./gc.h $(top_srcdir)/./signal.h $(top_srcdir)/./unwind.h $(top_srcdir)/./eval.h
diff --git a/txr.1 b/txr.1
index 90b72fb8..853a6988 100644
--- a/txr.1
+++ b/txr.1
@@ -23,7 +23,7 @@
 
 .TH "TXR" 1 2014-02-27 "Utility Commands" "TXR Text Processing Language" "Kaz Kylheku"
 .SH NAME
-txr \- text processing language (version 82)
+txr \- text processing language (version 83)
 .SH SYNOPSIS
 .B txr [ options ] query-file { data-file }*
 .sp
diff --git a/txr.c b/txr.c
index 05c4743c..fdc33eeb 100644
--- a/txr.c
+++ b/txr.c
@@ -47,7 +47,7 @@
 #include "eval.h"
 #include "txr.h"
 
-const wchli_t *version = wli("82");
+const wchli_t *version = wli("83");
 const wchar_t *progname = L"txr";
 
 /*