From 1886a18b83e2eddea8c4b7c1b1ef10f7ea6d03e1 Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Mon, 14 May 2007 21:19:48 +0000 Subject: [PATCH] Correction to error message bugs 8660 and 8672 svn: r6224 --- collects/profj/build-info.ss | 2 +- collects/profj/check.ss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/collects/profj/build-info.ss b/collects/profj/build-info.ss index 987ed29a25..5d7f8d67fb 100644 --- a/collects/profj/build-info.ss +++ b/collects/profj/build-info.ss @@ -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)) diff --git a/collects/profj/check.ss b/collects/profj/check.ss index f6b7e7c45a..68619cb88b 100644 --- a/collects/profj/check.ss +++ b/collects/profj/check.ss @@ -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)))))