Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv12354

Modified Files: clhp.lisp cgi.lisp Log Message: Finally got defpackage to work properly.

Date: Wed Oct 1 10:32:45 2003 Author: aventimiglia

Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.8 clhp/clhp.lisp:1.9 --- clhp/clhp.lisp:1.8 Tue Sep 23 22:11:16 2003 +++ clhp/clhp.lisp Wed Oct 1 10:32:45 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.8 2003/09/24 02:11:16 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.9 2003/10/01 14:32:45 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -21,21 +21,16 @@ ;; email: aventimigli@common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/

-;; This is here to make clean compilation (eval-when (:compile-toplevel) - (when (find-package :clhp) - (delete-package :clhp)) - ;; Since CGU us used and we may be building this before it's installed, - ;; We'll need to load it. (unless (find-package :cgi) (load "cgi")))

-(make-package :CLHP) - -(in-package :CLHP) -(export '(PARSE *CLHP-VERSION* ECHO INCLUDE XML-ELEMENT MAKE-XML-ELEMENT - COPY-XML-ELEMENT XML-ELEMENT-ATTRIBUTES XML-ELEMENT-NAME - XML-ELEMENT-CONTENTS XML-ELEMENT-P TAG)) +(defpackage :clhp + (:use :cgi :cl) + (:export #:parse #:*clhp-version* #:echo #:include #:xml-element + #:make-xml-element #:copy-xml-element #:xml-element-attributes + #:xml-element-name #:xml-element-contents #:xml-element-p #:tag)) +(in-package :clhp)

;; This elaborate reader macro converts the cvs Date keywords and ;; translates it into a 8 digit date code for marking the cvs version. @@ -43,7 +38,7 @@ ;; will override the CVS keyword (defconstant *CLHP-VERSION* #.(or nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/09/24 02:11:16 $")) + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/01 14:32:45 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4)

Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.2 clhp/cgi.lisp:1.3 --- clhp/cgi.lisp:1.2 Fri Sep 19 01:57:19 2003 +++ clhp/cgi.lisp Wed Oct 1 10:32:45 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: cgi.lisp,v 1.2 2003/09/19 05:57:19 aventimiglia Exp $") + "$Id: cgi.lisp,v 1.3 2003/10/01 14:32:45 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -21,14 +21,11 @@ ;; email: aventimigli@common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/

-;; This is here to make clean compilation -(eval-when (:compile-toplevel) - (when (find-package :cgi) - (delete-package :cgi))) +(defpackage :cgi + (:use :cl) + (:export #:*server-env* #:*query-vars* #:header #:debug #:init))

-(make-package "CGI") (in-package :cgi) -(export '(*SERVER-ENV* *QUERY-VARS* HEADER DEBUG INIT))

(defmacro make-keyword (name) "Translates a string into a keyword: (MAKE-KEYWORD "foo") -->