From 9a86938493af7c7c4d7feac43b541fa776d64a3f Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 23 Jun 2006 17:20:30 +0000 Subject: [PATCH] Export qname matchers for use in rdf-struct. --- v7/src/xml/turtle.scm | 20 +++++++++++++------- v7/src/xml/xml.pkg | 9 ++++++--- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/v7/src/xml/turtle.scm b/v7/src/xml/turtle.scm index 0d4ff46a1..12bff0c00 100644 --- 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))))) ;;;; Literals diff --git a/v7/src/xml/xml.pkg b/v7/src/xml/xml.pkg index c177d2b71..ec3b47acb 100644 --- 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 -- 2.25.1