correction to bugs 8947 and 8948
svn: r7388
This commit is contained in:
parent
b1ec11dd74
commit
9cb66102ed
|
@ -831,7 +831,9 @@
|
||||||
#f
|
#f
|
||||||
#t
|
#t
|
||||||
(apply append (cons f (map class-record-fields super-records)))
|
(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 i (map class-record-inners super-records)))
|
||||||
(apply append (cons (map class-record-name super-records)
|
(apply append (cons (map class-record-name super-records)
|
||||||
(map class-record-parents super-records)))
|
(map class-record-parents super-records)))
|
||||||
|
|
|
@ -698,7 +698,9 @@
|
||||||
[ifaces (consolidate-lists sorted-ifaces)])
|
[ifaces (consolidate-lists sorted-ifaces)])
|
||||||
#;(printf "iface-depth ~a ~a ~a ~n" elt
|
#;(printf "iface-depth ~a ~a ~a ~n" elt
|
||||||
iface-trees (map (lambda (i-list) (depth elt 0 i-list)) iface-trees))
|
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
|
;conversion-steps: type type -> int
|
||||||
(define (conversion-steps from to type-recs)
|
(define (conversion-steps from to type-recs)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user