suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix toplevel variable dereferencing in lazy stepper

Browse Source 
in lazy/lazy.rkt
- add 'lazy-op stepper-syntax-property to op in lazy #%app

in stepper/private/annotate.rkt
- in varref-abstraction, check for 'lazy-op operator for toplevel vars, and use
  varref-break-wrap if property = #t
This commit is contained in:
Stephen Chang 2011-04-09 15:55:12 -04:00
parent 341ed19e58
commit 225c011502
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collects/lazy/lazy.rkt
View File

@ -60,6 +60,8 @@
(define-for-syntax (stepper-hide-operator stx)
(stepper-syntax-property stx 'stepper-skipto (append skipto/cdr skipto/second)))
(define-for-syntax (stepper-add-lazy-op-prop stx)
(stepper-syntax-property stx 'lazy-op #t))
(define-syntax (hidden-car stx)
(syntax-case stx ()
@ -72,6 +74,10 @@
(define-syntax (hidden-! stx)
(syntax-case stx ()
[(_ arg) (stepper-hide-operator (syntax/loc stx (! arg)))]))
(define-syntax (mark-as-lazy-op stx)
(syntax-case stx ()
[(_ arg) (stepper-add-lazy-op-prop (syntax/loc stx arg))]))
(define-syntax (hidden-~ stx)
(syntax-case stx ()
@ -275,7 +281,7 @@
;; #,($$ #`(if (lazy? p) lazy strict))
(if (lazy? p) lazy strict))))))]))
(defsubst (!app f x ...) (!*app (hidden-! f) x ...))
(defsubst (!app f x ...) (!*app (hidden-! (mark-as-lazy-op f)) x ...))
(defsubst (~!*app f x ...) (hidden-~ (!*app f x ...)))
(defsubst (~!app f x ...) (hidden-~ (!app f x ...)))

5
collects/stepper/private/annotate.rkt
View File

@ -811,9 +811,12 @@
[varref-no-break-wrap
(lambda ()
(outer-wcm-wrap (make-debug-info-normal free-varrefs) var))]
[base-namespace-symbols (namespace-mapped-symbols (make-base-namespace))]
[top-level-varref-break-wrap
(lambda ()
(if (memq (syntax-e var) beginner-defined:must-reduce)
(if (or (memq (syntax-e var) beginner-defined:must-reduce)
(and (stepper-syntax-property var 'lazy-op)
(not (memq (syntax->datum var) base-namespace-symbols))))
(varref-break-wrap)
(varref-no-break-wrap)))])
(vector