OSCL/CXML
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

encoding-fehler resignalisieren

Browse Source
This commit is contained in:
dlichteblau
2005-11-27 17:19:10 +00:00
parent e4c9e057b1
commit 11f2514116
6 changed files with 44 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xml/xml-parse.lisp
View File

@ -2960,10 +2960,13 @@
:type type))))))
(defun parse-xstream (xstream handler &rest args)
(let ((zstream (make-zstream :input-stack (list xstream))))
(peek-rune xstream)
(with-scratch-pads ()
(apply #'p/document zstream handler args))))
(handler-case
(let ((zstream (make-zstream :input-stack (list xstream))))
(peek-rune xstream)
(with-scratch-pads ()
(apply #'p/document zstream handler args)))
(runes-encoding:encoding-error (c)
(wf-error "~A" c))))
(defun parse-file (filename handler &rest args)
(with-open-xfile (input filename)
@ -3021,10 +3024,7 @@
(defun parse-string (string handler)
;; XXX this function mis-handles encoding
(with-scratch-pads ()
(let* ((x (string->xstream string))
(z (make-zstream :input-stack (list x))))
(p/document z handler))))
(parse-xstream (string->xstream string) handler))
(defun string->xstream (string)
;; XXX encoding is mis-handled by this kind of stream