June 2004 - s-xml-cvs@common-lisp.net - mailman3.common-lisp.net

[s-xml-cvs] CVS update: public_html/index.html
by Sven Van Caekenberghe 30 Jun '04

30 Jun '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv24480 Modified Files: index.html Log Message: added reference to common-lisp.net keyring Date: Wed Jun 30 12:12:23 2004 Author: scaekenberghe Index: public_html/index.html diff -u public_html/index.html:1.5 public_html/index.html:1.6 --- public_html/index.html:1.5 Fri Jun 11 06:25:04 2004 +++ public_html/index.html Wed Jun 30 12:12:23 2004 @@ -39,7 +39,8 @@ <h3>Download</h3> You can download the LLGPL source code and documentation as <a href="s-xml.tgz">s-xml.tgz</a> - (signature: <a href="s-xml.tgz.asc">s-xml.tgz.asc</a>) + (signature: <a href="s-xml.tgz.asc">s-xml.tgz.asc</a> for which the public key can be found + in the <a href="http://common-lisp.net/keyring.asc">common-lisp.net keyring</a>) (build and/or install with ASDF). There is also <a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/?cvsroot=s-xml">CVS</a> access. @@ -273,7 +274,7 @@ <li><a href="http://common-lisp.net/mailman/listinfo/s-xml-announce">S-XML-ANNOUNCE mailing list info</a></li> </ul> - CVS version $Id: index.html,v 1.5 2004/06/11 13:25:04 scaekenberghe Exp $ + CVS version $Id: index.html,v 1.6 2004/06/30 19:12:23 scaekenberghe Exp $ <div class="footer"> Back to <a href="http://common-lisp.net/">Common-lisp.net</a>.

1 0

[s-xml-cvs] CVS update: public_html/S-XML.html
by Sven Van Caekenberghe 30 Jun '04

30 Jun '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv14647 Modified Files: S-XML.html Log Message: updated API to new exports Date: Wed Jun 30 12:09:43 2004 Author: scaekenberghe Index: public_html/S-XML.html diff -u public_html/S-XML.html:1.1 public_html/S-XML.html:1.2 --- public_html/S-XML.html:1.1 Fri Jun 11 06:25:04 2004 +++ public_html/S-XML.html Wed Jun 30 12:09:43 2004 @@ -46,6 +46,15 @@ <blockquote>Generate XML output to a string from a DOM of input-type (:lxml by default), optionally pretty printing (off by default)</blockquote> (start-parse-xml stream &optional (state (make-instance (quote xml-parser-state))))   function <blockquote>Parse and return a toplevel XML element from stream, using parser state</blockquote> +(xml-element-attribute xml-element key)   function +<blockquote>Return the string value of the attribute with name the keyword :key + of xml-element if any, return null if not found</blockquote> +(setf (xml-element-attribute xml-element key) value)   function +<blockquote>Set the string value of the attribute with name the keyword :key of + xml-element, creating a new attribute if necessary or overwriting an + existing one, returning the value</blockquote> +(xml-element-attributes object)   function +<blockquote>Return the alist of attribute names and values dotted pairs from an xml-element struct</blockquote> (xml-element-children object)   function <blockquote>Return the list of children from an xml-element struct</blockquote> (xml-element-name object)   function

1 0

[s-xml-cvs] CVS update: s-xml/src/package.lisp
by Sven Van Caekenberghe 30 Jun '04

30 Jun '04

Update of /project/s-xml/cvsroot/s-xml/src In directory common-lisp.net:/tmp/cvs-serv11191/src Modified Files: package.lisp Log Message: added some exports (get-attribute[s]) Date: Wed Jun 30 12:09:07 2004 Author: scaekenberghe Index: s-xml/src/package.lisp diff -u s-xml/src/package.lisp:1.1.1.1 s-xml/src/package.lisp:1.2 --- s-xml/src/package.lisp:1.1.1.1 Mon Jun 7 11:49:57 2004 +++ s-xml/src/package.lisp Wed Jun 30 12:09:06 2004 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: package.lisp,v 1.1.1.1 2004/06/07 18:49:57 scaekenberghe Exp $ +;;;; $Id: package.lisp,v 1.2 2004/06/30 19:09:06 scaekenberghe Exp $ ;;;; ;;;; This is a Common Lisp implementation of a very basic XML parser. ;;;; The parser is non-validating and not at all complete (no CDATA). @@ -29,6 +29,7 @@ #:print-xml-dom #:print-xml #:print-xml-string ;; xml-element structure #:make-xml-element #:xml-element-children #:xml-element-name + #:xml-element-attribute #:xml-element-attributes #:xml-element-p #:new-xml-element #:first-xml-element-child) (:documentation "A simple XML parser with an efficient, purely functional, event-based interface as well as a DOM interface"))

1 0

[s-xml-cvs] CVS update: s-xml/Makefile
by Sven Van Caekenberghe 11 Jun '04

11 Jun '04

Update of /project/s-xml/cvsroot/s-xml In directory common-lisp.net:/tmp/cvs-serv8453 Modified Files: Makefile Log Message: added release target Date: Fri Jun 11 06:46:49 2004 Author: scaekenberghe Index: s-xml/Makefile diff -u s-xml/Makefile:1.1.1.1 s-xml/Makefile:1.2 --- s-xml/Makefile:1.1.1.1 Mon Jun 7 11:49:56 2004 +++ s-xml/Makefile Fri Jun 11 06:46:48 2004 @@ -1,3 +1,5 @@ +# $Id: Makefile,v 1.2 2004/06/11 13:46:48 scaekenberghe Exp $ + default: @echo Possible targets: @echo clean-openmcl --- remove all '*.dfsl' recursively @@ -16,3 +18,14 @@ clean: clean-openmcl clean-lw clean-emacs +# +# This can obviously only be done by a specific person in a very specific context ;-) +# + +release: + rm -rf /tmp/s-xml /tmp/public_html /tmp/s-xml.tgz /tmp/s-xml.tgz.asc + cd /tmp; cvs export -r HEAD s-xml; cvs export -r HEAD public_html + mv /tmp/public_html /tmp/s-xml/doc + cd /tmp; gnutar cvfz s-xml.tgz s-xml; gpg -a -b s-xml.tgz + scp /tmp/s-xml.tgz scaekenberghe@common-lisp.net:/project/s-xml/public_html + scp /tmp/s-xml.tgz.asc scaekenberghe@common-lisp.net:/project/s-xml/public_html

1 0

[s-xml-cvs] CVS update: public_html/S-XML.html public_html/index.html
by Sven Van Caekenberghe 11 Jun '04

11 Jun '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv9100 Modified Files: index.html Added Files: S-XML.html Log Message: added api and download Date: Fri Jun 11 06:25:04 2004 Author: scaekenberghe Index: public_html/index.html diff -u public_html/index.html:1.4 public_html/index.html:1.5 --- public_html/index.html:1.4 Fri Jun 11 05:43:53 2004 +++ public_html/index.html Fri Jun 11 06:25:04 2004 @@ -16,11 +16,6 @@ S-XML is a simple XML parser implemented in Common Lisp. - This project is starting up - and is currently available via <a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/?cvsroot=s-xml">CVS</a>. - - - This XML parser implementation has the following features: <ul> @@ -41,6 +36,20 @@ <li>It is not validating, even skips DTD's all together.</li> </ul> +<h3>Download</h3> + + You can download the LLGPL source code and documentation as <a href="s-xml.tgz">s-xml.tgz</a> + (signature: <a href="s-xml.tgz.asc">s-xml.tgz.asc</a>) + (build and/or install with ASDF). + There is also <a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/?cvsroot=s-xml">CVS</a> access. + + +<h3>API</h3> + + The plain API exported by the package S-XML (automatically generated by LispDoc) + is available in <a href="S-XML.html">S-XML.html</a>. + + <h3>XML Parser</h3> Using a DOM parser is easier, but usually less efficient: see the next sections. To use the event-based API of the parser, you call the function start-parse-xml on a stream, specifying 3 hook functions: @@ -264,7 +273,7 @@ <li><a href="http://common-lisp.net/mailman/listinfo/s-xml-announce">S-XML-ANNOUNCE mailing list info</a></li> </ul> - CVS version $Id: index.html,v 1.4 2004/06/11 12:43:53 scaekenberghe Exp $ + CVS version $Id: index.html,v 1.5 2004/06/11 13:25:04 scaekenberghe Exp $ <div class="footer"> Back to <a href="http://common-lisp.net/">Common-lisp.net</a>.

1 0

[s-xml-cvs] CVS update: public_html/index.html
by Sven Van Caekenberghe 11 Jun '04

11 Jun '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv17648 Modified Files: index.html Log Message: added reference to mailing lists Date: Fri Jun 11 05:43:53 2004 Author: scaekenberghe Index: public_html/index.html diff -u public_html/index.html:1.3 public_html/index.html:1.4 --- public_html/index.html:1.3 Fri Jun 11 04:15:34 2004 +++ public_html/index.html Fri Jun 11 05:43:53 2004 @@ -256,7 +256,15 @@ <li>release 0, end of 2002: as part of an XML-RPC implementation</li> </ul> - CVS version $Id: index.html,v 1.3 2004/06/11 11:15:34 scaekenberghe Exp $ +<h3>Mailing Lists</h3> + +<ul> + <li><a href="http://common-lisp.net/mailman/listinfo/s-xml-cvs">S-XML-CVS mailing list info</a></li> + <li><a href="http://common-lisp.net/mailman/listinfo/s-xml-devel">S-XML-DEVEL mailing list info</a></li> + <li><a href="http://common-lisp.net/mailman/listinfo/s-xml-announce">S-XML-ANNOUNCE mailing list info</a></li> +</ul> + + CVS version $Id: index.html,v 1.4 2004/06/11 12:43:53 scaekenberghe Exp $ <div class="footer"> Back to <a href="http://common-lisp.net/">Common-lisp.net</a>.

1 0

[s-xml-cvs] CVS update: public_html/index.html
by Sven Van Caekenberghe 11 Jun '04

11 Jun '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv8363 Modified Files: index.html Log Message: reworked the example(s) section with better and more code added release history section Date: Fri Jun 11 04:15:34 2004 Author: scaekenberghe Index: public_html/index.html diff -u public_html/index.html:1.2 public_html/index.html:1.3 --- public_html/index.html:1.2 Tue Jun 8 01:23:18 2004 +++ public_html/index.html Fri Jun 11 04:15:34 2004 @@ -46,32 +46,160 @@ Using a DOM parser is easier, but usually less efficient: see the next sections. To use the event-based API of the parser, you call the function start-parse-xml on a stream, specifying 3 hook functions: <ul> - <li>new-element-hook <tt>(name attributes seed) => seed</tt> Called when the parser enters a new element. The name of the element (tag) and the attributes (an unordered dotted pair list of attribute names as keywords and attribute values as strings) of the element are passed in, as well as the seed from the parent or from the last encountered sibling. The hook must return a new seed value to be used for the next sibling.</li> - <li>finish-element-hook <tt>(name attributes parent-seed seed) => seed</tt> Called when the parser leaves an element. The name of the element (tag) and the attributes (an unordered dotted pair list of attribute names as keywords and attribute values as strings) of the element are passed in, as well as the parent-seed directly from the parent, as well as the seed from the parent or from the last encountered sibling. The hook must return a new seed value as result to passed to the parent.</li> - <li>text-hook <tt>(string seed) => seed</tt> Called when the parser finds text as contents. The string of the text encountered is passed in, as well as the seed from the parent or from the last encountered sibling. The hook must return a new seed value to be used for the next sibling or as result passed to the parent.</li> + <li>new-element-hook <tt>(name attributes seed) => seed</tt> + Called when the parser enters a new element. + The name of the element (tag) and the attributes (an unordered dotted pair list of attribute names as keywords + and attribute values as strings) of the element are passed in, + as well as the seed from the previous element (either the last encountered sibling or the parent). + The hook must return a seed value to be passed to the first child element + or directly to finish-element-hook (when there are no children).</li> + <li>finish-element-hook <tt>(name attributes parent-seed seed) => seed</tt> + Called when the parser leaves an element. + The name of the element (tag) and the attributes (an unordered dotted pair list of attribute names as keywords + and attribute values as strings) of the element are passed in, + as well as the parent-seed, the seed passed to us when this element started, + i.e. passed to our corresponding new-element-hook, + as well as the seed from the previous element (either the last encountered sibling or the parent). + The hook must return the final seed value for this element + to be passed to the next sibling or to the parent (when there are no more children).</li> + <li>text-hook <tt>(string seed) => seed</tt> + Called when the parser finds text as contents. + The string of the text encountered is passed in, as well as the seed from the previous element + (either the last encountered sibling or the parent). + The hook must return the final seed value for this element + to be passed to the next sibling or to the parent (when there are no more children).</li> </ul> - As an example, consider the next function that will echo an XML input stream to an output stream: - -<pre>(defun echo-xml (in out) - (start-parse-xml - in - (make-instance 'xml-parser-state - :new-element-hook #'(lambda (name attributes seed) - (declare (ignore seed)) - (format out "<~a~:{ ~a='~a'~}>" - name - (mapcar #'(lambda (p) (list (car p) (cdr p))) - attributes))) - :finish-element-hook #'(lambda (name attributes parent-seed seed) - (declare (ignore attributes parent-seed seed)) - (format out "</~a>" name)) - :text-hook #'(lambda (string seed) - (declare (ignore seed)) - (princ string out)))))</pre> - - The seed parameters and return values are not used here. As a simplification, we just print text and attribute values, in real code we would have to use print-xml-string to properly escape special characters. Have a look at the implementations of the different DOM representations, as well as the XML-RPC code and the CLOS serialization code elsewhere for more real-world examples. + As an example, consider the following tracer that shows how the different hooks are called: +<pre>(defun trace-xml-new-element-hook (name attributes seed) + (let ((new-seed (cons (1+ (car seed)) (1+ (cdr seed))))) + (trace-xml-log (car seed) + "(new-element :name ~s :attributes ~:[()~;~:*~s~] :seed ~s) => ~s" + name attributes seed new-seed) + new-seed)) + +(defun trace-xml-finish-element-hook (name attributes parent-seed seed) + (let ((new-seed (cons (1- (car seed)) (1+ (cdr seed))))) + (trace-xml-log (car parent-seed) + "(finish-element :name ~s :attributes ~:[()~;~:*~s~] :parent-seed ~s :seed ~s) => ~s" + name attributes parent-seed seed new-seed) + new-seed)) + +(defun trace-xml-text-hook (string seed) + (let ((new-seed (cons (car seed) (1+ (cdr seed))))) + (trace-xml-log (car seed) + "(text :string ~s :seed ~s) => ~s" + string seed new-seed) + new-seed)) + +(defun trace-xml (in) + "Parse and trace a toplevel XML element from stream in" + (start-parse-xml in + (make-instance 'xml-parser-state + :seed (cons 0 0) + ;; seed car is xml element nesting level + ;; seed cdr is ever increasing from element to element + :new-element-hook #'trace-xml-new-element-hook + :finish-element-hook #'trace-xml-finish-element-hook + :text-hook #'trace-xml-text-hook)))</pre> + + This is the output of the tracer on two small XML documents, the seed is a CONS that keeps track of the nesting level in its CAR and of its flow through the hooks with an ever increasing number is its CDR: + +<pre>S-XML 31 > (with-input-from-string (in "<FOO X='10' Y='20'>Text<BAR/><H1><H2></H2></H1></FOO>") (trace-xml in)) +(new-element :name :FOO :attributes ((:Y . "20") (:X . "10")) :seed (0 . 0)) => (1 . 1) + (new-element :name :P :attributes () :seed (1 . 1)) => (2 . 2) + (text :string "Text" :seed (2 . 2)) => (2 . 3) + (finish-element :name :P :attributes () :parent-seed (1 . 1) :seed (2 . 3)) => (1 . 4) + (new-element :name :BAR :attributes () :seed (1 . 4)) => (2 . 5) + (finish-element :name :BAR :attributes () :parent-seed (1 . 4) :seed (2 . 5)) => (1 . 6) + (new-element :name :H1 :attributes () :seed (1 . 6)) => (2 . 7) + (new-element :name :H2 :attributes () :seed (2 . 7)) => (3 . 8) + (finish-element :name :H2 :attributes () :parent-seed (2 . 7) :seed (3 . 8)) => (2 . 9) + (finish-element :name :H1 :attributes () :parent-seed (1 . 6) :seed (2 . 9)) => (1 . 10) +(finish-element :name :FOO :attributes ((:Y . "20") (:X . "10")) :parent-seed (0 . 0) :seed (1 . 10)) => (0 . 11) +(0 . 11) + +S-XML 32 > (with-input-from-string (in "<FOO><UL><LI>1</LI><LI>2</LI><LI>3</LI></UL></FOO>") (trace-xml in)) +(new-element :name :FOO :attributes () :seed (0 . 0)) => (1 . 1) + (new-element :name :UL :attributes () :seed (1 . 1)) => (2 . 2) + (new-element :name :LI :attributes () :seed (2 . 2)) => (3 . 3) + (text :string "1" :seed (3 . 3)) => (3 . 4) + (finish-element :name :LI :attributes () :parent-seed (2 . 2) :seed (3 . 4)) => (2 . 5) + (new-element :name :LI :attributes () :seed (2 . 5)) => (3 . 6) + (text :string "2" :seed (3 . 6)) => (3 . 7) + (finish-element :name :LI :attributes () :parent-seed (2 . 5) :seed (3 . 7)) => (2 . 8) + (new-element :name :LI :attributes () :seed (2 . 8)) => (3 . 9) + (text :string "3" :seed (3 . 9)) => (3 . 10) + (finish-element :name :LI :attributes () :parent-seed (2 . 8) :seed (3 . 10)) => (2 . 11) + (finish-element :name :UL :attributes () :parent-seed (1 . 1) :seed (2 . 11)) => (1 . 12) +(finish-element :name :FOO :attributes () :parent-seed (0 . 0) :seed (1 . 12)) => (0 . 13) +(0 . 13)</pre> + + The following example counts tags, attributes and characters: + +<pre>(defclass count-xml-seed () + ((elements :initform 0) + (attributes :initform 0) + (characters :initform 0))) + +(defun count-xml-new-element-hook (name attributes seed) + (declare (ignore name)) + (incf (slot-value seed 'elements)) + (incf (slot-value seed 'attributes) (length attributes)) + seed) + +(defun count-xml-text-hook (string seed) + (incf (slot-value seed 'characters) (length string)) + seed) + +(defun count-xml (in) + "Parse a toplevel XML element from stream in, counting elements, attributes and characters" + (start-parse-xml in + (make-instance 'xml-parser-state + :seed (make-instance 'count-xml-seed) + :new-element-hook #'count-xml-new-element-hook + :text-hook #'count-xml-text-hook))) + +(defun count-xml-file (pathname) + "Parse XMl from the file at pathname, counting elements, attributes and characters" + (with-open-file (in pathname) + (let ((result (count-xml in))) + (with-slots (elements attributes characters) result + (format t + "~a contains ~d XML elements, ~d attributes and ~d characters.~%" + pathname elements attributes characters)))))</pre> + + This example removes XML markup: + +<pre>(defun remove-xml-markup (in) + (let* ((state (make-instance 'xml-parser-state + :text-hook #'(lambda (string seed) (cons string seed)))) + (result (start-parse-xml in state))) + (apply #'concatenate 'string (nreverse result))))</pre> + + The next example is from the xml-element struct DOM implementation, where the SSAX parser hook functions are building the actual DOM: + +<pre>(defun standard-new-element-hook (name attributes seed) + (declare (ignore name attributes seed)) + '()) + +(defun standard-finish-element-hook (name attributes parent-seed seed) + (let ((xml-element (make-xml-element :name name + :attributes attributes + :children (nreverse seed)))) + (cons xml-element parent-seed))) + +(defun standard-text-hook (string seed) + (cons string seed)) + +(defmethod parse-xml-dom (stream (output-type (eql :xml-struct))) + (car (start-parse-xml stream + (make-instance 'xml-parser-state + :new-element-hook #'standard-new-element-hook + :finish-element-hook #'standard-finish-element-hook + :text-hook #'standard-text-hook)))) +</pre> The parse state can be used to specify the initial seed value (nil by default), and the set of known entities (the 5 standard entities (lt, gt, amp, qout, apos) and nbps by default). @@ -118,7 +246,17 @@ Tag and attribute names are converted to keywords. Note that XML is case-sensitive, hence the fact that Common Lisp has to resort to the special literal symbol syntax. - CVS version $Id: index.html,v 1.2 2004/06/08 08:23:18 scaekenberghe Exp $ +<h3>Release History</h3> + +<ul> + <li>today: project moved to common-lisp.net, renamed to s-xml, added examples counter, tracer and remove-markup, improved documentation</li> + <li>release 3, Januari 13, 2004: added ASDF systems, optimized print-string-xml</li> + <li>release 2, June 10, 2003: added echo-xml function, we are no longer taking the car when the last seed is returned from start-parse-xml</li> + <li>release 1, May 25, 2003: first public release of working code, tested on <a href="http://openmcl.clozure.com/">OpenMCL</a>, rewritten to be event-based, to improve efficiency and to optionally use different DOM representations, more documentation</li> + <li>release 0, end of 2002: as part of an XML-RPC implementation</li> +</ul> + + CVS version $Id: index.html,v 1.3 2004/06/11 11:15:34 scaekenberghe Exp $ <div class="footer"> Back to <a href="http://common-lisp.net/">Common-lisp.net</a>.

1 0

[s-xml-cvs] CVS update: s-xml/test/remove-markup.lisp s-xml/test/counter.lisp s-xml/test/tracer.lisp
by Sven Van Caekenberghe 11 Jun '04

11 Jun '04

Update of /project/s-xml/cvsroot/s-xml/test In directory common-lisp.net:/tmp/cvs-serv8028/test Modified Files: counter.lisp tracer.lisp Added Files: remove-markup.lisp Log Message: further cleanup of examples and hook documentation Date: Fri Jun 11 04:14:43 2004 Author: scaekenberghe Index: s-xml/test/counter.lisp diff -u s-xml/test/counter.lisp:1.1.1.1 s-xml/test/counter.lisp:1.2 --- s-xml/test/counter.lisp:1.1.1.1 Mon Jun 7 11:49:59 2004 +++ s-xml/test/counter.lisp Fri Jun 11 04:14:43 2004 @@ -1,8 +1,8 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: counter.lisp,v 1.1.1.1 2004/06/07 18:49:59 scaekenberghe Exp $ +;;;; $Id: counter.lisp,v 1.2 2004/06/11 11:14:43 scaekenberghe Exp $ ;;;; -;;;; A simple SAX counter example that can be used as a performance test +;;;; A simple SSAX counter example that can be used as a performance test ;;;; ;;;; Copyright (C) 2004 Sven Van Caekenberghe, Beta Nine BVBA. ;;;; @@ -41,7 +41,7 @@ (let ((result (count-xml in))) (with-slots (elements attributes characters) result (format t - "~a countains ~d XML elements, ~d attributes and ~d characters.~%" + "~a contains ~d XML elements, ~d attributes and ~d characters.~%" pathname elements attributes characters))))) ;;;; eof Index: s-xml/test/tracer.lisp diff -u s-xml/test/tracer.lisp:1.1 s-xml/test/tracer.lisp:1.2 --- s-xml/test/tracer.lisp:1.1 Fri Jun 11 01:20:58 2004 +++ s-xml/test/tracer.lisp Fri Jun 11 04:14:43 2004 @@ -1,8 +1,8 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: tracer.lisp,v 1.1 2004/06/11 08:20:58 scaekenberghe Exp $ +;;;; $Id: tracer.lisp,v 1.2 2004/06/11 11:14:43 scaekenberghe Exp $ ;;;; -;;;; A simple SAX tracer example that can be used to understand how the hooks are called +;;;; A simple SSAX tracer example that can be used to understand how the hooks are called ;;;; ;;;; Copyright (C) 2004 Sven Van Caekenberghe, Beta Nine BVBA. ;;;; @@ -18,28 +18,33 @@ (terpri *standard-output*)) (defun trace-xml-new-element-hook (name attributes seed) - (trace-xml-log (car seed) - "(new-element :name ~s :attributes ~:[()~;~:*s~] :seed ~s)" - name attributes seed) - (cons (1+ (car seed)) (1+ (cdr seed)))) + (let ((new-seed (cons (1+ (car seed)) (1+ (cdr seed))))) + (trace-xml-log (car seed) + "(new-element :name ~s :attributes ~:[()~;~:*~s~] :seed ~s) => ~s" + name attributes seed new-seed) + new-seed)) (defun trace-xml-finish-element-hook (name attributes parent-seed seed) - (trace-xml-log (car parent-seed) - "(finish-element :name ~s :attributes ~:[()~;~:*s~] :parent-seed ~s :seed ~s)" - name attributes parent-seed seed) - (cons (1- (car seed)) (1+ (cdr seed)))) + (let ((new-seed (cons (1- (car seed)) (1+ (cdr seed))))) + (trace-xml-log (car parent-seed) + "(finish-element :name ~s :attributes ~:[()~;~:*~s~] :parent-seed ~s :seed ~s) => ~s" + name attributes parent-seed seed new-seed) + new-seed)) (defun trace-xml-text-hook (string seed) - (trace-xml-log (car seed) - "(text :string ~s :seed ~s)" - string seed) - seed) + (let ((new-seed (cons (car seed) (1+ (cdr seed))))) + (trace-xml-log (car seed) + "(text :string ~s :seed ~s) => ~s" + string seed new-seed) + new-seed)) (defun trace-xml (in) "Parse and trace a toplevel XML element from stream in" (start-parse-xml in (make-instance 'xml-parser-state - :seed (cons 0 0) + :seed (cons 0 0) + ;; seed car is xml element nesting level + ;; seed cdr is ever increasing from element to element :new-element-hook #'trace-xml-new-element-hook :finish-element-hook #'trace-xml-finish-element-hook :text-hook #'trace-xml-text-hook)))

1 0

[s-xml-cvs] CVS update: s-xml/src/xml.lisp
by Sven Van Caekenberghe 11 Jun '04

11 Jun '04

Update of /project/s-xml/cvsroot/s-xml/src In directory common-lisp.net:/tmp/cvs-serv8028/src Modified Files: xml.lisp Log Message: further cleanup of examples and hook documentation Date: Fri Jun 11 04:14:42 2004 Author: scaekenberghe Index: s-xml/src/xml.lisp diff -u s-xml/src/xml.lisp:1.2 s-xml/src/xml.lisp:1.3 --- s-xml/src/xml.lisp:1.2 Fri Jun 11 01:22:47 2004 +++ s-xml/src/xml.lisp Fri Jun 11 04:14:42 2004 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xml.lisp,v 1.2 2004/06/11 08:22:47 scaekenberghe Exp $ +;;;; $Id: xml.lisp,v 1.3 2004/06/11 11:14:42 scaekenberghe Exp $ ;;;; ;;;; This is a Common Lisp implementation of a very basic XML parser. ;;;; The parser is non-validating and not at all complete (no CDATA). @@ -151,9 +151,10 @@ :accessor get-mini-buffer :initform (make-extendable-string)) (new-element-hook :documentation "Called when new element starts" - ;; Handle a new xml element with name and attributes, - ;; receiving seed from parent if any or top level - ;; return seed to be used for children/contents" + ;; Handle the start of a new xml element with name and attributes, + ;; receiving seed from previous element (sibling or parent) + ;; return seed to be used for first child (content) + ;; or directly to finish-element-hook :accessor get-new-element-hook :initarg :new-element-hook :initform #'(lambda (name attributes seed) @@ -161,17 +162,20 @@ seed)) (finish-element-hook :documentation "Called when element ends" ;; Handle the end of an xml element with name and attributes, - ;; receiving the seed that was passed by our parent, - ;; receiving seed from last child/contents - ;; return final seed for this element + ;; receiving parent-seed, the seed passed to us when this element started, + ;; i.e. passed to our corresponding new-element-hook + ;; and receiving seed from last child (content) + ;; or directly from new-element-hook + ;; return final seed for this element to next element (sibling or parent) :accessor get-finish-element-hook :initarg :finish-element-hook :initform #'(lambda (name attributes parent-seed seed) (declare (ignore name attributes parent-seed)) seed)) (text-hook :documentation "Called when text is found" - ;; Handle text in string, found as child/contents, - ;; receiving seed from parent element, return final seed for this element + ;; Handle text in string, found as contents, + ;; receiving seed from previous element (sibling or parent), + ;; return final seed for this element to next element (sibling or parent) :accessor get-text-hook :initarg :text-hook :initform #'(lambda (string seed)

1 0

[s-xml-cvs] CVS update: s-xml/src/xml.lisp
by Sven Van Caekenberghe 11 Jun '04

11 Jun '04

Update of /project/s-xml/cvsroot/s-xml/src In directory common-lisp.net:/tmp/cvs-serv23378/src Modified Files: xml.lisp Log Message: changed hook function comments Date: Fri Jun 11 01:22:47 2004 Author: scaekenberghe Index: s-xml/src/xml.lisp diff -u s-xml/src/xml.lisp:1.1.1.1 s-xml/src/xml.lisp:1.2 --- s-xml/src/xml.lisp:1.1.1.1 Mon Jun 7 11:49:58 2004 +++ s-xml/src/xml.lisp Fri Jun 11 01:22:47 2004 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xml.lisp,v 1.1.1.1 2004/06/07 18:49:58 scaekenberghe Exp $ +;;;; $Id: xml.lisp,v 1.2 2004/06/11 08:22:47 scaekenberghe Exp $ ;;;; ;;;; This is a Common Lisp implementation of a very basic XML parser. ;;;; The parser is non-validating and not at all complete (no CDATA). @@ -161,9 +161,9 @@ seed)) (finish-element-hook :documentation "Called when element ends" ;; Handle the end of an xml element with name and attributes, - ;; receiving the seed that was passed to our parent, - ;; receiving seed from last child/contents (or from new-level-hook for empty tags), - ;; return final seed for this element to higher levels + ;; receiving the seed that was passed by our parent, + ;; receiving seed from last child/contents + ;; return final seed for this element :accessor get-finish-element-hook :initarg :finish-element-hook :initform #'(lambda (name attributes parent-seed seed) @@ -171,7 +171,7 @@ seed)) (text-hook :documentation "Called when text is found" ;; Handle text in string, found as child/contents, - ;; receiving seed from parent element, return seed" + ;; receiving seed from parent element, return final seed for this element :accessor get-text-hook :initarg :text-hook :initform #'(lambda (string seed)

1 0