From dlichteblau at common-lisp.net  Wed Apr  6 19:23:20 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed,  6 Apr 2005 21:23:20 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/dom/dom-impl.lisp 
Message-ID: <20050406192320.A834D18C6F5@common-lisp.net>

Update of /project/cxml/cvsroot/cxml/dom
In directory common-lisp.net:/tmp/cvs-serv9153/dom

Modified Files:
	dom-impl.lisp 
Log Message:
documents returned by (dom:create-document) don't a have dtd, so don't try to
default attribute values

Date: Wed Apr  6 21:23:18 2005
Author: dlichteblau

Index: cxml/dom/dom-impl.lisp
diff -u cxml/dom/dom-impl.lisp:1.2 cxml/dom/dom-impl.lisp:1.3
--- cxml/dom/dom-impl.lisp:1.2	Fri Mar 25 19:16:30 2005
+++ cxml/dom/dom-impl.lisp	Wed Apr  6 21:23:18 2005
@@ -781,14 +781,14 @@
 
 (defun maybe-add-default-attribute (element name)
   (let* ((dtd (dtd (slot-value element 'owner)))
-         (e (cxml::find-element (dom:tag-name element) dtd))
+         (e (when dtd (cxml::find-element (dom:tag-name element) dtd)))
          (a (when e (cxml::find-attribute e name))))
     (when (and a (listp (cxml::attdef-default a)))
       (add-default-attribute element a))))
 
 (defun add-default-attributes (element)
   (let* ((dtd (dtd (slot-value element 'owner)))
-         (e (cxml::find-element (dom:tag-name element) dtd)))
+         (e (when dtd (cxml::find-element (dom:tag-name element) dtd))))
     (when e
       (dolist (a (cxml::elmdef-attributes e))
         (when (and a (listp (cxml::attdef-default a)))



From dlichteblau at common-lisp.net  Wed Apr  6 19:23:54 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed,  6 Apr 2005 21:23:54 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/xml/xml-parse.lisp 
Message-ID: <20050406192354.0EAC218C6F5@common-lisp.net>

Update of /project/cxml/cvsroot/cxml/xml
In directory common-lisp.net:/tmp/cvs-serv9188/xml

Modified Files:
	xml-parse.lisp 
Log Message:
- in p/document, check types of user-supplied arguments for better error 
  messages
- documents parsed from octet vectors don't have a base sysid, so don't try
  to merge it into  sysids referenced in such documents 

Date: Wed Apr  6 21:23:53 2005
Author: dlichteblau

Index: cxml/xml/xml-parse.lisp
diff -u cxml/xml/xml-parse.lisp:1.2 cxml/xml/xml-parse.lisp:1.3
--- cxml/xml/xml-parse.lisp:1.2	Fri Mar 25 19:17:35 2005
+++ cxml/xml/xml-parse.lisp	Wed Apr  6 21:23:53 2005
@@ -828,14 +828,14 @@
 (defstruct (internal-entdef
             (:include entdef)
             (:constructor make-internal-entdef (value))
-            (:conc-name #:ENTDEF-))
+            (:conc-name #:entdef-))
   (value (error "missing argument") :type rod)
   (expansion nil))
 
 (defstruct (external-entdef
             (:include entdef)
             (:constructor make-external-entdef (extid ndata))
-            (:conc-name #:ENTDEF-))
+            (:conc-name #:entdef-))
   (extid (error "missing argument") :type extid)
   (ndata nil :type (or rod null)))
 
@@ -875,8 +875,10 @@
 
 (defun absolute-uri (sysid source-stream)
   (let ((base-sysid (zstream-base-sysid source-stream)))
-    (assert (not (null base-sysid)))
-    (puri:merge-uris sysid base-sysid)))
+    ;; XXX is the IF correct?
+    (if base-sysid
+        (puri:merge-uris sysid base-sysid)
+        sysid)))
 
 (defstruct (extid (:constructor make-extid (public system)))
   (public nil :type (or rod null))
@@ -2533,10 +2535,16 @@
          (car (nth-value 1 (peek-token input)))
          (cdr (nth-value 1 (peek-token input))))))
     (consume-token input)))
-  
+
 (defun p/document
     (input handler
      &key validate dtd root entity-resolver disallow-internal-subset)
+  ;; check types of user-supplied arguments for better error messages:
+  (check-type validate boolean)
+  (check-type dtd (or null extid))
+  (check-type root (or null rod))
+  (check-type entity-resolver (or null function symbol))
+  (check-type disallow-internal-subset boolean)
   (let ((*ctx*
          (make-context :handler handler
                        :entity-resolver entity-resolver



From dlichteblau at common-lisp.net  Wed Apr  6 19:25:19 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed,  6 Apr 2005 21:25:19 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/mlisp-patch.diff 
Message-ID: <20050406192519.497DB18C6F5@common-lisp.net>

Update of /project/cxml/cvsroot/cxml
In directory common-lisp.net:/tmp/cvs-serv9227

Modified Files:
	mlisp-patch.diff 
Log Message:
updated mlisp-patch.diff

Date: Wed Apr  6 21:25:18 2005
Author: dlichteblau

Index: cxml/mlisp-patch.diff
diff -u cxml/mlisp-patch.diff:1.1.1.4 cxml/mlisp-patch.diff:1.2
--- cxml/mlisp-patch.diff:1.1.1.4	Sun Mar 13 19:02:31 2005
+++ cxml/mlisp-patch.diff	Wed Apr  6 21:25:18 2005
@@ -1,44 +1,5 @@
-* looking for david at knowledgetools.de--cxml/cxml--devel--1.0--patch-194 to compare with
-* comparing to david at knowledgetools.de--cxml/cxml--devel--1.0--patch-194
-M  xml/xml-name-rune-p.lisp
-M  xml/xml-parse.lisp
-
-* modified files
-
---- orig/xml/xml-name-rune-p.lisp
-+++ mod/xml/xml-name-rune-p.lisp
-@@ -206,15 +206,15 @@
-                      (setf (aref r i) 1))))) )
- 
-           `(progn
--             (DEFSUBST NAME-RUNE-P (RUNE)
--               (SETF RUNE (RUNE-CODE RUNE))
--               (AND (<= 0 RUNE ,*max*)
--                    (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3)))
--                             (= 1 (SBIT ',(predicate-to-bv #'name-rune-p)
--                                        (THE FIXNUM RUNE))))))
--             (DEFSUBST NAME-START-RUNE-P (RUNE)
--               (SETF RUNE (RUNE-CODE RUNE))
--               (AND (<= 0 RUNE ,*MAX*)
--                    (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3)))
--                             (= 1 (SBIT ',(predicate-to-bv #'name-start-rune-p)
--                                        (THE FIXNUM RUNE)))))))) ))))
-+             (defsubst name-rune-p (rune)
-+               (setf rune (rune-code rune))
-+               (and (<= 0 rune ,*max*)
-+                    (locally (declare (optimize (safety 0) (speed 3)))
-+                             (= 1 (sbit ',(predicate-to-bv #'name-rune-p)
-+                                        (the fixnum rune))))))
-+             (defsubst name-start-rune-p (rune)
-+               (setf rune (rune-code rune))
-+               (and (<= 0 rune ,*max*)
-+                    (locally (declare (optimize (safety 0) (speed 3)))
-+                             (= 1 (sbit ',(predicate-to-bv #'name-start-rune-p)
-+                                        (the fixnum rune)))))))) ))))
-
-
---- orig/xml/xml-parse.lisp
-+++ mod/xml/xml-parse.lisp
+--- xml/xml-parse.lisp
++++ xml/xml-parse.lisp
 @@ -2497,20 +2497,20 @@
    (let ((input-var (gensym))
          (collect (gensym))
@@ -74,3 +35,34 @@
 
 
 
+Index: xml/xml-name-rune-p.lisp
+===================================================================
+RCS file: /project/cxml/cvsroot/cxml/xml/xml-name-rune-p.lisp,v
+retrieving revision 1.2
+diff -r1.2 xml-name-rune-p.lisp
+214,225c214,225
+<              (DEFINLINE NAME-RUNE-P (RUNE)
+<                (SETF RUNE (RUNE-CODE RUNE))
+<                (AND (<= 0 RUNE ,*max*)
+<                     (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3)))
+<                              (= 1 (SBIT ',(predicate-to-bv #'name-rune-p)
+<                                         (THE FIXNUM RUNE))))))
+<              (DEFINLINE NAME-START-RUNE-P (RUNE)
+<                (SETF RUNE (RUNE-CODE RUNE))
+<                (AND (<= 0 RUNE ,*MAX*)
+<                     (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3)))
+<                              (= 1 (SBIT ',(predicate-to-bv #'name-start-rune-p)
+<                                         (THE FIXNUM RUNE)))))))) ))))
+---
+>              (definline name-rune-p (rune)
+>                (setf rune (rune-code rune))
+>                (and (<= 0 rune ,*max*)
+>                     (locally (declare (optimize (safety 0) (speed 3)))
+>                              (= 1 (sbit ',(predicate-to-bv #'name-rune-p)
+>                                         (the fixnum rune))))))
+>              (definline name-start-rune-p (rune)
+>                (setf rune (rune-code rune))
+>                (and (<= 0 rune ,*max*)
+>                     (locally (declare (optimize (safety 0) (speed 3)))
+>                              (= 1 (sbit ',(predicate-to-bv #'name-start-rune-p)
+>                                         (the fixnum rune)))))))) ))))



From dlichteblau at common-lisp.net  Wed Apr  6 21:14:42 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed,  6 Apr 2005 23:14:42 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/test/domtest.lisp 
Message-ID: <20050406211442.932C718C6F5@common-lisp.net>

Update of /project/cxml/cvsroot/cxml/test
In directory common-lisp.net:/tmp/cvs-serv15147/test

Modified Files:
	domtest.lisp 
Log Message:
update DOM test suite driver

Date: Wed Apr  6 23:14:41 2005
Author: dlichteblau

Index: cxml/test/domtest.lisp
diff -u cxml/test/domtest.lisp:1.1.1.14 cxml/test/domtest.lisp:1.2
--- cxml/test/domtest.lisp:1.1.1.14	Sun Mar 13 19:02:51 2005
+++ cxml/test/domtest.lisp	Wed Apr  6 23:14:41 2005
@@ -192,6 +192,7 @@
 (defun translate-condition (element)
   (string-case (tag-name element)
     ("equals" (translate-equals element))
+    ("notEquals" (translate-not-equals element))
     ("contentType" (translate-content-type element))
     ("hasFeature" (translate-has-feature element))
     ("implementationAttribute" (assert-have-implementation-attribute element))
@@ -200,6 +201,7 @@
     ("notNull" (translate-not-null element))
     ("or" (translate-or element))
     ("same" (translate-same element))
+    ("less" (translate-less element))
     (t (error "unknown condition: ~A" element))))
 
 (defun equalsp (a b test)
@@ -223,10 +225,17 @@
               ,(parse-java-literal |expected|)
               ',(if (parse-java-literal |ignoreCase|) '%equal '%equal))))
 
+(defun translate-not-equals (element)
+  `(not ,(translate-equals element)))
+
 (defun translate-same (element)
   (with-attributes (|actual| |expected|) element
     `(eql ,(%intern |actual|) ,(parse-java-literal |expected|))))
 
+(defun translate-less (element)
+  (with-attributes (|actual| |expected|) element
+    `(< ,(%intern |actual|) ,(parse-java-literal |expected|))))
+
 (defun translate-or (element)
   `(or ,@(map-child-elements 'list #'translate-condition element)))
 
@@ -317,6 +326,7 @@
     ("assertTrue"	(translate-assert-true element))
     ("assertFalse"	(translate-assert-false element))
     ("assertURIEquals"	(translate-assert-uri-equals element))
+    ("assign"		(translate-assign element))
     ("for-each"		(translate-for-each element))
     ("fail"		(translate-fail element))
     ("hasFeature" (translate-has-feature element))
@@ -337,6 +347,10 @@
                 `(,fn ,(parse-java-literal |op1|)
                       ,(parse-java-literal |op2|)))))
 
+(defun translate-assign (element)
+  (with-attributes (|var| |value|) element
+    (maybe-setf (%intern |var|) (parse-java-literal |value|))))
+
 (defun translate-unary-assignment (fn element)
   (with-attributes (|var| |value|) element
     (maybe-setf (%intern |var|)
@@ -599,7 +613,8 @@
     document))
 
 (defparameter *bad-tests*
-    '("hc_elementnormalize2.xml" "hc_nodereplacechildnewchildexists.xml"))
+    '("hc_nodereplacechildnewchildexists.xml"
+      "characterdatadeletedatanomodificationallowederr.xml"))
 
 (defun run-all-tests (*directory* &optional verbose)
   (let* ((cxml::*redefinition-warning* nil)
@@ -613,13 +628,15 @@
          (nfailed 0))
     (do-child-elements (member suite)
       (unless
-          (member (runes:rod-string (dom:get-attribute member "href"))
-                  *bad-tests*
-                  :test 'equal)
+          (or (equal (dom:tag-name member) "metadata")
+              (member (runes:rod-string (dom:get-attribute member "href"))
+                      *bad-tests*
+                      :test 'equal))
         (incf n)))
     (do-child-elements (member suite)
       (let ((href (runes:rod-string (dom:get-attribute member "href"))))
-        (unless (member href *bad-tests* :test 'equal)
+        (unless (or (equal (dom:tag-name member) "metadata")
+                    (member href *bad-tests* :test 'equal))
           (format t "~&~D/~D ~A~%" i n href)
           (let ((lisp (slurp-test (merge-pathnames href test-directory))))
             (when verbose



From dlichteblau at common-lisp.net  Wed Apr  6 21:14:42 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed,  6 Apr 2005 23:14:42 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/README.html 
Message-ID: <20050406211442.CB6FE18C6F6@common-lisp.net>

Update of /project/cxml/cvsroot/cxml
In directory common-lisp.net:/tmp/cvs-serv15147

Modified Files:
	README.html 
Log Message:
update DOM test suite driver

Date: Wed Apr  6 23:14:41 2005
Author: dlichteblau

Index: cxml/README.html
diff -u cxml/README.html:1.1.1.80 cxml/README.html:1.2
--- cxml/README.html:1.1.1.80	Sun Mar 13 19:02:58 2005
+++ cxml/README.html	Wed Apr  6 23:14:41 2005
@@ -57,22 +57,28 @@
 
     <p>
       Send bug reports to <a
-      href="mailto:david at lichteblau.com">david at lichteblau.com</a>.
+      href="mailto:cxml-devel at common-lisp.net">cxml-devel at common-lisp.net</a>
+      (<a
+      href="http://common-lisp.net/cgi-bin/mailman/listinfo/cxml-devel">list
+      information</a>).
     </p>
 
     <h2>Download</h2>
+    <ul>
+      <li>
+        <a href="http://common-lisp.net/project/cxml/download/">tarballs</a>
+      </li>
+    <li>
+      Anoncvs (<a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/cxml/?cvsroot=cxml">browse</a>):
+      <pre>$ export CVSROOT=:pserver:anonymous at common-lisp.net:/project/cxml/cvsroot
+$ cvs login
+Logging in to :pserver:anonymous at common-lisp.net:2401/project/cxml/cvsroot
+CVS password: anonymous
+$ cvs co cxml</pre>
+      </lii>
+    </ul>
     <p>
-      Get a <a href="http://common-lisp.net/project/cxml/download/">tarball</a>.
-    </p>
-    <p>
-      David's tla archive is at <a
-      href="http://common-lisp.net/project/cxml/david at knowledgetools.de--cxml/">http://common-lisp.net/project/cxml/david at knowledgetools.de--cxml/</a>.
-      (Brief tla usage instructions: Unpack the cxml tarball.&nbsp;
-      Enter <tt>tla register-archive URL</tt> to turn it into a working
-      copy.&nbsp; <tt>tla update</tt> is similar to <tt>cvs up</tt>.)
-      Note that this used to
-      be <tt><strike>www.</strike>common-lisp.net</tt> and is
-      now just <tt>common-lisp.net</tt>.
+      (David's tla archive is out of date.)
     </p>
 
     <h1>Contents</h1>
@@ -239,7 +245,9 @@
     <pre>$ export CVSROOT=:pserver:anonymous at dev.w3.org:/sources/public
 $ cvs login    # password is "anonymous"
 $ cvs co 2001/XML-Test-Suite/xmlconf
-$ cvs co 2001/DOM-Test-Suite</pre>
+$ cvs co -D '2005-05-06 23:00' 2001/DOM-Test-Suite</pre>
+    <p>(Omit <tt>-D</tt> to get the latest version, which may not work
+    with cxml yet.)</p>
     <p>Usage and expected output:</p>
     <pre>* (xmlconf:run-all-tests "/path/to/2001/XML-Test-Suite/xmlconf/")
 0/556 tests failed; 1606 tests were skipped



From dlichteblau at common-lisp.net  Wed Apr  6 21:27:04 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed,  6 Apr 2005 23:27:04 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/README.html 
Message-ID: <20050406212704.D106918C6F5@common-lisp.net>

Update of /project/cxml/cvsroot/cxml
In directory common-lisp.net:/tmp/cvs-serv16006

Modified Files:
	README.html 
Log Message:
for the DOM tests, Java and `ant' are required...

Date: Wed Apr  6 23:27:04 2005
Author: dlichteblau

Index: cxml/README.html
diff -u cxml/README.html:1.2 cxml/README.html:1.3
--- cxml/README.html:1.2	Wed Apr  6 23:14:41 2005
+++ cxml/README.html	Wed Apr  6 23:27:04 2005
@@ -245,9 +245,13 @@
     <pre>$ export CVSROOT=:pserver:anonymous at dev.w3.org:/sources/public
 $ cvs login    # password is "anonymous"
 $ cvs co 2001/XML-Test-Suite/xmlconf
-$ cvs co -D '2005-05-06 23:00' 2001/DOM-Test-Suite</pre>
-    <p>(Omit <tt>-D</tt> to get the latest version, which may not work
-    with cxml yet.)</p>
+$ cvs co -D '2005-05-06 23:00' 2001/DOM-Test-Suite
+$ cd 2001/DOM-Test-Suite && ant dom1-dtd</pre>
+    <p>
+      Omit <tt>-D</tt> to get the latest version, which may not work
+      with cxml yet.  The <tt>ant</tt> step is necessary to run the DOM
+      tests.
+    </p>
     <p>Usage and expected output:</p>
     <pre>* (xmlconf:run-all-tests "/path/to/2001/XML-Test-Suite/xmlconf/")
 0/556 tests failed; 1606 tests were skipped



From dlichteblau at common-lisp.net  Wed Apr 20 19:58:03 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed, 20 Apr 2005 21:58:03 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/README.html cxml/cxml.asd 
Message-ID: <20050420195803.62A6C886F9@common-lisp.net>

Update of /project/cxml/cvsroot/cxml
In directory common-lisp.net:/tmp/cvs-serv1210

Modified Files:
	README.html cxml.asd 
Log Message:
LispWorks port (thanks to Edi Weitz)

Date: Wed Apr 20 21:58:00 2005
Author: dlichteblau

Index: cxml/README.html
diff -u cxml/README.html:1.3 cxml/README.html:1.4
--- cxml/README.html:1.3	Wed Apr  6 23:27:04 2005
+++ cxml/README.html	Wed Apr 20 21:57:59 2005
@@ -114,6 +114,8 @@
       to <tt>parse-dtd-stream</tt>; SAX proxy class</li>
       <li>Minor bugfixes: Workaround for CMUCL problem
       with <tt>fd-streams</tt> (can read from cmucl sockets now)</li>
+      <li>Port to OpenMCL (thanks to Rudi Schlatte).</li>
+      <li>Port to LispWorks (thanks to Edi Weitz).</li>
     </ul>
     <p class="nomargin"><tt>patch-357</tt> (2004-10-10)</p>
     <ul class="nomargin">
@@ -190,6 +192,9 @@
         CLISP (reported to work with and without <tt>rune-is-character</tt>).
         CLISP needs to be run with an option like <tt>-E iso-8869-1</tt>
         teaching it to accept cxml's non-ASCII source files.
+      </li>
+      <li>
+        LispWorks
       </li>
     </ul>
     <p>


Index: cxml/cxml.asd
diff -u cxml/cxml.asd:1.2 cxml/cxml.asd:1.3
--- cxml/cxml.asd:1.2	Fri Mar 25 19:16:29 2005
+++ cxml/cxml.asd	Wed Apr 20 21:57:59 2005
@@ -53,7 +53,9 @@
 	    #+(and allegro-version>= (version>= 5.0)) "dep-acl5"
 	    #+(and allegro-version>= (not (version>= 5.0))) "dep-acl"
             #+openmcl                           "dep-openmcl"
-	    #-(or sbcl CLISP CMU allegro openmcl) #.(error "Configure!")
+            #+lispworks                         "dep-lw"
+	    #-(or sbcl CLISP CMU allegro openmcl lispworks)
+            #.(error "unsupported lisp implementation!")
             :depends-on ("package"))
      (:file runes
             :pathname



From dlichteblau at common-lisp.net  Wed Apr 20 19:58:03 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed, 20 Apr 2005 21:58:03 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/runes/dep-lw.lisp
	cxml/runes/characters.lisp 
Message-ID: <20050420195803.3436688032@common-lisp.net>

Update of /project/cxml/cvsroot/cxml/runes
In directory common-lisp.net:/tmp/cvs-serv1210/runes

Modified Files:
	characters.lisp 
Added Files:
	dep-lw.lisp 
Log Message:
LispWorks port (thanks to Edi Weitz)

Date: Wed Apr 20 21:58:01 2005
Author: dlichteblau



Index: cxml/runes/characters.lisp
diff -u cxml/runes/characters.lisp:1.2 cxml/runes/characters.lisp:1.3
--- cxml/runes/characters.lisp:1.2	Fri Mar 25 19:16:56 2005
+++ cxml/runes/characters.lisp	Wed Apr 20 21:58:01 2005
@@ -24,9 +24,9 @@
 
 (in-package :runes)
 
-(deftype rune () 'character)
-(deftype rod () '(vector character))
-(deftype simple-rod () '(simple-array character))
+(deftype rune () #-lispworks 'character #+lispworks 'lw:simple-char)
+(deftype rod () '(vector rune))
+(deftype simple-rod () '(simple-array rune))
 
 (definline rune (rod index)
   (char rod index))
@@ -101,7 +101,7 @@
   (string-equal x y))
 
 (definline make-rod (size)
-  (make-string size))
+  (make-string size :element-type 'rune))
 
 (defun char-rune (char)
   char)



From dlichteblau at common-lisp.net  Wed Apr 20 19:58:08 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed, 20 Apr 2005 21:58:08 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/test/xmlconf.lisp 
Message-ID: <20050420195808.A289B88032@common-lisp.net>

Update of /project/cxml/cvsroot/cxml/test
In directory common-lisp.net:/tmp/cvs-serv1210/test

Modified Files:
	xmlconf.lisp 
Log Message:
LispWorks port (thanks to Edi Weitz)

Date: Wed Apr 20 21:58:05 2005
Author: dlichteblau

Index: cxml/test/xmlconf.lisp
diff -u cxml/test/xmlconf.lisp:1.1.1.13 cxml/test/xmlconf.lisp:1.2
--- cxml/test/xmlconf.lisp:1.1.1.13	Sun Mar 13 19:02:50 2005
+++ cxml/test/xmlconf.lisp	Wed Apr 20 21:58:03 2005
@@ -95,7 +95,7 @@
             nfailed ntried nskipped)))
 
 (defmethod run-test :around (class pathname output description &rest args)
-  class pathname output args
+  (declare (ignore class pathname output args))
   (handler-case
       (call-next-method)
     (serious-condition (c)



From dlichteblau at common-lisp.net  Wed Apr 20 19:58:19 2005
From: dlichteblau at common-lisp.net (David Lichteblau)
Date: Wed, 20 Apr 2005 21:58:19 +0200 (CEST)
Subject: [closure-cvs] CVS update: cxml/xml/package.lisp
	cxml/xml/xml-name-rune-p.lisp cxml/xml/xml-parse.lisp 
Message-ID: <20050420195819.EE47188709@common-lisp.net>

Update of /project/cxml/cvsroot/cxml/xml
In directory common-lisp.net:/tmp/cvs-serv1210/xml

Modified Files:
	package.lisp xml-name-rune-p.lisp xml-parse.lisp 
Log Message:
LispWorks port (thanks to Edi Weitz)

Date: Wed Apr 20 21:58:07 2005
Author: dlichteblau

Index: cxml/xml/package.lisp
diff -u cxml/xml/package.lisp:1.1.1.29 cxml/xml/package.lisp:1.2
--- cxml/xml/package.lisp:1.1.1.29	Sun Mar 13 19:02:58 2005
+++ cxml/xml/package.lisp	Wed Apr 20 21:58:07 2005
@@ -12,7 +12,8 @@
                 #+cmu :ext
                 #+clisp :gray
                 #+openmcl :ccl
-                #-(or sbcl allegro cmu clisp openmcl) ...
+                #+lispworks :stream
+                #-(or sbcl allegro cmu clisp openmcl lispworks) ...
                 #:fundamental-binary-input-stream
                 #-(or clisp openmcl) #:stream-read-sequence
                 stream-read-byte)


Index: cxml/xml/xml-name-rune-p.lisp
diff -u cxml/xml/xml-name-rune-p.lisp:1.2 cxml/xml/xml-name-rune-p.lisp:1.3
--- cxml/xml/xml-name-rune-p.lisp:1.2	Fri Mar 25 19:17:34 2005
+++ cxml/xml/xml-name-rune-p.lisp	Wed Apr 20 21:58:07 2005
@@ -162,43 +162,45 @@
                 (<= 12540 rune 12542)))
 
              (base-rune-p (rune)
-               (or 
-                (<= 65 rune 90) (<= 97 rune 122) (<= 192 rune 214) (<= 216 rune 246) (<= 248 rune 255) (<= 256 rune 305)
-                (<= 308 rune 318) (<= 321 rune 328) (<= 330 rune 382) (<= 384 rune 451) (<= 461 rune 496) (<= 500 rune 501)
-                (<= 506 rune 535) (<= 592 rune 680) (<= 699 rune 705) (= 902 rune) (<= 904 rune 906) (= 908 rune)
-                (<= 910 rune 929) (<= 931 rune 974) (<= 976 rune 982) (= 986 rune) (= 988 rune) (= 990 rune) (= 992 rune)
-                (<= 994 rune 1011) (<= 1025 rune 1036) (<= 1038 rune 1103) (<= 1105 rune 1116) (<= 1118 rune 1153)
-                (<= 1168 rune 1220) (<= 1223 rune 1224) (<= 1227 rune 1228) (<= 1232 rune 1259) (<= 1262 rune 1269)
-                (<= 1272 rune 1273) (<= 1329 rune 1366) (= 1369 rune) (<= 1377 rune 1414) (<= 1488 rune 1514)
-                (<= 1520 rune 1522) (<= 1569 rune 1594) (<= 1601 rune 1610) (<= 1649 rune 1719) (<= 1722 rune 1726)
-                (<= 1728 rune 1742) (<= 1744 rune 1747) (= 1749 rune) (<= 1765 rune 1766) (<= 2309 rune 2361) (= 2365 rune)
-                (<= 2392 rune 2401) (<= 2437 rune 2444) (<= 2447 rune 2448) (<= 2451 rune 2472) (<= 2474 rune 2480)
-                (= 2482 rune) (<= 2486 rune 2489) (<= 2524 rune 2525) (<= 2527 rune 2529) (<= 2544 rune 2545)
-                (<= 2565 rune 2570) (<= 2575 rune 2576) (<= 2579 rune 2600) (<= 2602 rune 2608) (<= 2610 rune 2611)
-                (<= 2613 rune 2614) (<= 2616 rune 2617) (<= 2649 rune 2652) (= 2654 rune) (<= 2674 rune 2676)
-                (<= 2693 rune 2699) (= 2701 rune) (<= 2703 rune 2705) (<= 2707 rune 2728) (<= 2730 rune 2736)
-                (<= 2738 rune 2739) (<= 2741 rune 2745) (= 2749 rune) (= 2784 rune) (<= 2821 rune 2828) (<= 2831 rune 2832)
-                (<= 2835 rune 2856) (<= 2858 rune 2864) (<= 2866 rune 2867) (<= 2870 rune 2873) (= 2877 rune)
-                (<= 2908 rune 2909) (<= 2911 rune 2913) (<= 2949 rune 2954) (<= 2958 rune 2960) (<= 2962 rune 2965)
-                (<= 2969 rune 2970) (= 2972 rune) (<= 2974 rune 2975) (<= 2979 rune 2980) (<= 2984 rune 2986)
-                (<= 2990 rune 2997) (<= 2999 rune 3001) (<= 3077 rune 3084) (<= 3086 rune 3088) (<= 3090 rune 3112)
-                (<= 3114 rune 3123) (<= 3125 rune 3129) (<= 3168 rune 3169) (<= 3205 rune 3212) (<= 3214 rune 3216)
-                (<= 3218 rune 3240) (<= 3242 rune 3251) (<= 3253 rune 3257) (= 3294 rune) (<= 3296 rune 3297)
-                (<= 3333 rune 3340) (<= 3342 rune 3344) (<= 3346 rune 3368) (<= 3370 rune 3385) (<= 3424 rune 3425)
-                (<= 3585 rune 3630) (= 3632 rune) (<= 3634 rune 3635) (<= 3648 rune 3653) (<= 3713 rune 3714) (= 3716 rune)
-                (<= 3719 rune 3720) (= 3722 rune) (= 3725 rune) (<= 3732 rune 3735) (<= 3737 rune 3743) (<= 3745 rune 3747)
-                (= 3749 rune) (= 3751 rune) (<= 3754 rune 3755) (<= 3757 rune 3758) (= 3760 rune) (<= 3762 rune 3763) (= 3773 rune)
-                (<= 3776 rune 3780) (<= 3904 rune 3911) (<= 3913 rune 3945) (<= 4256 rune 4293) (<= 4304 rune 4342)
-                (= 4352 rune) (<= 4354 rune 4355) (<= 4357 rune 4359) (= 4361 rune) (<= 4363 rune 4364) (<= 4366 rune 4370)
-                (= 4412 rune) (= 4414 rune) (= 4416 rune) (= 4428 rune) (= 4430 rune) (= 4432 rune) (<= 4436 rune 4437) (= 4441 rune)
-                (<= 4447 rune 4449) (= 4451 rune) (= 4453 rune) (= 4455 rune) (= 4457 rune) (<= 4461 rune 4462) (<= 4466 rune 4467)
-                (= 4469 rune) (= 4510 rune) (= 4520 rune) (= 4523 rune) (<= 4526 rune 4527) (<= 4535 rune 4536) (= 4538 rune)
-                (<= 4540 rune 4546) (= 4587 rune) (= 4592 rune) (= 4601 rune) (<= 7680 rune 7835) (<= 7840 rune 7929)
-                (<= 7936 rune 7957) (<= 7960 rune 7965) (<= 7968 rune 8005) (<= 8008 rune 8013) (<= 8016 rune 8023)
-                (= 8025 rune) (= 8027 rune) (= 8029 rune) (<= 8031 rune 8061) (<= 8064 rune 8116) (<= 8118 rune 8124) (= 8126 rune)
-                (<= 8130 rune 8132) (<= 8134 rune 8140) (<= 8144 rune 8147) (<= 8150 rune 8155) (<= 8160 rune 8172)
-                (<= 8178 rune 8180) (<= 8182 rune 8188) (= 8486 rune) (<= 8490 rune 8491) (= 8494 rune) (<= 8576 rune 8578)
-                (<= 12353 rune 12436) (<= 12449 rune 12538) (<= 12549 rune 12588) (<= 44032 rune 55203)))
+               ;; split into two ORs for LispWorks...
+               (or
+                 (or (<= 65 rune 90) (<= 97 rune 122) (<= 192 rune 214) (<= 216 rune 246) (<= 248 rune 255) (<= 256 rune 305)
+                     (<= 308 rune 318) (<= 321 rune 328) (<= 330 rune 382) (<= 384 rune 451) (<= 461 rune 496) (<= 500 rune 501)
+                     (<= 506 rune 535) (<= 592 rune 680) (<= 699 rune 705) (= 902 rune) (<= 904 rune 906) (= 908 rune)
+                     (<= 910 rune 929) (<= 931 rune 974) (<= 976 rune 982) (= 986 rune) (= 988 rune) (= 990 rune) (= 992 rune)
+                     (<= 994 rune 1011) (<= 1025 rune 1036) (<= 1038 rune 1103) (<= 1105 rune 1116) (<= 1118 rune 1153)
+                     (<= 1168 rune 1220) (<= 1223 rune 1224) (<= 1227 rune 1228) (<= 1232 rune 1259) (<= 1262 rune 1269)
+                     (<= 1272 rune 1273) (<= 1329 rune 1366) (= 1369 rune) (<= 1377 rune 1414) (<= 1488 rune 1514)
+                     (<= 1520 rune 1522) (<= 1569 rune 1594) (<= 1601 rune 1610) (<= 1649 rune 1719) (<= 1722 rune 1726)
+                     (<= 1728 rune 1742) (<= 1744 rune 1747) (= 1749 rune) (<= 1765 rune 1766) (<= 2309 rune 2361) (= 2365 rune)
+                     (<= 2392 rune 2401) (<= 2437 rune 2444) (<= 2447 rune 2448) (<= 2451 rune 2472) (<= 2474 rune 2480)
+                     (= 2482 rune) (<= 2486 rune 2489) (<= 2524 rune 2525) (<= 2527 rune 2529) (<= 2544 rune 2545)
+                     (<= 2565 rune 2570) (<= 2575 rune 2576) (<= 2579 rune 2600) (<= 2602 rune 2608) (<= 2610 rune 2611)
+                     (<= 2613 rune 2614) (<= 2616 rune 2617) (<= 2649 rune 2652) (= 2654 rune) (<= 2674 rune 2676)
+                     (<= 2693 rune 2699) (= 2701 rune) (<= 2703 rune 2705) (<= 2707 rune 2728) (<= 2730 rune 2736)
+                     (<= 2738 rune 2739) (<= 2741 rune 2745) (= 2749 rune) (= 2784 rune) (<= 2821 rune 2828) (<= 2831 rune 2832)
+                     (<= 2835 rune 2856) (<= 2858 rune 2864) (<= 2866 rune 2867) (<= 2870 rune 2873) (= 2877 rune)
+                     (<= 2908 rune 2909) (<= 2911 rune 2913) (<= 2949 rune 2954) (<= 2958 rune 2960) (<= 2962 rune 2965)
+                     (<= 2969 rune 2970) (= 2972 rune))
+                 (or (<= 2974 rune 2975) (<= 2979 rune 2980) (<= 2984 rune 2986)
+                     (<= 2990 rune 2997) (<= 2999 rune 3001) (<= 3077 rune 3084) (<= 3086 rune 3088) (<= 3090 rune 3112)
+                     (<= 3114 rune 3123) (<= 3125 rune 3129) (<= 3168 rune 3169) (<= 3205 rune 3212) (<= 3214 rune 3216)
+                     (<= 3218 rune 3240) (<= 3242 rune 3251) (<= 3253 rune 3257) (= 3294 rune) (<= 3296 rune 3297)
+                     (<= 3333 rune 3340) (<= 3342 rune 3344) (<= 3346 rune 3368) (<= 3370 rune 3385) (<= 3424 rune 3425)
+                     (<= 3585 rune 3630) (= 3632 rune) (<= 3634 rune 3635) (<= 3648 rune 3653) (<= 3713 rune 3714) (= 3716 rune)
+                     (<= 3719 rune 3720) (= 3722 rune) (= 3725 rune) (<= 3732 rune 3735) (<= 3737 rune 3743) (<= 3745 rune 3747)
+                     (= 3749 rune) (= 3751 rune) (<= 3754 rune 3755) (<= 3757 rune 3758) (= 3760 rune) (<= 3762 rune 3763) (= 3773 rune)
+                     (<= 3776 rune 3780) (<= 3904 rune 3911) (<= 3913 rune 3945) (<= 4256 rune 4293) (<= 4304 rune 4342)
+                     (= 4352 rune) (<= 4354 rune 4355) (<= 4357 rune 4359) (= 4361 rune) (<= 4363 rune 4364) (<= 4366 rune 4370)
+                     (= 4412 rune) (= 4414 rune) (= 4416 rune) (= 4428 rune) (= 4430 rune) (= 4432 rune) (<= 4436 rune 4437) (= 4441 rune)
+                     (<= 4447 rune 4449) (= 4451 rune) (= 4453 rune) (= 4455 rune) (= 4457 rune) (<= 4461 rune 4462) (<= 4466 rune 4467)
+                     (= 4469 rune) (= 4510 rune) (= 4520 rune) (= 4523 rune) (<= 4526 rune 4527) (<= 4535 rune 4536) (= 4538 rune)
+                     (<= 4540 rune 4546) (= 4587 rune) (= 4592 rune) (= 4601 rune) (<= 7680 rune 7835) (<= 7840 rune 7929)
+                     (<= 7936 rune 7957) (<= 7960 rune 7965) (<= 7968 rune 8005) (<= 8008 rune 8013) (<= 8016 rune 8023)
+                     (= 8025 rune) (= 8027 rune) (= 8029 rune) (<= 8031 rune 8061) (<= 8064 rune 8116) (<= 8118 rune 8124) (= 8126 rune)
+                     (<= 8130 rune 8132) (<= 8134 rune 8140) (<= 8144 rune 8147) (<= 8150 rune 8155) (<= 8160 rune 8172)
+                     (<= 8178 rune 8180) (<= 8182 rune 8188) (= 8486 rune) (<= 8490 rune 8491) (= 8494 rune) (<= 8576 rune 8578)
+                     (<= 12353 rune 12436) (<= 12449 rune 12538) (<= 12549 rune 12588) (<= 44032 rune 55203))))
 
              (ideographic-rune-p (rune)
                (or (<= 19968 rune 40869) (= 12295 rune) (<= 12321 rune 12329)))


Index: cxml/xml/xml-parse.lisp
diff -u cxml/xml/xml-parse.lisp:1.3 cxml/xml/xml-parse.lisp:1.4
--- cxml/xml/xml-parse.lisp:1.3	Wed Apr  6 21:23:53 2005
+++ cxml/xml/xml-parse.lisp	Wed Apr 20 21:58:07 2005
@@ -3004,8 +3004,10 @@
             (elt octets pos)
           (incf pos)))))
 
-(defmethod stream-read-sequence ((stream octet-input-stream) sequence
-                                 &optional (start 0) (end (length sequence)))
+(defmethod stream-read-sequence
+    #-lispworks ((stream octet-input-stream) sequence
+                 &optional (start 0) (end (length sequence)))
+    #+lispworks ((stream octet-input-stream) sequence start end)
   (with-slots (octets pos) stream
     (let* ((length (min (- end start) (- (length octets) pos)))
            (end1 (+ start length))