From ee38580fdc2e6db49982aef4b4bafa7dfd6a4b5e Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 26 May 2004 10:52:11 +0000
Subject: [PATCH] When deciding whether it is legal to associate an IRI with a
 name, distinguish between a name with no prefix and a name that is not
 namespace well formed.  The former may have an IRI, and the latter may not.

---
 v7/src/xml/xml-names.scm | 55 +++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/v7/src/xml/xml-names.scm b/v7/src/xml/xml-names.scm
index fb354d236..373568656 100644
--- a/v7/src/xml/xml-names.scm
+++ b/v7/src/xml/xml-names.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml-names.scm,v 1.4 2004/02/26 04:52:03 cph Exp $
+$Id: xml-names.scm,v 1.5 2004/05/26 10:52:11 cph Exp $
 
 Copyright 2003,2004 Massachusetts Institute of Technology
 
@@ -37,16 +37,18 @@ USA.
 	  (%make-xml-name qname iri)))))
 
 (define (check-prefix+iri qname iri)
-  (let ((s (symbol-name qname)))
-    (let ((c (find-prefix-separator s)))
-      (if (if c
-	      (let ((prefix (string-head->symbol s c)))
-		(or (and (eq? prefix 'xml)
-			 (not (eq? iri xml-iri)))
-		    (and (eq? prefix 'xmlns)
-			 (not (eq? iri xmlns-iri)))))
-	      iri)
-	  (error:bad-range-argument iri 'MAKE-XML-NAME)))))
+  (if (let ((s (symbol-name qname)))
+	(let ((c (find-prefix-separator s)))
+	  (case c
+	    ((#f) #f)
+	    ((ILLEGAL) iri)
+	    (else
+	     (let ((prefix (string-head->symbol s c)))
+	       (or (and (eq? prefix 'xml)
+			(not (eq? iri xml-iri)))
+		   (and (eq? prefix 'xmlns)
+			(not (eq? iri xmlns-iri)))))))))
+      (error:bad-range-argument iri 'MAKE-XML-NAME)))
 
 (define (%make-xml-name qname iri)
   (let ((uname
@@ -224,28 +226,29 @@ USA.
 (define (xml-qname-local qname)
   (let ((s (symbol-name qname)))
     (let ((c (find-prefix-separator s)))
-      (if c
-	  (string-tail->symbol s (fix:+ c 1))
-	  qname))))
+      (if (or (not c) (eq? c 'ILLEGAL))
+	  qname
+	  (string-tail->symbol s (fix:+ c 1))))))
 
 (define (xml-qname-prefix qname)
   (let ((s (symbol-name qname)))
     (let ((c (find-prefix-separator s)))
-      (if c
-	  (string-head->symbol s c)
-	  (null-xml-name-prefix)))))
+      (if (or (not c) (eq? c 'ILLEGAL))
+	  (null-xml-name-prefix)
+	  (string-head->symbol s c)))))
 
 (define (find-prefix-separator s)
   (let ((c (string-find-next-char s #\:)))
-    (and c
-	 (let ((i (fix:+ c 1))
-	       (e (string-length s)))
-	   (and (let ((char (read-utf8-char (open-input-string s i e))))
-		  (and (not (eof-object? char))
-		       (not (char=? char #\:))
-		       (char-in-alphabet? char alphabet:name-initial)))
-		(not (substring-find-next-char s i e #\:))))
-	 c)))
+    (if (or (not c)
+	    (let ((i (fix:+ c 1))
+		  (e (string-length s)))
+	      (and (let ((char (read-utf8-char (open-input-string s i e))))
+		     (and (not (eof-object? char))
+			  (not (char=? char #\:))
+			  (char-in-alphabet? char alphabet:name-initial)))
+		   (not (substring-find-next-char s i e #\:)))))
+	c
+	'ILLEGAL)))
 
 (define-record-type <combo-name>
     (make-combo-name qname expanded)
-- 
2.25.1