The R6RS says a number of exceptions raised by the record stuff are supposed to use &assertion, but currently &error is being used. I searched chapter 6 for "assertion" and I've made the below changes so things use &assertion where chapter 6 says they're supposed to. Also, I improved some of the exception messages, I made the opaque and sealed tests test for boolean equivalence per the report, and I removed the (eqv? name (rtd-name rtd)) because the report does not say to do that test and the returned nongenerative record type is always the first one which always prints the name of the first one anyways.
=== modified file 'scheme/ikarus.records.procedural.ss'
--- scheme/ikarus.records.procedural.ss 2007-11-21 06:39:31 +0000
+++ scheme/ikarus.records.procedural.ss 2007-12-02 01:26:08 +0000
@@ -55,7 +55,7 @@
(define (record-rtd x)
(define (err x)
- (error 'record-rtd "not a record" x))
+ (assertion-violation 'record-rtd "not a record, or record is opaque" x))
(if ($struct? x)
(let ([rtd ($struct-rtd x)])
(if (rtd? rtd)
@@ -144,7 +144,7 @@
(cond
[(rtd? parent)
(when (rtd-sealed? parent)
- (error who "cannot extend sealed parent" parent))
+ (assertion-violation who "cannot extend sealed parent" parent))
(make-rtd-aux name parent uid sealed?
(or opaque? (rtd-opaque? parent))
(rtd-size parent)
@@ -153,6 +153,9 @@
(make-rtd-aux name parent uid sealed? opaque? 0
(convert-fields fields))]
[else (error who "not a valid parent" parent)])))
+ (define (boolean-equivalent? x y)
+ (or (and (not x) (not y))
+ (and x y)))
(define (same-fields-as-rtd? fields rtd)
(let* ([fv (rtd-fields rtd)]
[n (vector-length fv)])
@@ -179,12 +182,13 @@
[(lookup-rtd uid) =>
(lambda (rtd)
(unless
- (and (eqv? name (rtd-name rtd))
- (eqv? parent (rtd-parent rtd))
- (eqv? sealed? (rtd-sealed? rtd))
- (eqv? opaque? (rtd-opaque? rtd))
+ (and (eqv? parent (rtd-parent rtd))
+ (boolean-equivalent? sealed? (rtd-sealed? rtd))
+ (boolean-equivalent? opaque? (rtd-opaque? rtd))
(same-fields-as-rtd? fields rtd))
- (error who "invalid arguments"))
+ (assertion-violation who
+ "arguments not equivalent to nongenerative record type with the same uid"
+ parent sealed? opaque? fields))
rtd)]
[else
(let ([rtd (generate-rtd name parent uid sealed? opaque? fields)])
@@ -195,9 +199,9 @@
(unless (symbol? name)
(error who "not a valid record type name" name))
(unless (boolean? sealed?)
- (error who "not a valid sealed? argument" sealed?))
+ (error who "not a valid sealed argument" sealed?))
(unless (boolean? opaque?)
- (error who "not a valid opaque? argument" opaque?))
+ (error who "not a valid opaque argument" opaque?))
(cond
[(symbol? uid)
(make-nongenerative-rtd name parent uid sealed? opaque? fields)]
@@ -357,7 +361,7 @@
(unless (fx< i sz)
(error who "not a valid index" k))
(unless (car (vector-ref (rtd-fields rtd) k))
- (error who "field is not mutable" k rtd))
+ (assertion-violation who "field is not mutable" k rtd))
(let ([a-record-mutator
(lambda (x v)
(cond
On Dec 1, 2007, at 8:50 PM, Derick Eddington wrote:
> Public bug reported:
>
> The R6RS says a number of exceptions raised by the record stuff are
> supposed to use &assertion, but currently &error is being used.
I think this applies to almost all the errors that Ikarus currently
raises.
I will fix all of them at once at some time. Not today.
> I
> searched chapter 6 for "assertion" and I've made the below changes so
> things use &assertion where chapter 6 says they're supposed to.
> Also, I
> improved some of the exception messages,
OK. Thanks.
> I made the opaque and sealed
> tests test for boolean equivalence per the report,
eqv? and your boolean-equivalent? both return the same thing for
boolean values.
I don't see why you're making this change.
> and I removed the
> (eqv? name (rtd-name rtd)) because the report does not say to do that
> test and the returned nongenerative record type is always the first
> one
> which always prints the name of the first one anyways.
I don't know if this was intentional or by mistake. Will do as the
report says anyways.
Aziz,,,