Ticket #699: make-uri-for-uri-generic-and-uri-common.patch

uri-generic/trunk/uri-generic.scm

@@ -40 +40 @@
 (provide 'uri-generic)
 
 (module uri-generic
-  (uri-reference update-uri update-authority
+  (uri-reference make-uri update-uri update-authority
    uri-reference? uri-auth uri-authority uri-scheme uri-path uri-query
    uri-fragment uri-host uri-port uri-username uri-password
    authority? authority-host authority-port
@@ -134 +134 @@
           (make-URI scheme: scheme path: path query: query fragment: fragment
                     authority: final-auth))) key/values))))
 
+(define (make-uri . key/values)
+  (apply update-uri (make-URI) key/values))
+
 ;; Character classes
  
 (define (hexdigit-char? c)    (and (char? c) (char-set-contains? char-set:hex-digit c)))

uri-common/trunk/uri-common.scm

@@ -42 +42 @@
 (module uri-common
   (uri-reference uri-reference? absolute-uri absolute-uri? relative-ref?
    uri->uri-generic uri-generic->uri uri->list
-   update-uri uri? uri-scheme uri-username uri-password
+   make-uri update-uri uri? uri-scheme uri-username uri-password
    uri-host uri-port uri-path uri-query uri-fragment
    uri->string form-urlencode form-urldecode form-urlencoded-separator
    uri-relative-to uri-relative-from
@@ -215 +215 @@
           (URI-common-fragment-set! uc fragment))
         uc))))
 
+(define (make-uri . key/values)
+  (apply update-uri (make-URI-common generic: (generic:make-uri)) key/values))
+
 (define uri-encode-string generic:uri-encode-string)
 (define uri-decode-string generic:uri-decode-string)
 (define char-set:gen-delims generic:char-set:gen-delims)