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

adjust check syntax to deal properly with submodules at non-zero phases

Browse Source 
Thanks to Matthew for sorting this out.

(Also removed a bunch of line-ended space chars since git
yelled at me.)
This commit is contained in:
Robby Findler 2013-03-21 13:06:22 -05:00
parent 30a4b481dd
commit f166934700
2 changed files with 136 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
collects/drracket/private/syncheck/traversals.rkt
View File

@ -149,6 +149,7 @@
(let level+tail+mod-loop ([stx-obj stx-obj] (let level+tail+mod-loop ([stx-obj stx-obj]
[level 0] [level 0]
[level-of-enclosing-module 0]
[tail-parent-src #f] [tail-parent-src #f]
[tail-parent-pos #f] [tail-parent-pos #f]
;; mods: (or/f #f ; => outside a module ;; mods: (or/f #f ; => outside a module
@ -170,23 +171,29 @@
(values child-src child-pos)] (values child-src child-pos)]
[else [else
(values tail-parent-src tail-parent-pos)]))) (values tail-parent-src tail-parent-pos)])))
(let* ([level-loop (λ (sexp level) (level+tail+mod-loop sexp level #f #f mods))] (let* ([level-loop (λ (sexp level) (level+tail+mod-loop sexp level level-of-enclosing-module
[tail-loop (λ (sexp) (level+tail+mod-loop sexp level next-tail-parent-src next-tail-parent-pos mods))] #f #f
[mod-loop (λ (sexp mod) (level+tail+mod-loop sexp level #f #f mods))]
[tail-loop (λ (sexp) (level+tail+mod-loop sexp level level-of-enclosing-module
next-tail-parent-src next-tail-parent-pos
mods))]
[mod-loop (λ (sexp mod) (level+tail+mod-loop sexp 0
(+ level level-of-enclosing-module)
#f #f
(if mods (if mods
(cons mod mods) (cons mod mods)
'())))] '())))]
[loop (λ (sexp) (level+tail+mod-loop sexp level #f #f mods))] [loop (λ (sexp) (level+tail+mod-loop sexp level level-of-enclosing-module #f #f mods))]
[varrefs (lookup-phase-to-mapping phase-to-varrefs level)] [varrefs (lookup-phase-to-mapping phase-to-varrefs (+ level level-of-enclosing-module))]
[varsets (lookup-phase-to-mapping phase-to-varsets level)] [varsets (lookup-phase-to-mapping phase-to-varsets (+ level level-of-enclosing-module))]
[binders (lookup-phase-to-mapping phase-to-binders level)] [binders (lookup-phase-to-mapping phase-to-binders (+ level level-of-enclosing-module))]
[tops (lookup-phase-to-mapping phase-to-tops level)] [tops (lookup-phase-to-mapping phase-to-tops (+ level level-of-enclosing-module))]
[requires (hash-ref! phase-to-requires level (λ () (make-hash)))] [requires (hash-ref! phase-to-requires (+ level level-of-enclosing-module) (λ () (make-hash)))]
[collect-general-info [collect-general-info
(λ (stx) (λ (stx)
(add-origins stx varrefs) (add-origins stx varrefs level-of-enclosing-module)
(add-disappeared-bindings stx binders varrefs) (add-disappeared-bindings stx binders varrefs level-of-enclosing-module)
(add-disappeared-uses stx varrefs))]) (add-disappeared-uses stx varrefs level-of-enclosing-module))])
(collect-general-info stx-obj) (collect-general-info stx-obj)
(define (list-loop/tail-last bodies) (define (list-loop/tail-last bodies)
@ -209,81 +216,81 @@
(λ (x y) (free-identifier=? x y level 0)) (λ (x y) (free-identifier=? x y level 0))
[(#%plain-lambda args bodies ...) [(#%plain-lambda args bodies ...)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(add-binders (syntax args) binders #f #f) (add-binders (syntax args) binders #f #f level-of-enclosing-module)
(list-loop/tail-last (syntax->list (syntax (bodies ...)))))] (list-loop/tail-last (syntax->list (syntax (bodies ...)))))]
[(case-lambda [argss bodiess ...]...) [(case-lambda [argss bodiess ...]...)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(for-each (for-each
(λ (args bodies) (λ (args bodies)
(add-binders args binders #f #f) (add-binders args binders #f #f level-of-enclosing-module)
(list-loop/tail-last (syntax->list bodies))) (list-loop/tail-last (syntax->list bodies)))
(syntax->list (syntax (argss ...))) (syntax->list (syntax (argss ...)))
(syntax->list (syntax ((bodiess ...) ...)))))] (syntax->list (syntax ((bodiess ...) ...)))))]
[(if test then else) [(if test then else)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(loop (syntax test)) (loop (syntax test))
(tail-loop (syntax then)) (tail-loop (syntax then))
(tail-loop (syntax else)))] (tail-loop (syntax else)))]
[(begin bodies ...) [(begin bodies ...)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(list-loop/tail-last (syntax->list (syntax (bodies ...)))))] (list-loop/tail-last (syntax->list (syntax (bodies ...)))))]
;; treat a single body expression specially, since this has ;; treat a single body expression specially, since this has
;; different tail behavior. ;; different tail behavior.
[(begin0 body) [(begin0 body)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(tail-loop (syntax body)))] (tail-loop (syntax body)))]
[(begin0 bodies ...) [(begin0 bodies ...)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(for-each loop (syntax->list (syntax (bodies ...)))))] (for-each loop (syntax->list (syntax (bodies ...)))))]
[(let-values (bindings ...) bs ...) [(let-values (bindings ...) bs ...)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(for-each collect-general-info (syntax->list (syntax (bindings ...)))) (for-each collect-general-info (syntax->list (syntax (bindings ...))))
(with-syntax ([(((xss ...) es) ...) (syntax (bindings ...))]) (with-syntax ([(((xss ...) es) ...) (syntax (bindings ...))])
(for-each (λ (x es) (add-binders x binders binding-inits es)) (for-each (λ (x es) (add-binders x binders binding-inits es level-of-enclosing-module))
(syntax->list (syntax ((xss ...) ...))) (syntax->list (syntax ((xss ...) ...)))
(syntax->list (syntax (es ...)))) (syntax->list (syntax (es ...))))
(for-each loop (syntax->list (syntax (es ...)))) (for-each loop (syntax->list (syntax (es ...))))
(list-loop/tail-last (syntax->list (syntax (bs ...))))))] (list-loop/tail-last (syntax->list (syntax (bs ...))))))]
[(letrec-values (bindings ...) bs ...) [(letrec-values (bindings ...) bs ...)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(for-each collect-general-info (syntax->list (syntax (bindings ...)))) (for-each collect-general-info (syntax->list (syntax (bindings ...))))
(with-syntax ([(((xss ...) es) ...) (syntax (bindings ...))]) (with-syntax ([(((xss ...) es) ...) (syntax (bindings ...))])
(for-each (λ (x es) (add-binders x binders binding-inits es)) (for-each (λ (x es) (add-binders x binders binding-inits es level-of-enclosing-module))
(syntax->list (syntax ((xss ...) ...))) (syntax->list (syntax ((xss ...) ...)))
(syntax->list (syntax (es ...)))) (syntax->list (syntax (es ...))))
(for-each loop (syntax->list (syntax (es ...)))) (for-each loop (syntax->list (syntax (es ...))))
(list-loop/tail-last (syntax->list (syntax (bs ...))))))] (list-loop/tail-last (syntax->list (syntax (bs ...))))))]
[(set! var e) [(set! var e)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
;; tops are used here because a binding free use of a set!'d variable ;; tops are used here because a binding free use of a set!'d variable
;; is treated just the same as (#%top . x). ;; is treated just the same as (#%top . x).
(add-id varsets (syntax var)) (add-id varsets (syntax var) level-of-enclosing-module)
(if (identifier-binding (syntax var) 0) (if (identifier-binding (syntax var) 0)
(add-id varrefs (syntax var)) (add-id varrefs (syntax var) level-of-enclosing-module)
(add-id tops (syntax var))) (add-id tops (syntax var) level-of-enclosing-module))
(loop (syntax e)))] (loop (syntax e)))]
[(quote datum) [(quote datum)
(annotate-raw-keyword stx-obj varrefs)] (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)]
[(quote-syntax datum) [(quote-syntax datum)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(let loop ([stx #'datum]) (let loop ([stx #'datum])
(cond [(identifier? stx) (cond [(identifier? stx)
(add-id templrefs stx)] (add-id templrefs stx level-of-enclosing-module)]
[(syntax? stx) [(syntax? stx)
(loop (syntax-e stx))] (loop (syntax-e stx))]
[(pair? stx) [(pair? stx)
@ -296,37 +303,37 @@
[else (void)])))] [else (void)])))]
[(with-continuation-mark a b c) [(with-continuation-mark a b c)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(loop (syntax a)) (loop (syntax a))
(loop (syntax b)) (loop (syntax b))
(tail-loop (syntax c)))] (tail-loop (syntax c)))]
[(#%plain-app pieces ...) [(#%plain-app pieces ...)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(for-each loop (syntax->list (syntax (pieces ...)))))] (for-each loop (syntax->list (syntax (pieces ...)))))]
[(#%top . var) [(#%top . var)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(add-id tops (syntax var)))] (add-id tops (syntax var) level-of-enclosing-module))]
[(define-values vars b) [(define-values vars b)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(add-binders (syntax vars) binders binding-inits #'b) (add-binders (syntax vars) binders binding-inits #'b level-of-enclosing-module)
(add-definition-target (syntax vars) mods) (add-definition-target (syntax vars) mods)
(loop (syntax b)))] (loop (syntax b)))]
[(define-syntaxes names exp) [(define-syntaxes names exp)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(add-binders (syntax names) binders binding-inits #'exp) (add-binders (syntax names) binders binding-inits #'exp level-of-enclosing-module)
(add-definition-target (syntax names) mods) (add-definition-target (syntax names) mods)
(level-loop (syntax exp) (+ level 1)))] (level-loop (syntax exp) (+ level 1)))]
[(begin-for-syntax exp ...) [(begin-for-syntax exp ...)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(for-each (lambda (e) (level-loop e (+ level 1))) (syntax->list (syntax (exp ...)))))] (for-each (lambda (e) (level-loop e (+ level 1))) (syntax->list (syntax (exp ...)))))]
[(module m-name lang (#%plain-module-begin bodies ...)) [(module m-name lang (#%plain-module-begin bodies ...))
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(hash-set! module-lang-requires (syntax lang) #t) (hash-set! module-lang-requires (syntax lang) #t)
(annotate-require-open user-namespace user-directory (syntax lang)) (annotate-require-open user-namespace user-directory (syntax lang))
(hash-cons! requires (syntax->datum (syntax lang)) (syntax lang)) (hash-cons! requires (syntax->datum (syntax lang)) (syntax lang))
@ -334,7 +341,7 @@
(mod-loop body (syntax-e #'m-name))))] (mod-loop body (syntax-e #'m-name))))]
[(module* m-name lang (#%plain-module-begin bodies ...)) [(module* m-name lang (#%plain-module-begin bodies ...))
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(when (syntax-e #'lang) (when (syntax-e #'lang)
(hash-set! module-lang-requires (syntax lang) #t) (hash-set! module-lang-requires (syntax lang) #t)
(annotate-require-open user-namespace user-directory (syntax lang)) (annotate-require-open user-namespace user-directory (syntax lang))
@ -370,10 +377,10 @@
[else [else
(handle-phaseless-spec spec level)]))) (handle-phaseless-spec spec level)])))
(define (handle-phaseless-spec stx level) (define (handle-phaseless-spec stx level)
(define require-ht (hash-ref! phase-to-requires level (define require-ht (hash-ref! phase-to-requires (+ level level-of-enclosing-module)
(λ () (λ ()
(define h (make-hash)) (define h (make-hash))
(hash-set! phase-to-requires level h) (hash-set! phase-to-requires (+ level level-of-enclosing-module) h)
h))) h)))
(define raw-module-path (phaseless-spec->raw-module-path stx)) (define raw-module-path (phaseless-spec->raw-module-path stx))
(annotate-require-open user-namespace user-directory raw-module-path) (annotate-require-open user-namespace user-directory raw-module-path)
@ -390,18 +397,18 @@
[(#%provide provide-specs ...) [(#%provide provide-specs ...)
(let ([provided-varss (map extract-provided-vars (let ([provided-varss (map extract-provided-vars
(syntax->list (syntax (provide-specs ...))))]) (syntax->list (syntax (provide-specs ...))))])
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(for ([provided-vars (in-list provided-varss)]) (for ([provided-vars (in-list provided-varss)])
(for ([provided-var (in-list provided-vars)]) (for ([provided-var (in-list provided-vars)])
(add-id varrefs provided-var))))] (add-id varrefs provided-var level-of-enclosing-module))))]
[(#%expression arg) [(#%expression arg)
(begin (begin
(annotate-raw-keyword stx-obj varrefs) (annotate-raw-keyword stx-obj varrefs level-of-enclosing-module)
(tail-loop #'arg))] (tail-loop #'arg))]
[id [id
(identifier? (syntax id)) (identifier? (syntax id))
(add-id varrefs stx-obj)] (add-id varrefs stx-obj level-of-enclosing-module)]
[_ [_
(begin (begin
#; #;
@ -416,8 +423,8 @@
(define (hash-cons! ht k v) (define (hash-cons! ht k v)
(hash-set! ht k (cons v (hash-ref ht k '())))) (hash-set! ht k (cons v (hash-ref ht k '()))))
;; add-disappeared-bindings : syntax id-set -> void ;; add-disappeared-bindings : syntax id-set integer -> void
(define (add-disappeared-bindings stx binders disappaeared-uses) (define (add-disappeared-bindings stx binders disappaeared-uses level-of-enclosing-module)
(let ([prop (syntax-property stx 'disappeared-binding)]) (let ([prop (syntax-property stx 'disappeared-binding)])
(when prop (when prop
(let loop ([prop prop]) (let loop ([prop prop])
@ -426,11 +433,11 @@
(loop (car prop)) (loop (car prop))
(loop (cdr prop))] (loop (cdr prop))]
[(identifier? prop) [(identifier? prop)
(add-origins prop disappaeared-uses) (add-origins prop disappaeared-uses level-of-enclosing-module)
(add-id binders prop)]))))) (add-id binders prop level-of-enclosing-module)])))))
;; add-disappeared-uses : syntax id-set -> void ;; add-disappeared-uses : syntax id-set integer -> void
(define (add-disappeared-uses stx id-set) (define (add-disappeared-uses stx id-set level-of-enclosing-module)
(let ([prop (syntax-property stx 'disappeared-use)]) (let ([prop (syntax-property stx 'disappeared-use)])
(when prop (when prop
(let loop ([prop prop]) (let loop ([prop prop])
@ -439,7 +446,7 @@
(loop (car prop)) (loop (car prop))
(loop (cdr prop))] (loop (cdr prop))]
[(identifier? prop) [(identifier? prop)
(add-id id-set prop)]))))) (add-id id-set prop level-of-enclosing-module)])))))
;; annotate-variables : namespace directory string id-set[four of them] (listof syntax) (listof syntax) -> void ;; annotate-variables : namespace directory string id-set[four of them] (listof syntax) (listof syntax) -> void
;; colors in and draws arrows for variables, according to their classifications ;; colors in and draws arrows for variables, according to their classifications
@ -883,8 +890,8 @@
test))) test)))
possible-suffixes))))) possible-suffixes)))))
;; add-origins : sexp id-set -> void ;; add-origins : sexp id-set integer -> void
(define (add-origins sexp id-set) (define (add-origins sexp id-set level-of-enclosing-module)
(let ([origin (syntax-property sexp 'origin)]) (let ([origin (syntax-property sexp 'origin)])
(when origin (when origin
(let loop ([ct origin]) (let loop ([ct origin])
@ -893,7 +900,7 @@
(loop (car ct)) (loop (car ct))
(loop (cdr ct))] (loop (cdr ct))]
[(syntax? ct) [(syntax? ct)
(add-id id-set ct)] (add-id id-set ct level-of-enclosing-module)]
[else (void)]))))) [else (void)])))))
;; FIXME: handle for-template and for-label ;; FIXME: handle for-template and for-label
@ -937,11 +944,11 @@
(define (symbolic-compare? x y) (eq? (syntax-e x) (syntax-e y))) (define (symbolic-compare? x y) (eq? (syntax-e x) (syntax-e y)))
;; add-binders : syntax id-set (or/c #f id-set) (or/c #f syntax) -> void ;; add-binders : syntax id-set (or/c #f id-set) (or/c #f syntax) integer -> void
;; transforms an argument list into a bunch of symbols/symbols ;; transforms an argument list into a bunch of symbols/symbols
;; and puts them into the id-set ;; and puts them into the id-set
;; effect: colors the identifiers ;; effect: colors the identifiers
(define (add-binders stx id-set binding-to-init init-exp) (define (add-binders stx id-set binding-to-init init-exp level-of-enclosing-module)
(let loop ([stx stx]) (let loop ([stx stx])
(let ([e (if (syntax? stx) (syntax-e stx) stx)]) (let ([e (if (syntax? stx) (syntax-e stx) stx)])
(cond (cond
@ -952,14 +959,14 @@
(begin (begin
(when binding-to-init (when binding-to-init
(add-init-exp binding-to-init fst init-exp)) (add-init-exp binding-to-init fst init-exp))
(add-id id-set fst) (add-id id-set fst level-of-enclosing-module)
(loop rst)) (loop rst))
(loop rst)))] (loop rst)))]
[(null? e) (void)] [(null? e) (void)]
[else [else
(when binding-to-init (when binding-to-init
(add-init-exp binding-to-init stx init-exp)) (add-init-exp binding-to-init stx init-exp))
(add-id id-set stx)])))) (add-id id-set stx level-of-enclosing-module)]))))
;; add-definition-target : syntax[(sequence of identifiers)] (listof symbol) -> void ;; add-definition-target : syntax[(sequence of identifiers)] (listof symbol) -> void
(define (add-definition-target stx mods) (define (add-definition-target stx mods)
@ -980,16 +987,16 @@
(syntax-e id) (syntax-e id)
mods)))))) mods))))))
;; annotate-raw-keyword : syntax id-map -> void ;; annotate-raw-keyword : syntax id-map integer -> void
;; annotates keywords when they were never expanded. eg. ;; annotates keywords when they were never expanded. eg.
;; if someone just types `(λ (x) x)' it has no 'origin ;; if someone just types `(λ (x) x)' it has no 'origin
;; field, but there still are keywords. ;; field, but there still are keywords.
(define (annotate-raw-keyword stx id-map) (define (annotate-raw-keyword stx id-map level-of-enclosing-module)
(let ([lst (syntax-e stx)]) (let ([lst (syntax-e stx)])
(when (pair? lst) (when (pair? lst)
(let ([f-stx (car lst)]) (let ([f-stx (car lst)])
(when (identifier? f-stx) (when (identifier? f-stx)
(add-id id-map f-stx)))))) (add-id id-map f-stx level-of-enclosing-module))))))
; ;
; ;
@ -1245,9 +1252,10 @@
(free-identifier-mapping-put! mapping id new)))) (free-identifier-mapping-put! mapping id new))))
;; add-id : id-set identifier -> void ;; add-id : id-set identifier -> void
(define (add-id mapping id) (define (add-id mapping id level-of-enclosing-module)
(when (syntax-original? id) (when (syntax-original? id)
(let* ([old (free-identifier-mapping-get mapping id (λ () '()))] (let* ([id (syntax-shift-phase-level id level-of-enclosing-module)]
[old (free-identifier-mapping-get mapping id (λ () '()))]
[new (cons id old)]) [new (cons id old)])
(free-identifier-mapping-put! mapping id new)))) (free-identifier-mapping-put! mapping id new))))

28
collects/tests/drracket/syncheck-test.rkt
View File

@ -1011,7 +1011,35 @@
(list '((6 17) (19 26)) (list '((6 17) (19 26))
'((27 36) (38 43)))) '((27 36) (38 43))))
(build-test "#lang racket\n(begin-for-syntax (module m racket/base (let ([x 1]) x)))"
'(("#lang racket\n(" default-color)
("begin-for-syntax" imported)
(" (" default-color)
("module" imported)
(" m racket/base (" default-color)
("let" imported)
(" ([" default-color)
("x" lexically-bound)
(" 1]) " default-color)
("x" lexically-bound)
(")))" default-color))
(list '((60 61) (66 67))
'((6 12) (14 30) (32 38))))
(build-test "#lang racket\n(define-for-syntax x 1)\n(begin-for-syntax (module* m #f x))"
'(("#lang racket\n(" default-color)
("define-for-syntax" imported)
(" " default-color)
("x" lexically-bound)
(" 1)\n(" default-color)
("begin-for-syntax" imported)
(" (" default-color)
("module*" imported)
(" m #f " default-color)
("x" imported)
("))" default-color))
(list '((6 12) (14 31) (38 54) (56 63))
'((32 33) ((69 70)))))
(build-rename-test "(lambda (x) x)" (build-rename-test "(lambda (x) x)"
9 9