Corrected bug allowing value after return for void method in full/dynamic
svn: r1399
This commit is contained in:
parent
11f4c3a661
commit
6cd0f93eb4
|
@ -1066,13 +1066,13 @@
|
||||||
;check-return: expression type env (expression -> type/env) src bool symbol type-records -> type/env
|
;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)
|
(define (check-return ret-expr return env check src interact? level type-recs)
|
||||||
(cond
|
(cond
|
||||||
(interact? (void))
|
(interact? (check ret-expr))
|
||||||
((and ret-expr (not (eq? 'void return)))
|
((and ret-expr (not (eq? 'void return)))
|
||||||
(let ((ret/env (check ret-expr)))
|
(let ((ret/env (check ret-expr)))
|
||||||
(if (assignment-conversion return (type/env-t ret/env) type-recs)
|
(if (assignment-conversion return (type/env-t ret/env) type-recs)
|
||||||
ret/env
|
ret/env
|
||||||
(return-error 'not-equal (type/env-t ret/env) return src))))
|
(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))
|
(return-error 'void #f return src))
|
||||||
((and (not ret-expr) (not (eq? 'void return)))
|
((and (not ret-expr) (not (eq? 'void return)))
|
||||||
(return-error 'val #f return src))
|
(return-error 'val #f return src))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user