[cxml-devel] Patch: downcase symbol names.

Douglas Crosher dtc at scieneer.com
Wed Jun 13 05:05:41 EDT 2007


o Downcase symbol names for compatibility with CL variants with
   lower case symbol names such the Scieneer CL and ACL 'modern' mode.
-------------- next part --------------
o Downcase symbol names for compatibility with CL variants with
  lower case symbol names such the Scieneer CL and ACL 'modern' mode.

Index: klacks/klacks.lisp
===================================================================
RCS file: /project/cxml/cvsroot/cxml/klacks/klacks.lisp,v
retrieving revision 1.8
diff -u -r1.8 klacks.lisp
--- klacks/klacks.lisp	1 May 2007 18:21:41 -0000	1.8
+++ klacks/klacks.lisp	13 Jun 2007 08:15:03 -0000
@@ -93,7 +93,7 @@
 	      (sax:start-cdata source)
 	      (sax:characters handler a)
 	      (sax:end-cdata source))
-	    (T
+	    (t
 	      (sax:characters handler a))))
 	(:processing-instruction
 	  (sax:processing-instruction handler a b))
Index: runes/ystream.lisp
===================================================================
RCS file: /project/cxml/cvsroot/cxml/runes/ystream.lisp,v
retrieving revision 1.5
diff -u -r1.5 ystream.lisp
--- runes/ystream.lisp	2 Dec 2006 13:21:36 -0000	1.5
+++ runes/ystream.lisp	13 Jun 2007 08:15:03 -0000
@@ -42,11 +42,11 @@
 
 (defstruct (utf8-ystream
 	    (:include ystream)
-	    (:conc-name "YSTREAM-"))
+	    (:conc-name #:ystream-))
   (out-buffer (make-ub8-array (* 6 +ystream-bufsize+))
 	      :type (simple-array (unsigned-byte 8) (*))))
 
-(defstruct (%stream-ystream (:include utf8-ystream) (:conc-name "YSTREAM-"))
+(defstruct (%stream-ystream (:include utf8-ystream) (:conc-name #:ystream-))
   (os-stream nil))
 
 (definline write-rune (rune ystream)
@@ -176,7 +176,7 @@
   (defstruct (character-stream-ystream
 	      (:constructor make-character-stream-ystream (target-stream))
 	      (:include ystream)
-	      (:conc-name "YSTREAM-"))
+	      (:conc-name #:ystream-))
     (target-stream nil))
 
   (defmethod flush-ystream ((ystream character-stream-ystream))
@@ -193,7 +193,7 @@
 
 (defstruct (octet-vector-ystream
 	    (:include utf8-ystream)
-	    (:conc-name "YSTREAM-"))
+	    (:conc-name #:ystream-))
   (result (make-buffer)))
 
 (defmethod ystream-device-write ((ystream octet-vector-ystream) buf nbytes)
@@ -214,7 +214,7 @@
 (defstruct (octet-stream-ystream
 	    (:include %stream-ystream)
 	    (:constructor make-octet-stream-ystream (os-stream))
-	    (:conc-name "YSTREAM-")))
+	    (:conc-name #:ystream-)))
 
 (defmethod ystream-device-write ((ystream octet-stream-ystream) buf nbytes)
   (write-sequence buf (ystream-os-stream ystream) :end nbytes))
@@ -227,7 +227,7 @@
   (defstruct (character-stream-ystream/utf8
 	      (:constructor make-character-stream-ystream/utf8 (os-stream))
 	      (:include %stream-ystream)
-	      (:conc-name "YSTREAM-")))
+	      (:conc-name #:ystream-)))
 
   (defmethod ystream-device-write
       ((ystream character-stream-ystream/utf8) buf nbytes)
@@ -244,7 +244,7 @@
   (defstruct (string-ystream/utf8
 	      (:include character-stream-ystream/utf8
 			(os-stream (make-string-output-stream)))
-	      (:conc-name "YSTREAM-")))
+	      (:conc-name #:ystream-)))
 
   (defmethod close-ystream ((ystream string-ystream/utf8))
     (get-output-stream-string (ystream-os-stream ystream))))
Index: xml/xml-name-rune-p.lisp
===================================================================
RCS file: /project/cxml/cvsroot/cxml/xml/xml-name-rune-p.lisp,v
retrieving revision 1.8
diff -u -r1.8 xml-name-rune-p.lisp
--- xml/xml-name-rune-p.lisp	10 Sep 2006 14:52:44 -0000	1.8
+++ xml/xml-name-rune-p.lisp	13 Jun 2007 08:15:04 -0000
@@ -162,20 +162,20 @@
                      (setf (aref r i) 1))))) )
 
           `(progn
-	    (DEFINLINE NAME-RUNE-P (RUNE)
-	      (SETF RUNE (RUNE-CODE RUNE))
-	      (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3))
+	    (definline name-rune-p (rune)
+	      (setf rune (rune-code rune))
+	      (locally (declare (optimize (safety 0) (speed 3))
 				(type fixnum rune))
-		(AND (<= 0 RUNE ,+max+)
-		     (= 1 (SBIT ',(predicate-to-bv #'name-rune-p)
-				RUNE)))))
-	    (DEFINLINE NAME-START-RUNE-P (RUNE)
-	      (SETF RUNE (RUNE-CODE RUNE))
-	      (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3))
+		(and (<= 0 rune ,+max+)
+		     (= 1 (sbit ',(predicate-to-bv #'name-rune-p)
+				rune)))))
+	    (definline name-start-rune-p (rune)
+	      (setf rune (rune-code rune))
+	      (locally (declare (optimize (safety 0) (speed 3))
 				(type fixnum rune))
-		(AND (<= 0 RUNE ,+MAX+)
-		     (= 1 (SBIT ',(predicate-to-bv #'name-start-rune-p)
-				RUNE)))))
+		(and (<= 0 rune ,+max+)
+		     (= 1 (sbit ',(predicate-to-bv #'name-start-rune-p)
+				rune)))))
 	    (definline valid-name-p (rod)
 	      (and (plusp (length rod))
 		   (name-start-rune-p (elt rod 0))
Index: xml/xml-parse.lisp
===================================================================
RCS file: /project/cxml/cvsroot/cxml/xml/xml-parse.lisp,v
retrieving revision 1.67
diff -u -r1.67 xml-parse.lisp
--- xml/xml-parse.lisp	4 Mar 2007 21:04:13 -0000	1.67
+++ xml/xml-parse.lisp	13 Jun 2007 08:15:07 -0000
@@ -3326,20 +3368,20 @@
   (let ((input-var (gensym))
         (collect (gensym))
         (c (gensym)))
-    `(LET ((,input-var ,input))
-       (MULTIPLE-VALUE-BIND (,res ,res-start ,res-end)
-           (WITH-RUNE-COLLECTOR/RAW (,collect)
-             (LOOP
-               (LET ((,c (PEEK-RUNE ,input-var)))
-                 (COND ((EQ ,c :EOF)
+    `(let ((,input-var ,input))
+       (multiple-value-bind (,res ,res-start ,res-end)
+           (with-rune-collector/raw (,collect)
+             (loop
+               (let ((,c (peek-rune ,input-var)))
+                 (cond ((eq ,c :eof)
                         ;; xxx error message
-                        (RETURN))
-                       ((FUNCALL ,predicate ,c)
-                        (RETURN))
+                        (return))
+                       ((funcall ,predicate ,c)
+                        (return))
                        (t
                         (,collect ,c)
-                        (CONSUME-RUNE ,input-var))))))
-         (LOCALLY
+                        (consume-rune ,input-var))))))
+         (locally
            , at body)))))
 
 (defun read-name-token (input)


More information about the cxml-devel mailing list