From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#73431: Add `setf` support for `stream.el` in ELPA Date: Tue, 24 Sep 2024 10:15:08 +0000 Message-ID: <87ikultl1v.fsf@posteo.net> References: <827cc7fc-10be-4b93-bd67-f275193e5d84@protonmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33401"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Nicolas Petton , 73431@debbugs.gnu.org, Stefan Monnier To: Okamsn Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Sep 24 12:16:21 2024 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 1st2ai-0008Tc-50 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 24 Sep 2024 12:16:20 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1st2aK-0002eS-Db; Tue, 24 Sep 2024 06:15:57 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1st2a5-0002bs-DM for bug-gnu-emacs@gnu.org; Tue, 24 Sep 2024 06:15:46 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1st2a2-0004Rg-1o for bug-gnu-emacs@gnu.org; Tue, 24 Sep 2024 06:15:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=jSRP4AicYSqBHaa2dUfoYMdUhKGHVHDI6xVzpcQKEJk=; b=h3+4mRZt1gifeC2qw1JRMDsKRI+cKhznQPddwLPZtEz+4iEau4mJHY+WuPoVjJxKVzL8nGbW2US+f2GQ7MYIEDMymhdaShlFsSXMH7UVUuS+BcsK/4QwXceiHOp8o2R0KbudCqJKNkUWPDEZSWc7hfohT3GO5odp1rK+gbfhNneE2cGBat4ctkwt6e1BgUFPXkDu+ThwyVJGG/IZijJUhiBiskEiKR/RvchknEZGqGBSg84YBcEYYPRQOj8eflM7JLu7PLWdgUfPSbArJKxeCm9I2KPNo/ZWZQgn+fuJ4t+L+PRqrlDoa/akjkRwJ+p+4AIDNXxWhWUOAI4JXMODaA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1st2aP-0007WL-Uo for bug-gnu-emacs@gnu.org; Tue, 24 Sep 2024 06:16:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 24 Sep 2024 10:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73431 X-GNU-PR-Package: emacs Original-Received: via spool by 73431-submit@debbugs.gnu.org id=B73431.172717294928883 (code B ref 73431); Tue, 24 Sep 2024 10:16:01 +0000 Original-Received: (at 73431) by debbugs.gnu.org; 24 Sep 2024 10:15:49 +0000 Original-Received: from localhost ([127.0.0.1]:45361 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1st2aC-0007Vn-SC for submit@debbugs.gnu.org; Tue, 24 Sep 2024 06:15:49 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:40199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1st2a8-0007VU-AB for 73431@debbugs.gnu.org; Tue, 24 Sep 2024 06:15:47 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C2374240101 for <73431@debbugs.gnu.org>; Tue, 24 Sep 2024 12:15:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1727172913; bh=7p7sF53F05pksc0ChZkrjwHAwf3X1ShIkkVKhVpTLkw=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=YFfWpxXP5Nd+pOeWSpxo8eF18b8TGbVc2E3ppSL6EZoh6SfUwiT4RH6koqH6EL39e 784//8IyuTMi98yWzc+TZY8kOoXzNKs6ss8CLiDymdXYpWJBMIvyX4MDCPK8xQ1ncT A8ZJGPD0JJ7ULw2lC1E1rSJGbuVfMHGDDsvBLR7B9YzzcRijhiiJWk3BP7lng0DDB6 lJbrYR+zv/3NpArNNnujXpjVCPaCli6LMR6O1rscNpGgT2VJE56fM2DnMaAbVTRP5h axm0kA1Zt1l05kCGUszR7Q/AoRBboZJRhLv+F/ZPhLFQ32Hr1f+6yFITewgZBuhA78 hqHszz7iwURMA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XCbMf0R74z6tw8; Tue, 24 Sep 2024 12:15:09 +0200 (CEST) In-Reply-To: <827cc7fc-10be-4b93-bd67-f275193e5d84@protonmail.com> (okamsn@protonmail.com's message of "Mon, 23 Sep 2024 01:33:24 +0000") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=philipk@posteo.net; url="https://keys.openpgp.org/vks/v1/by-email/philipk@posteo.net"; preference=signencrypt X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:292316 Archived-At: Okamsn writes: > Hello, > > The attached patch adds `setf` support for `stream-first`, > `stream-rest`, and `seq-elt` for streams. The support for `setf` with > `seq-elt` for streams uses the added support for `stream-first`, > following the definition of `seq-elt` for streams. > > Would you like anything changed? > > Thank you. > > From fed785a332bb335522a4b71ef8a68896f304e1d0 Mon Sep 17 00:00:00 2001 > From: Earl Hyatt > Date: Sun, 22 Sep 2024 19:23:36 -0400 > Subject: [PATCH] Add setf support to stream.el. > > * stream.el (\(setf\ stream-first\), \(setf\ stream-rest\)): Add support to > `setf' for stream-first and stream-rest. > > * stream.el (\(setf\ seq-elt\)): Support `setf' with `seq-elt' for streams. > > * tests/stream-tests.el (setf-stream-first, setf-stream-first-error) > (setf-stream-rest, setf-stream-rest-error, setf-stream-seq-elt) > (setf-stream-seq-elt-error): Add tests for the above features. > --- > stream.el | 23 ++++++++++++++++ > tests/stream-tests.el | 64 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 87 insertions(+) > > diff --git a/stream.el b/stream.el > index 7135ee0..eb8b179 100644 > --- a/stream.el > +++ b/stream.el > @@ -212,11 +212,23 @@ (defun stream-first (stream) > Return nil if STREAM is empty." > (car (stream--force stream))) > > +(defun \(setf\ stream-first\) (store stream) > + "Set the first element of STREAM to value STORE." > + (if (stream-empty-p stream) > + (error "Cannot set first element of empty stream: %s" stream) > + (setcar (stream--force stream) store))) I am not sure what the preferred practice to define generalised setters is. In gv.el everything is defined using `gv-define-simple-setter' or `gv-define-setter', which /feels/ more robust? I believe that Stefan (as the author or gv.el) might be able to explain if this is so or not. > + > (defun stream-rest (stream) > "Return a stream of all but the first element of STREAM." > (or (cdr (stream--force stream)) > (stream-empty))) > > +(defun \(setf\ stream-rest\) (new-stream stream) > + "Set the remainder of STREAM to NEW-STREAM." > + (if (stream-empty-p stream) > + (error "Cannot set remainder of empty stream: %s" stream) > + (setcdr (stream--force stream) new-stream))) > + > (defun stream-append (&rest streams) > "Concatenate the STREAMS. > Requesting elements from the resulting stream will request the > @@ -273,6 +285,17 @@ (cl-defmethod seq-elt ((stream stream) n) > (setq n (1- n))) > (stream-first stream)) > > +(cl-defmethod \(setf\ seq-elt\) (store (stream stream) n) > + "Set the element of STREAM at index N to value STORE." > + (let ((stream-for-signal stream) > + (n-for-signal n)) > + (while (> n 0) > + (setq stream (stream-rest stream)) > + (setq n (1- n))) > + (if (stream-empty-p stream) > + (signal 'args-out-of-range (list stream-for-signal n-for-signal)) > + (setf (stream-first stream) store)))) > + > (cl-defmethod seq-length ((stream stream)) > "Return the length of STREAM. > This function will eagerly consume the entire stream." > diff --git a/tests/stream-tests.el b/tests/stream-tests.el > index ba304f1..f82c206 100644 > --- a/tests/stream-tests.el > +++ b/tests/stream-tests.el > @@ -308,5 +308,69 @@ (deftest-for-delayed-evaluation (stream-scan #'* 1 (make-delayed-test-stream))) > (deftest-for-delayed-evaluation (stream-concatenate (stream (list (make-delayed-test-stream) > (make-delayed-test-stream))))) > > +;; Test `setf' support > +(ert-deftest setf-stream-first () > + (should (= 100 (let ((test (stream (vector 0 1 2 3 4)))) > + (setf (stream-first test) 100) > + (stream-first test)))) > + > + (should (= 100 (let ((test (stream-range 0 10 2))) > + (setf (stream-first test) 100) > + (stream-first test))))) > + > +(ert-deftest setf-stream-first-error () > + (should-error (let ((test (stream-empty))) > + (setf (stream-first test) 100) > + (stream-first test)))) > + > +(ert-deftest setf-stream-rest () > + (should (equal '(0 11 12 13 14) > + (let ((test (stream (vector 0 1 2 3 4)))) > + (setf (stream-rest test) (stream (list 11 12 13 14))) > + (seq-into test 'list)))) > + > + (should (equal '(0 11 12 13 14) > + (let ((test (stream-range 0 10 2))) > + (setf (stream-rest test) (stream (list 11 12 13 14))) > + (seq-into test 'list)))) > + > + (should (equal '(0 11 12 13 14) > + (let ((test (stream-range 0 10 2))) > + ;; Test using an evaluated stream. > + (setf (stream-rest test) > + (let ((stream (stream (list 11 12 13 14)))) > + (seq-do #'ignore stream) > + stream)) > + (seq-into test 'list))))) > + > +(ert-deftest setf-stream-rest-error () > + (should-error (let ((test (stream-empty))) > + (setf (stream-rest test) (stream (list 11 12 13 14))) > + (seq-into test 'list)))) > + > +(ert-deftest setf-stream-seq-elt () > + (should (= 100 (let ((test (stream (vector 0 1 2 3 4)))) > + (setf (seq-elt test 3) 100) > + (seq-elt test 3)))) > + > + (should (equal '(0 1 2 100 4) > + (let ((test (stream (vector 0 1 2 3 4)))) > + (setf (seq-elt test 3) 100) > + (seq-into test 'list)))) > + > + (should (= 100 (let ((test (stream-range 0 10 2))) > + (setf (seq-elt test 3) 100) > + (seq-elt test 3)))) > + > + (should (equal '(0 2 4 100 8) > + (let ((test (stream-range 0 10 2))) > + (setf (seq-elt test 3) 100) > + (seq-into test 'list))))) > + > +(ert-deftest setf-stream-seq-elt-error () > + (should-error (let ((test (stream (vector 0 1 2 3 4)))) > + (setf (seq-elt test 1000) 100)) > + :type 'args-out-of-range)) > + > (provide 'stream-tests) > ;;; stream-tests.el ends here -- Philip Kaludercic on siskin