correction to bugs 8947 and 8948

svn: r7388
This commit is contained in:
Kathy Gray 2007-09-19 23:32:26 +00:00
parent b1ec11dd74
commit 9cb66102ed
2 changed files with 6 additions and 2 deletions

View File

@ -831,7 +831,9 @@
#f
#t
(apply append (cons f (map class-record-fields super-records)))
(apply append (cons m (map class-record-methods super-records)))
(if (null? super-records)
object-methods
(apply append (cons m (map class-record-methods super-records))))
(apply append (cons i (map class-record-inners super-records)))
(apply append (cons (map class-record-name super-records)
(map class-record-parents super-records)))

View File

@ -698,7 +698,9 @@
[ifaces (consolidate-lists sorted-ifaces)])
#;(printf "iface-depth ~a ~a ~a ~n" elt
iface-trees (map (lambda (i-list) (depth elt 0 i-list)) iface-trees))
(apply min (map (lambda (i-list) (depth elt 0 i-list)) ifaces)))))
(if (null? ifaces)
0
(apply min (map (lambda (i-list) (depth elt 0 i-list)) ifaces))))))
;conversion-steps: type type -> int
(define (conversion-steps from to type-recs)