Changeset 263

Timestamp:

08/23/04 14:11:47 (4 years ago)

Author:

david

Message:

removed REGISTER-ROD; fixed some warnings; cmucl 19a works now

Files:

• trunk/thirdparty/cxml/cxml.asd (modified) (1 diff)
• trunk/thirdparty/cxml/dom/dom-sax.lisp (modified) (1 diff)
• trunk/thirdparty/cxml/runes/characters.lisp (modified) (1 diff)
• trunk/thirdparty/cxml/runes/runes.lisp (modified) (5 diffs)
• trunk/thirdparty/cxml/runes/syntax.lisp (modified) (1 diff)
• trunk/thirdparty/cxml/test/domtest.lisp (modified) (1 diff)
• trunk/thirdparty/cxml/xml/xml-parse.lisp (modified) (3 diffs)

trunk/thirdparty/cxml/cxml.asd

@@ -5 +5 @@
-  (:use :asdf :cl))
-(in-package :cxml-system)
+
+;; XXX das sollte natuerlich erst beim laden stattfinden
+#+cmu
+(require :gray-streams)
-
-(defclass closure-source-file (cl-source-file) ())

trunk/thirdparty/cxml/dom/dom-sax.lisp

@@ -1 @@
-b
+
-
-(defun dom:map-document

trunk/thirdparty/cxml/runes/characters.lisp

@@ -135 +135 @@
-  (stringp object))
-
-(defun really-rod-p (object)
-  (stringp object))
-
-(defun rod-subseq (source start &optional (end (length source)))
-  (unless (stringp source)

trunk/thirdparty/cxml/runes/runes.lisp

@@ -90 +90 @@
-(defun rod-downcase (rod)
-  ;; FIXME
-
-
+
-
-(defun rod-upcase (rod)
-  ;; FIXME
-
-
+
-
-(defsubst white-space-rune-p (char)
@@ -116 +114 @@
-
-(defun rod (x)
-register-rod (map 'rod #'char-code x)
+map 'rod #'char-code x
-        ((symbolp x)    (rod (string x)))
-        ((characterp x) (rod (string x)))
-register-rod (coerce x 'rod)
-register-rod (map 'rod #'identity (list x)
+coerce x 'rod
+map 'rod #'identity (list x
-        (t              (error "Cannot convert ~S to a ~S" x 'rod))))
-
@@ -145 +143 @@
-
-(defsubst make-rod (size)
-
-
-
+
-
-(defun char-rune (char)
@@ -177 +173 @@
-(defun rodp (object)
-  (typep object 'rod))
-
-(defun really-rod-p (object)
-  (and (typep object 'rod)
-       (really-really-rod-p object)))
-
-(defun rod-subseq (source start &optional (end (length source)))
@@ -221 +213 @@
-        (setf (%rune res i) (aref source (the fixnum (+ i start))))))))
-
-;;; Support for telling ROD and arrays apart:
-
-#+CMU
-(progn
-  (defvar *rod-hash-table*
-    (make-array 5003 :initial-element nil)))
-
-(defun register-rod (rod)
-  #+CMU
-  (unless (really-really-rod-p rod)
-    (push (ext:make-weak-pointer rod)
-          (aref *rod-hash-table* (mod (cl::pointer-hash rod)
-                                      (length *rod-hash-table*)))))
-  rod)
-
-(defun really-really-rod-p (rod)
-  #+CMU
-  (find rod (aref *rod-hash-table* (mod (cl::pointer-hash rod)
-                                        (length *rod-hash-table*)))
-        :key #'ext:weak-pointer-value))
-
-#+CMU
-(progn
-  (defun rod-hash-table-rehash ()
-    (let* ((n 5003)
-           (new (make-array n :initial-element nil)))
-      (loop for bucket across *rod-hash-table* do
-            (loop for item in bucket do
-                  (let ((v (ext:weak-pointer-value item)))
-                    (when v
-                      (push item (aref new (mod (cl::pointer-hash v) n)))))))
-      (setf *rod-hash-table* new)))
-
-  (defun rod-hash-after-gc-hook ()
-    ;; hmm interesting question: should we rehash?
-    (rod-hash-table-rehash))
-
-  (pushnew 'rod-hash-after-gc-hook extensions:*after-gc-hooks*) )
-
-(defun rod< (rod1 rod2)
-  (do ((i 0 (+ i 1)))

trunk/thirdparty/cxml/runes/syntax.lisp

@@ -179 +179 @@
-  (princ #\" stream))
-
-#-rune-is-character
-(set-pprint-dispatch '(satisfies really-rod-p) #'rod-printer)
-
-(set-dispatch-macro-character #\# #\" 'rod-reader)
-
-#||
-(defun longish-array-p (arr)
-  (and (arrayp arr)
-       (> (array-total-size arr) 10)))
-
-(set-pprint-dispatch '(satisfies longish-array-p)
-                     #'(lambda (stream object)
-                         (let ((*print-array* nil)
-                               (*print-pretty* nil))
-                           (prin1 object stream))))
-||#

trunk/thirdparty/cxml/test/domtest.lisp

@@ -557 +557 @@
-           (bindings '())
-           (code '()))
-      (declare (ignore title))
-      (do-child-elements (e test)
-        (string-case (tag-name e)

trunk/thirdparty/cxml/xml/xml-parse.lisp

@@ -147 +147 @@
-;; o xstreams auslagern, documententieren und dann auch in SGML und
-;;   CSS parser verwenden. (halt alles was zeichen liest).
-::
+;;
-;;   in Closure ist ein ganz anderes Thema]
-;;
@@ -242 +242 @@
-
-(defvar *ctx*)
+
+;; forward declaration for DEFVAR
+(declaim (special *default-namespace-bindings*))
-
-(defstruct (context (:conc-name nil))
@@ -2420 +2423 @@
-    (consume-token input)))
-  
-;; forward declaration for DEFVAR
-(declaim (special *default-namespace-bindings*))
-
-(defun p/document (input handler &key validate root)
-  (let ((*ctx* (make-context))