Update of /project/cxml/cvsroot/closure-common In directory clnet:/tmp/cvs-serv27317
Modified Files: closure-common.asd hax.lisp utf8.lisp Log Message: hax:%want-strings-p
--- /project/cxml/cvsroot/closure-common/closure-common.asd 2007/10/14 17:29:43 1.2 +++ /project/cxml/cvsroot/closure-common/closure-common.asd 2007/10/21 17:07:38 1.3 @@ -25,7 +25,6 @@ :rune-is-character)) (unless (or (<= #xD800 x #xDFFF) (and (< x char-code-limit) (code-char x))) - (print (code-char x)) (format t " no, reverting to octet strings.~%") (return :rune-is-integer))) *features*)) --- /project/cxml/cvsroot/closure-common/hax.lisp 2007/10/21 14:11:28 1.2 +++ /project/cxml/cvsroot/closure-common/hax.lisp 2007/10/21 17:07:38 1.3 @@ -9,15 +9,15 @@
;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions are -;;; met: -;;; +;;; met: +;;; ;;; 1. Redistributions of source code must retain the above copyright -;;; notice, this list of conditions and the following disclaimer. -;;; +;;; notice, this list of conditions and the following disclaimer. +;;; ;;; 2. Redistributions in binary form must reproduce the above copyright ;;; notice, this list of conditions and the following disclaimer in the ;;; documentation and/or other materials provided with the distribution -;;; +;;; ;;; THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ;;; WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ;;; MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -34,20 +34,23 @@ (:use :common-lisp) (:export #:abstract-handler #:default-handler - + #:make-attribute #:standard-attribute #:find-attribute #:attribute-name #:attribute-value #:attribute-specified-p - + #:start-document #:start-element #:characters #:end-element #:end-document - #:comment)) + #:comment + + #+rune-is-integer + #:%want-strings-p))
(in-package :hax)
@@ -86,6 +89,11 @@ (defclass abstract-handler () ()) (defclass default-handler (abstract-handler) ())
+#+rune-is-integer +(defgeneric %want-strings-p (handler) + (:method ((handler null)) nil) + (:method ((handler abstract-handler)) t)) + (defgeneric start-document (handler name public-id system-id) (:method ((handler null) name public-id system-id) (declare (ignore name public-id system-id)) --- /project/cxml/cvsroot/closure-common/utf8.lisp 2007/05/26 21:55:58 1.3 +++ /project/cxml/cvsroot/closure-common/utf8.lisp 2007/10/21 17:07:38 1.4 @@ -29,7 +29,7 @@ (defun rod-reader (stream subchar arg) (runes::rod-string (runes::rod-reader stream subchar arg)))
-(setf runes-system:*utf8-runes-readtable* +(setf closure-common-system:*utf8-runes-readtable* (let ((rt (copy-readtable))) (set-dispatch-macro-character ## #/ 'rune-reader rt) (set-dispatch-macro-character ## #" 'rod-reader rt)