From f0b24a9f276e186154b21d2a10539c416cc1fc66 Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Sat, 3 Dec 2005 19:40:55 +0000 Subject: [PATCH] svn: r1514 --- collects/profj/check.ss | 8 +++++++- collects/profj/tool.ss | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/collects/profj/check.ss b/collects/profj/check.ss index c54098e510..0569e33206 100644 --- a/collects/profj/check.ss +++ b/collects/profj/check.ss @@ -1520,8 +1520,14 @@ (and (eq? 'boolean l) (eq? 'boolean r))) 'boolean) ((and (reference-type? l) (reference-type? r)) - (let ((right-to-left (assignment-conversion l r type-recs)) + (let* ((dl? (dynamic-val? l)) + (dr? (dynamic-val? r)) + (dlt (when dl? (dynamic-val-type l))) + (drt (when dr? (dynamic-val-type r))) + (right-to-left (assignment-conversion l r type-recs)) (left-to-right (assignment-conversion r l type-recs))) + (when (and dl? (not dlt)) (set-dynamic-val-type! l #f)) + (when (and dr? (not drt)) (set-dynamic-val-type! r #f)) (cond ((or right-to-left left-to-right) 'boolean) (else (bin-op-equality-error 'both op l r src))))) diff --git a/collects/profj/tool.ss b/collects/profj/tool.ss index 24daec96ed..541f14bdc8 100644 --- a/collects/profj/tool.ss +++ b/collects/profj/tool.ss @@ -551,7 +551,7 @@ (newline port)) (define/public (create-executable fn parent . args) - (printf "create-exe called~n") + ;(printf "create-exe called~n") (message-box "Unsupported" "Sorry - executables are not supported for Java at this time" parent))