- clhp-cvs@lists.common-lisp.net - mailman3.common-lisp.net

[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

[clhp-cvs] CVS update: clhp/clhp.lisp clhp/cgi.lisp clhp/TODO clhp/NEWS clhp/Makefile clhp/ChangeLog
by Anthony Ventimiglia 15 Oct '03

15 Oct '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv31434 Modified Files: clhp.lisp cgi.lisp TODO NEWS Makefile ChangeLog Log Message: 0.1.1 release Date: Wed Oct 15 10:44:04 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.12 clhp/clhp.lisp:1.13 --- clhp/clhp.lisp:1.12 Wed Oct 15 08:50:52 2003 +++ clhp/clhp.lisp Wed Oct 15 10:44:04 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.12 2003/10/15 12:50:52 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.13 2003/10/15 14:44:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -25,7 +25,8 @@ (unless (find-package :cgi) (load "cgi"))) -(defpackage :clhp +(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 @@ -38,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 nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/15 12:50:52 $")) + #.(or "0.1.1alpha" ; Set this for releases + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/10/15 14:44:04 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.9 clhp/cgi.lisp:1.10 --- clhp/cgi.lisp:1.9 Wed Oct 15 08:50:52 2003 +++ clhp/cgi.lisp Wed Oct 15 10:44:04 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.9 2003/10/15 12:50:52 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.10 2003/10/15 14:44:04 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -20,7 +20,8 @@ ;; email: aventimiglia(a)common-lisp.net ;; HomePage: http://common-lisp.net/project/clhp/ -(defpackage :cgi +(defpackage #:net.common-lisp.aventimiglia.cgi + (:nicknames #:cgi) (:use :cl) (:export #:*server-env* #:*query-vars* #:header #:debug #:init)) Index: clhp/TODO diff -u clhp/TODO:1.6 clhp/TODO:1.7 --- clhp/TODO:1.6 Wed Oct 1 15:11:33 2003 +++ clhp/TODO Wed Oct 15 10:44:04 2003 @@ -1,13 +1,14 @@ -$Id: TODO,v 1.6 2003/10/01 19:11:33 aventimiglia Exp $ -*- outline -*- +$Id: TODO,v 1.7 2003/10/15 14:44:04 aventimiglia Exp $ -*- outline -*- + +* Convert *QUERY-VARS* and *SERVER-ENV* to hashes + I should probably make interface functions to access them, actually + I should make them read-only maybe encapsulate a hash in a class and + only allow reading from external functions * Test suite - Write a test suite, in lisp that will run test on clhp components, - this will be used during development, to make sure everything is - working properly. - - This is in thw works is tests/, I think I'll refine it a bit and - make it it's own package. There is still more work to be done, and - that's a whole different can of beans +** Complete suite for :cgi +** Write suite for :clhp +** Refine :test-suite * COMPILE-CGI This is just a convenience function that will compile and save fasl @@ -34,6 +35,7 @@ should not stop the entire page from parsing, it should just fail for that form, report the error (and the offendding form) and continue at the next reasonable point. + * Differences from PHP Some differences I should keep, like you can't end blocks in the Index: clhp/NEWS diff -u clhp/NEWS:1.2 clhp/NEWS:1.3 --- clhp/NEWS:1.2 Fri Sep 19 01:57:19 2003 +++ clhp/NEWS Wed Oct 15 10:44:04 2003 @@ -1,5 +1,35 @@ +$Id: NEWS,v 1.3 2003/10/15 14:44:04 aventimiglia Exp $ -*- outline -*- -Wed Sep 17 15:17:02 EDT 2003 -- CLHP package migrated from my local -server to common-lisp.net +* Wed Sep 17 15:17:02 EDT 2003 -- CLHP package migrated from my local + server to common-lisp.net -Fri Sep 19 01:56:45 EDT 2003 -- 0.1.0alpha released +* Fri Sep 19 01:56:45 EDT 2003 -- 0.1.0alpha released + +* Wed Oct 15 10:08:33 EDT 2003 -- 0.1.1alpha release + See ChangeLog for details, but here's a rundown of the new stuff: +** Converted CGI:*SERVER-ENV* and CGI:*QUERY-VARS* + In the previous version these had been cons type a-lists ((like + . this)) I've converted them to List type a-lists ((like this)), + don't get used to it though, since eventually I'll probably end up + making them into Hashtables. +** XML-ELEMENT structure + This structure along with it's PPRINT function and the TAG macro, + creating ax XML element is as east as: (TAG 'REMARK "this") +** Somewhat better error reporting. + When the parser encounters Lisp errors, it tries its best to print + a good message and take up at the next reasonable place it can. +** Internals stuff + This isn't of much interest unless you want to hack the code. +** Pakcage names + The package names were changed to more descriptive + :net.common-lisp.aventimiglia.{cgi,clhp}, but I've still retained + :CLHP and :CGI as nicknames so there is not any change to the + interface +*** Code cleanup -- working to make all this more readable. +*** Test-suite -- + The new tests/ directory contains a test-suite package and a + test for the :CGI library. I really just decided to write my own + test suite since I didn't really want to deal with learning + someone elses. In the future I'm going to write tests for :CLHP + + Index: clhp/Makefile diff -u clhp/Makefile:1.11 clhp/Makefile:1.12 --- clhp/Makefile:1.11 Wed Oct 15 10:05:57 2003 +++ clhp/Makefile Wed Oct 15 10:44:04 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.11 2003/10/15 14:05:57 aventimiglia Exp $ +# $Id: Makefile,v 1.12 2003/10/15 14:44:04 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -69,7 +69,8 @@ RECURSIVE_SUBDIRS = examples tests EXTRADIST=config/binfmt-test.lisp config/build-core.lisp config/lispc.lisp \ config/runclcgi.src examples/Makefile examples/clhp-test.lisp \ - examples/index.clhp examples/test.lisp Makefile + examples/index.clhp examples/test.lisp Makefile tests/Makefile \ + tests/cgi-test.lisp tests/test-suite.lisp DISTFILES=$(SOURCES) $(DOCS) $(EXTRADIST) Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.11 clhp/ChangeLog:1.12 --- clhp/ChangeLog:1.11 Tue Oct 14 18:47:30 2003 +++ clhp/ChangeLog Wed Oct 15 10:44:04 2003 @@ -1,3 +1,13 @@ +2003-10-15 <ant(a)afghan.dogpound> + + * cgi.lisp, clhp.lisp: Changed real package names to a more exact + one ala java style. They still have :CGI and :CLHP for nicknames. + + * tests/test-suite.lisp (run-tests): Moved test-suite out of + cgi-test into its own file, now I can write tests for clhp as + well. Modified Makefiles to deal with the new directory. Now + running make check from the toplevel runs the tests. + 2003-10-14 <ant(a)afghan.dogpound> * cgi.lisp (debug): Changed format string to ~S so objects will be @@ -67,4 +77,4 @@ used to create tables from (CONS . TYPE) a-lists. Also added some comments. -$Id: ChangeLog,v 1.11 2003/10/14 22:47:30 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.12 2003/10/15 14:44:04 aventimiglia Exp $ \ No newline at end of file

1 0

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

15 Oct '03

Update of /project/clhp/cvsroot/clhp/tests In directory common-lisp.net:/tmp/cvs-serv10945/tests Modified Files: cgi-test.lisp Added Files: test-suite.lisp Makefile Log Message: Moved test-suite out of cgi-test into its own file, now I can write tests for clhp as well. Modified Makefiles to deal with the new directory. Now running make check from the toplevel runs the tests. Date: Wed Oct 15 10:05:57 2003 Author: aventimiglia Index: clhp/tests/cgi-test.lisp diff -u clhp/tests/cgi-test.lisp:1.7 clhp/tests/cgi-test.lisp:1.8 --- clhp/tests/cgi-test.lisp:1.7 Wed Oct 15 08:50:51 2003 +++ clhp/tests/cgi-test.lisp Wed Oct 15 10:05:56 2003 @@ -27,144 +27,12 @@ (eval-when (:load-toplevel :compile-toplevel) (unless (find-package :cgi) - (load "library:cgi"))) + (load "library:cgi")) + (unless (find-package :net.common-lisp.aventimiglia.test-suite) + (load "test-suite")) + (when (find-package :clhp) (delete-package :clhp))) -;; These macros Used for run-test methods -(defmacro call-if-function (form) - `(when (functionp ,form) (funcall ,form))) - -(defmacro test-return (test &rest args) - `(cons (test-data-symbol data) - (if ,test - (progn (princ 'ok stream) (terpri) :OK) - (progn (princ 'failed stream) (format stream ,@args) - (terpri) :FAILED)))) - -(defclass test-data () - ((symbol :initform NIL - :type symbol - :reader test-data-symbol - :initarg :symbol - :documentation "The symbol name to be tested") - (pre-function :initform NIL - :type (or function nil) - :reader test-data-pre-function - :initarg :pre-function - :documentation "Function to be called prior to running tests") - (post-function :initform NIL - :type (or function nil) - :reader test-data-post-function - :initarg :post-function - :documentation "Function to be called after running tests")) - (:documentation "Abstract supertype for CLASS, STRUCTURE, VARIABLE -and FUNCTION test-data")) - -(defclass function-test-data (test-data) - ((test-args :initform NIL - :type list - :reader function-test-data-test-args - :initarg :test-args - :documentation "A list of arguments to be passed to the -function for testing") - (result-form :initform NIL - :reader function-test-data-result-form - :initarg :result-form - :documentation "The expected return value when SYMBOL -is called with TEST-ARGS")) - (:documentation "A class to test functions or macros, taking -TEST-ARGS as a list of arguments to call the function with and -expecting RESULT-FORM to be the result")) - -(defclass output-function-test-data (function-test-data) - ((output :initform NIL - :type string - :reader output-function-test-data-output - :initarg :output - :documentation "A string which should be equal to the output")) - (:documentation "A subclass of function-test-data for testing macros -or functions, but this is used when thye output to *STANDARD-OUTPUT* -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 - :initarg :var-list - :documentation "An a-list of ((SYMBOL VALUE)) pairs. All -Symbols should be EQUAL to the VALUES after test function is -evaluated.")) - (:documentation "A subclass of function-test-data used to test -functions which have side effects of setting global variables.")) - -;; It's important that the RUN-TEST methods below all use DATA as the -;; TEST-DATA object name, because some of the macros defined at the -;; top of the file are hard coded to use the common names. - - -(defmethod run-test ((data function-test-data) - &optional (stream *standard-output*)) - (unwind-protect - (progn - (call-if-function (test-data-pre-function data)) - (let* ((test-form (cons (test-data-symbol data) - (function-test-data-test-args data))) - (result (eval test-form))) - (format stream "~S --> ~S : " test-form result) - (let ((test-result (function-test-data-result-form data))) - (test-return (equal result test-result) - "~S expected" test-result)))) - (call-if-function (test-data-post-function data)))) - -(defmethod run-test ((data output-function-test-data) - &optional (stream *standard-output*)) - (unwind-protect - (progn - (call-if-function (test-data-pre-function data)) - (let* ((test-form (cons (test-data-symbol data) - (function-test-data-test-args data))) - (output (make-array 0 :element-type 'base-char - :fill-pointer 0 :adjustable t)) - (result (with-output-to-string - (*standard-output* output) - (eval test-form)))) - (format stream "~S --> ~S ~S : " test-form output result) - (let ((test-output (output-function-test-data-output data)) - (test-result (function-test-data-result-form data))) - (test-return (and (equal result test-result) - (string= output test-output)) - "~S -> ~S expected" test-output test-result)))) - (call-if-function (test-data-post-function data)))) - -(defmethod run-test ((data side-effect-function-test-data) - &optional stream) - (unwind-protect - (progn - (call-if-function (test-data-pre-function data)) - (let* ((test-form (cons (test-data-symbol data) - (function-test-data-test-args data))) - (result (eval test-form)) - (test-var-list (side-effect-function-test-data-var-list - data)) - (vars (mapcar #'(lambda (c) (car c)) test-var-list)) - (var-list (mapcar - #'(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))) - (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)))) - -;; Example -;(defvar list-test (make-instance 'function-test-data -; :symbol 'list -; :test-args '(1 2 3 4 5) -; :result-form '(1 2 3 4 5))) -; -;* (run-test list-test) -;> (LIST 1 2 3 4 5) --> (1 2 3 4 5) : OK -;> (LIST . :OK ) +(use-package :test-suite) (defvar *cgi-tests*) @@ -229,6 +97,10 @@ :test-args '('(list 1 2 3)) :output (format nil "(CGI:DEBUG: (LIST 1 2 3) --> (1 2 3))~%")) + (make-instance 'function-test-data + :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 'output-function-test-data :symbol 'cgi:header :output (format nil @@ -249,11 +121,8 @@ (fmakunbound 'cgi:header) (load "library:cgi")) :symbol 'cgi:header - :output "") - (make-instance 'function-test-data - :symbol 'cgi::ca-list-to-a-list - :test-args '('((a . 1)(b . 2)(c . 3))) - :result-form '((a 1)(b 2)(c 3))))) + :output ""))) + ; (make-instance 'side-effect-function-test-data ; :symbol 'cgi:init ; :pre-function #'(lambda () @@ -266,5 +135,8 @@ ; :var-list '((cgi:*server-env* t))))) ; -(defun run () - (mapcar #'run-test *cgi-tests*)) \ No newline at end of file +(eval-when (load) + (unix:unix-exit (cadr (multiple-value-list (run-tests *cgi-tests*))))) + + + \ No newline at end of file

1 0

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

15 Oct '03

Update of /project/clhp/cvsroot/clhp/examples In directory common-lisp.net:/tmp/cvs-serv10945/examples Modified Files: Makefile Log Message: Moved test-suite out of cgi-test into its own file, now I can write tests for clhp as well. Modified Makefiles to deal with the new directory. Now running make check from the toplevel runs the tests. Date: Wed Oct 15 10:05:57 2003 Author: aventimiglia Index: clhp/examples/Makefile diff -u clhp/examples/Makefile:1.3 clhp/examples/Makefile:1.4 --- clhp/examples/Makefile:1.3 Wed Oct 15 08:50:51 2003 +++ clhp/examples/Makefile Wed Oct 15 10:05:57 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 2003/10/15 12:50:51 aventimiglia Exp $ +# $Id: Makefile,v 1.4 2003/10/15 14:05:57 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -57,7 +57,8 @@ all: $(BINS) -.PHONY: all clean install uninstall clean-all clean-backups check-install-path +.PHONY: all clean install uninstall clean-all clean-backups \ + check-install-path check %.x86f: %.lisp $(LISPC) $<

1 0