From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.bugs Subject: bug#40693: 28.0.50; json-encode-alist changes alist Date: Sun, 19 Apr 2020 01:34:38 +0100 Message-ID: <87a738jotd.fsf@tcd.ie> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="18647"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Ivan Andrus , 40693@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Apr 19 02:36:28 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jPxwi-0004mW-Da for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 19 Apr 2020 02:36:28 +0200 Original-Received: from localhost ([::1]:34908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPxwh-0006nY-Em for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 18 Apr 2020 20:36:27 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40252) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPxwG-0006lB-24 for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2020 20:36:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jPxvK-0001ZT-Pp for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2020 20:35:59 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jPxvK-0001Yv-7O for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2020 20:35:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jPxvK-0001Qp-4h for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2020 20:35:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Apr 2020 00:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40693 X-GNU-PR-Package: emacs Original-Received: via spool by 40693-submit@debbugs.gnu.org id=B40693.15872564885475 (code B ref 40693); Sun, 19 Apr 2020 00:35:02 +0000 Original-Received: (at 40693) by debbugs.gnu.org; 19 Apr 2020 00:34:48 +0000 Original-Received: from localhost ([127.0.0.1]:43818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPxv6-0001QE-DV for submit@debbugs.gnu.org; Sat, 18 Apr 2020 20:34:48 -0400 Original-Received: from mail-wr1-f51.google.com ([209.85.221.51]:42958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPxv4-0001Q1-JZ for 40693@debbugs.gnu.org; Sat, 18 Apr 2020 20:34:47 -0400 Original-Received: by mail-wr1-f51.google.com with SMTP id j2so7544822wrs.9 for <40693@debbugs.gnu.org>; Sat, 18 Apr 2020 17:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=eTIyVYiGl9vC0MKBLbPziW+Li8FTdlsDmHyp+VSPS/I=; b=wvp3169KMVlVoVLBOrQCqqf67e+ILCsoYYwzwdfO2lqmKAqyZ0vmRuHbI8THIre8uT VOVqITKo6im6Ysw3jyrTIDdaFlSEzvyrEfcvNIykhsJd1TI4rmKBIX6afEs9HhW73c5l /An1dGZ2xaWUaRd6CKbjN+PJa9+I6uWv++H0WtCTQKAMR7dNen9HLHO+D/vkTWM7YdMg ItIH1QwFuZTHDYjlHZW4J0ii5Yn//T2DTEarSuofDaGQVOKsKsc3Ga/FTBfC6nsx8oVo Pv4oGcV8flipRaUQGmGgxj8X/U3DhkQslNIogWdO2y0jJ1yZoxdnM3u5n8bzW7SxwuDO iy9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=eTIyVYiGl9vC0MKBLbPziW+Li8FTdlsDmHyp+VSPS/I=; b=Qgfx+hHKznLvNXjJTINWwGVLxopfGHkgQIW9nF3tl2yAYS234agUwYQfmyyXKR0rp7 BCPkAXuW/2KW2kJfeZ6++UpVobaeJw3HBXtEgHXxpCSJYcKioMalRPuNZgiJRuBfQC8e BUseX/xKgB2DMOvC/cixm6hngU0fqbiATDcD/RIw5ohCPqgSqpNjq2hoLtkEb5aLYLrN TqHoBZmOxRoGi4k/uo8hzjYnMiyzW7264IKCOPoT61YeJeU2AcvmFFqpMpujJj42AXZ5 mSBdCnsErY51+H0tKjryv5Nwm4qYDk4nqY1uCUnvCH4EVAmjUq1It7u8k6ebixPjI7wD esBA== X-Gm-Message-State: AGi0PubzGeuPrnOW9qp5fnSYNPgrhBDXZ5P9hYMGyWyy31RjQqicUAv5 MgY8Aikvif8Q743KBpKSKDqcjg== X-Google-Smtp-Source: APiQypLKRH7W+VN+V9+NvYRDlREAnGdtMLxZFpXX7QKHEKW3+XpFLZsIfIC+kul4qQd+xBaZoN0Z4Q== X-Received: by 2002:adf:afdf:: with SMTP id y31mr11094818wrd.120.1587256480946; Sat, 18 Apr 2020 17:34:40 -0700 (PDT) Original-Received: from localhost ([2a02:8084:20e2:c380:92bd:1bfd:38fc:fae2]) by smtp.gmail.com with ESMTPSA id v1sm33995375wrv.19.2020.04.18.17.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 17:34:39 -0700 (PDT) In-Reply-To: (Dmitry Gutov's message of "Sat, 18 Apr 2020 20:29:03 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:178613 Archived-At: --=-=-= Content-Type: text/plain Dmitry Gutov writes: > How about this one? > > diff --git a/lisp/json.el b/lisp/json.el > index 18d7fda882..b65884f913 100644 > --- a/lisp/json.el > +++ b/lisp/json.el > @@ -564,9 +564,10 @@ json-encode-alist > "Return a JSON representation of ALIST." > (when json-encoding-object-sort-predicate > (setq alist > - (sort alist (lambda (a b) > - (funcall json-encoding-object-sort-predicate > - (car a) (car b)))))) > + (sort (copy-sequence alist) > + (lambda (a b) > + (funcall json-encoding-object-sort-predicate > + (car a) (car b)))))) > (format "{%s%s}" > (json-join > (json--with-indentation LGTM. Perhaps add a test as well: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=json-tests.diff diff --git a/test/lisp/json-tests.el b/test/lisp/json-tests.el index 05837e83f9..9d7ffd5feb 100644 --- a/test/lisp/json-tests.el +++ b/test/lisp/json-tests.el @@ -269,10 +269,13 @@ test-json-encode-plist-with-sort-predicate (should (equal (json-encode plist) "{\"a\":1,\"b\":2,\"c\":3}")))) (ert-deftest test-json-encode-alist-with-sort-predicate () - (let ((alist '((:c . 3) (:a . 1) (:b . 2))) - (json-encoding-object-sort-predicate 'string<) - (json-encoding-pretty-print nil)) - (should (equal (json-encode alist) "{\"a\":1,\"b\":2,\"c\":3}")))) + (let* ((alist '((:c . 3) (:a . 1) (:b . 2))) + (clone (copy-sequence alist)) + (json-encoding-object-sort-predicate #'string<) + (json-encoding-pretty-print nil)) + (should (equal (json-encode alist) "{\"a\":1,\"b\":2,\"c\":3}")) + ;; Ensure sorting isn't destructive (bug#40693). + (should (equal alist clone)))) (ert-deftest test-json-encode-list () (let ((json-encoding-pretty-print nil)) --=-=-= Content-Type: text/plain Eli, would this be okay for emacs-27? Thanks, -- Basil --=-=-=--