Merge branch 'develop' into main

Zulu-Inuoe · Aug 28, 2023 · 062f171 · 062f171
2 parents 628ac48 + 06f3c55
commit 062f171
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## PENDING v1.1.3
+
+Changes relative to [v1.1.2](#v112)
+
+## v1.1.2
+
+Changes relative to [v1.1.1](#v111)
+
+* Fix printing non-square multidimensional arrays https://github.com/Zulu-Inuoe/jzon/issues/43
+* Fix serializing CLOS objects on LispWorks https://github.com/Zulu-Inuoe/jzon/issues/49
+* `jzon:span` support for `cl:stream`
+* Fix serializing non-square multidimensional arrays https://github.com/Zulu-Inuoe/jzon/pull/44
+* Can now test jzon via `asdf:test-system` https://github.com/Zulu-Inuoe/jzon/pull/51
+
 ## v1.1.1
 
 Changes relative to [v1.1.0](#v110)

diff --git a/src/com.inuoe.jzon.asd b/src/com.inuoe.jzon.asd
@@ -1,5 +1,5 @@
 (defsystem #:com.inuoe.jzon
-  :version "1.1.1"
+  :version "1.1.2"
   :description "A correct and safe(er) JSON RFC 8259 parser with sane defaults."
   :author "Wilfredo Velázquez-Rodríguez <zulu.inuoe@gmail.com>"
   :license "MIT"
@@ -8,6 +8,7 @@
                (:feature (:not :ecl) #:float-features)
                #:trivial-gray-streams
                #:uiop)
+  :in-order-to ((test-op (test-op "com.inuoe.jzon-tests")))
   :components ((:file "eisel-lemire")
                (:file "ratio-to-double")
                (:file "schubfach")

diff --git a/src/jzon.lisp b/src/jzon.lisp
@@ -1687,16 +1687,22 @@ see `write-values'"
   (:method ((writer writer) (value array))
     (let ((dimensions (array-dimensions value)))
       (if (null dimensions)
-          (write-value writer (aref value))
-          (labels ((recurse (dimensions acc)
+        (write-value writer (aref value))
+        (labels ((recurse (dimensions head tail)
+                   (if (null dimensions)
+                     (write-value writer (apply #'aref value head))
                      (destructuring-bind (d . rest) dimensions
                        (with-array writer
-                         (if (null rest)
-                           (loop :for i :below d
-                                 :do (write-value writer (row-major-aref value (+ acc i))))
-                           (loop :for i :below d
-                                 :do (recurse rest (+ acc (* i d)))))))))
-            (recurse dimensions 0)))))
+                         (let ((cell (setf (cdr tail) (cons 0 nil))))
+                           (dotimes (i d)
+                             (setf (car cell) i)
+                             (recurse rest head cell))))))))
+          (destructuring-bind (d . rest) dimensions
+            (with-array writer
+              (let ((cell (cons 0 nil)))
+                (dotimes (i d)
+                  (setf (car cell) i)
+                  (recurse rest cell cell)))))))))
 
   ;;; Sequence support
   (:method ((writer writer) (value sequence))

diff --git a/src/schubfach.lisp b/src/schubfach.lisp
@@ -166,6 +166,7 @@
   (the (values null &optional)
     (let ((q0 q)
           (pos p))
+      (declare (type (signed-byte 32) q0))
       (loop :while (> pos pos-lim)
             :do (let* ((q1 (%int32 (%>>64 (* q0 1374389535) 37)))
                        (d (aref ds (- q0 (* q1 100)))))
@@ -183,6 +184,7 @@
     (let* ((q0 q)
            (q1 0)
            (pos p))
+      (declare (type (signed-byte 32) q0))
       (loop :while (let ((qp (%int64 (* q0 1374389535))))
                      (setf q1 (%int32 (%>>64 qp 37)))
                      (zerop (logand qp #x1FC0000000)))
@@ -219,6 +221,7 @@
            (type (simple-array (unsigned-byte 16) (100)) ds))
   (let ((q0 q)
         (pos p))
+    (declare (type (signed-byte 32) q0))
     (loop
       (setf pos (- pos 2))
       (when (< q0 100)

diff --git a/test/com.inuoe.jzon-tests.asd b/test/com.inuoe.jzon-tests.asd
@@ -5,6 +5,8 @@
   :license "MIT"
   :components
   ((:file "jzon-tests"))
+  :perform
+  (test-op (o c) (symbol-call '#:com.inuoe.jzon-tests '#:run))
   :depends-on
   (#:alexandria
    #:fiveam

diff --git a/test/jzon-tests.lisp b/test/jzon-tests.lisp
@@ -1229,6 +1229,12 @@
 (test stringify-multidimensional-array
   (is (string= "[[1,2],[3,4]]" (jzon:stringify #2A((1 2) (3 4))))))
 
+(test stringify-non-square-multidimensional-arrays-2×3
+  (is (string= "[[0,1,2],[3,4,5]]" (jzon:stringify #2A((0 1 2) (3 4 5))))))
+
+(test stringify-non-square-multidimensional-arrays-3x2
+  (is (string= "[[0,1],[2,3],[4,5]]" (jzon:stringify #2A((0 1) (2 3) (4 5))))))
+
 (test 0-dimension-array
   (is (string= "42" (jzon:stringify #0A42))))