Export qname matchers for use in rdf-struct.

diff --git a/v7/src/xml/turtle.scm b/v7/src/xml/turtle.scm
index 0d4ff46a121f74c37efdb857628d27a2b3e630ff..12bff0c0007fe2c7070be4a96906982febf37024 100644 (file)
--- a/v7/src/xml/turtle.scm
+++ b/v7/src/xml/turtle.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: turtle.scm,v 1.1 2006/06/10 04:43:02 cph Exp $
+$Id: turtle.scm,v 1.2 2006/06/23 17:20:28 cph Exp $
 
 Copyright 2006 Massachusetts Institute of Technology
 
@@ -154,14 +154,20 @@ USA.
                                       "Expected close parenthesis"))))))))))
 
 (define parse:name
-  (*parser
-   (match (seq (alphabet alphabet:name-start-char)
-              (* (alphabet alphabet:name-char))))))
+  (*parser (match match:name)))
+
+(define match:name
+  (*matcher
+   (seq (alphabet alphabet:name-start-char)
+       (* (alphabet alphabet:name-char)))))
 
 (define parse:prefix-name
-  (*parser
-   (match (seq (alphabet alphabet:prefix-name-start-char)
-              (* (alphabet alphabet:name-char))))))
+  (*parser (match match:prefix-name)))
+
+(define match:prefix-name
+  (*matcher
+   (seq (alphabet alphabet:prefix-name-start-char)
+       (* (alphabet alphabet:name-char)))))
 \f
 ;;;; Literals
 

diff --git a/v7/src/xml/xml.pkg b/v7/src/xml/xml.pkg
index c177d2b717b5b6dd08ff6172577ac12a697b3c3e..ec3b47acba3fc80c468b2fc7825ccc6d38c99cca 100644 (file)
--- a/v7/src/xml/xml.pkg
+++ b/v7/src/xml/xml.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml.pkg,v 1.71 2006/06/22 19:17:29 cph Exp $
+$Id: xml.pkg,v 1.72 2006/06/23 17:20:30 cph Exp $
 
 Copyright 2001,2002,2003,2004,2005,2006 Massachusetts Institute of Technology
 
@@ -560,7 +560,7 @@ USA.
          rdf-triple-predicate
          rdf-triple-subject
          rdf-triple?)
-  (export (runtime rdf nt)
+  (export (runtime rdf)
          %make-rdf-literal
          match-bnode-name
          match-language))
@@ -582,4 +582,7 @@ USA.
   (files "turtle")
   (parent (runtime rdf))
   (export ()
-         read-rdf/turtle-file))
\ No newline at end of file
+         read-rdf/turtle-file)
+  (export (runtime rdf)
+         match:name
+         match:prefix-name))
\ No newline at end of file