From 6cd0f93eb43fb21a5e73c2092806508fc8d8a010 Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Thu, 24 Nov 2005 18:16:58 +0000 Subject: [PATCH] Corrected bug allowing value after return for void method in full/dynamic svn: r1399 --- collects/profj/check.ss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collects/profj/check.ss b/collects/profj/check.ss index e1049931b7..33e52dd808 100644 --- a/collects/profj/check.ss +++ b/collects/profj/check.ss @@ -1066,13 +1066,13 @@ ;check-return: expression type env (expression -> type/env) src bool symbol type-records -> type/env (define (check-return ret-expr return env check src interact? level type-recs) (cond - (interact? (void)) + (interact? (check ret-expr)) ((and ret-expr (not (eq? 'void return))) (let ((ret/env (check ret-expr))) (if (assignment-conversion return (type/env-t ret/env) type-recs) ret/env (return-error 'not-equal (type/env-t ret/env) return src)))) - ((and ret-expr (eq? 'void return) (not (eq? level 'full))) + ((and ret-expr (eq? 'void return)) (return-error 'void #f return src)) ((and (not ret-expr) (not (eq? 'void return))) (return-error 'val #f return src))