Correction to bug 9022

svn: r7579
This commit is contained in:
Kathy Gray 2007-10-27 19:14:13 +00:00
parent 98a526fd41
commit 05e2b658ef
2 changed files with 13 additions and 1 deletions

View File

@ -868,7 +868,8 @@
,@(generate-wrapper-fields fields from-dynamic?)
,@(generate-wrapper-methods
(filter (lambda (m) (not (eq? (method-record-rtype m) 'ctor)))
(filter (lambda (m) (and (not (eq? (method-record-rtype m) 'ctor))
(not (object-method? m))))
wrapped-methods) #f from-dynamic?)
,@extra-methods
))))

View File

@ -33,6 +33,17 @@
(define comparable-type (make-ref-type "Comparable" `("java" "lang")))
(define cloneable-type (make-ref-type "Cloneable" `("java" "lang")))
(define (object-method? m-rec)
(or
(and (equal? (method-record-name m-rec) "equals")
(eq? (method-record-rtype m-rec) 'boolean)
(= 1 (length (method-record-atypes m-rec)))
(type=? object-type (car (method-record-atypes m-rec))))
(and (equal? (method-record-name m-rec) "hashcode")
(eq? (method-record-rtype m-rec) 'int)
(= 0 (length (method-record-atypes m-rec))))
))
;
;
; ; ; ;