* json.el: Bump version to 1.3; (json-alist-p, json-plist-p): Rewrite to avoid recursion.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3daabae64415dd979744e84226d9da32138da86..8034cebf0e5f3a1abc94e69f9a982d3990a8da00 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-17  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * json.el: Bump version to 1.3 and note change in History.
+       (json-alist-p, json-plist-p): Rewrite to avoid recursion.
+
 2011-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * comint.el (comint-insert-input, comint-send-input)

diff --git a/lisp/json.el b/lisp/json.el
index 47448f4702af940f395ee229b1104f93aa3d8c2f..33e985abbee35f6826d182fe4fcf52acba562542 100644 (file)
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
 ;; Author: Edward O'Connor <ted@oconnor.cx>
-;; Version: 1.2
+;; Version: 1.3
 ;; Keywords: convenience
 
 ;; This file is part of GNU Emacs.
@@ -47,6 +47,7 @@
 ;;              other cleanups, bugfixes, and improvements.
 ;; 2006-12-29 - XEmacs support, from Aidan Kehoe <kehoea@parhasard.net>.
 ;; 2008-02-21 - Installed in GNU Emacs.
+;; 2011-10-17 - Patch `json-alist-p' and `json-plist-p' to avoid recursion -tzz
 
 ;;; Code:
 
@@ -108,16 +109,20 @@ this around your call to `json-read' instead of `setq'ing it.")
 
 (defun json-alist-p (list)
   "Non-null if and only if LIST is an alist."
-  (or (null list)
-      (and (consp (car list))
-           (json-alist-p (cdr list)))))
+  (while (consp list)
+    (setq list (if (consp (car list))
+                   (cdr list)
+                 'not-alist)))
+  (null list))
 
 (defun json-plist-p (list)
   "Non-null if and only if LIST is a plist."
-  (or (null list)
-      (and (keywordp (car list))
-           (consp (cdr list))
-           (json-plist-p (cddr list)))))
+  (while (consp list)
+    (setq list (if (and (keywordp (car list))
+                        (consp (cdr list)))
+                   (cddr list)
+                 'not-plist)))
+  (null list))
 
 ;; Reader utilities