[Emacs-diffs] /srv/bzr/emacs/trunk r109736: strict key encoding for json.el

[Glenn Morris]

------------------------------------------------------------
revno: 109736
author: Edward O'Connor <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-21 21:29:22 -0400
message:
  strict key encoding for json.el
  
  Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00642.html
  
  * lisp/json.el (json-key-format): Add error properties.
  (json-encode-key): New function.
  (json-encode-hash-table, json-encode-alist, json-encode-plist):
  Use json-encode-key.
modified:
  lisp/ChangeLog
  lisp/json.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-22 00:39:44 +0000
+++ b/lisp/ChangeLog    2012-08-22 01:29:22 +0000
@@ -1,3 +1,10 @@
+2012-08-22  Edward O'Connor  <address@hidden>
+
+       * json.el (json-key-format): Add error properties.
+       (json-encode-key): New function.
+       (json-encode-hash-table, json-encode-alist, json-encode-plist):
+       Use json-encode-key.
+
 2012-08-22  Glenn Morris  <address@hidden>
 
        * calendar/cal-tex.el (cal-tex-longday): New function, replacing...

=== modified file 'lisp/json.el'
--- a/lisp/json.el      2012-01-19 07:21:25 +0000
+++ b/lisp/json.el      2012-08-22 01:29:22 +0000
@@ -174,6 +174,10 @@
 (put 'json-string-format 'error-conditions
      '(json-string-format json-error error))
 
+(put 'json-key-format 'error-message "Bad JSON object key")
+(put 'json-key-format 'error-conditions
+     '(json-key-format json-error error))
+
 (put 'json-object-format 'error-message "Bad JSON object")
 (put 'json-object-format 'error-conditions
      '(json-object-format json-error error))
@@ -321,6 +325,15 @@
   "Return a JSON representation of STRING."
   (format "\"%s\"" (mapconcat 'json-encode-char string "")))
 
+(defun json-encode-key (object)
+  "Return a JSON representation of OBJECT.
+If the resulting JSON object isn't a valid JSON object key,
+this signals `json-key-format'."
+  (let ((encoded (json-encode object)))
+    (unless (stringp (json-read-from-string encoded))
+      (signal 'json-key-format (list object)))
+    encoded))
+
 ;;; JSON Objects
 
 (defun json-new-object ()
@@ -395,7 +408,7 @@
              (maphash
               (lambda (k v)
                 (push (format "%s:%s"
-                              (json-encode k)
+                              (json-encode-key k)
                               (json-encode v))
                       r))
               hash-table)
@@ -409,7 +422,7 @@
   (format "{%s}"
           (json-join (mapcar (lambda (cons)
                                (format "%s:%s"
-                                       (json-encode (car cons))
+                                       (json-encode-key (car cons))
                                        (json-encode (cdr cons))))
                              alist)
                      ", ")))
@@ -418,7 +431,7 @@
   "Return a JSON representation of PLIST."
   (let (result)
     (while plist
-      (push (concat (json-encode (car plist))
+      (push (concat (json-encode-key (car plist))
                     ":"
                     (json-encode (cadr plist)))
             result)