r5292: *** empty log message ***

diff --git a/phtml.cl b/phtml.cl
index 14cbb3a4b74ee5450aa473379702d764b5251339..fc2e08b2b1df0c419fad2e5a1a413eb6186ff118 100644 (file)
--- a/phtml.cl
+++ b/phtml.cl
@@ -1,3 +1,4 @@
+#+allegro
 (sys:defpatch "phtml" 1
   "parse-html close tag closes consecutive identical open tags."
   :type :system
@@ -24,7 +25,7 @@
 ;; Suite 330, Boston, MA  02111-1307  USA
 ;;
 
-;; $Id: phtml.cl,v 1.2 2003/06/20 02:21:23 kevin Exp $
+;; $Id: phtml.cl,v 1.3 2003/07/11 18:02:41 kevin Exp $
 
 ;; phtml.cl  - parse html
 
@@ -48,7 +49,7 @@
 ;
 
 (defpackage net.html.parser
-  (:use :lisp :clos :excl)
+  (:use :cl #+allegro :clos :excl #+allegro :mp #-allegro :acl-mp)
   (:export
    #:phtml-internal
    #:parse-html))
@@ -103,7 +104,7 @@
 (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))
@@ -121,7 +122,7 @@
 
 (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
@@ -533,7 +534,7 @@
 (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))
@@ -552,7 +553,7 @@
 
 (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

diff --git a/pxml0.cl b/pxml0.cl
index 93ba24856ae3a8a3b5298d6f838bd57d752c02cf..9ec33b02117f5a445129c7e99459fcfec5d13998 100644 (file)
--- a/pxml0.cl
+++ b/pxml0.cl
@@ -1,3 +1,8 @@
+#+lispworks
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (hcl:toggle-source-debugging nil)
+  (setq system:*stack-overflow-behaviour* :warn)
+  (declaim (optimize (debug 0))))
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA
 ;;
@@ -29,7 +34,7 @@
 ;;
 
 (defpackage net.xml.parser
-  (:use :lisp :clos :excl :net.uri)
+  (:use :cl #+allegro :clos :excl :net.uri #+allegro :mp #-allegro :acl-mp)
   (:export
    #:parse-xml)
   )
@@ -44,10 +49,10 @@
        (loop for string in (reverse pxml-version-strings)
            do (write-string string stream-or-string)
               (terpri stream-or-string))))
-
+    #+excl
     (push 'pxml-dribble-bug-hook excl:*dribble-bug-hooks*)))
 
-(funcall 'pxml-dribble-bug-hook "$Id: pxml0.cl,v 1.4 2003/06/20 02:21:23 kevin Exp $")
+(funcall 'pxml-dribble-bug-hook "$Id: pxml0.cl,v 1.5 2003/07/11 18:02:41 kevin Exp $")
 
 (defun xml-char-p (char)
   (declare (optimize (speed 3) (safety 1)))

diff --git a/pxml1.cl b/pxml1.cl
index cc6df9dc05544fa1223d3bba34c8acb5d25bd96c..4849fb255a782363e2d5b08c117b4e00eacb8a58 100644 (file)
--- a/pxml1.cl
+++ b/pxml1.cl
@@ -25,13 +25,13 @@
 
 (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
@@ -83,7 +83,7 @@
 (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))
@@ -185,7 +185,7 @@
 
 (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
@@ -197,7 +197,7 @@
 (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))
@@ -266,17 +266,20 @@
     (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
@@ -285,8 +288,9 @@
              (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)
@@ -432,6 +436,7 @@
          ;; 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)))

diff --git a/pxml3.cl b/pxml3.cl
index bce65823d2a3431087256e8d72bffc4688f7977f..9e1cd36ddcc9680d88b5e87555a6ebcaa56d78c4 100644 (file)
--- a/pxml3.cl
+++ b/pxml3.cl
@@ -22,7 +22,7 @@
 
 (in-package :net.xml.parser)
 
-(pxml-dribble-bug-hook "$Id: pxml3.cl,v 1.2 2003/06/20 02:21:23 kevin Exp $")
+(pxml-dribble-bug-hook "$Id: pxml3.cl,v 1.3 2003/07/11 18:02:41 kevin Exp $")
 
 (defvar *debug-dtd* nil)
 
@@ -147,7 +147,9 @@
 
 (defun next-dtd-token (tokenbuf
                       external include-count external-callback)
-  (declare (:fbound parse-default-value) (optimize (speed 3) (safety 1)))
+  (declare #+allegro (:fbound parse-default-value)
+          #+lispworks (optimize (safety 0) (debug 3))
+          #-lispworks (optimize (speed 3) (safety 1)))
   (macrolet ((add-to-entity-buf (entity-symbol p-value)
               `(progn
                  (push (make-tokenbuf :cur 0 :max (length ,p-value) :data ,p-value)
@@ -2396,7 +2398,10 @@
     ))
 
 (defun external-param-reference (tokenbuf old-coll external-callback)
-  (declare (:fbound next-token) (ignorable old-coll) (optimize (speed 3) (safety 1)))
+  (declare #+allegro (:fbound next-token)
+          #+lispworks (optimize (safety 0) (debug 3))
+          (ignorable old-coll)
+          #-lispworks (optimize (speed 3) (safety 1)))
   (setf (iostruct-seen-parameter-reference tokenbuf) t)
   (macrolet ((add-to-entity-buf (entity-symbol p-value)
               `(progn