From 148045f95435e871a5b83abf66d104fdcf6e1ae1 Mon Sep 17 00:00:00 2001 From: David Lichteblau Date: Sun, 14 Oct 2007 19:25:19 +0200 Subject: [PATCH] Update to current CXML. * types.lisp (SAX:START-PREFIX-MAPPING, SAX:END-PREFIX-MAPPING): Changed from primary methods to :after methods. * validate.lisp (VALIDATOR): Inherit from default-handler rather than sax-parser-mixin. (TEXT-NORMALIZER): Don't inherit explicitly from sax-parser-mixin. --- types.lisp | 4 ++-- validate.lisp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/types.lisp b/types.lisp index 2d0e3dc..26f89fa 100644 --- a/types.lisp +++ b/types.lisp @@ -282,11 +282,11 @@ automatically, and the user's SAX handler can simply be passed as a validation context to data type functions.")) -(defmethod sax:start-prefix-mapping +(defmethod sax:start-prefix-mapping :after ((handler sax-validation-context-mixin) prefix uri) (push (cons prefix uri) (context-stack handler))) -(defmethod sax:end-prefix-mapping +(defmethod sax:end-prefix-mapping :after ((handler sax-validation-context-mixin) prefix) (setf (context-stack handler) (remove prefix diff --git a/validate.lisp b/validate.lisp index 90ab85c..3e07e8f 100644 --- a/validate.lisp +++ b/validate.lisp @@ -172,7 +172,7 @@ ;;;; VALIDATOR -(defclass validator (sax:sax-parser-mixin +(defclass validator (sax:default-handler cxml-types:sax-validation-context-mixin) ((current-pattern :initarg :current-pattern :accessor current-pattern) (after-start-tag-p :accessor after-start-tag-p) @@ -796,7 +796,7 @@ ;;; FIXME: since we ignore PI, CDATA, and comment events, we should probably ;;; discard them properly. -(defclass text-normalizer (cxml:sax-proxy sax:sax-parser-mixin) +(defclass text-normalizer (cxml:sax-proxy) ((pending-text-node :initform (make-string-output-stream) :accessor pending-text-node))) -- 2.11.4.GIT