From 32038f425fe093998bd875b939ccdc3d88b5acfc Mon Sep 17 00:00:00 2001
From: forsyth <forsyth@vitanuova.com>
Date: Fri, 8 Apr 2011 15:40:13 +0100
Subject: 20110408-1540

---
 CHANGES           |   2 ++
 appl/lib/json.b   |   4 ++--
 appl/lib/vac.b    |   2 +-
 dis/lib/json.dis  | Bin 7426 -> 7483 bytes
 dis/lib/vac.dis   | Bin 17874 -> 17880 bytes
 include/version.h |   2 +-
 man/2/sys-dup     |   3 +++
 7 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index eb25ccf7..cdad654c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20110408
+	appl/lib/json.b - have writeval produce same (correct) form as .text for Real [issue 230]
 20110407
 	fix embarrassingly broken Lists->delete; add Lists->find [issue 257]
 	add some extra explanation to sys-dup(2) about fildes
diff --git a/appl/lib/json.b b/appl/lib/json.b
index 50e93b27..f4fdce14 100644
--- a/appl/lib/json.b
+++ b/appl/lib/json.b
@@ -279,9 +279,9 @@ writeval(out: ref Iobuf, o: ref JValue) raises(Badwrite)
 		String =>
 			writestring(out, r.s);
 		Int =>
-			puts(out, string r.value);
+			puts(out, r.text());
 		Real =>
-			puts(out, string r.value);
+			puts(out, r.text());
 		Object =>	# '{' [pair (',' pair)*] '}'
 			putc(out, '{');
 			for(l := r.mem; l != nil; l = tl l){
diff --git a/appl/lib/vac.b b/appl/lib/vac.b
index 0284fb1a..2ea78c12 100644
--- a/appl/lib/vac.b
+++ b/appl/lib/vac.b
@@ -1029,7 +1029,7 @@ p48(d: array of byte, i: int, v: big): int
 p64(d: array of byte, i: int, v: big): int
 {
 	p32(d, i+0, int (v>>32));
-	p32(d, i+0, int v);
+	p32(d, i+4, int v);
 	return i+BIT64SZ;
 }
 
diff --git a/dis/lib/json.dis b/dis/lib/json.dis
index 7a7b172f..f27ebb69 100644
Binary files a/dis/lib/json.dis and b/dis/lib/json.dis differ
diff --git a/dis/lib/vac.dis b/dis/lib/vac.dis
index 6a5e36da..7af761b2 100644
Binary files a/dis/lib/vac.dis and b/dis/lib/vac.dis differ
diff --git a/include/version.h b/include/version.h
index fd472ab7..b50a775e 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20110407)"
+#define VERSION	"Fourth Edition (20110408)"
diff --git a/man/2/sys-dup b/man/2/sys-dup
index 2fd45f7b..6ecb8953 100644
--- a/man/2/sys-dup
+++ b/man/2/sys-dup
@@ -63,6 +63,9 @@ such as
 .IR sys-print (2)
 and
 .IR sys-read (2).
+(Note that as described above, the newly-allocated file descriptor will be closed automatically when the
+.B FD
+value is reclaimed.)
 .B Fildes
 returns nil
 if it cannot duplicate
-- 
cgit v1.2.3