Changeset 13108 in project for release/4/uri-generic

Timestamp:

01/26/09 22:19:24 (12 years ago)

Author:

sjamaan

Message:

Fix annoying edge case with empty path components in merge-paths procedure, add test. Also clean up a COND guard a little by using LET instead of LAMBDA

Location:

release/4/uri-generic/trunk

Files:

• tests/run.scm (modified) (1 diff)
• uri-generic.scm (modified) (2 diffs)

release/4/uri-generic/trunk/tests/run.scm

@@ -108 +108 @@
     ("http://a/b/c/d/" "../e/" "http://a/b/c/e/")
     ("http://a/b//c///d///" "..//.." "http://a/b/")
+    ("http://a" "b" "http://a/b") ; RFC3986, section 5.2.3, first bullet point
     ))
 

release/4/uri-generic/trunk/uri-generic.scm

@@ -823 +823 @@
                                                 path: (just-segments ref)
                                                 scheme: (uri-scheme base)))
-             (((lambda (p) (and (not (null? p)) p))  (uri-path ref)) =>
+             ((let ((p (uri-path ref))) (and (not (null? p)) p)) =>
               (lambda (ref-path)
                 (if (and (pair? ref-path) (eq? '/ (car ref-path)))
@@ -855 +855 @@
   (let ((ba (uri-authority b))
         (pb (uri-path b)))
-    (let ((mp  (if (and ba (null? pb)) pr (merge0 pb pr))))
+    (let ((mp (if (and ba (null? pb))
+                  (merge0 '(/ "") pr) ; RFC3986, section 5.2.3, first bullet
+                  (merge0 pb pr))))
       (remove-dot-segments mp))))