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

make separate-path-strings use regexp-split, minor formatting

Browse Source 
svn: r3090
This commit is contained in:
Eli Barzilay 2006-05-28 02:28:46 +00:00
parent c34045e66b
commit 6207c0fa5e
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
collects/net/url-unit.ss
View File

@ -420,29 +420,22 @@
;; separate-path-strings : string[starting with /] -> (listof path/param)
(define (separate-path-strings str)
(cond
[(string=? str "") '()]
[else
(let loop ([str (if (char=? #\/ (string-ref str 0))
(substring str 1 (string-length str))
str)])
(cond
[(regexp-match #rx"([^/]*)/(.*)$" str)
=>
(lambda (m)
(cons (separate-params (cadr m)) (loop (caddr m))))]
[else (list (separate-params str))]))]))
(if (string=? str "")
'()
(let ([str (if (char=? #\/ (string-ref str 0))
(substring str 1 (string-length str))
str)])
(map separate-params (regexp-split #rx"/" str)))))
(define (separate-params s)
(let ([lst (map path-segment-decode (regexp-split #rx";" s))])
(make-path/param (car lst) (cdr lst))))
(define (path-segment-decode p)
(cond
[(string=? p "..") 'up]
[(string=? p ".") 'same]
[else (uri-path-segment-decode p)]))
(cond [(string=? p "..") 'up]
[(string=? p ".") 'same]
[else (uri-path-segment-decode p)]))
(define (path-segment-encode p)
(cond
[(eq? p 'up) ".."]
@ -455,21 +448,15 @@
(cond
[(null? path/params) ""]
[else
(apply
string-append
(if absolute? "/" "")
(add-between
"/"
(map join-params path/params)))]))
(apply string-append
(if absolute? "/" "")
(add-between "/" (map join-params path/params)))]))
(define (join-params s)
(apply
string-append
(add-between ";"
(map
path-segment-encode
(cons (path/param-path s)
(path/param-param s))))))
(apply string-append
(add-between ";" (map path-segment-encode
(cons (path/param-path s)
(path/param-param s))))))
(define (add-between bet lst)
(cond