r5094: *** empty log message ***

diff --git a/attrib-class.lisp b/attrib-class.lisp
index 505a8a443a9d65cf0ac7a6ffa205bfdafd8f5ec6..04f8840f14d9c6da7cb25381fcd1129b7c493b91 100644 (file)
--- a/attrib-class.lisp
+++ b/attrib-class.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: attrib-class.lisp,v 1.13 2003/04/29 09:23:56 kevin Exp $
+;;;; $Id: attrib-class.lisp,v 1.14 2003/06/12 02:38:39 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -101,6 +101,5 @@ on example from AMOP"))
               slot-name instance attribute))
       attr-bucket)))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (export '(attributes-class slot-attributes)))
+
 

diff --git a/kmrcl.asd b/kmrcl.asd
index b866b39929c914e7a83e8e4eaf9c1a28256bb9bf..19fe091abd1239d45a0685ac0a7fddaf39817c67 100644 (file)
--- a/kmrcl.asd
+++ b/kmrcl.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: kmrcl.asd,v 1.30 2003/06/06 21:59:29 kevin Exp $
+;;;; $Id: kmrcl.asd,v 1.31 2003/06/12 02:38:39 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -48,7 +48,7 @@
      #+kmr-mop (:file "mop" :depends-on ("macros"))
      #+kmr-mop (:file "attrib-class" :depends-on ("seqs" "mop"))
      (:file "equal" :depends-on ("macros" #+kmr-mop "mop"))
-     (:file "web-utils" :depends-on ("macros"))
+     (:file "web-utils" :depends-on ("macros" "strings"))
      (:file "xml-utils" :depends-on ("macros")))
     )
 

diff --git a/package.lisp b/package.lisp
index 79306a82fe977c1f0f10200361d8c2eb976d2272..a4011d7cee25cc8851f3e3ed48a47f9beaa65bfe 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.35 2003/06/07 05:45:14 kevin Exp $
+;;;; $Id: package.lisp,v 1.36 2003/06/12 02:38:39 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -47,6 +47,7 @@
    #:integer-string
    #:fast-string-search
    #:string-to-list-skip-delimiter
+   #:string-starts-with
    
    #:flatten
    
@@ -124,8 +125,10 @@
    ;; From attrib-class.lisp
    #:attributes-class
    #:slot-attribute
+   #:slot-attributes
+
    #:generalized-equal
-   
+
    ;; From buffered input
    
    #:make-fields-buffer

diff --git a/strings.lisp b/strings.lisp
index a070731a2afff44463a1def6f1bae6619e2c4fc2..5343f31cb0f488c3f01af628c57f40b004a42ecb 100644 (file)
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.36 2003/06/07 05:45:14 kevin Exp $
+;;;; $Id: strings.lisp,v 1.37 2003/06/12 02:38:39 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -168,7 +168,7 @@
     (null (find-if #'not-whitespace? str))))
 
 (defun replaced-string-length (str repl-alist)
-  (declare (string str))
+  (declare (simple-string str))
   (let* ((orig-len (length str))
         (new-len orig-len))
     (declare (fixnum orig-len new-len))
@@ -198,7 +198,8 @@ list of characters and replacement strings."
       (if match
          (let* ((subst (cdr match))
                 (len (length subst)))
-           (declare (fixnum len))
+           (declare (fixnum len)
+                    (simple-string subst))
            (dotimes (j len)
              (declare (fixnum j))
              (setf (char new-string dpos) (char subst j))
@@ -212,31 +213,31 @@ list of characters and replacement strings."
   (substitute-chars-strings string '((#\& . "&amp;") (#\< . "&lt;"))))
 
 (defun make-usb8-array (len)
-  (make-array len :adjustable nil
-             :fill-pointer nil
-             :element-type '(unsigned-byte 8)))
+  (make-array len :element-type '(unsigned-byte 8)))
 
 (defun usb8-array-to-string (vec)
+  (declare (type (simple-array (unsigned-byte 8) (*)) vec))
   (let* ((len (length vec))
         (str (make-string len)))
     (declare (fixnum len)
             (simple-string str)
             (optimize (speed 3)))
-    (dotimes (i len)
+    (do ((i 0 (1+ i)))
+       ((= i len) str)
       (declare (fixnum i))
-      (setf (schar str i) (code-char (aref vec i))))
-    str))
+      (setf (schar str i) (code-char (aref vec i))))))
 
 (defun string-to-usb8-array (str)
+  (declare (simple-string str))
   (let* ((len (length str))
         (vec (make-usb8-array len)))
     (declare (fixnum len)
-            (type (array fixnum (*)) vec)
+            (type (simple-array (unsigned-byte 8) (*)) vec)
             (optimize (speed 3)))
-    (dotimes (i len)
+    (do ((i 0 (1+ i)))
+       ((= i len) vec)
       (declare (fixnum i))
-      (setf (aref vec i) (char-code (schar str i))))
-    vec))
+      (setf (aref vec i) (char-code (schar str i))))))
 
 (defun concat-separated-strings (separator &rest lists)
   (format nil (concatenate 'string "~{~A~^" (string separator) "~}")
@@ -331,3 +332,7 @@ Leading zeros are present."
        (nreverse results))
     (declare (fixnum i j end))
     (push (subseq str i j) results)))
+
+(defun string-starts-with (start str)
+  (and (>= (length str) (length start))
+       (string-equal start str :end2 (length start))))

diff --git a/web-utils.lisp b/web-utils.lisp
index 1614fe4fa33703501a03bdf859596db8b5474159..1c475a8379a650c62fb0f259276f7e4ac9a2855d 100644 (file)
--- a/web-utils.lisp
+++ b/web-utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: web-utils.lisp,v 1.10 2003/06/06 21:59:30 kevin Exp $
+;;;; $Id: web-utils.lisp,v 1.11 2003/06/12 02:38:39 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,22 +22,21 @@
 ;;; HTML/XML constants
 
 (defvar *standard-xml-header* 
-  #.(format nil "<?xml version=\"1.0\" ?>~%<?xml-stylesheet type=\"text/css\" href=\"http://b9.com/umlsxml.css\" ?>~%~%"))
+  #.(format nil "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>~%<?xml-stylesheet type=\"text/css\" href=\"http://b9.com/umlsxml.css\" ?>~%~%"))
 
 (defvar *standard-html-header* "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">")
 
 (defvar *standard-xhtml-header*
-  #.(format nil "<?xml version=\"1.0\" standalone=\"yes\"?>~%<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3c.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"))
+  #.(format nil "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>~%<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3c.org/TR/xhtml11/DTD/xhtml11\">"))
 
 
 ;;; User agent functions
 
 (defun user-agent-ie-p (agent)
   "Takes a user-agent string and returns T for Internet Explorer."
-  (when (or (string-equal "Microsoft" (subseq agent 0 (length "Microsoft")))
-           (string-equal "Internet Explore" (subseq agent 0 (length "Internet Explore")))
-           (search "MSIE" agent))
-    t))
+  (or (string-starts-with "Microsoft" agent)
+      (string-starts-with "Internet Explore" agent)
+      (search "MSIE" agent)))
 
 ;;; URL Functions