- cxml-cvs@common-lisp.net - mailman3.common-lisp.net

[cxml-cvs] CVS cxml/doc
by dlichteblau 04 Mar '07

04 Mar '07

Update of /project/cxml/cvsroot/cxml/doc In directory clnet:/tmp/cvs-serv2817/doc Modified Files: html.xsl index.xml klacks.xml sax.xml Log Message: xml:base --- /project/cxml/cvsroot/cxml/doc/html.xsl 2007/02/18 16:46:32 1.3 +++ /project/cxml/cvsroot/cxml/doc/html.xsl 2007/03/04 21:04:11 1.4 @@ -60,6 +60,7 @@ <li><a href="klacks.html#sources">Parsing incrementally</a></li> <li><a href="klacks.html#convenience">Convenience functions</a></li> <li><a href="klacks.html#klacksax">Bridging Klacks and SAX</a></li> + <li><a href="klacks.html#locator">Location information</a></li> <li><a href="klacks.html#klacksax">Examples</a></li> </ul> </li> --- /project/cxml/cvsroot/cxml/doc/index.xml 2007/03/04 18:30:41 1.3 +++ /project/cxml/cvsroot/cxml/doc/index.xml 2007/03/04 21:04:11 1.4 @@ -52,6 +52,9 @@ <h2>Recent Changes</h2> <p class="nomargin"><tt>rel-2007-xx-yy</tt></p> <ul class="nomargin"> + <li>xml:base support (SAX and Klacks only, not yet used in DOM). + See documentation <a href="sax.html#saxparser">here</a> and <a + href="klacks.html#locator">here</a>.</li> <li>Fixed attributes to carry an lname even without when occurring without a namespace.</li> <li>Klacks improvements: Incompatibly changed --- /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/03/04 18:30:41 1.7 +++ /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/03/04 21:04:11 1.8 @@ -282,6 +282,29 @@ events to the SAX <tt>handler</tt>. </p> + <a name="locator"/> + <h3>Location information</h3> + <p> + <div class="def">Function KLACKS:CURRENT-LINE-NUMBER (source)</div> + Return an approximation of the current line number, or NIL. + </p> + <p> + <div class="def">Function KLACKS:CURRENT-COLUMN-NUMBER (source)</div> + Return an approximation of the current column number, or NIL. + </p> + <p> + <div class="def">Function KLACKS:CURRENT-SYSTEM-ID (source)</div> + Return the URI of the document being parsed. This is either the + main document, or the entity's system ID while contents of a parsed + general external entity are being processed. + </p> + <p> + <div class="def">Function KLACKS:CURRENT-XML-BASE (source)</div> + Return the [Base URI] of the current element. This URI can differ from + the value returned by <tt>current-system-id</tt> if xml:base + attributes are present. + </p> + <a name="examples"/> <h3>Examples</h3> <p> --- /project/cxml/cvsroot/cxml/doc/sax.xml 2007/02/18 12:35:50 1.1 +++ /project/cxml/cvsroot/cxml/doc/sax.xml 2007/03/04 21:04:11 1.2 @@ -476,6 +476,48 @@ <em>fixme:</em> thread-safety </p> + <a name="saxparser"/> + <h3>Location information</h3> + <p> + <div class="def">Class SAX:SAX-PARSER ()</div> + A class providing location information through an + implementation-specific subclass. Parsers will use + <tt>sax:register-sax-parser</tt> to pass their parser instance to + the handler. The easiest way to receive sax parsers instances is + to inherit from sax-parser-mixin when defining a sax handler. + </p> + <p> + <div class="def">Class SAX:SAX-PARSER-MIXIN ()</div> + A mixin for sax handler classes that records the sax handler + object for use with the following functions. Trampoline methods + are provided that allow those functions to be called directly on + the sax-parser-mixin. + </p> + <p> + <div class="def">Function SAX:SAX-HANDLER (sax-handler-mixin) => sax-handler</div> + Return the sax-parser instance recorded by this handler, or NIL. + </p> + <p> + <div class="def">Function SAX:LINE-NUMBER (sax-parser)</div> + Return an approximation of the current line number, or NIL. + </p> + <p> + <div class="def">Function SAX:COLUMN-NUMBER (sax-parser)</div> + Return an approximation of the current column number, or NIL. + </p> + <p> + <div class="def">Function SAX:SYSTEM-ID (sax-parser)</div> + Return the URI of the document being parsed. This is either the + main document, or the entity's system ID while contents of a parsed + general external entity are being processed. + </p> + <p> + <div class="def">Function SAX:XML-BASE (sax-parser)</div> + Return the [Base URI] of the current element. This URI can differ from + the value returned by <tt>sax:system-id</tt> if xml:base + attributes are present. + </p> + <a name="catalogs"/> <h3>XML Catalogs</h3> <p>

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 04 Mar '07

04 Mar '07

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv1722/xml Modified Files: xml-parse.lisp Log Message: <li>Fixed attributes to carry an lname even without when occurring without a namespace.</li> <li>Klacks improvements: Incompatibly changed klacks:find-element and find-event to consider the current event as a result. Added klacks-error, klacks:expect, klacks:skip, klacks:expecting-element.</li> --- /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2007/02/11 18:21:22 1.65 +++ /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2007/03/04 18:30:42 1.66 @@ -948,12 +948,9 @@ (wf-error nil "Entity '~A' is not defined." (rod-string name))) def)) -(defun xstream-open-extid (extid) - (let* ((sysid (extid-system extid)) - (stream - (or (funcall (or (entity-resolver *ctx*) (constantly nil)) - (extid-public extid) - (extid-system extid)) +(defun xstream-open-extid* (entity-resolver pubid sysid) + (let* ((stream + (or (funcall (or entity-resolver (constantly nil)) pubid sysid) (open (uri-to-pathname sysid) :element-type '(unsigned-byte 8) :direction :input)))) @@ -961,6 +958,11 @@ :name (make-stream-name :uri sysid) :initial-speed 1))) +(defun xstream-open-extid (extid) + (xstream-open-extid* (entity-resolver *ctx*) + (extid-public extid) + (extid-system extid))) + (defun call-with-entity-expansion-as-stream (zstream cont name kind internalp) ;; `zstream' is for error messages (let ((in (entity->xstream zstream name kind internalp))) @@ -3568,15 +3570,12 @@ (setf (sax:attribute-namespace-uri attribute) #"http://www.w3.org/2000/xmlns/") (multiple-value-bind (prefix local-name) (split-qname qname) - (declare (ignorable local-name)) (when (and prefix ;; default namespace doesn't apply to attributes (or (not (rod= #"xmlns" prefix)) sax:*use-xmlns-namespace*)) - (multiple-value-bind (uri prefix local-name) - (decode-qname qname) - (declare (ignore prefix)) - (setf (sax:attribute-namespace-uri attribute) uri) - (setf (sax:attribute-local-name attribute) local-name))))))) + (setf (sax:attribute-namespace-uri attribute) + (decode-qname qname))) + (setf (sax:attribute-local-name attribute) local-name))))) ;;;;;;;;;;;;;;;;;

1 0

[cxml-cvs] CVS cxml/doc
by dlichteblau 04 Mar '07

04 Mar '07

Update of /project/cxml/cvsroot/cxml/doc In directory clnet:/tmp/cvs-serv1722/doc Modified Files: GNUmakefile index.xml installation.xml klacks.xml Log Message: <li>Fixed attributes to carry an lname even without when occurring without a namespace.</li> <li>Klacks improvements: Incompatibly changed klacks:find-element and find-event to consider the current event as a result. Added klacks-error, klacks:expect, klacks:skip, klacks:expecting-element.</li> --- /project/cxml/cvsroot/cxml/doc/GNUmakefile 2007/02/18 12:35:50 1.1 +++ /project/cxml/cvsroot/cxml/doc/GNUmakefile 2007/03/04 18:30:40 1.2 @@ -1,4 +1,5 @@ all: dom.html index.html installation.html klacks.html quickstart.html sax.html xmls-compat.html %.html: %.xml html.xsl - xsltproc html.xsl $< >$@ + xsltproc html.xsl $< >$@.tmp + mv $@.tmp $@ --- /project/cxml/cvsroot/cxml/doc/index.xml 2007/02/18 16:50:53 1.2 +++ /project/cxml/cvsroot/cxml/doc/index.xml 2007/03/04 18:30:41 1.3 @@ -50,6 +50,15 @@ <a name="changes"/> <h2>Recent Changes</h2> + <p class="nomargin"><tt>rel-2007-xx-yy</tt></p> + <ul class="nomargin"> + <li>Fixed attributes to carry an lname even without when occurring + without a namespace.</li> + <li>Klacks improvements: Incompatibly changed + klacks:find-element and find-event to consider the current event + as a result. Added klacks-error, klacks:expect, klacks:skip, + klacks:expecting-element.</li> + </ul> <p class="nomargin"><tt>rel-2007-02-18</tt></p> <ul class="nomargin"> <li>New StAX-like parser interface.</li> --- /project/cxml/cvsroot/cxml/doc/installation.xml 2007/02/18 12:35:50 1.1 +++ /project/cxml/cvsroot/cxml/doc/installation.xml 2007/03/04 18:30:41 1.2 @@ -10,11 +10,7 @@ <li> <div> Anoncvs (<a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/cxml/?cvsroot=cxml">browse</a>): - <pre>$ export CVSROOT=:pserver:anonymous@common-lisp.net:/project/cxml/cvsroot -$ cvs login -Logging in to :pserver:anonymous@common-lisp.net:2401/project/cxml/cvsroot -CVS password: anonymous -$ cvs co cxml</pre> + <pre>cvs -d :pserver:anonymous:anonymous@common-lisp.net:/project/cxml/cvsroot co cxml</pre> </div> </li> </ul> --- /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 17:35:37 1.6 +++ /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/03/04 18:30:41 1.7 @@ -231,6 +231,32 @@ namespace matches. Return values like <tt>peek</tt> or NIL if no such event was found. </p> + <p> + <div class="def">Condition KLACKS:KLACKS-ERROR (xml-parse-error)</div> + The condition class signalled by <tt>expect</tt>. + </p> + <p> + <div class="def">Function KLACKS:EXPECT (source key &optional + value1 value2 value3)</div> + Assert that the current event is equal to (key value1 value2 + value3). (Ignore <i>value</i> arguments that are NIL.) If so, + return it as multiple values. Otherwise signal a + <tt>klacks-error</tt>. + </p> + <p> + <div class="def">Function KLACKS:SKIP (source key &optional + value1 value2 value3)</div> + <tt>expect</tt> the specific event, then <tt>consume</tt> it. + </p> + <p> + <div class="def">Macro KLACKS:EXPECTING-ELEMENT ((fn source + &optional lname uri) &body body</div> + Assert that the current event matches (:start-element uri lname). + (Ignore <i>value</i> arguments that are NIL) Otherwise signal a + <tt>klacks-error</tt>. + Evaluate <tt>body</tt> as an implicit progn. Finally assert that + the remaining event matches (:end-element uri lname). + </p> <a name="klacksax"/> <h3>Bridging Klacks and SAX</h3>

1 0

[cxml-cvs] CVS cxml/klacks
by dlichteblau 04 Mar '07

04 Mar '07

Update of /project/cxml/cvsroot/cxml/klacks In directory clnet:/tmp/cvs-serv1722/klacks Modified Files: klacks.lisp package.lisp Log Message: <li>Fixed attributes to carry an lname even without when occurring without a namespace.</li> <li>Klacks improvements: Incompatibly changed klacks:find-element and find-event to consider the current event as a result. Added klacks-error, klacks:expect, klacks:skip, klacks:expecting-element.</li> --- /project/cxml/cvsroot/cxml/klacks/klacks.lisp 2007/02/18 16:46:33 1.3 +++ /project/cxml/cvsroot/cxml/klacks/klacks.lisp 2007/03/04 18:30:41 1.4 @@ -148,7 +148,7 @@ (defun klacks:find-element (source &optional lname uri) (loop (multiple-value-bind (key current-uri current-lname current-qname) - (klacks:peek-next source) + (klacks:peek source) (case key ((nil) (return nil)) @@ -159,14 +159,55 @@ (or (null uri) (equal uri (klacks:current-uri source)))) (return - (values key current-uri current-lname current-qname)))))))) + (values key current-uri current-lname current-qname))))) + (klacks:consume source)))) (defun klacks:find-event (source key) (loop (multiple-value-bind (this a b c) - (klacks:peek-next source) + (klacks:peek source) (cond ((null this) (return nil)) ((eq this key) - (return (values this a b c))))))) + (return (values this a b c)))) + (klacks:consume source)))) + +(define-condition klacks-error (xml-parse-error) ()) + +(defun klacks-error (fmt &rest args) + (%error 'klacks-error + nil + (format nil "Klacks assertion failed: ~?" fmt args))) + +(defun klacks:expect (source key &optional u v w) + (multiple-value-bind (this a b c) + (klacks:peek source) + (unless (eq this key) (klacks-error "expected ~A but got ~A" key this)) + (when (and u (not (equal a u))) + (klacks-error "expected ~A but got ~A" u a)) + (when (and v (not (equal b v))) + (klacks-error "expected ~A but got ~A" v b)) + (when (and w (not (equal c w))) + (klacks-error "expected ~A but got ~A" w c)) + (values this a b c))) + +(defun klacks:skip (source key &optional a b c) + (klacks:expect source key a b c) + (klacks:consume source)) + +(defun invoke-expecting-element (fn source &optional lname uri) + (multiple-value-bind (key a b) + (klacks:peek source) + (unless (eq key :start-element) + (klacks-error "expected ~A but got ~A" (or lname "element") key)) + (when (and uri (not (equal a uri))) + (klacks-error "expected ~A but got ~A" uri a)) + (when (and lname (not (equal b lname))) + (klacks-error "expected ~A but got ~A" lname b)) + (multiple-value-prog1 + (funcall fn) + (klacks:skip source :end-element a b)))) + +(defmacro klacks:expecting-element ((source &optional lname uri) &body body) + `(invoke-expecting-element (lambda () ,@body) ,source ,lname ,uri)) --- /project/cxml/cvsroot/cxml/klacks/package.lisp 2007/02/18 16:46:33 1.2 +++ /project/cxml/cvsroot/cxml/klacks/package.lisp 2007/03/04 18:30:41 1.3 @@ -27,8 +27,11 @@ #:peek-next #:consume + #:expect + #:skip #:find-element #:find-event + #:expecting-element #:map-attributes #:list-attributes @@ -40,4 +43,6 @@ #:serialize-event #:serialize-element - #:serialize-source)) + #:serialize-source + + #:klacks-error))

1 0

[cxml-cvs] CVS cxml/doc
by dlichteblau 18 Feb '07

18 Feb '07

Update of /project/cxml/cvsroot/cxml/doc In directory clnet:/tmp/cvs-serv12078 Modified Files: klacks.xml Log Message: typo --- /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 17:30:52 1.5 +++ /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 17:35:37 1.6 @@ -296,7 +296,7 @@ uninteresting events until the opening <tt>child1</tt> tag is found. Then <tt>serialize-element</tt> is used to generate SAX events for the following element, including its children, and an - xmls-compatible list structure is build from those + xmls-compatible list structure is built from those events. <tt>find-element</tt> skips over whitespace, and <tt>find-event</tt> is used to parse up to <tt>:end-document</tt>, ensuring that the source has been

1 0

[cxml-cvs] CVS cxml/doc
by dlichteblau 18 Feb '07

18 Feb '07

Update of /project/cxml/cvsroot/cxml/doc In directory clnet:/tmp/cvs-serv11705 Modified Files: klacks.xml Log Message: typo --- /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 16:46:32 1.4 +++ /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 17:30:52 1.5 @@ -236,8 +236,8 @@ <h3>Bridging Klacks and SAX</h3> <p> <div class="def">Function KLACKS:SERIALIZE-EVENT (source handler)</div> - Send the current klacks events from <tt>source</tt> as a SAX - events to the SAX <tt>handler</tt> and consume it. + Send the current klacks event from <tt>source</tt> as a SAX + event to the SAX <tt>handler</tt> and consume it. </p> <p> <div class="def">Function KLACKS:SERIALIZE-ELEMENT (source handler

1 0

[cxml-cvs] CVS cxml/doc
by dlichteblau 18 Feb '07

18 Feb '07

Update of /project/cxml/cvsroot/cxml/doc In directory clnet:/tmp/cvs-serv4173 Modified Files: index.xml Log Message: release --- /project/cxml/cvsroot/cxml/doc/index.xml 2007/02/18 12:35:50 1.1 +++ /project/cxml/cvsroot/cxml/doc/index.xml 2007/02/18 16:50:53 1.2 @@ -50,7 +50,7 @@ <a name="changes"/> <h2>Recent Changes</h2> - <p class="nomargin"><tt>rel-2007-xx-yy</tt></p> + <p class="nomargin"><tt>rel-2007-02-18</tt></p> <ul class="nomargin"> <li>New StAX-like parser interface.</li> <li>Serialization fixes (thanks to Nathan Bird, Donavon Keithley).</li>

1 0

[cxml-cvs] CVS cxml/doc
by dlichteblau 18 Feb '07

18 Feb '07

Update of /project/cxml/cvsroot/cxml/doc In directory clnet:/tmp/cvs-serv3570/doc Modified Files: html.xsl klacks.xml Log Message: find-element, find-event --- /project/cxml/cvsroot/cxml/doc/html.xsl 2007/02/18 15:27:30 1.2 +++ /project/cxml/cvsroot/cxml/doc/html.xsl 2007/02/18 16:46:32 1.3 @@ -58,7 +58,9 @@ <a href="klacks.html">Klacks parser</a> <ul class="sub"> <li><a href="klacks.html#sources">Parsing incrementally</a></li> + <li><a href="klacks.html#convenience">Convenience functions</a></li> <li><a href="klacks.html#klacksax">Bridging Klacks and SAX</a></li> + <li><a href="klacks.html#klacksax">Examples</a></li> </ul> </li> <li> --- /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 15:27:30 1.3 +++ /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 16:46:32 1.4 @@ -16,34 +16,9 @@ support, entity resolution) while offering a more flexible interface than SAX. </p> - - <h3>Example</h3> <p> - The following example illustrates creation of a klacks <tt>source</tt>, - use of the <tt>consume</tt> function to read individual events, - and shows some of the most common event types. + See below for <a href="#examples">examples</a>. </p> - <pre>* <b>(defparameter *source* (cxml:make-source "<example>text</example>"))</b> -*SOURCE* -* <b>(klacks:consume *source*)</b> -:START-DOCUMENT -* <b>(klacks:consume *source*)</b> -:START-ELEMENT -NIL ;namespace URI -"example" ;local name -"example" ;qualified name -* <b>(klacks:consume *source*)</b> -:CHARACTERS -"text" -* <b>(klacks:consume *source*)</b> -:END-ELEMENT -NIL -"example" -"example" -* <b>(klacks:consume *source*)</b> -:END-DOCUMENT -* <b>(klacks:consume *source*)</b> -NIL</pre> <a name="sources"/> <h3>Parsing incrementally using sources</h3> @@ -161,11 +136,11 @@ <tt>peek</tt> returns the current event's key and main values. </p> <p> - <div class="def">Function KLACKS:CONSUME (source) => key, value*</div> + <div class="def">Function KLACKS:PEEK-NEXT (source) => key, value*</div> </p> <p> - Return the same values <tt>peek</tt> would, and in addition - advance the source forward to the next event. + Advance the source forward to the next event and returns it + like <tt>peek</tt> would. </p> <p> <div class="def">Function KLACKS:PEEK-VALUE (source) => value*</div> @@ -174,6 +149,13 @@ Like <tt>peek</tt>, but return only the values, not the key. </p> <p> + <div class="def">Function KLACKS:CONSUME (source) => key, value*</div> + </p> + <p> + Return the same values <tt>peek</tt> would, and in addition + advance the source forward to the next event. + </p> + <p> <div class="def">Function KLACKS:CURRENT-URI (source) => uri</div> <div class="def">Function KLACKS:CURRENT-LNAME (source) => string</div> <div class="def">Function KLACKS:CURRENT-QNAME (source) => string</div> @@ -231,11 +213,124 @@ exiting <tt>body</tt>, whether normally or abnormally. </p> + <a name="convenience"/> + <h3>Convenience functions</h3> + <p> + <div class="def">Function KLACKS:FIND-EVENT (source key)</div> + Read events from <tt>source</tt> and discard them until an event + of type <i>key</i> is found. Return values like <tt>peek</tt>, or + NIL if no such event was found. + </p> + <p> + <div class="def">Function KLACKS:FIND-ELEMENT (source &optional + lname uri)</div> + Read events from <tt>source</tt> and discard them until an event + of type :start-element is found with matching local name and + namespace uri is found. If <tt>lname</tt> is <tt>nil</tt>, any + tag name matches. If <tt>uri</tt> is <tt>nil</tt>, any + namespace matches. Return values like <tt>peek</tt> or NIL if no + such event was found. + </p> + <a name="klacksax"/> <h3>Bridging Klacks and SAX</h3> <p> + <div class="def">Function KLACKS:SERIALIZE-EVENT (source handler)</div> + Send the current klacks events from <tt>source</tt> as a SAX + events to the SAX <tt>handler</tt> and consume it. + </p> + <p> + <div class="def">Function KLACKS:SERIALIZE-ELEMENT (source handler + &key document-events)</div> + Read all klacks events from the following <tt>:start-element</tt> to + its <tt>:end-element</tt> and send them as SAX events + to <tt>handler</tt>. When this function is called, the current + event must be <tt>:start-element</tt>, else an error is + signalled. With <tt>document-events</tt> (the default), + <tt>sax:start-document</tt> and <tt>sax:end-document</tt> events + are sent around the element. + </p> + <p> <div class="def">Function KLACKS:SERIALIZE-SOURCE (source handler)</div> Read all klacks events from <tt>source</tt> and send them as SAX events to the SAX <tt>handler</tt>. </p> + + <a name="examples"/> + <h3>Examples</h3> + <p> + The following example illustrates creation of a klacks <tt>source</tt>, + use of the <tt>peek-next</tt> function to read individual events, + and shows some of the most common event types. + </p> + <pre>* <b>(defparameter *source* (cxml:make-source "<example>text</example>"))</b> +*SOURCE* + +* <b>(klacks:peek-next *source*)</b> +:START-DOCUMENT + +* <b>(klacks:peek-next *source*)</b> +:START-ELEMENT +NIL ;namespace URI +"example" ;local name +"example" ;qualified name + +* <b>(klacks:peek-next *source*)</b> +:CHARACTERS +"text" + +* <b>(klacks:peek-next *source*)</b> +:END-ELEMENT +NIL +"example" +"example" + +* <b>(klacks:peek-next *source*)</b> +:END-DOCUMENT + +* <b>(klacks:peek-next *source*)</b> +NIL</pre> + + <p> + In this example, <tt>find-element</tt> is used to skip over the + uninteresting events until the opening <tt>child1</tt> tag is + found. Then <tt>serialize-element</tt> is used to generate SAX + events for the following element, including its children, and an + xmls-compatible list structure is build from those + events. <tt>find-element</tt> skips over whitespace, + and <tt>find-event</tt> is used to parse up + to <tt>:end-document</tt>, ensuring that the source has been + closed. + </p> + <pre>* <b>(defparameter *source* + (cxml:make-source "<example> + <child1><p>foo</p></child1> + <child2 bar='baz'/> + </example>"))</b> +*SOURCE* + +* <b>(klacks:find-element *source* "child1")</b> +:START-ELEMENT +NIL +"child1" +"child1" + +* <b>(klacks:serialize-element *source* (cxml-xmls:make-xmls-builder))</b> +("child1" NIL ("p" NIL "foo")) + +* <b>(klacks:find-element *source*)</b> +:START-ELEMENT +NIL +"child2" +"child2" + +* <b>(klacks:serialize-element *source* (cxml-xmls:make-xmls-builder))</b> +("child2" (("bar" "baz"))) + +* <b>(klacks:find-event *source* :end-document)</b> +:END-DOCUMENT +NIL +NIL +NIL +</pre> </documentation>

1 0

[cxml-cvs] CVS cxml/klacks
by dlichteblau 18 Feb '07

18 Feb '07

Update of /project/cxml/cvsroot/cxml/klacks In directory clnet:/tmp/cvs-serv3570/klacks Modified Files: klacks-impl.lisp klacks.lisp package.lisp Log Message: find-element, find-event --- /project/cxml/cvsroot/cxml/klacks/klacks-impl.lisp 2007/02/18 15:27:30 1.4 +++ /project/cxml/cvsroot/cxml/klacks/klacks-impl.lisp 2007/02/18 16:46:33 1.5 @@ -79,6 +79,12 @@ (fill-source source) (apply #'values current-values))) +(defmethod klacks:peek-next ((source cxml-source)) + (with-source (source current-key current-values) + (setf current-key nil) + (fill-source source) + (apply #'values current-key current-values))) + (defmethod klacks:consume ((source cxml-source)) (with-source (source current-key current-values) (fill-source source) --- /project/cxml/cvsroot/cxml/klacks/klacks.lisp 2007/02/18 14:35:15 1.2 +++ /project/cxml/cvsroot/cxml/klacks/klacks.lisp 2007/02/18 16:46:33 1.3 @@ -69,9 +69,9 @@ (check-type key (member :characters)) characters)) -(defun klacks:serialize-source (source handler) - (loop - (multiple-value-bind (key a b c) (klacks:peek source) +(defun klacks:serialize-event (source handler) + (multiple-value-bind (key a b c) (klacks:peek source) + (let ((result nil)) (case key (:start-document (sax:start-document handler)) @@ -107,12 +107,66 @@ (:end-element (sax:end-element handler a b c)) (:end-document - (return (sax:end-document handler))) + (setf result (sax:end-document handler))) + ((nil) + (error "serialize-event read past end of document")) (t (error "unexpected klacks key: ~A" key))) - (klacks:consume source)))) + (klacks:consume source) + result))) (defun serialize-declaration-kludge (list handler) (loop for (fn . args) in list do (apply fn handler args))) + +(defun klacks:serialize-source (source handler) + (loop + (let ((document (klacks:serialize-event source handler))) + (when document + (return document))))) + +(defun klacks:serialize-element (source handler &key (document-events t)) + (unless (eq (klacks:peek source) :start-element) + (error "not at start of element")) + (when document-events + (sax:start-document handler)) + (labels ((recurse () + (klacks:serialize-event source handler) + (loop + (let ((key (klacks:peek source))) + (ecase key + (:start-element (recurse)) + (:end-element (return)) + ((:characters :comment :processing-instruction) + (klacks:serialize-event source handler))))) + (klacks:serialize-event source handler))) + (recurse)) + (when document-events + (sax:end-document handler))) + +(defun klacks:find-element (source &optional lname uri) + (loop + (multiple-value-bind (key current-uri current-lname current-qname) + (klacks:peek-next source) + (case key + ((nil) + (return nil)) + (:start-element + (when (and (eq key :start-element) + (or (null lname) + (equal lname (klacks:current-lname source))) + (or (null uri) + (equal uri (klacks:current-uri source)))) + (return + (values key current-uri current-lname current-qname)))))))) + +(defun klacks:find-event (source key) + (loop + (multiple-value-bind (this a b c) + (klacks:peek-next source) + (cond + ((null this) + (return nil)) + ((eq this key) + (return (values this a b c))))))) --- /project/cxml/cvsroot/cxml/klacks/package.lisp 2007/02/11 18:21:21 1.1 +++ /project/cxml/cvsroot/cxml/klacks/package.lisp 2007/02/18 16:46:33 1.2 @@ -24,6 +24,11 @@ #:peek #:peek-value + #:peek-next + #:consume + + #:find-element + #:find-event #:map-attributes #:list-attributes @@ -33,6 +38,6 @@ #:current-characters #:current-cdata-section-p - #:consume - + #:serialize-event + #:serialize-element #:serialize-source))

1 0

[cxml-cvs] CVS cxml/klacks
by dlichteblau 18 Feb '07

18 Feb '07

Update of /project/cxml/cvsroot/cxml/klacks In directory clnet:/tmp/cvs-serv24285/klacks Modified Files: klacks-impl.lisp Log Message: new argument :buffering to make-source --- /project/cxml/cvsroot/cxml/klacks/klacks-impl.lisp 2007/02/18 14:35:15 1.3 +++ /project/cxml/cvsroot/cxml/klacks/klacks-impl.lisp 2007/02/18 15:27:30 1.4 @@ -101,10 +101,12 @@ (defun make-source (input &rest args &key validate dtd root entity-resolver disallow-internal-subset - pathname) + (buffering t) pathname) (declare (ignore validate dtd root entity-resolver disallow-internal-subset)) (etypecase input (xstream + (when (and (not buffering) (< 1 (runes::xstream-speed input))) + (warn "make-source called with !buffering, but xstream is buffering")) (let ((*ctx* nil)) (let ((zstream (make-zstream :input-stack (list input)))) (peek-rune input) @@ -113,10 +115,10 @@ zstream (loop for (name value) on args by #'cddr - unless (eq name :pathname) + unless (member name '(:pathname :buffering)) append (list name value))))))) (stream - (let ((xstream (make-xstream input))) + (let ((xstream (make-xstream input :speed (if buffering 8192 1)))) (setf (xstream-name xstream) (make-stream-name :entity-name "main document" @@ -126,7 +128,8 @@ (apply #'make-source xstream args))) (pathname (let* ((xstream - (make-xstream (open input :element-type '(unsigned-byte 8))))) + (make-xstream (open input :element-type '(unsigned-byte 8)) + :speed (if buffering 8192 1)))) (setf (xstream-name xstream) (make-stream-name :entity-name "main document"

1 0