summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Browning <rlb@defaultvalue.org>2023-05-27 11:09:07 -0500
committerRob Browning <rlb@defaultvalue.org>2023-05-27 11:09:07 -0500
commit77f124f65bda4c7c2491ac5a969731041001ed8d (patch)
tree8bb8d2b0e8113bca424f0828927126c5ab0b3938
parent6c6ec07da1564207da01b8be507813ccafc733d2 (diff)
lokke base collection: make #:pure; hide assoc and list?
Make #:pure so the (guile) #:select doesn't undermine #:hide, and then remove the related assoc hack. Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
-rw-r--r--mod/lokke/base/collection.scm10
1 files changed, 6 insertions, 4 deletions
diff --git a/mod/lokke/base/collection.scm b/mod/lokke/base/collection.scm
index 5969d6d..7300a97 100644
--- a/mod/lokke/base/collection.scm
+++ b/mod/lokke/base/collection.scm
@@ -1,4 +1,4 @@
-;;; Copyright (C) 2015-2020 Rob Browning <rlb@defaultvalue.org>
+;;; Copyright (C) 2015-2023 Rob Browning <rlb@defaultvalue.org>
;;; SPDX-License-Identifier: LGPL-2.1-or-later OR EPL-1.0+
;;; This is the core of the collection implementation. It's in a
@@ -13,9 +13,12 @@
(define-module (lokke base collection)
#:version (0 0 0)
+ #:pure
+ #:use-module ((guile) #:hide (assoc list? peek reverse sort))
#:use-module ((guile)
- #:hide (peek reverse sort)
- :select ((apply . %scm-apply) (cons . %scm-cons) (list? . %scm-list?)))
+ :select ((apply . %scm-apply)
+ (cons . %scm-cons)
+ (list? . %scm-list?)))
#:use-module ((ice-9 match) #:select (match-lambda*))
#:use-module ((ice-9 q) #:select (enq! deq! make-q q-length))
#:use-module ((lokke base invoke) #:select (apply))
@@ -95,7 +98,6 @@
;; FIXME: should these implmentations of rest actually be next?
-(set! assoc #f) ;; We do not want the guile assoc as the fallback
(define-generic assoc)
(define-generic dissoc)
(define-generic contains)