From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 29 Oct 2006 05:23:59 +0000 (+0000)
Subject: Exchange position of REGISTRY and ERROR? arguments on RDF-QNAME->URI,
X-Git-Tag: 20090517-FFI~863
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=2a68c155237ab1798327250afc59b4ced5aada4e;p=mit-scheme.git

Exchange position of REGISTRY and ERROR? arguments on RDF-QNAME->URI,
URI->RDF-QNAME, and URI->RDF-PREFIX.
---

diff --git a/v7/src/xml/rdf-struct.scm b/v7/src/xml/rdf-struct.scm
index 4d37677a0..bd7bc0dfd 100644
--- a/v7/src/xml/rdf-struct.scm
+++ b/v7/src/xml/rdf-struct.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: rdf-struct.scm,v 1.18 2006/10/19 17:48:23 cph Exp $
+$Id: rdf-struct.scm,v 1.19 2006/10/29 05:23:59 cph Exp $
 
 Copyright 2006 Massachusetts Institute of Technology
 
@@ -285,7 +285,7 @@ USA.
     (and p
 	 (cdr p))))
 
-(define (uri->rdf-prefix uri #!optional error? registry)
+(define (uri->rdf-prefix uri #!optional registry error?)
   (let ((s (uri->string (->absolute-uri uri 'URI->RDF-PREFIX))))
     (let ((p
 	   (let ((alist
@@ -303,15 +303,15 @@ USA.
 	    (if error? (error:bad-range-argument uri 'URI->RDF-PREFIX))
 	    (values #f #f))))))
 
-(define (uri->rdf-qname uri #!optional error? registry)
+(define (uri->rdf-qname uri #!optional registry error?)
   (let ((uri (->absolute-uri uri 'URI->RDF-QNAME)))
-    (receive (prefix expansion) (uri->rdf-prefix uri error? registry)
+    (receive (prefix expansion) (uri->rdf-prefix uri registry error?)
       (and prefix
 	   (symbol prefix
 		   (string-tail (uri->string uri)
 				(string-length expansion)))))))
 
-(define (rdf-qname->uri qname #!optional error? registry)
+(define (rdf-qname->uri qname #!optional registry error?)
   (receive (prefix local) (split-rdf-qname qname)
     (let ((expansion (rdf-prefix-expansion prefix registry)))
       (if expansion
@@ -384,9 +384,10 @@ USA.
       (let ((registry *default-rdf-prefix-registry*))
 	(if (rdf-prefix-registry? registry)
 	    registry
-	    (begin
+	    (let ((registry (new-rdf-prefix-registry)))
 	      (warn "*default-rdf-prefix-registry* has illegal value.")
-	      (new-rdf-prefix-registry))))
+	      (set! *default-rdf-prefix-registry* registry)
+	      registry)))
       (begin
 	(guarantee-rdf-prefix-registry registry caller)
 	registry)))