From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 6 Mar 2006 04:42:59 +0000 (+0000)
Subject: Redefine ->URI and friends to treat a false CALLER as meaning "no
X-Git-Tag: 20090517-FFI~1080
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=3ac61f19656480f0cf33df5d5e89f5ecdfed715f;p=mit-scheme.git

Redefine ->URI and friends to treat a false CALLER as meaning "no
errors".
---

diff --git a/v7/src/runtime/url.scm b/v7/src/runtime/url.scm
index c7c603455..bc6aec63b 100644
--- a/v7/src/runtime/url.scm
+++ b/v7/src/runtime/url.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: url.scm,v 1.42 2006/02/18 02:59:27 cph Exp $
+$Id: url.scm,v 1.43 2006/03/06 04:42:59 cph Exp $
 
 Copyright 2000,2001,2003,2004,2005,2006 Massachusetts Institute of Technology
 
@@ -311,20 +311,20 @@ USA.
 ;;;; Parser
 
 (define (->uri object #!optional caller)
-  (%->uri object parse-uri caller #t))
+  (%->uri object parse-uri caller))
 
 (define (->absolute-uri object #!optional caller)
-  (%->uri object parse-absolute-uri caller #t))
+  (%->uri object parse-absolute-uri caller))
 
 (define (->relative-uri object #!optional caller)
-  (%->uri object parse-relative-uri caller #t))
+  (%->uri object parse-relative-uri caller))
 
-(define (%->uri object parser caller error?)
+(define (%->uri object parser caller)
   ;; Kludge: take advantage of fact that (NOT (NOT #!DEFAULT)).
   (let* ((do-parse
 	  (lambda (string)
 	    (let ((uri (complete-parse parser (string->parser-buffer string))))
-	      (if (and (not uri) error?)
+	      (if (and (not uri) caller)
 		  (error:bad-range-argument object caller))
 	      uri)))
 	 (do-string
@@ -342,7 +342,7 @@ USA.
 	     (or (hash-table/get interned-uris string #f)
 		 (do-parse object))))
 	  (else
-	   (if error? (error:not-uri object caller))
+	   (if caller (error:not-uri object caller))
 	   #f))))
 
 (define (string->uri string #!optional start end)