Fix guarantee-uri and friends to correspond with their predicates.

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 05104d2e3e994e0dc433cbe20ab7988e0f84720e..4929d324067b70aa95fa777b59350f829813fe0d 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -5371,9 +5371,6 @@ USA.
   (files "url")
   (parent (runtime))
   (export ()
-         (guarantee-absolute-uri ->absolute-uri)
-         (guarantee-relative-uri ->relative-uri)
-         (guarantee-uri ->uri)
          (url:decode-string decode-component)
          (url:match:escape matcher:pct-encoded)
          (url:parse:hostport parser:hostport)
@@ -5397,14 +5394,16 @@ USA.
          char-set:uri-userinfo
          encode-uri-path-segment
          error:not-partial-uri
-         error:not-uri
          error:not-uri-authority
          error:not-uri-host
          error:not-uri-path
          error:not-uri-port
          error:not-uri-scheme
          error:not-uri-userinfo
+         guarantee-absolute-uri
          guarantee-partial-uri
+         guarantee-relative-uri
+         guarantee-uri
          guarantee-uri-authority
          guarantee-uri-host
          guarantee-uri-path

diff --git a/src/runtime/url.scm b/src/runtime/url.scm
index 7b7c25e87e4a827a9735c40a6c5addb513d1017e..5803027f86464e2dd4f5a8c4ea4d7aa1a4f485c7 100644 (file)
--- a/src/runtime/url.scm
+++ b/src/runtime/url.scm
@@ -75,8 +75,9 @@ USA.
   (and (uri? object)
        (uri-relative? object)))
 
-(define (error:not-uri object caller)
-  (error:wrong-type-argument object "URI" caller))
+(define-guarantee uri "URI")
+(define-guarantee absolute-uri "absolute URI")
+(define-guarantee relative-uri "relative URI")
 \f
 (define (uri-scheme? object)
   (and (interned-symbol? object)