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

Create renaming to avoid using the same identifier multiple times.

Browse Source 
Delete dead code.

svn: r9122
This commit is contained in:
Sam Tobin-Hochstadt 2008-03-31 21:01:29 +00:00
parent f833112489
commit 1fd2e9b3fc
2 changed files with 31 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
collects/scheme/match/compiler.ss
View File

@ -158,10 +158,11 @@
(Row-unmatch row) (Row-unmatch row)
seen))] seen))]
;;otherwise, bind the matched variable to x, and add it to the list of vars we've seen ;;otherwise, bind the matched variable to x, and add it to the list of vars we've seen
[else (make-Row ps [else (let ([v* (free-identifier-mapping-get (current-renaming) v (lambda () v))])
#`(let ([#,v #,x]) #,(Row-rhs row)) (make-Row ps
(Row-unmatch row) #`(let ([#,v* #,x]) #,(Row-rhs row))
(cons (cons v x) (Row-vars-seen row)))]))]) (Row-unmatch row)
(cons (cons v x) (Row-vars-seen row))))]))])
;; compile the transformed block ;; compile the transformed block
(compile* xs (map transform block) esc))] (compile* xs (map transform block) esc))]
;; the Constructor rule ;; the Constructor rule
@ -272,11 +273,13 @@
(for/list ([heads headss]) (for/list ([heads headss])
(apply append (map bound-vars heads)))] (apply append (map bound-vars heads)))]
[hid-argss (map generate-temporaries head-idss)] [hid-argss (map generate-temporaries head-idss)]
[head-idss* (map generate-temporaries head-idss)]
[hid-args (apply append hid-argss)] [hid-args (apply append hid-argss)]
[reps (generate-temporaries (for/list ([head heads]) 'rep))]) [reps (generate-temporaries (for/list ([head heads]) 'rep))])
(with-syntax ([x xvar] (with-syntax ([x xvar]
[var0 (car vars)] [var0 (car vars)]
[((hid ...) ...) head-idss] [((hid ...) ...) head-idss]
[((hid* ...) ...) head-idss*]
[((hid-arg ...) ...) hid-argss] [((hid-arg ...) ...) hid-argss]
[(rep ...) reps] [(rep ...) reps]
[(maxrepconstraint ...) [(maxrepconstraint ...)
@ -297,7 +300,7 @@
#`(reverse #,hid-arg))))] #`(reverse #,hid-arg))))]
[(parse-loop failkv fail-tail) (generate-temporaries #'(parse-loop failkv fail-tail))]) [(parse-loop failkv fail-tail) (generate-temporaries #'(parse-loop failkv fail-tail))])
(with-syntax ([(rhs ...) (with-syntax ([(rhs ...)
#`[(let ([hid-arg (cons hid hid-arg)] ...) #`[(let ([hid-arg (cons hid* hid-arg)] ...)
(if maxrepconstraint (if maxrepconstraint
(let ([rep (add1 rep)]) (let ([rep (add1 rep)])
(parse-loop x #,@hid-args #,@reps fail)) (parse-loop x #,@hid-args #,@reps fail))
@ -312,57 +315,25 @@
#,(compile* (cdr vars) #,(compile* (cdr vars)
(list (make-Row rest-pats k (Row-unmatch (car block)) (Row-vars-seen (car block)))) (list (make-Row rest-pats k (Row-unmatch (car block)) (Row-vars-seen (car block))))
#'fail-tail))])]) #'fail-tail))])])
#`(let parse-loop ([x var0] [hid-arg null] ... ... [rep 0] ... [failkv #,esc]) (parameterize ([current-renaming
(for/fold ([ht (copy-mapping (current-renaming))])
([id (apply append head-idss)]
[id* (apply append head-idss*)])
(free-identifier-mapping-put! ht id id*)
(free-identifier-mapping-for-each
ht
(lambda (k v)
(when (free-identifier=? v id)
(free-identifier-mapping-put! ht k id*))))
ht)])
#`(let parse-loop ([x var0] [hid-arg null] ... ... [rep 0] ... [failkv #,esc])
#,(compile* (list #'x) #,(compile* (list #'x)
(append (append
(map (lambda (pats rhs) (make-Row pats rhs (Row-unmatch (car block)) null)) (map (lambda (pats rhs) (make-Row pats rhs (Row-unmatch (car block)) null))
(map list heads) (map list heads)
(syntax->list #'(rhs ...))) (syntax->list #'(rhs ...)))
(list (make-Row (list tail) #`tail-rhs (Row-unmatch (car block)) null))) (list (make-Row (list tail) #`tail-rhs (Row-unmatch (car block)) null)))
#'failkv)))))] #'failkv))))))]
;; doesn't work, never called
#;
[(VectorSeq? first)
(let*-values ([(row) (car block)]
[(p ps) (Row-split-pats row)]
[(head) (VectorSeq-p p)]
[(start) (VectorSeq-start p)]
[(expr) (Row-rhs row)]
[(count) (VectorSeq-count p)]
[(head-vars) (bound-vars head)])
(with-syntax ([var0 (car vars)]
[(x) (generate-temporaries #'(x))]
[(hid ...) head-vars]
[(hid-arg ...) (generate-temporaries head-vars)]
[(parse-k parse-loop head-var tail-var fail reps len)
(generate-temporaries
#'(parse-k parse-loop head-var tail-var fail reps len))])
#`(if (vector? var0)
(let ([len (vector-length var0)])
(define (parse-k hid ...)
#,(compile* xs
(list (make-Row ps expr))
esc))
(define (parse-loop reps hid-arg ...)
(define (fail)
(parse-k (reverse hid-arg) ...))
(if (and
(< reps len)
#,@(if (number? count)
#`((reps . < . '#,(+ start count)))
#'()))
(let ([head-var (vector-ref var0 reps)])
#,(compile*
(list #'head-var)
(list
(make-Row (list head)
#`(parse-loop (add1 reps)
(cons hid hid-arg) ...)))
#'fail))
(fail)))
(let ([hid null] ...)
(parse-loop #,start hid ...)))
(#,esc))))]
[else (error 'compile "unsupported pattern: ~a~n" first)])) [else (error 'compile "unsupported pattern: ~a~n" first)]))
(define (compile* vars rows esc) (define (compile* vars rows esc)

11
collects/scheme/match/patterns.ss
View File

@ -165,7 +165,9 @@
(cond (cond
[(Dummy? p) null] [(Dummy? p) null]
[(Pred? p) null] [(Pred? p) null]
[(Var? p) (list (Var-v p))] [(Var? p) (let* ([v (Var-v p)]
[v* (free-identifier-mapping-get (current-renaming) v (lambda () v))])
(list v*))]
[(Or? p) [(Or? p)
(bound-vars (car (Or-ps p)))] (bound-vars (car (Or-ps p)))]
[(Box? p) [(Box? p)
@ -202,6 +204,13 @@
"used out of context: not in match pattern" "used out of context: not in match pattern"
stx))) stx)))
(define current-renaming (make-parameter (make-free-identifier-mapping)))
(define (copy-mapping ht)
(define new-ht (make-free-identifier-mapping))
(free-identifier-mapping-for-each ht (lambda (k v) (free-identifier-mapping-put! new-ht k v)))
new-ht)
#| #|
;; EXAMPLES ;; EXAMPLES