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

fix `compiler/zo-parse', etc. for phase-shift addition

Browse Source 
original commit: d93f4214a4
This commit is contained in:
Matthew Flatt 2012-05-13 08:59:36 -06:00
parent 95e0451656
commit c9f62c0bc5
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collects/compiler/decompile.rkt
View File

@ -144,8 +144,8 @@
ignored ignored
alist) alist)
`(,(if has-free-id-renames? 'lexical/free-id=? 'lexical) . ,alist)] `(,(if has-free-id-renames? 'lexical/free-id=? 'lexical) . ,alist)]
[(phase-shift amt src dest) [(phase-shift amt src dest cancel-id)
`(phase-shift ,amt ,src ,dest)] `(phase-shift ,amt ,src ,dest, cancel-id)]
[(wrap-mark val) [(wrap-mark val)
val] val]
[(prune sym) [(prune sym)

4
collects/compiler/zo-marshal.rkt
View File

@ -416,8 +416,8 @@
(define (encode-wraps wraps) (define (encode-wraps wraps)
(for/list ([wrap (in-list wraps)]) (for/list ([wrap (in-list wraps)])
(match wrap (match wrap
[(struct phase-shift (amt src dest)) [(struct phase-shift (amt src dest cancel-id))
(box (vector amt src dest #f #f))] (box (vector amt src dest #f #f cancel-id))]
[(struct module-rename (phase kind set-id unmarshals renames mark-renames plus-kern?)) [(struct module-rename (phase kind set-id unmarshals renames mark-renames plus-kern?))
(define encoded-kind (eq? kind 'marked)) (define encoded-kind (eq? kind 'marked))
(define encoded-unmarshals (map encode-all-from-module unmarshals)) (define encoded-unmarshals (map encode-all-from-module unmarshals))

3
collects/compiler/zo-parse.rkt
View File

@ -689,7 +689,8 @@
[`#(,amt ,src ,dest #f #f ,cancel-id) [`#(,amt ,src ,dest #f #f ,cancel-id)
(make-phase-shift amt (make-phase-shift amt
(parse-module-path-index cp src) (parse-module-path-index cp src)
(parse-module-path-index cp dest))] (parse-module-path-index cp dest)
cancel-id)]
[else (error 'parse "bad phase shift: ~e" a)])] [else (error 'parse "bad phase shift: ~e" a)])]
[else (error 'decode-wraps "bad wrap element: ~e" a)]))) [else (error 'decode-wraps "bad wrap element: ~e" a)])))

5
collects/compiler/zo-structs.rkt
View File

@ -193,7 +193,10 @@
(or/c (or/c
(cons/c symbol? (or/c symbol? #f)) (cons/c symbol? (or/c symbol? #f))
free-id-info?)))))])) free-id-info?)))))]))
(define-form-struct (phase-shift wrap) ([amt (or/c exact-integer? #f)] [src (or/c module-path-index? #f)] [dest (or/c module-path-index? #f)])) (define-form-struct (phase-shift wrap) ([amt (or/c exact-integer? #f)]
[src (or/c module-path-index? #f)]
[dest (or/c module-path-index? #f)]
[cancel-id (or/c exact-integer? #f)]))
(define-form-struct (wrap-mark wrap) ([val exact-integer?])) (define-form-struct (wrap-mark wrap) ([val exact-integer?]))
(define-form-struct (prune wrap) ([sym any/c])) (define-form-struct (prune wrap) ([sym any/c]))