Merge branches/quickjs to trunk. This is the way.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3621 ed5197a5-7fde-0310-b194-c3ffbd925b24

deps/quickjs/tests/test_bjson.js

@@ -1,12 +1,20 @@
-import * as bjson from "../bjson.so";
+import * as bjson from "./bjson.so";
 
-function assert(b, str)
-{
-    if (b) {
+function assert(actual, expected, message) {
+    if (arguments.length == 1)
+        expected = true;
+
+    if (actual === expected)
         return;
-    } else {
-        throw Error("assertion failed: " + str);
-    }
+
+    if (actual !== null && expected !== null
+    &&  typeof actual == 'object' && typeof expected == 'object'
+    &&  actual.toString() === expected.toString())
+        return;
+
+    throw Error("assertion failed: got |" + actual + "|" +
+                ", expected |" + expected + "|" +
+                (message ? " (" + message + ")" : ""));
 }
 
 function toHex(a)
@@ -24,6 +32,20 @@ function toHex(a)
     return s;
 }
 
+function isArrayLike(a)
+{
+    return Array.isArray(a) || 
+        (a instanceof Uint8ClampedArray) ||
+        (a instanceof Uint8Array) ||
+        (a instanceof Uint16Array) ||
+        (a instanceof Uint32Array) ||
+        (a instanceof Int8Array) ||
+        (a instanceof Int16Array) ||
+        (a instanceof Int32Array) ||
+        (a instanceof Float32Array) ||
+        (a instanceof Float64Array);
+}
+
 function toStr(a)
 {
     var s, i, props, prop;
@@ -32,7 +54,15 @@ function toStr(a)
     case "object":
         if (a === null)
             return "null";
-        if (Array.isArray(a)) {
+        if (a instanceof Date) {
+            s = "Date(" + toStr(a.valueOf()) + ")";
+        } else if (a instanceof Number) {
+            s = "Number(" + toStr(a.valueOf()) + ")";
+        } else if (a instanceof String) {
+            s = "String(" + toStr(a.valueOf()) + ")";
+        } else if (a instanceof Boolean) {
+            s = "Boolean(" + toStr(a.valueOf()) + ")";
+        } else if (isArrayLike(a)) {
             s = "[";
             for(i = 0; i < a.length; i++) {
                 if (i != 0)
@@ -85,6 +115,35 @@ function bjson_test(a)
     }
 }
 
+/* test multiple references to an object including circular
+   references */
+function bjson_test_reference()
+{
+    var array, buf, i, n, array_buffer;
+    n = 16;
+    array = [];
+    for(i = 0; i < n; i++)
+        array[i] = {};
+    array_buffer = new ArrayBuffer(n);
+    for(i = 0; i < n; i++) {
+        array[i].next = array[(i + 1) % n];
+        array[i].idx = i;
+        array[i].typed_array = new Uint8Array(array_buffer, i, 1);
+    }
+    buf = bjson.write(array, true);
+
+    array = bjson.read(buf, 0, buf.byteLength, true);
+
+    /* check the result */
+    for(i = 0; i < n; i++) {
+        assert(array[i].next, array[(i + 1) % n]);
+        assert(array[i].idx, i);
+        assert(array[i].typed_array.buffer, array_buffer);
+        assert(array[i].typed_array.length, 1);
+        assert(array[i].typed_array.byteOffset, i);
+    }
+}
+
 function bjson_test_all()
 {
     var obj;
@@ -104,7 +163,18 @@ function bjson_test_all()
                    BigFloat.MIN_VALUE]);
         }, 113, 15);
     }
+    if (typeof BigDecimal !== "undefined") {
+        bjson_test([BigDecimal("0"),
+                    BigDecimal("0.8"), BigDecimal("123321312321321e100"),
+                    BigDecimal("-1233213123213214332333223332e100"),
+                    BigDecimal("1.233e-1000")]);
+    }
 
+    bjson_test([new Date(1234), new String("abc"), new Number(-12.1), new Boolean(true)]);
+
+    bjson_test(new Int32Array([123123, 222111, -32222]));
+    bjson_test(new Float64Array([123123, 222111.5]));
+    
     /* tested with a circular reference */
     obj = {};
     obj.x = obj;
@@ -114,6 +184,8 @@ function bjson_test_all()
     } catch(e) {
         assert(e instanceof TypeError);
     }
+
+    bjson_test_reference();
 }
 
 bjson_test_all();