From b8e937ac1febb13c9f1247274ae7df7825a8b94d Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Wed, 23 Nov 2005 18:31:56 +0000 Subject: [PATCH] Corrected a bug where name collision was possible in wrappers for dynamic svn: r1384 --- collects/profj/to-scheme.ss | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/collects/profj/to-scheme.ss b/collects/profj/to-scheme.ss index 1ad2c9344e..5d41da1a43 100644 --- a/collects/profj/to-scheme.ss +++ b/collects/profj/to-scheme.ss @@ -743,14 +743,14 @@ (lambda (name super-name from-dynamic? extra-methods) `(define ,name (class ,super-name - (init w p n s c) - (define-values (wrapped-obj pos-blame neg-blame src cc-marks) (values null null null null null)) - (set! wrapped-obj w) - (set! pos-blame p) - (set! neg-blame n) - (set! src s) - (set! cc-marks c) - (super-instantiate (w p n s c)) + (init w* p* n* s* c*) + (define-values (wrapped-obj pos-blame neg-blame src* cc-marks) (values null null null null null)) + (set! wrapped-obj w*) + (set! pos-blame p*) + (set! neg-blame n*) + (set! src* s*) + (set! cc-marks c*) + (super-instantiate (w* p* n* s* c*)) ,(generate-wrapper-fields fields from-dynamic?) @@ -857,8 +857,8 @@ ((dynamic-val? type) value) ((array-type? type) value #;(if from-dynamic? - `(wrap-convert-assert-array ,value pos-blame neg-blame src cc-marks) - `(make-object guard-convert-array ,value pos-blame neg-blame src cc-marks))) + `(wrap-convert-assert-array ,value pos-blame neg-blame src* cc-marks) + `(make-object guard-convert-array ,value pos-blame neg-blame src* cc-marks))) ((ref-type? type) (cond ((and (equal? string-type type) from-dynamic?) `(make-java-string ,value)) @@ -868,9 +868,9 @@ (make-ref-type "PrintStream" '("java" "io")) (make-ref-type "PrintWriter" '("java" "io")))) value) (from-dynamic? `(,(build-identifier (string-append "wrap-convert-assert-" (ref-type-class/iface type))) - ,value pos-blame neg-blame src cc-marks)) + ,value pos-blame neg-blame src* cc-marks)) (else `(make-object ,(build-identifier (string-append "guard-convert-" (ref-type-class/iface type))) - ,value pos-blame neg-blame src cc-marks)))) + ,value pos-blame neg-blame src* cc-marks)))) (else value))) ;assert-value: sexp type boolean -> sexp