From 54eecf0b08d1e32e89c9441e4d7e10fb58c3c5f5 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 1 Oct 2018 23:15:02 -0700
Subject: [PATCH] Simplify implementation slightly.
---
src/runtime/bundle.scm | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/runtime/bundle.scm b/src/runtime/bundle.scm
index a031ca3d9..25dab6e82 100644
--- a/src/runtime/bundle.scm
+++ b/src/runtime/bundle.scm
@@ -36,16 +36,8 @@ USA.
(declare (usual-integrations))
-(define (make-bundle-predicate name #!optional parent-predicate)
- (let ((type
- (new-make-record-type name
- '()
- (if (default-object? parent-predicate)
- <bundle>
- (%predicate->record-type
- (guarantee bundle-predicate?
- parent-predicate
- 'make-bundle-predicate))))))
+(define (make-bundle-predicate name)
+ (let ((type (new-make-record-type name '() <bundle>)))
(set-record-type-applicator! type %bundle-applicator)
(record-predicate type)))
@@ -83,10 +75,14 @@ USA.
(symbol? (car p)))
object)))
-(define-record-type <bundle>
- (%unused% alist) ;change to #f after 9.3 release
- bundle?
- (alist bundle-alist))
+(define <bundle>
+ (new-make-record-type '<bundle> '(alist)))
+
+(define bundle?
+ (record-predicate <bundle>))
+
+(define bundle-alist
+ (record-accessor <bundle> 'alist))
(define-print-method bundle?
(standard-print-method
--
2.25.1