(in-package :net.xml.parser)
-(pxml-dribble-bug-hook "$Id: pxml1.cl,v 1.3 2003/06/20 02:21:23 kevin Exp $")
+(pxml-dribble-bug-hook "$Id: pxml1.cl,v 1.4 2003/07/11 18:02:41 kevin Exp $")
(defparameter *collectors* (list nil nil nil nil nil nil nil nil))
(defun put-back-collector (col)
(declare (optimize (speed 3) (safety 1)))
- (mp::without-scheduling
+ (without-scheduling
(do ((cols *collectors* (cdr cols)))
((null cols)
; toss it away
(defun get-tokenbuf ()
(declare (optimize (speed 3) (safety 1)))
(let (buf)
- (mp::without-scheduling
+ (without-scheduling
(do* ((bufs *tokenbufs* (cdr bufs))
(this (car bufs) (car bufs)))
((null bufs))
(defun put-back-tokenbuf (buf)
(declare (optimize (speed 3) (safety 1)))
- (mp::without-scheduling
+ (without-scheduling
(do ((bufs *tokenbufs* (cdr bufs)))
((null bufs)
; toss it away
(defun get-collector ()
(declare (optimize (speed 3) (safety 1)))
(let (col)
- (mp::without-scheduling
+ (without-scheduling
(do* ((cols *collectors* (cdr cols))
(this (car cols) (car cols)))
((null cols))
(if* (and from-stream (eq tmp-char #\return)) then #\newline else tmp-char)))
(defun unicode-check (p tokenbuf)
+ #-allegro (return-from unicode-check t)
+ #+allegro
(declare (ignorable tokenbuf) (optimize (speed 3) (safety 1)))
;; need no-OO check because external format support isn't completely done yet
+ #+allegro
(when (not (typep p 'string-input-simple-stream))
- #+(version>= 6 0 pre-final 1)
+ #+allegro
(let ((format (ignore-errors (excl:sniff-for-unicode p))))
(if* (eq format (find-external-format :unicode))
then
(setf (stream-external-format p) format)
else
(setf (stream-external-format p) (find-external-format :utf8))))
- #-(version>= 6 0 pre-final 1)
+ #-allegro
(let* ((c (read-char p nil)) c2
(c-code (if c (char-code c) nil)))
(if* (eq #xFF c-code) then
(if* (eq #xFE c-code) then
(format t "set unicode~%")
(setf (stream-external-format p)
- (find-external-format #+(version>= 6 0 pre-final 1) :unicode
- #-(version>= 6 0 pre-final 1) :fat-little))
+ (find-external-format
+ #+allegro :unicode
+ #-allegro :fat-little))
else
(xml-error "stream has incomplete Unicode marker"))
else (setf (stream-external-format p)
;; if we have a stream we're reading from set its external-format
;; to the encoding
;; note - tokenbuf is really an iostruct, not a tokenbuf
+ #+allegro
(if* (tokenbuf-stream (iostruct-tokenbuf tokenbuf))
then (setf (stream-external-format
(tokenbuf-stream (iostruct-tokenbuf tokenbuf)))