Correction to error message bugs 8660 and 8672

svn: r6224
This commit is contained in:
Kathy Gray 2007-05-14 21:19:48 +00:00
parent 9fa7ec966d
commit 1886a18b83
2 changed files with 3 additions and 2 deletions

View File

@ -1159,7 +1159,7 @@
(apply append (map class-record-methods records))
level)
(method-error 'inherit-conflict
(method-record-name (car methods))
(make-id (method-record-name (car methods)) #f)
(method-record-atypes (car methods))
(method-record-rtype (car methods))
(id-string (name-id from))

View File

@ -2494,7 +2494,8 @@
(if (assignment-conversion then else-t type-recs)
then
(if (assignment-conversion else-t then type-recs)
else-t)))
else-t
(condition-mismatch-error then else-t src))))
(else (condition-mismatch-error then else-t src)))
(intersect-var-sets (type/env-e test/env) (type/env-e then/env) (type/env-e else/env)))))