emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master b80c4b4: Add an appropriate error for reading bad JSON arrays


From: Mark Oteiza
Subject: master b80c4b4: Add an appropriate error for reading bad JSON arrays
Date: Thu, 13 Feb 2020 20:00:44 -0500 (EST)

branch: master
commit b80c4b43dd47bf44c45bdab3e6f8b4b66a461074
Author: Mark Oteiza <address@hidden>
Commit: Mark Oteiza <address@hidden>

    Add an appropriate error for reading bad JSON arrays
    
    * lisp/json.el (json-array-format): New error.
    (json-read-array): Use it.
---
 lisp/json.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/json.el b/lisp/json.el
index 18d7fda..055f3f5 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -227,6 +227,7 @@ Unlike `reverse', this keeps the property-value pairs 
intact."
 (define-error 'json-string-format "Bad string format" 'json-error)
 (define-error 'json-key-format "Bad JSON object key" 'json-error)
 (define-error 'json-object-format "Bad JSON object" 'json-error)
+(define-error 'json-array-format "Bad JSON array" 'json-error)
 (define-error 'json-end-of-file "End of file while parsing JSON"
   '(end-of-file json-error))
 
@@ -640,7 +641,7 @@ become JSON objects."
       (when (/= (json-peek) ?\])
         (if (= (json-peek) ?,)
             (json-advance)
-          (signal 'json-error (list 'bleah)))))
+          (signal 'json-array-format (list ?, (json-peek))))))
     ;; Skip over the "]"
     (json-advance)
     (pcase json-array-type



reply via email to

[Prev in Thread] Current Thread [Next in Thread]