mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-20 19:50:24 +02:00
Changes from arch/CVS synchronization
This commit is contained in:
parent
454866e052
commit
bc4ee34e1d
2 changed files with 23 additions and 10 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2007-09-10 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
|
||||||
|
* srfi-35.scm (make-compound-condition-type): When PARENTS
|
||||||
|
contains only one element, return its car. This improves the
|
||||||
|
output of `print-condition' for non-compound conditions returned
|
||||||
|
by `make-compound-condition'.
|
||||||
|
|
||||||
2007-08-11 Ludovic Courtès <ludo@gnu.org>
|
2007-08-11 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
|
||||||
* srfi-35.scm: New file.
|
* srfi-35.scm: New file.
|
||||||
|
|
|
@ -115,6 +115,12 @@ supertypes."
|
||||||
;; Return a compound condition type made of the types listed in PARENTS.
|
;; Return a compound condition type made of the types listed in PARENTS.
|
||||||
;; All fields from PARENTS are kept, even same-named ones, since they are
|
;; All fields from PARENTS are kept, even same-named ones, since they are
|
||||||
;; needed by `extract-condition'.
|
;; needed by `extract-condition'.
|
||||||
|
(cond ((null? parents)
|
||||||
|
(error "`make-compound-condition-type' passed empty parent list"
|
||||||
|
id))
|
||||||
|
((null? (cdr parents))
|
||||||
|
(car parents))
|
||||||
|
(else
|
||||||
(let* ((all-fields (append-map condition-type-all-fields
|
(let* ((all-fields (append-map condition-type-all-fields
|
||||||
parents))
|
parents))
|
||||||
(layout (struct-layout-for-condition all-fields)))
|
(layout (struct-layout-for-condition all-fields)))
|
||||||
|
@ -124,7 +130,7 @@ supertypes."
|
||||||
id
|
id
|
||||||
parents ;; list of parents!
|
parents ;; list of parents!
|
||||||
all-fields
|
all-fields
|
||||||
all-fields)))
|
all-fields)))))
|
||||||
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue