Changeset 13106 in project


Ignore:
Timestamp:
01/26/09 20:19:05 (11 years ago)
Author:
sjamaan
Message:

Merge latest changes from release 4

Location:
release/3/uri-generic/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/3/uri-generic/trunk

  • release/3/uri-generic/trunk/uri-generic.scm

    r12954 r13106  
    148148(define (hexdigit-char? c)    (and (char? c) (char-set-contains? char-set:hex-digit c)))
    149149
    150 (define (reserved-char? c)    (and (char? c) (char-set-contains? char-set:uri-reserved c)))
    151 
    152150(define (unreserved-char? c)  (and (char? c) (char-set-contains? char-set:uri-unreserved c)))
    153151
     
    167165                    (char-set-contains? extras-set c) ))))
    168166 
    169 ;; same as uchar, but without sub-delims
    170 (define (schar extras)
    171   (let ((extras-set (or (and (char-set? extras) extras) (string->char-set extras))))
    172     (lambda (c) (or (pct-encoded? c)  (unreserved-char? c)
    173                     (char-set-contains? extras-set c) ))))
    174                  
    175167(define (many pred?)
    176168  (lambda (s)
     
    598590;;                 / path-empty      ; zero characters
    599591;;
     592;;  oddly, "path" is never used in the grammar. The following are used
     593;;  in "hier-part" and "relative-ref", however:
     594;;
    600595;;   path-abempty  = *( "/" segment )
    601596;;   path-abs      = "/" [ segment-nz *( "/" segment ) ]
     
    610605;;   pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
    611606
    612 (define (path s)
    613   (or (path-abempty s)  (path-abs s) (path-noscheme s)
    614       (path-rootless s) (list (list) s)))
    615 
    616  
    617607(define (slash-segment s)
    618608  (match s
Note: See TracChangeset for help on using the changeset viewer.