October 2003 - clhp-cvs@common-lisp.net - mailman3.common-lisp.net

[clhp-cvs] CVS update: clhp/utility.lisp clhp/clhp.lisp clhp/clhp.asd clhp/cgi.lisp clhp/ChangeLog clhp/.cvsignore
by Anthony Ventimiglia 17 Oct '03

17 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv9555 Modified Files: clhp.lisp clhp.asd cgi.lisp ChangeLog .cvsignore Added Files: utility.lisp Log Message: * (Module): Moved COND-BIND, IF-BIND, A-LIST-VALUE, CA-LIST-TO-A-LIST, MAKE-KEYWORD, and LIST-TO-A-LIST out of cgi.lisp in here. * clhp.asd, package.lisp, clhp.lisp, cgi.lisp: Converted all this to an ASDF system, it's not quite battle tested, but hey, that's what this is all about. Date: Fri Oct 17 09:11:44 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.16 clhp/clhp.lisp:1.17 --- clhp/clhp.lisp:1.16 Fri Oct 17 08:58:04 2003 +++ clhp/clhp.lisp Fri Oct 17 09:11:44 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.16 2003/10/17 12:58:04 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.17 2003/10/17 13:11:44 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -21,18 +21,6 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -;(eval-when (:compile-toplevel) -; (unless (find-package :cgi) -; (load "cgi"))) - -;(defpackage #:net.common-lisp.aventimiglia.clhp -; (:nicknames :clhp) -; (:use :cgi :cl) -; (:import-from :cgi #:cond-bind #:list-to-a-list) -; (: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 @@ -41,7 +29,7 @@ ;; will override the CVS keyword (defconstant *CLHP-VERSION* #.(or nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/17 12:58:04 $")) + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/17 13:11:44 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) @@ -83,8 +71,8 @@ to use CLHP. See README for an example." (use-package :cgi) (use-package :clhp) - (cgi:init) - (cgi:header :content-type + (init) + (header :content-type :text/html :extra '(#.(format Index: clhp/clhp.asd diff -u clhp/clhp.asd:1.1 clhp/clhp.asd:1.2 --- clhp/clhp.asd:1.1 Fri Oct 17 08:58:04 2003 +++ clhp/clhp.asd Fri Oct 17 09:11:44 2003 @@ -1,5 +1,4 @@ -#+cmu (ext:file-comment "$Id: clhp.asd,v 1.1 2003/10/17 12:58:04 aventimiglia Exp $") -;; -*- lisp -*- +#+cmu (ext:file-comment "$Id: clhp.asd,v 1.2 2003/10/17 13:11:44 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -37,5 +36,6 @@ :licence "GNU Lesser General Public License" :components ((:file "package") - (:file "cgi" :depends-on ("package")) + (:file "utility" :depends-on ("package")) + (:file "cgi" :depends-on ("utility")) (:file "clhp" :depends-on ("cgi")))) Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.11 clhp/cgi.lisp:1.12 --- clhp/cgi.lisp:1.11 Fri Oct 17 08:58:04 2003 +++ clhp/cgi.lisp Fri Oct 17 09:11:44 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.11 2003/10/17 12:58:04 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.12 2003/10/17 13:11:44 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -20,17 +20,7 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -;(defpackage #:net.common-lisp.aventimiglia.cgi -; (:nicknames #:cgi) -; (:use :cl) -; (:export #:*server-env* #:*query-vars* #:header #:debug #:init)) - -(in-package :cgi) - -(defmacro make-keyword (name) - "Translates a string into a keyword: (MAKE-KEYWORD \"foo\") --> -:FOO" - `(read-from-string (format nil ":~a" ,name))) +(in-package :clhp) (defmacro debug (expression) "Print out EXPRESSION and the result of (EVAL EXPRESSION)" @@ -42,19 +32,6 @@ ex: (EXPLODE-STRING (\"Hello\") --> (#\H #\e #\l #\l #\o)" `(concatenate 'list ,string)) -(defmacro a-list-value (key a-list) - "returns the value from a (KEY . VALUE) A-LIST" - `(cadr (assoc ,key ,a-list))) - -(defmacro cond-bind ((&rest bindings) &body body) - "A COND wrapped in a Let" - `(let (,@bindings) (cond ,@body))) - -(defmacro if-bind ((&rest bindings) test if else) - "An IF wrapped in a LET" - `(let (,@bindings) (if ,test ,if ,else))) - - ;; External Symbol section (defvar *server-env* nil @@ -92,10 +69,6 @@ (format t "Content-type: ~a~%~%" content-type) (setf done t)))) -(defun ca-list-to-a-list (list) - "Converts a CONS type a-list '((A . 3)(B . 4)) to a list type '((A 3)(B 4))" - (mapcar #'(lambda (cons) (list (car cons)(cdr cons))) list)) - ;; This sets the main variables, since the library is already part of the lisp ;; core, we can't use an eval-when, I may eventually make a cgi:init that also ;; prints the header. @@ -180,19 +153,6 @@ (a-list-value :CONTENT_LENGTH *server-env*)))) post-char-list) post-char-list))) - -(defun list-to-a-list (list &optional a-list) - "Converts a list to an a-list, pairing odd and even elements. If an -odd number of elements are in LIST, the last element is returnes as -the second value. -ex: (LIST-TO-A-LIST '(a b c d) --> '((a b)(c d)) NIL -ex: (LIST-TO-A-LIST '(1 2 3 4 5) --> '((1 2)(3 4)) 5" - (cond - ((null list) (nreverse a-list)) - ((= 1 (length list)) (values (nreverse a-list) (car list))) - (t (list-to-a-list (cddr list) - (cons (list (car list) (cadr list)) - a-list))))) (defun query-to-a-list (get/post-data) (list-to-a-list Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.15 clhp/ChangeLog:1.16 --- clhp/ChangeLog:1.15 Fri Oct 17 08:58:04 2003 +++ clhp/ChangeLog Fri Oct 17 09:11:44 2003 @@ -1,5 +1,9 @@ 2003-10-17 <ant(a)afghan.dogpound> + * (Module): Moved COND-BIND, IF-BIND, A-LIST-VALUE, + CA-LIST-TO-A-LIST, MAKE-KEYWORD, and LIST-TO-A-LIST out of + cgi.lisp in here. + * clhp.asd, package.lisp, clhp.lisp, cgi.lisp: Converted all this to an ASDF system, it's not quite battle tested, but hey, that's what this is all about. @@ -97,4 +101,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.16 2003/10/17 13:11:44 aventimiglia Exp $ \ No newline at end of file Index: clhp/.cvsignore diff -u clhp/.cvsignore:1.2 clhp/.cvsignore:1.3 --- clhp/.cvsignore:1.2 Fri Oct 17 08:58:04 2003 +++ clhp/.cvsignore Fri Oct 17 09:11:44 2003 @@ -3,3 +3,4 @@ clhp.x86f package.x86f start-clcgi.x86f +utility.x86f

1 0

[clhp-cvs] CVS update: clhp/package.lisp clhp/clhp.asd clhp/clhp.lisp clhp/cgi.lisp clhp/TODO clhp/Makefile clhp/ChangeLog clhp/.cvsignore
by Anthony Ventimiglia 17 Oct '03

17 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv27650 Modified Files: clhp.lisp cgi.lisp TODO Makefile ChangeLog .cvsignore Added Files: package.lisp clhp.asd Log Message: Converted all this to an ASDF system, it's not quite battle tested, but hey, that's what this is all about. Date: Fri Oct 17 08:58:04 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.15 clhp/clhp.lisp:1.16 --- clhp/clhp.lisp:1.15 Thu Oct 16 15:31:59 2003 +++ clhp/clhp.lisp Fri Oct 17 08:58:04 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.15 2003/10/16 19:31:59 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.16 2003/10/17 12:58:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -21,17 +21,18 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -(eval-when (:compile-toplevel) - (unless (find-package :cgi) - (load "cgi"))) +;(eval-when (:compile-toplevel) +; (unless (find-package :cgi) +; (load "cgi"))) + +;(defpackage #:net.common-lisp.aventimiglia.clhp +; (:nicknames :clhp) +; (:use :cgi :cl) +; (:import-from :cgi #:cond-bind #:list-to-a-list) +; (: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 #:net.common-lisp.aventimiglia.clhp - (:nicknames :clhp) - (:use :cgi :cl) - (:import-from :cgi #:cond-bind #:list-to-a-list) - (: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 @@ -40,7 +41,7 @@ ;; will override the CVS keyword (defconstant *CLHP-VERSION* #.(or nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/16 19:31:59 $")) + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/17 12:58:04 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.10 clhp/cgi.lisp:1.11 --- clhp/cgi.lisp:1.10 Wed Oct 15 10:44:04 2003 +++ clhp/cgi.lisp Fri Oct 17 08:58:04 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.10 2003/10/15 14:44:04 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.11 2003/10/17 12:58:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -20,10 +20,10 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -(defpackage #:net.common-lisp.aventimiglia.cgi - (:nicknames #:cgi) - (:use :cl) - (:export #:*server-env* #:*query-vars* #:header #:debug #:init)) +;(defpackage #:net.common-lisp.aventimiglia.cgi +; (:nicknames #:cgi) +; (:use :cl) +; (:export #:*server-env* #:*query-vars* #:header #:debug #:init)) (in-package :cgi) Index: clhp/TODO diff -u clhp/TODO:1.7 clhp/TODO:1.8 --- clhp/TODO:1.7 Wed Oct 15 10:44:04 2003 +++ clhp/TODO Fri Oct 17 08:58:04 2003 @@ -1,4 +1,6 @@ -$Id: TODO,v 1.7 2003/10/15 14:44:04 aventimiglia Exp $ -*- outline -*- +$Id: TODO,v 1.8 2003/10/17 12:58:04 aventimiglia Exp $ -*- outline -*- + +* Use ASDF for package building * Convert *QUERY-VARS* and *SERVER-ENV* to hashes I should probably make interface functions to access them, actually @@ -7,7 +9,7 @@ * Test suite ** Complete suite for :cgi -** Write suite for :clhp +** Complete suite for :clhp ** Refine :test-suite * COMPILE-CGI Index: clhp/Makefile diff -u clhp/Makefile:1.14 clhp/Makefile:1.15 --- clhp/Makefile:1.14 Thu Oct 16 15:40:18 2003 +++ clhp/Makefile Fri Oct 17 08:58:04 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.14 2003/10/16 19:40:18 aventimiglia Exp $ +# $Id: Makefile,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -57,8 +57,9 @@ LISPC=$(LISP) -noinit -load config/lispc -eval '(make)' -SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp -LIBS=cgi.x86f clhp.x86f start-clcgi.x86f +BUILD_CORE=config/build-core.x86f +BINS=start-clcgi.x86f +SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp package.lisp clhp.asd CORE=clhp.core LISPCBIN=config/lispc.x86f RUNCGI=config/runclcgi @@ -84,7 +85,7 @@ # makefile most likeley will not match the cvs version ID in # clhp.lisp, since they depend on their own file's cvs date keyword. -CVSID=$(shell echo $Date: 2003/10/16 19:40:18 $ | \ +CVSID=$(shell echo $Date: 2003/10/17 12:58:04 $ | \ awk '{print $$2}'| sed s/\\///g )cvs VERSION=$(CVSID) @@ -94,7 +95,7 @@ RECURSIVE_TARGETS=clean-recursive clean-all-recursive check-recursive -all: $(LISPCBIN) $(LIBS) $(CORE) $(RUNCGI) +all: $(LISPCBIN) $(CORE) $(RUNCGI) $(BINS) .PHONY: all install uninstall clean clean-all clean-backups install-dirs \ install-source install-source-dirs uninstall-files uninstall-dirs \ @@ -115,8 +116,8 @@ $(LISPCBIN): config/lispc.lisp -$(CORE): $(SOURCES) config/build-core.lisp - $(LISP) -noinit -eval '(load (open "config/build-core.lisp"))' +$(CORE): $(SOURCES) $(BUILD_CORE) + $(LISP) -noinit -load "config/build-core" $(RUNCGI): $(RUNCGI).src sed 's:$LISP=$:\1$(LISP):' < $< | \ @@ -124,7 +125,7 @@ sed 's:$CMUCLLIB=$:\1$(LIBDIR):' > $@ install: all install-dirs install-core - for f in $(LIBS); do \ + for f in $(BINS) ; do \ $(INSTALLFILE) $$f $(LIBDIR) ; \ done $(INSTALL) $(DOCS) $(DOCDIR) @@ -194,11 +195,12 @@ clean-all: clean-all-recursive clean clean-backups clean-dist clean: clean-recursive - for f in $(LIBS) $(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) \ + for f in $(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) \ $(TESTS) $(TARBALL); \ do \ if test -f $$f ; then rm -v $$f ; fi \ done + find -iname "*.x86f" -exec rm -v {} \; $(MAKE) -C examples clean find -iname "*.tar.gz" -exec rm -v {} \; Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.14 clhp/ChangeLog:1.15 --- clhp/ChangeLog:1.14 Thu Oct 16 12:57:25 2003 +++ clhp/ChangeLog Fri Oct 17 08:58:04 2003 @@ -1,3 +1,9 @@ +2003-10-17 <ant(a)afghan.dogpound> + + * clhp.asd, package.lisp, clhp.lisp, cgi.lisp: Converted all this + to an ASDF system, it's not quite battle tested, but hey, that's + what this is all about. + 2003-10-16 <ant(a)afghan.dogpound> * tests/clhp-test.lisp (*CLHP-TESTS*): Wrote tests for most of @@ -91,4 +97,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.14 2003/10/16 16:57:25 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $ \ No newline at end of file Index: clhp/.cvsignore diff -u clhp/.cvsignore:1.1 clhp/.cvsignore:1.2 --- clhp/.cvsignore:1.1 Tue Oct 14 00:33:41 2003 +++ clhp/.cvsignore Fri Oct 17 08:58:04 2003 @@ -1,4 +1,5 @@ cgi.x86f clhp.core clhp.x86f +package.x86f start-clcgi.x86f

1 0

[clhp-cvs] CVS update: clhp/config/build-core.lisp clhp/config/.cvsignore
by Anthony Ventimiglia 17 Oct '03

17 Oct '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv27650/config Modified Files: build-core.lisp .cvsignore Log Message: Converted all this to an ASDF system, it's not quite battle tested, but hey, that's what this is all about. Date: Fri Oct 17 08:58:03 2003 Author: aventimiglia Index: clhp/config/build-core.lisp diff -u clhp/config/build-core.lisp:1.3 clhp/config/build-core.lisp:1.4 --- clhp/config/build-core.lisp:1.3 Wed Oct 15 08:50:52 2003 +++ clhp/config/build-core.lisp Fri Oct 17 08:58:03 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: build-core.lisp,v 1.3 2003/10/15 12:50:52 aventimiglia Exp $") + "$Id: build-core.lisp,v 1.4 2003/10/17 12:58:03 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -37,21 +37,24 @@ (block abort (let ((output-file #p"clhp.core") - (packages '(:cgi :clhp))) - (gc-off) - - (dolist (package packages) - (when (find-package package) - (delete-package package)) - (handler-case - (load (format nil "~A" (string-downcase (string package)))) - (file-error (c) - (format - t - "There was an file-error in loading \"~A\"~%Perhaps the proper packages did not build successfully, or maybe you're mokeying around.~%" - (file-error-pathname c)) - (unix:unix-exit 1)))) +; (packages '(:cgi :clhp))) +) + (gc-off) + (asdf:operate 'asdf:load-op 'clhp) + +; (dolist (package packages) +; (when (find-package package) +; (delete-package package)) +; (handler-case +; (load (format nil "~A" (string-downcase (string package)))) +; (file-error (c) +; (format +; t +; "There was an file-error in loading \"~A\"~%Perhaps the proper packages did not build successfully, or maybe you're mokeying around.~%" +; (file-error-pathname c)) +; (unix:unix-exit 1)))) +; (when (probe-file output-file) (multiple-value-bind (ignore old new) Index: clhp/config/.cvsignore diff -u clhp/config/.cvsignore:1.1 clhp/config/.cvsignore:1.2 --- clhp/config/.cvsignore:1.1 Tue Oct 14 18:47:29 2003 +++ clhp/config/.cvsignore Fri Oct 17 08:58:03 2003 @@ -1,2 +1,3 @@ +build-core.x86f lispc.x86f runclcgi

1 0

[clhp-cvs] CVS update: clhp/Makefile
by Anthony Ventimiglia 16 Oct '03

16 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv24854 Modified Files: Makefile Log Message: Got cvs-type versioning working, this way if someone does a "make dist" on the cvs they won't get a mislabeled version Date: Thu Oct 16 15:40:18 2003 Author: aventimiglia Index: clhp/Makefile diff -u clhp/Makefile:1.13 clhp/Makefile:1.14 --- clhp/Makefile:1.13 Thu Oct 16 15:31:59 2003 +++ clhp/Makefile Thu Oct 16 15:40:18 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.13 2003/10/16 19:31:59 aventimiglia Exp $ +# $Id: Makefile,v 1.14 2003/10/16 19:40:18 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -77,9 +77,17 @@ # This is the version for the next release, during cvs development the # real version number is based on the date of the last change to # clhp.lisp, the only place this version carries in is during -# make-dist. -CVSID=$(shell echo \ - $$Date: 2003/10/16 19:31:59 $$ ) +# make-dist. +# +# I've put a nice little trick to make sure tarballs made with make +# dist have a cvs-type versioning number. The version here in the +# makefile most likeley will not match the cvs version ID in +# clhp.lisp, since they depend on their own file's cvs date keyword. + +CVSID=$(shell echo $Date: 2003/10/16 19:40:18 $ | \ + awk '{print $$2}'| sed s/\\///g )cvs + +VERSION=$(CVSID) #VERSION=0.1.2alpha TARROOT=clhp-$(VERSION) TARBALL=$(TARROOT).tar.gz @@ -87,9 +95,6 @@ RECURSIVE_TARGETS=clean-recursive clean-all-recursive check-recursive all: $(LISPCBIN) $(LIBS) $(CORE) $(RUNCGI) - -version: - echo $(CVSID) .PHONY: all install uninstall clean clean-all clean-backups install-dirs \ install-source install-source-dirs uninstall-files uninstall-dirs \

1 0

[clhp-cvs] CVS update: clhp/clhp.lisp clhp/Makefile
by Anthony Ventimiglia 16 Oct '03

16 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv19798 Modified Files: clhp.lisp Makefile Log Message: Trying to get a nice little feature where the makefile creates a CVS version ID similar to how it's done in clhp.lisp Date: Thu Oct 16 15:31:59 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.14 clhp/clhp.lisp:1.15 --- clhp/clhp.lisp:1.14 Thu Oct 16 12:57:25 2003 +++ clhp/clhp.lisp Thu Oct 16 15:31:59 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.14 2003/10/16 16:57:25 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.15 2003/10/16 19:31:59 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -39,8 +39,8 @@ ;; by changing the NIL in the first part of the OR, a release number ;; will override the CVS keyword (defconstant *CLHP-VERSION* - #.(or "0.1.1alpha" ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/16 16:57:25 $")) + #.(or nil ; Set this for releases + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/16 19:31:59 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/Makefile diff -u clhp/Makefile:1.12 clhp/Makefile:1.13 --- clhp/Makefile:1.12 Wed Oct 15 10:44:04 2003 +++ clhp/Makefile Thu Oct 16 15:31:59 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.12 2003/10/15 14:44:04 aventimiglia Exp $ +# $Id: Makefile,v 1.13 2003/10/16 19:31:59 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -78,13 +78,18 @@ # real version number is based on the date of the last change to # clhp.lisp, the only place this version carries in is during # make-dist. -VERSION=0.1.1alpha +CVSID=$(shell echo \ + $$Date: 2003/10/16 19:31:59 $$ ) +#VERSION=0.1.2alpha TARROOT=clhp-$(VERSION) TARBALL=$(TARROOT).tar.gz RECURSIVE_TARGETS=clean-recursive clean-all-recursive check-recursive all: $(LISPCBIN) $(LIBS) $(CORE) $(RUNCGI) + +version: + echo $(CVSID) .PHONY: all install uninstall clean clean-all clean-backups install-dirs \ install-source install-source-dirs uninstall-files uninstall-dirs \

1 0

[clhp-cvs] CVS update: clhp/tests/clhp-test.lisp clhp/tests/test-suite.lisp clhp/tests/cgi-test.lisp clhp/tests/Makefile clhp/tests/.cvsignore
by Anthony Ventimiglia 16 Oct '03

16 Oct '03

Update of /project/clhp/cvsroot/clhp/tests In directory common-lisp.net:/tmp/cvs-serv1115/tests Modified Files: test-suite.lisp cgi-test.lisp Makefile .cvsignore Added Files: clhp-test.lisp Log Message: * tests/clhp-test.lisp (*CLHP-TESTS*): Wrote tests for most of :CLHP * clhp.lisp (FIND-PI-START, FIND-PI-END): Made 0 a default value for START. Date: Thu Oct 16 12:57:25 2003 Author: aventimiglia Index: clhp/tests/test-suite.lisp diff -u clhp/tests/test-suite.lisp:1.2 clhp/tests/test-suite.lisp:1.3 --- clhp/tests/test-suite.lisp:1.2 Thu Oct 16 00:00:42 2003 +++ clhp/tests/test-suite.lisp Thu Oct 16 12:57:25 2003 @@ -160,7 +160,7 @@ (call-if-function (test-data-post-function data)))) ;; Example -;(defvar list-test (make-instance 'function-test-data +;(defparameter list-test (make-instance 'function-test-data ; :symbol 'list ; :test-args '(1 2 3 4 5) ; :result-form '(1 2 3 4 5))) Index: clhp/tests/cgi-test.lisp diff -u clhp/tests/cgi-test.lisp:1.9 clhp/tests/cgi-test.lisp:1.10 --- clhp/tests/cgi-test.lisp:1.9 Thu Oct 16 00:00:42 2003 +++ clhp/tests/cgi-test.lisp Thu Oct 16 12:57:25 2003 @@ -23,19 +23,15 @@ ;; Test suite to for the :CGI package. The aim of this is to test all ;; external, and possibly internal symbols in the package -;; These classes and methods should be a separate package - (eval-when (:load-toplevel :compile-toplevel) (unless (find-package :cgi) - (load "library:cgi")) + (load "../cgi")) (unless (find-package :net.common-lisp.aventimiglia.test-suite) (load "test-suite")) (when (find-package :clhp) (delete-package :clhp))) (use-package :test-suite) -(defvar *cgi-tests*) - ;; Still to be tested ;; Functions which have side effects and no return values ;; INIT @@ -45,7 +41,7 @@ ;; Use the following to run-tests ;; (mapcar #'run-test *cgi-tests*) -(setf *cgi-tests* +(defparameter *cgi-tests* (list (make-instance 'function-test-data :symbol 'cgi::explode-string Index: clhp/tests/Makefile diff -u clhp/tests/Makefile:1.1 clhp/tests/Makefile:1.2 --- clhp/tests/Makefile:1.1 Wed Oct 15 10:05:57 2003 +++ clhp/tests/Makefile Thu Oct 16 12:57:25 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 2003/10/15 14:05:57 aventimiglia Exp $ +# $Id: Makefile,v 1.2 2003/10/16 16:57:25 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -31,7 +31,7 @@ LISPC=$(LISP) -noinit -load ../config/lispc -core $(CORE) -eval '(make)' TEST=$(LISP) -core $(CORE) -load PKGS=test-suite.x86f -TESTS=cgi-test.x86f +TESTS=cgi-test.x86f clhp-test.x86f all: $(TESTS) Index: clhp/tests/.cvsignore diff -u clhp/tests/.cvsignore:1.1 clhp/tests/.cvsignore:1.2 --- clhp/tests/.cvsignore:1.1 Tue Oct 14 00:33:40 2003 +++ clhp/tests/.cvsignore Thu Oct 16 12:57:25 2003 @@ -1 +1,3 @@ cgi-test.x86f +clhp-test.x86f +test-suite.x86f

1 0

[clhp-cvs] CVS update: clhp/clhp.lisp clhp/ChangeLog
by Anthony Ventimiglia 16 Oct '03

16 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv1115 Modified Files: clhp.lisp ChangeLog Log Message: * tests/clhp-test.lisp (*CLHP-TESTS*): Wrote tests for most of :CLHP * clhp.lisp (FIND-PI-START, FIND-PI-END): Made 0 a default value for START. Date: Thu Oct 16 12:57:25 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.13 clhp/clhp.lisp:1.14 --- clhp/clhp.lisp:1.13 Wed Oct 15 10:44:04 2003 +++ clhp/clhp.lisp Thu Oct 16 12:57:25 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.13 2003/10/15 14:44:04 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.14 2003/10/16 16:57:25 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -40,7 +40,7 @@ ;; will override the CVS keyword (defconstant *CLHP-VERSION* #.(or "0.1.1alpha" ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/15 14:44:04 $")) + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/16 16:57:25 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) @@ -63,14 +63,14 @@ (attributes NIL :type list) (contents NIL :type (or string symbol cons xml-element))) -(defmacro find-pi-start (buffer &key start end) +(defmacro find-pi-start (buffer &key (start 0) end) "Find the next occurence of *PI-START* and return its index. Returns NIL if not found" (declare (type (array character 1) buffer) - (type fixnum start end)) + (type fixnum start)) `(search ,*PI-START* ,buffer :test #'string= :start2 ,start :end2 ,end)) -(defmacro find-pi-end (buffer &key start end) +(defmacro find-pi-end (buffer &key (start 0) end) (declare (type (array character 1) buffer) (type fixnum start end)) "Find the next occurence of *pi-end* and return its index. Returns Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.13 clhp/ChangeLog:1.14 --- clhp/ChangeLog:1.13 Thu Oct 16 00:00:42 2003 +++ clhp/ChangeLog Thu Oct 16 12:57:25 2003 @@ -1,3 +1,11 @@ +2003-10-16 <ant(a)afghan.dogpound> + + * tests/clhp-test.lisp (*CLHP-TESTS*): Wrote tests for most of + :CLHP + + * clhp.lisp (FIND-PI-START, FIND-PI-END): Made 0 a default value + for START. + 2003-10-15 <ant(a)afghan.dogpound> * tests/test-suite.lisp: Exporting @@ -83,4 +91,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.13 2003/10/16 04:00:42 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.14 2003/10/16 16:57:25 aventimiglia Exp $ \ No newline at end of file

1 0

[clhp-cvs] CVS update: clhp/config/binfmt-test.lisp
by Anthony Ventimiglia 16 Oct '03

16 Oct '03

Update of /project/clhp/cvsroot/clhp/config In directory common-lisp.net:/tmp/cvs-serv589/config Modified Files: binfmt-test.lisp Log Message: Addedd explanation to comments Date: Thu Oct 16 10:55:35 2003 Author: aventimiglia Index: clhp/config/binfmt-test.lisp diff -u clhp/config/binfmt-test.lisp:1.3 clhp/config/binfmt-test.lisp:1.4 --- clhp/config/binfmt-test.lisp:1.3 Wed Oct 15 08:50:52 2003 +++ clhp/config/binfmt-test.lisp Thu Oct 16 10:55:34 2003 @@ -1,4 +1,4 @@ -;; $Id: binfmt-test.lisp,v 1.3 2003/10/15 12:50:52 aventimiglia Exp $ +;; $Id: binfmt-test.lisp,v 1.4 2003/10/16 14:55:34 aventimiglia Exp $ ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -21,7 +21,8 @@ ;; HomePage: http://common-lisp.net/project/clhp/ ;; -;; A short test program to make sure you have binfmt_misc support working -;; properly. +;; A short test program to make sure you have binfmt_misc support +;; working properly. In order for this to serve it's purpose, it needs +;; to be compiled, chmodded and run from the command-line (format t "binfmt_misc is working~&")

1 0

[clhp-cvs] CVS update: clhp/ChangeLog
by Anthony Ventimiglia 16 Oct '03

16 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv15576 Modified Files: ChangeLog Log Message: * tests/test-suite.lisp: Exporting OUTPUT-FUNCTION-TEST-DATA-OUTPUT * tests/cgi-test.lisp (*CGI-TESTS*): Added tests for LIST-TO-A-LIST Date: Thu Oct 16 00:00:42 2003 Author: aventimiglia Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.12 clhp/ChangeLog:1.13 --- clhp/ChangeLog:1.12 Wed Oct 15 10:44:04 2003 +++ clhp/ChangeLog Thu Oct 16 00:00:42 2003 @@ -1,5 +1,11 @@ 2003-10-15 <ant(a)afghan.dogpound> + * tests/test-suite.lisp: Exporting + OUTPUT-FUNCTION-TEST-DATA-OUTPUT + + * tests/cgi-test.lisp (*CGI-TESTS*): Added tests for + LIST-TO-A-LIST + * cgi.lisp, clhp.lisp: Changed real package names to a more exact one ala java style. They still have :CGI and :CLHP for nicknames. @@ -77,4 +83,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.12 2003/10/15 14:44:04 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.13 2003/10/16 04:00:42 aventimiglia Exp $ \ No newline at end of file

1 0

[clhp-cvs] CVS update: clhp/tests/test-suite.lisp clhp/tests/cgi-test.lisp
by Anthony Ventimiglia 16 Oct '03

16 Oct '03

Update of /project/clhp/cvsroot/clhp/tests In directory common-lisp.net:/tmp/cvs-serv15576/tests Modified Files: test-suite.lisp cgi-test.lisp Log Message: * tests/test-suite.lisp: Exporting OUTPUT-FUNCTION-TEST-DATA-OUTPUT * tests/cgi-test.lisp (*CGI-TESTS*): Added tests for LIST-TO-A-LIST Date: Thu Oct 16 00:00:42 2003 Author: aventimiglia Index: clhp/tests/test-suite.lisp diff -u clhp/tests/test-suite.lisp:1.1 clhp/tests/test-suite.lisp:1.2 --- clhp/tests/test-suite.lisp:1.1 Wed Oct 15 10:05:56 2003 +++ clhp/tests/test-suite.lisp Thu Oct 16 00:00:42 2003 @@ -27,7 +27,8 @@ (:nicknames #:test-suite) (:use :cl) (:export #:run-tests #:function-test-data - #:output-function-test-data #:side-effect-function-test-data )) + #:output-function-test-data #:side-effect-function-test-data + #:output-function-test-data-output )) (in-package :test-suite) ;; These macros Used for run-test methods @@ -87,6 +88,7 @@ must be tested as well.")) (defclass side-effect-function-test-data (function-test-data) + ((var-list :initform NIL :type list :reader side-effect-function-test-data-var-list @@ -148,14 +150,14 @@ data)) (vars (mapcar #'(lambda (c) (car c)) test-var-list)) (var-list (mapcar - #'(lambda (|v|) (list |v| (eval |v|))) vars))) + #'(lambda (v) (list v (eval v))) vars))) (format stream "~S --> ~S ~S : " test-form result var-list) - (let ((test-result (output-function-test-data-output data))) + (let ((test-result (function-test-data-result-form data))) (test-return (and (equal result test-result) (equal test-var-list var-list)) "~S and ~S expected" test-result test-var-list)))) - (call-if-function (test-data-post-function data)))) + (call-if-function (test-data-post-function data)))) ;; Example ;(defvar list-test (make-instance 'function-test-data Index: clhp/tests/cgi-test.lisp diff -u clhp/tests/cgi-test.lisp:1.8 clhp/tests/cgi-test.lisp:1.9 --- clhp/tests/cgi-test.lisp:1.8 Wed Oct 15 10:05:56 2003 +++ clhp/tests/cgi-test.lisp Thu Oct 16 00:00:42 2003 @@ -41,7 +41,7 @@ ;; INIT ;; ;; And -;; POST-DATA QUERY-TO-A-LIST HANDLE-GENERAL-ERROR +;; POST-DATA HANDLE-GENERAL-ERROR ;; Use the following to run-tests ;; (mapcar #'run-test *cgi-tests*) @@ -101,6 +101,32 @@ :symbol 'cgi::ca-list-to-a-list :test-args '('((a . 1)(b . 2)(c . 3))) :result-form '((a 1)(b 2)(c 3))) + (make-instance 'function-test-data + :symbol 'cgi::list-to-a-list + :test-args '('(1 2 3 4 5 6 7 8)) + :result-form '((1 2)(3 4)(5 6)(7 8))) + (make-instance 'function-test-data + :symbol 'cgi::list-to-a-list + :test-args '('(1 2 3 4 5 6 7 8 9)) + ;; This should be (values ((1 2) .. ) 9) the testing + ;; system hgas to be refined + :result-form '((1 2)(3 4)(5 6)(7 8))) + (make-instance 'function-test-data + :symbol 'cgi::query-to-a-list + :test-args '((cgi::explode-string + "Hello=there&no=yes&red=blue")) + :result-form '(("Hello" "there") ("no" "yes") + ("red" "blue"))) +; (make-instance 'side-effect-function-test-data +; :symbol 'cgi:init +; :pre-function #'(lambda () +; (setq ext:*environment-list* +; '((:request_method . "get") +; (:query_string . "hi=4&a=5")))) +; :post-function #'(lambda () +; (setq ext:*environment-list* nil)) +; :result-form '(values) +; :var-list '((cgi:*server-env* t))) (make-instance 'output-function-test-data :symbol 'cgi:header :output (format nil @@ -121,19 +147,9 @@ (fmakunbound 'cgi:header) (load "library:cgi")) :symbol 'cgi:header - :output ""))) + :output "") + )) -; (make-instance 'side-effect-function-test-data -; :symbol 'cgi:init -; :pre-function #'(lambda () -; (setq ext:*environment-list* -; '((:request_method . "post") -; (:query_string . "hi=4&a=5")))) -; :post-function #'(lambda () -; (setq ext:*environment-list* "nil")) -; :result-form '(values) -; :var-list '((cgi:*server-env* t))))) -; (eval-when (load) (unix:unix-exit (cadr (multiple-value-list (run-tests *cgi-tests*)))))

1 0