projects
/
xmlutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3044: *** empty log message ***
[xmlutils.git]
/
pxml1.cl
diff --git
a/pxml1.cl
b/pxml1.cl
index 3142ec6f0969450f82314cc735d2e6c7d290b452..d7c925206f2ccd09efb68d61eff5a6e93ced1fc5 100644
(file)
--- a/
pxml1.cl
+++ b/
pxml1.cl
@@
-19,7
+19,7
@@
;; version) or write to the Free Software Foundation, Inc., 59 Temple Place,
;; Suite 330, Boston, MA 02111-1307 USA
;;
;; version) or write to the Free Software Foundation, Inc., 59 Temple Place,
;; Suite 330, Boston, MA 02111-1307 USA
;;
-;; $Id: pxml1.cl,v 1.
1 2002/10/15 12:23:03
kevin Exp $
+;; $Id: pxml1.cl,v 1.
2 2002/10/16 03:45:52
kevin Exp $
;; Change Log
;;
;; Change Log
;;
@@
-27,7
+27,7
@@
(in-package :net.xml.parser)
(in-package :net.xml.parser)
-(pxml-dribble-bug-hook "$Id: pxml1.cl,v 1.
1 2002/10/15 12:23:03
kevin Exp $")
+(pxml-dribble-bug-hook "$Id: pxml1.cl,v 1.
2 2002/10/16 03:45:52
kevin Exp $")
(defparameter *collectors* (list nil nil nil nil nil nil nil nil))
(defparameter *collectors* (list nil nil nil nil nil nil nil nil))
@@
-271,14
+271,14
@@
(declare (ignorable tokenbuf) (optimize (speed 3) (safety 1)))
;; need no-OO check because external format support isn't completely done yet
(when (not (typep p 'string-input-simple-stream))
(declare (ignorable tokenbuf) (optimize (speed 3) (safety 1)))
;; need no-OO check because external format support isn't completely done yet
(when (not (typep p 'string-input-simple-stream))
- #+(
version>= 6 0 pre-final 1
)
+ #+(
and allegro (version>= 6 0 pre-final 1)
)
(let ((format (ignore-errors (excl:sniff-for-unicode p))))
(if* (eq format (find-external-format :unicode))
then
(let ((format (ignore-errors (excl:sniff-for-unicode p))))
(if* (eq format (find-external-format :unicode))
then
- (setf (stream-external-format p) format)
+
#+allegro
(setf (stream-external-format p) format)
else
else
- (setf (stream-external-format p) (find-external-format :utf8))))
- #-(
version>= 6 0 pre-final 1
)
+
#+allegro
(setf (stream-external-format p) (find-external-format :utf8))))
+ #-(
and allegro (version>= 6 0 pre-final 1)
)
(let* ((c (read-char p nil)) c2
(c-code (if c (char-code c) nil)))
(if* (eq #xFF c-code) then
(let* ((c (read-char p nil)) c2
(c-code (if c (char-code c) nil)))
(if* (eq #xFF c-code) then
@@
-286,12
+286,12
@@
(setf c-code (if c (char-code c2) nil))
(if* (eq #xFE c-code) then
(format t "set unicode~%")
(setf c-code (if c (char-code c2) nil))
(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))
+
#+allegro
(setf (stream-external-format p)
+ (find-external-format #+(
and allegro (version>= 6 0 pre-final 1)
) :unicode
+ #-(
and allegro (version>= 6 0 pre-final 1)
) :fat-little))
else
(xml-error "stream has incomplete Unicode marker"))
else
(xml-error "stream has incomplete Unicode marker"))
- else (setf (stream-external-format p)
+ else
#+allegro
(setf (stream-external-format p)
(find-external-format :utf8))
(when c
(push c (iostruct-unget-char tokenbuf))
(find-external-format :utf8))
(when c
(push c (iostruct-unget-char tokenbuf))