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

[closure-cvs] CVS update: cxml/README.html cxml/cxml.asd
by dlichteblau＠common-lisp.net 20 Apr '05

20 Apr '05

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

1 0

[closure-cvs] CVS update: cxml/runes/dep-lw.lisp cxml/runes/characters.lisp
by dlichteblau＠common-lisp.net 20 Apr '05

20 Apr '05

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)

1 0

[closure-cvs] CVS update: cxml/README.html
by dlichteblau＠common-lisp.net 06 Apr '05

06 Apr '05

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@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

1 0

[closure-cvs] CVS update: cxml/test/domtest.lisp
by dlichteblau＠common-lisp.net 06 Apr '05

06 Apr '05

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

1 0

[closure-cvs] CVS update: cxml/README.html
by dlichteblau＠common-lisp.net 06 Apr '05

06 Apr '05

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@lichteblau.com">david(a)lichteblau.com</a>. + href="mailto:cxml-devel@common-lisp.net">cxml-devel(a)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@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> + </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@knowledgetools.de--cxml/">http://common-lisp.net/project/cxml/david@knowledgetools.de--cxml/</a>. - (Brief tla usage instructions: Unpack the cxml tarball.  - Enter <tt>tla register-archive URL</tt> to turn it into a working - copy.  <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@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

1 0

[closure-cvs] CVS update: cxml/mlisp-patch.diff
by dlichteblau＠common-lisp.net 06 Apr '05

06 Apr '05

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(a)knowledgetools.de--cxml/cxml--devel--1.0--patch-194 to compare with -* comparing to david(a)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)))))))) ))))

1 0

[closure-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 06 Apr '05

06 Apr '05

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

1 0

[closure-cvs] CVS update: cxml/dom/dom-impl.lisp
by dlichteblau＠common-lisp.net 06 Apr '05

06 Apr '05

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)))

1 0

[closure-cvs] CVS update: cxml/xml/util.lisp cxml/xml/xml-name-rune-p.lisp cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 25 Mar '05

25 Mar '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv9430/xml Modified Files: xml-name-rune-p.lisp xml-parse.lisp Added Files: util.lisp Log Message: - Moved utility functions from the "runes" package to the "cxml" package to avoid name conflicts with functions from "glisp" of the same name. - Renamed defsubst to definline for the same reason. (This is a commit to the cxml repository, not the main closure repository. If you don't want cxml commit messages on the closure list, please complain to me and I'll change it.) Date: Fri Mar 25 19:17:36 2005 Author: dlichteblau Index: cxml/xml/xml-name-rune-p.lisp diff -u cxml/xml/xml-name-rune-p.lisp:1.1.1.10 cxml/xml/xml-name-rune-p.lisp:1.2 --- cxml/xml/xml-name-rune-p.lisp:1.1.1.10 Sun Mar 13 19:02:51 2005 +++ cxml/xml/xml-name-rune-p.lisp Fri Mar 25 19:17:34 2005 @@ -211,13 +211,13 @@ (setf (aref r i) 1))))) ) `(progn - (DEFSUBST NAME-RUNE-P (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)))))) - (DEFSUBST NAME-START-RUNE-P (RUNE) + (DEFINLINE NAME-START-RUNE-P (RUNE) (SETF RUNE (RUNE-CODE RUNE)) (AND (<= 0 RUNE ,*MAX*) (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3))) Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.1.1.121 cxml/xml/xml-parse.lisp:1.2 --- cxml/xml/xml-parse.lisp:1.1.1.121 Sun Mar 13 19:02:57 2005 +++ cxml/xml/xml-parse.lisp Fri Mar 25 19:17:35 2005 @@ -378,7 +378,7 @@ ) (defun make-rod-hashtable (&key (size 200)) - (setf size (runes::nearest-greater-prime size)) + (setf size (nearest-greater-prime size)) (make-rod-hashtable/low :size size :table (make-array size :initial-element nil))) @@ -392,13 +392,13 @@ (1- (expt 2 +fixnum-bits+)) "Pessimistic approximation of the largest bit-mask, still being a fixnum.")) -(defsubst stir (a b) +(definline stir (a b) (%and +fixnum-mask+ (%xor (%ior (%ash (%and a #.(ash +fixnum-mask+ -5)) 5) (%ash a #.(- 5 +fixnum-bits+))) b))) -(defsubst rod-hash (rod start end) +(definline rod-hash (rod start end) "Compute a hash code out of a rod." (let ((res (%- end start))) (do ((i start (%+ i 1))) @@ -407,7 +407,7 @@ (setf res (stir res (rune-code (%rune rod i))))) res)) -(defsubst rod=* (x y &key (start1 0) (end1 (length x)) +(definline rod=* (x y &key (start1 0) (end1 (length x)) (start2 0) (end2 (length y))) (and (%= (%- end1 start1) (%- end2 start2)) (do ((i start1 (%+ i 1)) @@ -417,7 +417,7 @@ (unless (rune= (%rune x i) (%rune y j)) (return nil))))) -(defsubst rod=** (x y start1 end1 start2 end2) +(definline rod=** (x y start1 end1 start2 end2) (and (%= (%- end1 start1) (%- end2 start2)) (do ((i start1 (%+ i 1)) (j start2 (%+ j 1))) @@ -1339,7 +1339,7 @@ (perror input "Expected \";\".")) (values :NAMED name)))))) -(defsubst read-S? (input) +(definline read-S? (input) (while (member (peek-rune input) '(#/U+0020 #/U+0009 #/U+000A #/U+000D) :test #'eq) (consume-rune input))) @@ -1413,7 +1413,7 @@ (collect c)))) value)))) -(defsubst data-rune-p (rune) +(definline data-rune-p (rune) ;; any Unicode character, excluding the surrogate blocks, FFFE, and FFFF. (let ((c (rune-code rune))) (or (= c #x9) (= c #xA) (= c #xD)

1 0

[closure-cvs] CVS update: cxml/runes/characters.lisp cxml/runes/dep-acl.lisp cxml/runes/dep-acl5.lisp cxml/runes/dep-clisp.lisp cxml/runes/dep-cmucl-dtc.lisp cxml/runes/dep-cmucl.lisp cxml/runes/dep-openmcl.lisp cxml/runes/dep-sbcl.lisp cxml/runes/package.lisp cxml/runes/runes.lisp cxml/runes/xstream.lisp cxml/runes/util.lisp
by dlichteblau＠common-lisp.net 25 Mar '05

25 Mar '05

Update of /project/cxml/cvsroot/cxml/runes In directory common-lisp.net:/tmp/cvs-serv9430/runes Modified Files: characters.lisp dep-acl.lisp dep-acl5.lisp dep-clisp.lisp dep-cmucl-dtc.lisp dep-cmucl.lisp dep-openmcl.lisp dep-sbcl.lisp package.lisp runes.lisp xstream.lisp Removed Files: util.lisp Log Message: - Moved utility functions from the "runes" package to the "cxml" package to avoid name conflicts with functions from "glisp" of the same name. - Renamed defsubst to definline for the same reason. (This is a commit to the cxml repository, not the main closure repository. If you don't want cxml commit messages on the closure list, please complain to me and I'll change it.) Date: Fri Mar 25 19:16:57 2005 Author: dlichteblau Index: cxml/runes/characters.lisp diff -u cxml/runes/characters.lisp:1.1.1.3 cxml/runes/characters.lisp:1.2 --- cxml/runes/characters.lisp:1.1.1.3 Sun Mar 13 19:02:56 2005 +++ cxml/runes/characters.lisp Fri Mar 25 19:16:56 2005 @@ -28,31 +28,31 @@ (deftype rod () '(vector character)) (deftype simple-rod () '(simple-array character)) -(defsubst rune (rod index) +(definline rune (rod index) (char rod index)) (defun (setf rune) (new rod index) (setf (char rod index) new)) -(defsubst %rune (rod index) +(definline %rune (rod index) (aref (the simple-string rod) (the fixnum index))) -(defsubst (setf %rune) (new rod index) +(definline (setf %rune) (new rod index) (setf (aref (the simple-string rod) (the fixnum index)) new)) (defun rod-capitalize (rod) (string-upcase rod)) -(defsubst code-rune (x) (code-char x)) -(defsubst rune-code (x) (char-code x)) +(definline code-rune (x) (code-char x)) +(definline rune-code (x) (char-code x)) -(defsubst rune= (x y) +(definline rune= (x y) (char= x y)) (defun rune-downcase (rune) (char-downcase rune)) -(defsubst rune-upcase (rune) +(definline rune-upcase (rune) (char-upcase rune)) (defun rune-upper-case-letter-p (rune) @@ -70,13 +70,13 @@ (defun rod-upcase (rod) (string-upcase rod)) -(defsubst white-space-rune-p (char) +(definline white-space-rune-p (char) (or (char= char #\tab) (char= char #.(code-char 10)) ;Linefeed (char= char #.(code-char 13)) ;Carriage Return (char= char #\space))) -(defsubst digit-rune-p (char &optional (radix 10)) +(definline digit-rune-p (char &optional (radix 10)) (digit-char-p char radix)) (defun rod (x) @@ -100,7 +100,7 @@ (defun rod-equal (x y) (string-equal x y)) -(defsubst make-rod (size) +(definline make-rod (size) (make-string size)) (defun char-rune (char) Index: cxml/runes/dep-acl.lisp diff -u cxml/runes/dep-acl.lisp:1.1.1.1 cxml/runes/dep-acl.lisp:1.2 --- cxml/runes/dep-acl.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-acl.lisp Fri Mar 25 19:16:56 2005 @@ -28,13 +28,13 @@ ;; Unfortunately it is also incapable to declaim such functions inline. ;; So we revoke the DEFUN hack from dep-gcl here. -(defmacro runes::defsubst (fun args &body body) +(defmacro runes::definline (fun args &body body) (if (and (consp fun) (eq (car fun) 'setf)) (let ((fnam (intern (concatenate 'string "(SETF " (symbol-name (cadr fun)) ")") (symbol-package (cadr fun))))) `(progn (defsetf ,(cadr fun) (&rest ap) (new-value) (list* ',fnam new-value ap)) - (runes::defsubst ,fnam ,args .,body))) + (runes::definline ,fnam ,args .,body))) `(progn (defun ,fun ,args .,body) (define-compiler-macro ,fun (&rest .args.) Index: cxml/runes/dep-acl5.lisp diff -u cxml/runes/dep-acl5.lisp:1.1.1.1 cxml/runes/dep-acl5.lisp:1.2 --- cxml/runes/dep-acl5.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-acl5.lisp Fri Mar 25 19:16:56 2005 @@ -40,13 +40,13 @@ ;; Unfortunately it is also incapable to declaim such functions inline. ;; So we revoke the DEFUN hack from dep-gcl here. -(defmacro runes::defsubst (fun args &body body) +(defmacro runes::definline (fun args &body body) (if (and (consp fun) (eq (car fun) 'setf)) (let ((fnam (intern (concatenate 'string "(SETF " (symbol-name (cadr fun)) ")") (symbol-package (cadr fun))))) `(progn (defsetf ,(cadr fun) (&rest ap) (new-value) (list* ',fnam new-value ap)) - (runes::defsubst ,fnam ,args .,body))) + (runes::definline ,fnam ,args .,body))) (labels ((declp (x) (and (consp x) (eq (car x) 'declare)))) `(progn Index: cxml/runes/dep-clisp.lisp diff -u cxml/runes/dep-clisp.lisp:1.1.1.2 cxml/runes/dep-clisp.lisp:1.2 --- cxml/runes/dep-clisp.lisp:1.1.1.2 Sun Mar 13 19:02:30 2005 +++ cxml/runes/dep-clisp.lisp Fri Mar 25 19:16:56 2005 @@ -53,7 +53,7 @@ ;;; `(progn ;;; ',name))) -(defmacro runes::defsubst (name args &body body) +(defmacro runes::definline (name args &body body) `(progn (declaim (inline ,name)) (defun ,name ,args .,body))) Index: cxml/runes/dep-cmucl-dtc.lisp diff -u cxml/runes/dep-cmucl-dtc.lisp:1.1.1.1 cxml/runes/dep-cmucl-dtc.lisp:1.2 --- cxml/runes/dep-cmucl-dtc.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-cmucl-dtc.lisp Fri Mar 25 19:16:56 2005 @@ -24,7 +24,7 @@ ;;; superseded by a newer version) or write to the Free Software ;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(defmacro runes::defsubst (name args &body body) +(defmacro runes::definline (name args &body body) `(progn (declaim (inline ,name)) (defun ,name ,args .,body))) Index: cxml/runes/dep-cmucl.lisp diff -u cxml/runes/dep-cmucl.lisp:1.1.1.1 cxml/runes/dep-cmucl.lisp:1.2 --- cxml/runes/dep-cmucl.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-cmucl.lisp Fri Mar 25 19:16:56 2005 @@ -24,7 +24,7 @@ ;;; superseded by a newer version) or write to the Free Software ;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(defmacro runes::defsubst (name args &body body) +(defmacro runes::definline (name args &body body) `(progn (declaim (inline ,name)) (defun ,name ,args .,body))) Index: cxml/runes/dep-openmcl.lisp diff -u cxml/runes/dep-openmcl.lisp:1.1.1.1 cxml/runes/dep-openmcl.lisp:1.2 --- cxml/runes/dep-openmcl.lisp:1.1.1.1 Sun Mar 13 19:02:58 2005 +++ cxml/runes/dep-openmcl.lisp Fri Mar 25 19:16:56 2005 @@ -5,7 +5,7 @@ ;;;; ;;;; (c) copyright 1999 by Gilbert Baumann -(defmacro runes::defsubst (fun args &body body) +(defmacro runes::definline (fun args &body body) (if (consp fun) `(defun ,fun ,args ,@body) Index: cxml/runes/dep-sbcl.lisp diff -u cxml/runes/dep-sbcl.lisp:1.1.1.1 cxml/runes/dep-sbcl.lisp:1.2 --- cxml/runes/dep-sbcl.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-sbcl.lisp Fri Mar 25 19:16:56 2005 @@ -24,7 +24,7 @@ ;;; superseded by a newer version) or write to the Free Software ;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(defmacro runes::defsubst (name args &body body) +(defmacro runes::definline (name args &body body) `(progn (declaim (inline ,name)) (defun ,name ,args .,body))) Index: cxml/runes/package.lisp diff -u cxml/runes/package.lisp:1.1.1.2 cxml/runes/package.lisp:1.2 --- cxml/runes/package.lisp:1.1.1.2 Sun Mar 13 19:02:27 2005 +++ cxml/runes/package.lisp Fri Mar 25 19:16:56 2005 @@ -10,15 +10,8 @@ (defpackage :runes (:use :cl) - (:export #:defsubst + (:export #:definline - ;; util.lisp : - #:compose - #:curry - #:rcurry - #:until - #:while - ;; runes.lisp #:rune #:rod Index: cxml/runes/runes.lisp diff -u cxml/runes/runes.lisp:1.1.1.4 cxml/runes/runes.lisp:1.2 --- cxml/runes/runes.lisp:1.1.1.4 Sun Mar 13 19:02:44 2005 +++ cxml/runes/runes.lisp Fri Mar 25 19:16:56 2005 @@ -42,26 +42,26 @@ (deftype rod () '(array rune (*))) (deftype simple-rod () '(simple-array rune (*))) -(defsubst rune (rod index) +(definline rune (rod index) (aref rod index)) (defun (setf rune) (new rod index) (setf (aref rod index) new)) -(defsubst %rune (rod index) +(definline %rune (rod index) (aref (the (simple-array (unsigned-byte 16) (*)) rod) (the fixnum index))) -(defsubst (setf %rune) (new rod index) +(definline (setf %rune) (new rod index) (setf (aref (the (simple-array (unsigned-byte 16) (*)) rod) (the fixnum index)) new)) (defun rod-capitalize (rod) (warn "~S is not implemented." 'rod-capitalize) rod) -(defsubst code-rune (x) x) -(defsubst rune-code (x) x) +(definline code-rune (x) x) +(definline rune-code (x) x) -(defsubst rune= (x y) +(definline rune= (x y) (= x y)) (defun rune-downcase (rune) @@ -70,7 +70,7 @@ ((<= #x00c0 rune #x00de) (+ rune #x20)) (t rune))) -(defsubst rune-upcase (rune) +(definline rune-upcase (rune) (cond ((<= #x0061 rune #x007a) (- rune #x20)) ((= rune #x00f7) rune) ((<= #x00e0 rune #x00fe) (- rune #x20)) @@ -95,13 +95,13 @@ ;; FIXME (map '(simple-array (unsigned-byte 16) (*)) #'rune-upcase rod)) -(defsubst white-space-rune-p (char) +(definline white-space-rune-p (char) (or (= char 9) ;TAB (= char 10) ;Linefeed (= char 13) ;Carriage Return (= char 32))) ;Space -(defsubst digit-rune-p (char &optional (radix 10)) +(definline digit-rune-p (char &optional (radix 10)) (cond ((<= #.(char-code #\0) char #.(char-code #\9)) (and (< (- char #.(char-code #\0)) radix) (- char #.(char-code #\0)))) @@ -141,7 +141,7 @@ (unless (rune-equal (rune x i) (rune y i)) (return nil))))) -(defsubst make-rod (size) +(definline make-rod (size) (make-array size :element-type 'rune)) (defun char-rune (char) Index: cxml/runes/xstream.lisp diff -u cxml/runes/xstream.lisp:1.1.1.5 cxml/runes/xstream.lisp:1.2 --- cxml/runes/xstream.lisp:1.1.1.5 Sun Mar 13 19:02:51 2005 +++ cxml/runes/xstream.lisp Fri Mar 25 19:16:56 2005 @@ -217,7 +217,7 @@ nil) ,input)) -(defsubst unread-rune (rune input) +(definline unread-rune (rune input) "Unread the last recently read rune; if there wasn't such a rune, you deserve to lose." (declare (ignore rune))

1 0