summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorforsyth <forsyth@vitanuova.com>2010-03-20 22:42:50 +0000
committerforsyth <forsyth@vitanuova.com>2010-03-20 22:42:50 +0000
commitd764bd874c57ace45a2722fbc0c347ade01bc2f2 (patch)
tree2e835f5d481c623a085aa66174176c470d7244a2
parentd0e1d143ef6f03c75c008c7ec648859dd260cbab (diff)
20100320-2242
-rw-r--r--CHANGES2
-rw-r--r--appl/lib/json.b2
-rw-r--r--dis/lib/json.disbin7401 -> 7426 bytes
-rw-r--r--include/version.h2
4 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index c0f60384..a82fde92 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20100320
+ appl/lib/json.b dis/lib/json.dis - use %f not string <real-value> to ensure json value acceptable [issue 230, powerman]
20100310
stop tabs(2) from issuing pointless tk cmd that produces diagnostics
20100305
diff --git a/appl/lib/json.b b/appl/lib/json.b
index 09947a7d..50e93b27 100644
--- a/appl/lib/json.b
+++ b/appl/lib/json.b
@@ -576,7 +576,7 @@ JValue.text(v: self ref JValue): string
Int =>
return string r.value;
Real =>
- return string r.value;
+ return sys->sprint("%f", r.value);
String =>
return quote(r.s); # quoted, or not?
Array =>
diff --git a/dis/lib/json.dis b/dis/lib/json.dis
index 3467efaf..7a7b172f 100644
--- a/dis/lib/json.dis
+++ b/dis/lib/json.dis
Binary files differ
diff --git a/include/version.h b/include/version.h
index ba2c7d06..ef6a6351 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20100311)"
+#define VERSION "Fourth Edition (20100320)"