cxml-cvs February 2007

cxml-cvs@common-lisp.net

1 participants
24 discussions

[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

[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-serv24285/doc Modified Files: html.xsl klacks.xml Log Message: new argument :buffering to make-source --- /project/cxml/cvsroot/cxml/doc/html.xsl 2007/02/18 12:35:50 1.1 +++ /project/cxml/cvsroot/cxml/doc/html.xsl 2007/02/18 15:27:30 1.2 @@ -57,8 +57,8 @@ <li> <a href="klacks.html">Klacks parser</a> <ul class="sub"> - <li><a href="klacks.html#parsing">Parsing incrementally</a></li> - <li><a href="klacks.html#sax">Bridging Klacks and SAX</a></li> + <li><a href="klacks.html#sources">Parsing incrementally</a></li> + <li><a href="klacks.html#klacksax">Bridging Klacks and SAX</a></li> </ul> </li> <li> --- /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 14:35:14 1.2 +++ /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 15:27:30 1.3 @@ -45,7 +45,8 @@ * <b>(klacks:consume *source*)</b> NIL</pre> - <h3>Klacks sources</h3> + <a name="sources"/> + <h3>Parsing incrementally using sources</h3> <p> To parse using Klacks, create an XML <tt>source</tt> first. </p> @@ -96,8 +97,22 @@ closed otherwise. </p> <p> - <b>Keyword arguments</b> have the same meaning as with the SAX parser, - please refer to the documentation of <a + <b>Buffering:</b> By default, the Klacks parser performs buffering + of octets being read from the stream as an optimization. This can + result in unwanted blocking if the stream is a socket and the + parser tries to read more data than required to parse the current + event. Use <tt>:buffering nil</tt> to disable this optimization. + </p> + <ul> + <li> + <tt>buffering</tt> -- Boolean, defaults to <tt>t</tt>. If + enabled, read data several kilobytes at time. If disabled, + read only single bytes at a time. + </li> + </ul> + <p> + The following <b>keyword arguments</b> have the same meaning as + with the SAX parser, please refer to the documentation of <a href="sax.html#parser">parse-file</a> for more information: </p> <ul> @@ -216,6 +231,7 @@ exiting <tt>body</tt>, whether normally or abnormally. </p> + <a name="klacksax"/> <h3>Bridging Klacks and SAX</h3> <p> <div class="def">Function KLACKS:SERIALIZE-SOURCE (source handler)</div>

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-serv13701/klacks Modified Files: klacks-impl.lisp klacks.lisp Log Message: klacks fixes --- /project/cxml/cvsroot/cxml/klacks/klacks-impl.lisp 2007/02/18 11:07:40 1.2 +++ /project/cxml/cvsroot/cxml/klacks/klacks-impl.lisp 2007/02/18 14:35:15 1.3 @@ -31,7 +31,7 @@ (current-values) (current-attributes) (cdata-section-p :reader klacks:current-cdata-section-p) - ;; extra with-source magic + ;; extra WITH-SOURCE magic (data-behaviour :initform :DTD) (namespace-stack :initform (list *initial-namespace-bindings*)) (temporary-streams :initform nil) @@ -126,13 +126,18 @@ (apply #'make-source xstream args))) (pathname (let* ((xstream - (make-xstream (open input :element-type '(unsigned-byte 8)))) - (source (apply #'make-source - xstream - :pathname input - args))) - (push xstream (slot-value source 'temporary-streams)) - source)) + (make-xstream (open input :element-type '(unsigned-byte 8))))) + (setf (xstream-name xstream) + (make-stream-name + :entity-name "main document" + :entity-kind :main + :uri (pathname-to-uri (merge-pathnames input)))) + (let ((source (apply #'make-source + xstream + :pathname input + args))) + (push xstream (slot-value source 'temporary-streams)) + source))) (rod (let ((xstream (string->xstream input))) (setf (xstream-name xstream) @@ -152,8 +157,7 @@ (check-type entity-resolver (or null function symbol)) (check-type disallow-internal-subset boolean) (let* ((context - (make-context :handler nil - :main-zstream input + (make-context :main-zstream input :entity-resolver entity-resolver :disallow-internal-subset disallow-internal-subset)) (source @@ -167,6 +171,7 @@ :scratch-pad-2 *scratch-pad-2* :scratch-pad-3 *scratch-pad-3* :scratch-pad-4 *scratch-pad-4*))) + (setf (handler context) (make-instance 'klacks-dtd-handler :source source)) (setf (slot-value source 'continuation) (lambda () (klacks/xmldecl source input))) source)) @@ -208,25 +213,26 @@ (defun klacks/doctype (source input) (with-source (source current-key current-values validate dtd) (let ((cont (lambda () (klacks/finish-doctype source input))) - ignoreme name extid) + l) (prog1 (cond ((eq (peek-token input) :<!DOCTYPE) - (setf (values ignoreme name extid) - (p/doctype-decl input dtd)) + (setf l (cdr (p/doctype-decl input dtd))) (lambda () (klacks/misc*-2 source input cont))) (dtd - (setf (values ignoreme name extid) - (synthesize-doctype dtd input)) + (setf l (cdr (synthesize-doctype dtd input))) cont) ((and validate (not dtd)) (validity-error "invalid document: no doctype")) (t (return-from klacks/doctype (funcall cont)))) - (setf current-key :dtd) - (setf current-values - (list name (extid-public extid) (extid-system extid))))))) + (destructuring-bind (&optional name extid) l + (setf current-key :dtd) + (setf current-values + (list name + (and extid (extid-public extid)) + (and extid (extid-system extid))))))))) (defun klacks/finish-doctype (source input) (with-source (source current-key current-values root data-behaviour) @@ -323,7 +329,7 @@ (klacks/entity-reference source input name recurse))) ((:<!\[) (setf current-key :characters) - (setf current-values (list (process-cdata-section input sem))) + (setf current-values (list (process-cdata-section input))) (setf cdata-section-p t) recurse) ((:PI) @@ -376,6 +382,58 @@ (set-full-speed input) (klacks/content source input cont))) + +;;;; terrible kludges + +(defclass klacks-dtd-handler () + ((handler-source :initarg :source :reader handler-source) + (internal-subset-p :initform nil :accessor handler-internal-subset-p))) + +(defmethod sax:start-internal-subset ((handler klacks-dtd-handler)) + (setf (slot-value (handler-source handler) 'internal-declarations) '()) + (setf (handler-internal-subset-p handler) t)) + +(defmethod sax:end-internal-subset ((handler klacks-dtd-handler)) + (setf (handler-internal-subset-p handler) nil)) + +(defmethod sax:entity-resolver ((handler klacks-dtd-handler) fn) + (setf (slot-value (handler-source handler) 'dom-impl-entity-resolver) fn)) + +(defmethod sax::dtd ((handler klacks-dtd-handler) dtd) + (setf (slot-value (handler-source handler) 'dom-impl-dtd) dtd)) + +(defmethod sax:end-dtd ((handler klacks-dtd-handler)) + (let ((source (handler-source handler))) + (when (slot-boundp source 'internal-declarations) + (setf (slot-value source 'internal-declarations) + (reverse (slot-value source 'internal-declarations))) + (setf (slot-value source 'external-declarations) + (reverse (slot-value source 'external-declarations)))))) + +(macrolet + ((defhandler (name &rest args) + `(defmethod ,name ((handler klacks-dtd-handler) ,@args) + (let ((source (handler-source handler)) + (spec (list ',name ,@args))) + (if (handler-internal-subset-p handler) + (push spec (slot-value source 'internal-declarations)) + (push spec (slot-value source 'external-declarations))))))) + (defhandler sax:unparsed-entity-declaration + name public-id system-id notation-name) + (defhandler sax:external-entity-declaration + kind name public-id system-id) + (defhandler sax:internal-entity-declaration + kind name value) + (defhandler sax:notation-declaration + name public-id system-id) + (defhandler sax:element-declaration + name model) + (defhandler sax:attribute-declaration + element-name attribute-name type default)) + + +;;;; debugging + #+(or) (trace CXML::KLACKS/DOCTYPE CXML::KLACKS/EXT-PARSED-ENT --- /project/cxml/cvsroot/cxml/klacks/klacks.lisp 2007/02/11 18:21:20 1.1 +++ /project/cxml/cvsroot/cxml/klacks/klacks.lisp 2007/02/18 14:35:15 1.2 @@ -18,7 +18,13 @@ (in-package :cxml) -(defclass klacks:source () ()) +(defclass klacks:source () + ( + ;; fixme, terrible DTD kludges + (internal-declarations) + (external-declarations :initform nil) + (dom-impl-dtd :initform nil) + (dom-impl-entity-resolver :initform nil))) (defgeneric klacks:close-source (source)) @@ -83,7 +89,19 @@ (sax:comment handler a)) (:dtd (sax:start-dtd handler a b c) - (sax:end-dtd handler)) + (when (slot-boundp source 'internal-declarations) + (sax:start-internal-subset handler) + (serialize-declaration-kludge + (slot-value source 'internal-declarations) + handler) + (sax:end-internal-subset handler)) + (serialize-declaration-kludge + (slot-value source 'external-declarations) + handler) + (sax:end-dtd handler) + (sax:entity-resolver handler + (slot-value source 'dom-impl-entity-resolver)) + (sax::dtd handler (slot-value source 'dom-impl-dtd))) (:start-element (sax:start-element handler a b c (klacks:list-attributes source))) (:end-element @@ -93,3 +111,8 @@ (t (error "unexpected klacks key: ~A" key))) (klacks:consume source)))) + +(defun serialize-declaration-kludge (list handler) + (loop + for (fn . args) in list + do (apply fn handler args)))

1 0

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

18 Feb '07

Update of /project/cxml/cvsroot/cxml/test In directory clnet:/tmp/cvs-serv13701/test Modified Files: xmlconf.lisp Log Message: klacks fixes --- /project/cxml/cvsroot/cxml/test/xmlconf.lisp 2006/08/20 11:48:58 1.13 +++ /project/cxml/cvsroot/cxml/test/xmlconf.lisp 2007/02/18 14:35:16 1.14 @@ -75,8 +75,19 @@ :if-exists :supersede) (run-all-tests directory)))) -(defun run-all-tests (directory) - (let* ((pathname (merge-pathnames "xmlconf.xml" directory)) +(defvar *parser-fn* 'sax-test) + +(defun sax-test (filename handler &rest args) + (apply #'cxml:parse-file filename handler :recode nil args)) + +(defun klacks-test (filename handler &rest args) + (klacks:with-open-source + (s (apply #'cxml:make-source (pathname filename) args)) + (klacks:serialize-source s handler))) + +(defun run-all-tests (parser-fn directory) + (let* ((*parser-fn* parser-fn) + (pathname (merge-pathnames "xmlconf.xml" directory)) (builder (rune-dom:make-dom-builder)) (xmlconf (cxml:parse-file pathname builder :recode nil)) (ntried 0) @@ -123,10 +134,9 @@ (defmethod run-test ((class null) pathname output description &rest args) (declare (ignore description)) - (let ((document (apply #'cxml:parse-file + (let ((document (apply *parser-fn* pathname (rune-dom:make-dom-builder) - :recode nil args))) (cond ((null output) @@ -163,10 +173,10 @@ (handler-case (progn (format t " [validating:]") - (cxml:parse-file pathname - (rune-dom:make-dom-builder) - :recode nil - :validate t) + (funcall *parser-fn* + pathname + (rune-dom:make-dom-builder) + :validate t) (error "validity error not detected") nil) (cxml:validity-error () @@ -179,10 +189,10 @@ (handler-case (progn (format t " [not validating:]") - (cxml:parse-file pathname - (rune-dom:make-dom-builder) - :recode nil - :validate nil) + (funcall *parser-fn* + pathname + (rune-dom:make-dom-builder) + :validate nil) (error "well-formedness violation not detected") nil) (cxml:well-formedness-violation () @@ -191,10 +201,10 @@ (handler-case (progn (format t " [validating:]") - (cxml:parse-file pathname - (rune-dom:make-dom-builder) - :recode nil - :validate t) + (funcall *parser-fn* + pathname + (rune-dom:make-dom-builder) + :validate t) (error "well-formedness violation not detected") nil) (cxml:well-formedness-violation () @@ -206,4 +216,9 @@ t))) #+(or) -(xmlconf::run-all-tests "/home/david/2001/XML-Test-Suite/xmlconf/") +(xmlconf::run-all-tests 'xmlconf::sax-test + "/home/david/2001/XML-Test-Suite/xmlconf/") + +#+(or) +(xmlconf::run-all-tests 'xmlconf::klacks-test + "/home/david/2001/XML-Test-Suite/xmlconf/")

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-serv13701/doc Modified Files: klacks.xml Log Message: klacks fixes --- /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 12:35:50 1.1 +++ /project/cxml/cvsroot/cxml/doc/klacks.xml 2007/02/18 14:35:14 1.2 @@ -215,4 +215,11 @@ Call <tt>klacks:close-source</tt> to close the source after exiting <tt>body</tt>, whether normally or abnormally. </p> + + <h3>Bridging Klacks and SAX</h3> + <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> </documentation>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cxml-cvs February 2007