diff options
| author | Andy Wingo <wingo@pobox.com> | 2017-09-22 11:59:51 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2017-09-22 12:02:25 +0200 |
| commit | 2f9ad7d9bcd1f787e324158a1ee402d111e8608e (patch) | |
| tree | 7a79123f736074bfee46574e9067dd6702b39ff7 /module/rnrs | |
| parent | ed549da23078657836e359d9d9ef3c6bd01cd738 (diff) | |
| parent | c7c7588f2416624319be2a037056ba8bb1c054e7 (diff) | |
| download | guile-2f9ad7d9bcd1f787e324158a1ee402d111e8608e.tar.gz | |
Merge stable-2.2 into master
This commit resolves conflicts by removing the deprecated make-struct.
Diffstat (limited to 'module/rnrs')
| -rw-r--r-- | module/rnrs/records/procedural.scm | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/module/rnrs/records/procedural.scm b/module/rnrs/records/procedural.scm index d925263d8..69c5d1c56 100644 --- a/module/rnrs/records/procedural.scm +++ b/module/rnrs/records/procedural.scm @@ -1,6 +1,6 @@ ;;; procedural.scm --- Procedural interface to R6RS records -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010, 2017 Free Software Foundation, Inc. ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -36,7 +36,7 @@ and=> throw display - make-struct + make-struct/no-tail make-vtable map simple-format @@ -127,7 +127,7 @@ (and=> (struct-ref obj 0) private-record-predicate)))) (define (field-binder parent-struct . args) - (apply make-struct (cons* late-rtd 0 parent-struct args))) + (apply make-struct/no-tail late-rtd parent-struct args)) (if (and parent (struct-ref parent rtd-index-sealed?)) (r6rs-raise (make-assertion-violation))) @@ -152,23 +152,24 @@ matching-rtd (r6rs-raise (make-assertion-violation))) - (let ((rtd (make-struct record-type-vtable 0 + (let ((rtd (make-struct/no-tail + record-type-vtable - fields-layout - (lambda (obj port) - (simple-format - port "#<r6rs:record:~A>" name)) + fields-layout + (lambda (obj port) + (simple-format + port "#<r6rs:record:~A>" name)) - name - uid - parent - sealed? - opaque? + name + uid + parent + sealed? + opaque? - private-record-predicate - field-names - fields-bit-field - field-binder))) + private-record-predicate + field-names + fields-bit-field + field-binder))) (set! late-rtd rtd) (if uid (hashq-set! uid-table uid rtd)) rtd)))) @@ -196,7 +197,7 @@ (prot (or protocol (if pcd default-inherited-protocol default-protocol)))) - (make-struct record-constructor-vtable 0 rtd pcd prot))) + (make-struct/no-tail record-constructor-vtable rtd pcd prot))) (define (record-constructor rctd) (let* ((rtd (struct-ref rctd rctd-index-rtd)) |