changed name (& sign) of track-inferred-names? to show-lambdas-as-lambdas?

svn: r7589
This commit is contained in:
John Clements 2007-10-29 20:55:39 +00:00
parent fa07c5a9e9
commit 366dc3551a
4 changed files with 24 additions and 17 deletions

View File

@ -224,6 +224,10 @@ stepper-fake-exp :
this expression does not occur directly in the source; reconstruct specially. this expression does not occur directly in the source; reconstruct specially.
used for begin. used for begin.
args-of-call [ADDED BY RECONSTRUCTOR] :
this reconstructed (...) expression is the result of a call with these args.
used by the check-expect unwinder to figure out the expected values.
STEPPER-HINT COLLISIONS STEPPER-HINT COLLISIONS
The major concern with the stepper-hint is that two of them may The major concern with the stepper-hint is that two of them may
@ -249,3 +253,4 @@ collision can occur.
2) the intermediate let* expands into the beginner let; both add a 2) the intermediate let* expands into the beginner let; both add a
stepper-hint. To resolve this, the expansion of let allows an existing stepper-hint. To resolve this, the expansion of let allows an existing
stepper-hint to stand. stepper-hint to stand.

View File

@ -28,7 +28,7 @@
(list?) (list?)
. opt->* . . opt->* .
(any/c)) ; procedure for runtime break (any/c)) ; procedure for runtime break
boolean? ; track-inferred-name? boolean? ; show-lambdas-as-lambdas?
(union any/c (symbols 'testing)); language-level (union any/c (symbols 'testing)); language-level
. -> . . -> .
syntax?)] ; results syntax?)] ; results
@ -40,7 +40,7 @@
(list?) (list?)
. opt->* . . opt->* .
(any/c)) ; procedure for runtime break (any/c)) ; procedure for runtime break
boolean? ; track-inferred-name? boolean? ; show-lambdas-as-lambdas?
(union any/c (symbols 'testing)); language-level (union any/c (symbols 'testing)); language-level
. -> . . -> .
syntax?)] ; results syntax?)] ; results
@ -270,7 +270,7 @@
(define ((annotate/master input-is-top-level?) main-exp break track-inferred-names? language-level) (define ((annotate/master input-is-top-level?) main-exp break show-lambdas-as-lambdas? language-level)
#;(define _ (>>> (syntax-object->datum main-exp))) #;(define _ (>>> (syntax-object->datum main-exp)))
(define binding-indexer (define binding-indexer
@ -495,11 +495,12 @@
(lambda (annotated-lambda free-varrefs) (lambda (annotated-lambda free-varrefs)
(let*-2vals (let*-2vals
([closure-info (make-debug-info-app 'all free-varrefs 'none)] ([closure-info (make-debug-info-app 'all free-varrefs 'none)]
[closure-name (if track-inferred-names? ;; if we manually disable the storage of names, lambdas get rendered as lambdas.
[closure-name (if show-lambdas-as-lambdas?
#f
(cond [(syntax? procedure-name-info) procedure-name-info] (cond [(syntax? procedure-name-info) procedure-name-info]
[(pair? procedure-name-info) (car procedure-name-info)] [(pair? procedure-name-info) (car procedure-name-info)]
[else #f]) [else #f]))]
#f)]
[closure-storing-proc [closure-storing-proc
(opt-lambda (closure debug-info [lifted-index #f]) (opt-lambda (closure debug-info [lifted-index #f])
(closure-table-put! closure (make-closure-record (closure-table-put! closure (make-closure-record

View File

@ -72,7 +72,7 @@
; go starts a stepper instance ; go starts a stepper instance
; see provide stmt for contract ; see provide stmt for contract
(define (go program-expander receive-result render-settings (define (go program-expander receive-result render-settings
track-inferred-names? language-level run-on-drscheme-side) show-lambdas-as-lambdas? language-level run-on-drscheme-side)
;; finished-exps: ;; finished-exps:
;; (listof (list/c syntax-object? (or/c number? false?)( -> any))) ;; (listof (list/c syntax-object? (or/c number? false?)( -> any)))
@ -295,7 +295,7 @@
(lambda (stx dont-care) (list stx)))) (lambda (stx dont-care) (list stx))))
(define (step-through-expression expanded expand-next-expression) (define (step-through-expression expanded expand-next-expression)
(let* ([annotated (a:annotate expanded break track-inferred-names? (let* ([annotated (a:annotate expanded break show-lambdas-as-lambdas?
language-level)]) language-level)])
(eval-syntax annotated) (eval-syntax annotated)
(expand-next-expression))) (expand-next-expression)))

View File

@ -464,9 +464,11 @@
program-expander-prime receive-result program-expander-prime receive-result
(get-render-settings render-to-string render-to-sexp (get-render-settings render-to-string render-to-sexp
(send language-level stepper:enable-let-lifting?)) (send language-level stepper:enable-let-lifting?))
(not (member language-level-name ;; coerce to boolean to satisfy contract checker:
(if (member language-level-name
(list (string-constant intermediate-student/lambda) (list (string-constant intermediate-student/lambda)
(string-constant advanced-student)))) (string-constant advanced-student)))
#t #f)
language-level language-level
run-on-drscheme-side) run-on-drscheme-side)
(send s-frame show #t) (send s-frame show #t)
@ -610,8 +612,7 @@
;; apply the mixins dynamically to the drscheme unit frame and ;; apply the mixins dynamically to the drscheme unit frame and
;; definitions text: ;; definitions text:
(drscheme:get/extend:extend-unit-frame stepper-unit-frame-mixin) (drscheme:get/extend:extend-unit-frame stepper-unit-frame-mixin)
(drscheme:get/extend:extend-definitions-text (drscheme:get/extend:extend-definitions-text stepper-definitions-text-mixin)
stepper-definitions-text-mixin)
) )