From 16e65dce99768b88517662e50c8d08e861ecac68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= <daniel@turtleware.eu> Date: Mon, 31 Aug 2015 19:37:09 +0200 Subject: [PATCH] restruct: use logical pathname for auxiliary modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Kochmański <daniel@turtleware.eu> --- arrays/bit-and.lsp | 2 +- arrays/bit-andc1.lsp | 2 +- arrays/bit-andc2.lsp | 2 +- arrays/bit-eqv.lsp | 2 +- arrays/bit-ior.lsp | 2 +- arrays/bit-nand.lsp | 2 +- arrays/bit-nor.lsp | 2 +- arrays/bit-orc1.lsp | 2 +- arrays/bit-orc2.lsp | 2 +- arrays/bit-xor.lsp | 2 +- arrays/make-array.lsp | 2 +- auxiliary/hash-table-aux.lsp | 2 +- auxiliary/numbers-aux.lsp | 2 +- .../packages00-aux.lsp | 0 auxiliary/printer-aux.lsp | 3 +- auxiliary/string-aux.lsp | 2 +- characters/name-char.lsp | 2 +- cons/acons.lsp | 2 +- cons/adjoin.lsp | 2 +- cons/append.lsp | 2 +- cons/assoc-if-not.lsp | 2 +- cons/assoc.lsp | 2 +- cons/atom.lsp | 2 - cons/butlast.lsp | 2 +- cons/cons-test-01.lsp | 2 +- cons/cons-test-03.lsp | 2 +- cons/cons-test-05.lsp | 2 +- cons/cons.lsp | 2 +- cons/consp.lsp | 2 +- cons/copy-alist.lsp | 2 +- cons/copy-list.lsp | 2 +- cons/copy-tree.lsp | 2 +- cons/cxr.lsp | 2 +- cons/endp.lsp | 2 +- cons/get-properties.lsp | 2 +- cons/getf.lsp | 2 +- cons/intersection.lsp | 2 +- cons/last.lsp | 2 +- cons/ldiff.lsp | 2 +- cons/list-length.lsp | 2 +- cons/list.lsp | 2 +- cons/listp.lsp | 2 +- cons/make-list.lsp | 2 +- cons/mapc.lsp | 2 +- cons/mapcan.lsp | 2 +- cons/mapcar.lsp | 2 +- cons/mapcon.lsp | 2 +- cons/mapl.lsp | 2 +- cons/maplist.lsp | 2 +- cons/member-if-not.lsp | 2 +- cons/member-if.lsp | 2 +- cons/member.lsp | 2 +- cons/nbutlast.lsp | 2 +- cons/nconc.lsp | 2 +- cons/nintersection.lsp | 2 +- cons/nreconc.lsp | 2 +- cons/nset-difference.lsp | 2 +- cons/nset-exclusive-or.lsp | 2 +- cons/nsublis.lsp | 2 +- cons/nsubst-if-not.lsp | 2 +- cons/nsubst-if.lsp | 2 +- cons/nsubst.lsp | 2 +- cons/nth.lsp | 2 +- cons/nthcdr.lsp | 2 +- cons/nunion.lsp | 2 +- cons/pairlis.lsp | 2 +- cons/pop.lsp | 2 +- cons/push.lsp | 2 +- cons/pushnew.lsp | 2 +- cons/rassoc-if-not.lsp | 2 +- cons/rassoc-if.lsp | 2 +- cons/rassoc.lsp | 2 +- cons/remf.lsp | 2 +- cons/rest.lsp | 2 +- cons/revappend.lsp | 2 +- cons/rplaca.lsp | 2 +- cons/rplacd.lsp | 2 +- cons/set-difference.lsp | 2 +- cons/set-exclusive-or.lsp | 2 +- cons/sublis.lsp | 2 +- cons/subsetp.lsp | 2 +- cons/subst-if-not.lsp | 2 +- cons/subst-if.lsp | 2 +- cons/subst.lsp | 2 +- cons/tailp.lsp | 2 +- cons/tree-equal.lsp | 2 +- cons/union.lsp | 2 +- data-and-control-flow/assoc-if.lsp | 181 ------------------ data-and-control-flow/equalp.lsp | 2 - data-and-control-flow/etypecase.lsp | 2 - format/format-a.lsp | 2 +- format/format-ampersand.lsp | 2 +- format/format-b.lsp | 2 +- format/format-brace.lsp | 2 +- format/format-c.lsp | 2 +- format/format-circumflex.lsp | 2 +- format/format-conditional.lsp | 2 +- format/format-d.lsp | 2 +- format/format-f.lsp | 2 +- format/format-goto.lsp | 2 +- format/format-i.lsp | 2 +- format/format-justify.lsp | 2 +- format/format-logical-block.lsp | 2 +- format/format-newline.lsp | 2 +- format/format-o.lsp | 2 +- format/format-p.lsp | 2 +- format/format-page.lsp | 2 +- format/format-paren.lsp | 2 +- format/format-percent.lsp | 2 +- format/format-question.lsp | 2 +- format/format-r.lsp | 2 +- format/format-s.lsp | 2 +- format/format-slash.lsp | 2 +- format/format-t.lsp | 2 +- format/format-tilde.lsp | 2 +- format/format-underscore.lsp | 2 +- format/format-x.lsp | 2 +- format/formatter-c.lsp | 2 +- gclload1.lsp | 29 ++- load-arrays.lsp | 4 +- load-characters.lsp | 9 +- load-conditions.lsp | 5 +- load-cons.lsp | 3 +- load-data-and-control-flow.lsp | 3 + load-hash-tables.lsp | 2 +- load-iteration.lsp | 2 +- load-numbers.lsp | 17 +- load-objects.lsp | 3 +- load-packages.lsp | 4 +- load-pathnames.lsp | 10 +- load-reader.lsp | 8 +- load-sequences.lsp | 4 + load-strings.lsp | 2 +- load-symbols.lsp | 4 +- load-types-and-class.lsp | 1 + makefile | 1 + numbers/abs.lsp | 2 +- {conditions => numbers}/arithmetic-error.lsp | 0 numbers/boole.lsp | 2 +- numbers/ceiling.lsp | 4 +- numbers/cis.lsp | 2 +- numbers/decf.lsp | 2 +- numbers/divide.lsp | 4 +- numbers/epsilons.lsp | 2 +- numbers/evenp.lsp | 2 +- numbers/exp.lsp | 4 +- numbers/fceiling.lsp | 4 +- numbers/ffloor.lsp | 4 +- numbers/floor.lsp | 4 +- numbers/fround.lsp | 4 +- numbers/ftruncate.lsp | 4 +- numbers/gcd.lsp | 4 +- numbers/incf.lsp | 2 +- numbers/isqrt.lsp | 2 +- numbers/lcm.lsp | 4 +- numbers/logand.lsp | 2 +- numbers/logandc1.lsp | 2 +- numbers/logandc2.lsp | 2 +- numbers/logbitp.lsp | 2 +- numbers/logeqv.lsp | 2 +- numbers/logior.lsp | 2 +- numbers/lognand.lsp | 2 +- numbers/lognor.lsp | 2 +- numbers/lognot.lsp | 2 +- numbers/logorc1.lsp | 2 +- numbers/logorc2.lsp | 2 +- numbers/logxor.lsp | 2 +- numbers/max.lsp | 2 +- numbers/min.lsp | 2 +- numbers/minus.lsp | 2 +- numbers/number-comparison.lsp | 2 +- numbers/numerator-denominator.lsp | 2 +- numbers/oddp.lsp | 2 +- numbers/oneminus.lsp | 2 +- numbers/oneplus.lsp | 2 +- numbers/plus.lsp | 2 +- numbers/random.lsp | 4 +- numbers/round.lsp | 4 +- numbers/sqrt.lsp | 2 +- numbers/times.lsp | 4 +- numbers/truncate.lsp | 4 +- numbers/upgraded-complex-part-type.lsp | 2 +- packages/defpackage.lsp | 2 +- packages/do-external-symbols.lsp | 2 +- packages/do-symbols.lsp | 2 +- packages/find-symbol.lsp | 2 - packages/import.lsp | 2 +- packages/unuse-package.lsp | 2 +- packages/use-package.lsp | 2 +- packages/with-package-iterator.lsp | 2 +- pathnames/pathname-device.lsp | 2 +- pathnames/pathname-directory.lsp | 2 +- pathnames/pathname-host.lsp | 2 +- pathnames/pathname-match-p.lsp | 2 +- pathnames/pathname-name.lsp | 2 +- pathnames/pathname-type.lsp | 2 +- pathnames/pathname-version.lsp | 2 +- pathnames/wild-pathname-p.lsp | 2 +- printer/pprint-newline.lsp | 2 +- printer/pprint-tab.lsp | 2 +- printer/pprint.lsp | 2 +- printer/prin1-to-string.lsp | 2 +- printer/prin1.lsp | 2 +- printer/princ-to-string.lsp | 2 +- printer/princ.lsp | 2 +- printer/print-array.lsp | 2 +- printer/print-backquote.lsp | 4 +- printer/print-bit-vector.lsp | 2 +- printer/print-characters.lsp | 2 +- printer/print-complex.lsp | 2 +- printer/print-cons.lsp | 2 +- printer/print-floats.lsp | 2 +- printer/print-integers.lsp | 2 +- printer/print-length.lsp | 2 +- printer/print-level.lsp | 2 +- printer/print-pathname.lsp | 2 +- printer/print-random-state.lsp | 2 +- printer/print-ratios.lsp | 2 +- printer/print-strings.lsp | 2 +- printer/print-structure.lsp | 2 +- printer/print-symbols.lsp | 2 +- printer/print-unreadable-object.lsp | 2 +- printer/print-vector.lsp | 2 +- printer/print.lsp | 2 +- printer/write-to-string.lsp | 2 +- printer/write.lsp | 2 +- rctest/load.lsp | 2 +- reader/get-macro-character.lsp | 2 +- reader/read-suppress.lsp | 2 +- reader/reader-test.lsp | 2 +- reader/set-syntax-from-char.lsp | 2 +- reader/syntax-tokens.lsp | 2 +- reader/syntax.lsp | 2 +- sequences/remove-duplicates.lsp | 4 +- sequences/remove.lsp | 2 +- sequences/search-bitvector.lsp | 2 +- sequences/search-list.lsp | 2 +- sequences/search-string.lsp | 2 +- sequences/search-vector.lsp | 2 +- sequences/subseq.lsp | 2 +- strings/string-comparisons.lsp | 2 - types-and-classes/deftype.lsp | 2 +- types-and-classes/subtypep-array.lsp | 2 +- types-and-classes/subtypep-complex.lsp | 2 +- types-and-classes/subtypep-cons.lsp | 2 +- types-and-classes/subtypep-eql.lsp | 2 +- types-and-classes/subtypep-float.lsp | 2 +- types-and-classes/subtypep-function.lsp | 2 +- types-and-classes/subtypep-integer.lsp | 2 +- types-and-classes/subtypep-member.lsp | 2 +- types-and-classes/subtypep-rational.lsp | 2 +- types-and-classes/subtypep-real.lsp | 2 +- types-and-classes/subtypep.lsp | 2 +- types-and-classes/types-and-class-2.lsp | 2 +- types-and-classes/types-and-class.lsp | 2 +- 255 files changed, 307 insertions(+), 486 deletions(-) rename packages-00.lsp => auxiliary/packages00-aux.lsp (100%) delete mode 100644 data-and-control-flow/assoc-if.lsp rename {conditions => numbers}/arithmetic-error.lsp (100%) diff --git a/arrays/bit-and.lsp b/arrays/bit-and.lsp index d4c5fb62..693c9b18 100644 --- a/arrays/bit-and.lsp +++ b/arrays/bit-and.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-and.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/bit-andc1.lsp b/arrays/bit-andc1.lsp index 3997a88b..24a521a8 100644 --- a/arrays/bit-andc1.lsp +++ b/arrays/bit-andc1.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-andc1.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/bit-andc2.lsp b/arrays/bit-andc2.lsp index 9a20b7ec..8138657a 100644 --- a/arrays/bit-andc2.lsp +++ b/arrays/bit-andc2.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-andc2.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/bit-eqv.lsp b/arrays/bit-eqv.lsp index 5fdfb329..abbc830a 100644 --- a/arrays/bit-eqv.lsp +++ b/arrays/bit-eqv.lsp @@ -6,7 +6,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-eqv.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/bit-ior.lsp b/arrays/bit-ior.lsp index bad18647..d231ccde 100644 --- a/arrays/bit-ior.lsp +++ b/arrays/bit-ior.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-ior.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/bit-nand.lsp b/arrays/bit-nand.lsp index 2cc97329..d5dd884d 100644 --- a/arrays/bit-nand.lsp +++ b/arrays/bit-nand.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-nand.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/bit-nor.lsp b/arrays/bit-nor.lsp index cc9a0d76..d4e3886d 100644 --- a/arrays/bit-nor.lsp +++ b/arrays/bit-nor.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-nor.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/bit-orc1.lsp b/arrays/bit-orc1.lsp index fddac473..dca631c8 100644 --- a/arrays/bit-orc1.lsp +++ b/arrays/bit-orc1.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-orc1.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/bit-orc2.lsp b/arrays/bit-orc2.lsp index aaec562e..26801c72 100644 --- a/arrays/bit-orc2.lsp +++ b/arrays/bit-orc2.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-orc2.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/bit-xor.lsp b/arrays/bit-xor.lsp index 0f629cfa..1360bf27 100644 --- a/arrays/bit-xor.lsp +++ b/arrays/bit-xor.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "bit-aux.lsp") + (deftest bit-xor.1 (let* ((s1 (make-array nil :initial-element 0 :element-type 'bit)) diff --git a/arrays/make-array.lsp b/arrays/make-array.lsp index b7525d5a..b1173d44 100644 --- a/arrays/make-array.lsp +++ b/arrays/make-array.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "array-aux.lsp") + (deftest make-array.1 (let ((a (make-array-with-checks 10))) diff --git a/auxiliary/hash-table-aux.lsp b/auxiliary/hash-table-aux.lsp index 6bf3d068..dd5ceb60 100644 --- a/auxiliary/hash-table-aux.lsp +++ b/auxiliary/hash-table-aux.lsp @@ -6,7 +6,7 @@ (in-package :cl-test) (eval-when (:load-toplevel :compile-toplevel :execute) - (compile-and-load "random-aux.lsp")) + (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")) (defparameter *hash-table-test-iters* 1000) diff --git a/auxiliary/numbers-aux.lsp b/auxiliary/numbers-aux.lsp index b9f3c5f6..c9ef7b5d 100644 --- a/auxiliary/numbers-aux.lsp +++ b/auxiliary/numbers-aux.lsp @@ -6,7 +6,7 @@ (in-package :cl-test) (eval-when (:compile-toplevel :load-toplevel :execute) - (compile-and-load "random-aux.lsp")) + (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")) ;;; Binary search on reals diff --git a/packages-00.lsp b/auxiliary/packages00-aux.lsp similarity index 100% rename from packages-00.lsp rename to auxiliary/packages00-aux.lsp diff --git a/auxiliary/printer-aux.lsp b/auxiliary/printer-aux.lsp index 5846c677..f6d7ca3b 100644 --- a/auxiliary/printer-aux.lsp +++ b/auxiliary/printer-aux.lsp @@ -5,7 +5,8 @@ (in-package :cl-test) -(eval-when (:compile-toplevel :load-toplevel :execute) (compile-and-load "random-aux.lsp")) +(eval-when (:compile-toplevel :load-toplevel :execute) + (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")) (defmacro def-print-test (name form result &rest bindings) `(deftest ,name diff --git a/auxiliary/string-aux.lsp b/auxiliary/string-aux.lsp index be4d9080..9b00f849 100644 --- a/auxiliary/string-aux.lsp +++ b/auxiliary/string-aux.lsp @@ -6,7 +6,7 @@ (in-package :cl-test) (eval-when (:compile-toplevel :load-toplevel :execute) - (compile-and-load "random-aux.lsp")) + (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp")) (defun my-string-compare (string1 string2 comparison &key (start1 0) end1 (start2 0) end2 case diff --git a/characters/name-char.lsp b/characters/name-char.lsp index d60862c1..34530e71 100644 --- a/characters/name-char.lsp +++ b/characters/name-char.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "char-aux.lsp") + (deftest name-char.1 (name-char.1.body) diff --git a/cons/acons.lsp b/cons/acons.lsp index f6da8ea5..62424ec0 100644 --- a/cons/acons.lsp +++ b/cons/acons.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest acons.1 (let* ((x (copy-tree '((c . d) (e . f)))) diff --git a/cons/adjoin.lsp b/cons/adjoin.lsp index c5b5a3c6..ca9fe74c 100644 --- a/cons/adjoin.lsp +++ b/cons/adjoin.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest adjoin.1 (adjoin 'a nil) diff --git a/cons/append.lsp b/cons/append.lsp index eb49d6a9..b80f1244 100644 --- a/cons/append.lsp +++ b/cons/append.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest append.1 (append) diff --git a/cons/assoc-if-not.lsp b/cons/assoc-if-not.lsp index 37a969ac..2586776c 100644 --- a/cons/assoc-if-not.lsp +++ b/cons/assoc-if-not.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest assoc-if-not.1 (let* ((x (copy-list '((1 . a) (3 . b) (6 . c) (7 . d)))) diff --git a/cons/assoc.lsp b/cons/assoc.lsp index b2cbb885..78a08bd5 100644 --- a/cons/assoc.lsp +++ b/cons/assoc.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest assoc.1 (assoc nil nil) diff --git a/cons/atom.lsp b/cons/atom.lsp index 9e1e57e7..3c825f42 100644 --- a/cons/atom.lsp +++ b/cons/atom.lsp @@ -5,8 +5,6 @@ (in-package :cl-test) -; (compile-and-load "cons-aux.lsp") - (deftest atom.1 (loop for x in *universe* unless (if (atom x) (not (consp x)) (consp x)) diff --git a/cons/butlast.lsp b/cons/butlast.lsp index f8c9811e..577db6d3 100644 --- a/cons/butlast.lsp +++ b/cons/butlast.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest butlast.1 (let ((x (list 'a 'b 'c 'd 'e))) diff --git a/cons/cons-test-01.lsp b/cons/cons-test-01.lsp index 28ba178a..d839d49f 100644 --- a/cons/cons-test-01.lsp +++ b/cons/cons-test-01.lsp @@ -7,7 +7,7 @@ (declaim (optimize (safety 3))) -(compile-and-load "cons-aux.lsp") + ;; ;; Test the subtype relationships between null, list, cons and atom diff --git a/cons/cons-test-03.lsp b/cons/cons-test-03.lsp index 43173434..facd8666 100644 --- a/cons/cons-test-03.lsp +++ b/cons/cons-test-03.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; (typep <obj> 'list) diff --git a/cons/cons-test-05.lsp b/cons/cons-test-05.lsp index f56d087a..c7df1bcd 100644 --- a/cons/cons-test-05.lsp +++ b/cons/cons-test-05.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (defparameter *cons-accessors* '(first second third fourth fifth sixth seventh eighth ninth tenth diff --git a/cons/cons.lsp b/cons/cons.lsp index 565c122f..f8c90a39 100644 --- a/cons/cons.lsp +++ b/cons/cons.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + ;;; Various easy tests of cons diff --git a/cons/consp.lsp b/cons/consp.lsp index c2e7f4c3..0b86de67 100644 --- a/cons/consp.lsp +++ b/cons/consp.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + ;; Lists satisfy consp (deftest consp-list diff --git a/cons/copy-alist.lsp b/cons/copy-alist.lsp index 41e3739f..beaeec9c 100644 --- a/cons/copy-alist.lsp +++ b/cons/copy-alist.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest copy-alist.1 (let* ((x (copy-tree '((a . b) (c . d) nil (e f) ((x) ((y z)) w) diff --git a/cons/copy-list.lsp b/cons/copy-list.lsp index c085c089..e1d0bb6f 100644 --- a/cons/copy-list.lsp +++ b/cons/copy-list.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest copy-list.1 (check-copy-list '(a b c d)) diff --git a/cons/copy-tree.lsp b/cons/copy-tree.lsp index 8dd04243..769dca26 100644 --- a/cons/copy-tree.lsp +++ b/cons/copy-tree.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + ;; Try copy-tree on a tree containing elements of various kinds (deftest copy-tree.1 diff --git a/cons/cxr.lsp b/cons/cxr.lsp index ae892d19..63a9e6c7 100644 --- a/cons/cxr.lsp +++ b/cons/cxr.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + ;; Tests of car, cdr and compound forms (deftest cons.23 diff --git a/cons/endp.lsp b/cons/endp.lsp index 1b5323ce..3e8e2540 100644 --- a/cons/endp.lsp +++ b/cons/endp.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest endp-nil (notnot-mv (endp nil)) diff --git a/cons/get-properties.lsp b/cons/get-properties.lsp index f38831e0..fd265257 100644 --- a/cons/get-properties.lsp +++ b/cons/get-properties.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest get-properties.1 (get-properties nil nil) diff --git a/cons/getf.lsp b/cons/getf.lsp index c63feb51..533923f3 100644 --- a/cons/getf.lsp +++ b/cons/getf.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest getf.1 (getf nil 'a) diff --git a/cons/intersection.lsp b/cons/intersection.lsp index 574a405a..826326b4 100644 --- a/cons/intersection.lsp +++ b/cons/intersection.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest intersection.1 (intersection nil nil) diff --git a/cons/last.lsp b/cons/last.lsp index 2323d545..dbb5b7e9 100644 --- a/cons/last.lsp +++ b/cons/last.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest last.1 (last nil) diff --git a/cons/ldiff.lsp b/cons/ldiff.lsp index b031d6fe..82885320 100644 --- a/cons/ldiff.lsp +++ b/cons/ldiff.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest ldiff.1 (let* ((x (copy-tree '(a b c d e f))) diff --git a/cons/list-length.lsp b/cons/list-length.lsp index ecde7b01..9632d5b2 100644 --- a/cons/list-length.lsp +++ b/cons/list-length.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest list-length-nil (list-length nil) diff --git a/cons/list.lsp b/cons/list.lsp index ee5761e4..af3a7672 100644 --- a/cons/list.lsp +++ b/cons/list.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest list.1 (list 'a 'b 'c) diff --git a/cons/listp.lsp b/cons/listp.lsp index df099d13..ef5aef1c 100644 --- a/cons/listp.lsp +++ b/cons/listp.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest listp-nil (notnot-mv (listp nil)) diff --git a/cons/make-list.lsp b/cons/make-list.lsp index f7b88b58..d9971ebd 100644 --- a/cons/make-list.lsp +++ b/cons/make-list.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest make-list-empty.1 (make-list 0) diff --git a/cons/mapc.lsp b/cons/mapc.lsp index 4c9a6544..97f8ba21 100644 --- a/cons/mapc.lsp +++ b/cons/mapc.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest mapc.1 (mapc #'list nil) diff --git a/cons/mapcan.lsp b/cons/mapcan.lsp index c5b2f6e8..221e9c8b 100644 --- a/cons/mapcan.lsp +++ b/cons/mapcan.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest mapcan.1 (mapcan #'list nil) diff --git a/cons/mapcar.lsp b/cons/mapcar.lsp index 34bb0e9c..bd59424f 100644 --- a/cons/mapcar.lsp +++ b/cons/mapcar.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest mapcar.1 (mapcar #'1+ nil) diff --git a/cons/mapcon.lsp b/cons/mapcon.lsp index d61ffd3b..ce307ee2 100644 --- a/cons/mapcon.lsp +++ b/cons/mapcon.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest mapcon.1 (mapcon #'(lambda (x) (append '(a) x nil)) nil) diff --git a/cons/mapl.lsp b/cons/mapl.lsp index 08ac5824..187beca0 100644 --- a/cons/mapl.lsp +++ b/cons/mapl.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest mapl.1 (mapl #'list nil) diff --git a/cons/maplist.lsp b/cons/maplist.lsp index 5d6c33a3..78eb8b35 100644 --- a/cons/maplist.lsp +++ b/cons/maplist.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest maplist.1 (maplist #'list nil) diff --git a/cons/member-if-not.lsp b/cons/member-if-not.lsp index 69ee39a1..83ec8016 100644 --- a/cons/member-if-not.lsp +++ b/cons/member-if-not.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest member-if-not.1 (member-if-not #'listp nil) diff --git a/cons/member-if.lsp b/cons/member-if.lsp index 68111794..04228ee5 100644 --- a/cons/member-if.lsp +++ b/cons/member-if.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest member-if.1 (member-if #'listp nil) diff --git a/cons/member.lsp b/cons/member.lsp index 826db8e3..ce6684cc 100644 --- a/cons/member.lsp +++ b/cons/member.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest member.1 (let* ((x (copy-tree '(a b c d e f))) diff --git a/cons/nbutlast.lsp b/cons/nbutlast.lsp index db433823..c72b492b 100644 --- a/cons/nbutlast.lsp +++ b/cons/nbutlast.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nbutlast.1 (let ((x (list 'a 'b 'c 'd 'e))) diff --git a/cons/nconc.lsp b/cons/nconc.lsp index c660ca23..f337338c 100644 --- a/cons/nconc.lsp +++ b/cons/nconc.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nconc.1 (nconc) diff --git a/cons/nintersection.lsp b/cons/nintersection.lsp index 13d23b0d..88c50099 100644 --- a/cons/nintersection.lsp +++ b/cons/nintersection.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nintersection.1 (nintersection nil nil) diff --git a/cons/nreconc.lsp b/cons/nreconc.lsp index 3ebf2789..51b2303d 100644 --- a/cons/nreconc.lsp +++ b/cons/nreconc.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nreconc.1 (let* ((x (list 'a 'b 'c)) diff --git a/cons/nset-difference.lsp b/cons/nset-difference.lsp index 2e1a74a8..77bdb2d6 100644 --- a/cons/nset-difference.lsp +++ b/cons/nset-difference.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nset-difference.1 (nset-difference nil nil) diff --git a/cons/nset-exclusive-or.lsp b/cons/nset-exclusive-or.lsp index dcb40b79..7252e31c 100644 --- a/cons/nset-exclusive-or.lsp +++ b/cons/nset-exclusive-or.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nset-exclusive-or.1 (nset-exclusive-or nil nil) diff --git a/cons/nsublis.lsp b/cons/nsublis.lsp index a33a5d59..afc15be4 100644 --- a/cons/nsublis.lsp +++ b/cons/nsublis.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nsublis.1 (check-nsublis '((a b) g (d e 10 g h) 15 . g) diff --git a/cons/nsubst-if-not.lsp b/cons/nsubst-if-not.lsp index ba7131df..4ecf9e8f 100644 --- a/cons/nsubst-if-not.lsp +++ b/cons/nsubst-if-not.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nsubst-if-not.1 (check-nsubst-if-not '(x) 'consp '(1 (1 2) (1 2 3) (1 2 3 4))) diff --git a/cons/nsubst-if.lsp b/cons/nsubst-if.lsp index ea88373a..74bd5790 100644 --- a/cons/nsubst-if.lsp +++ b/cons/nsubst-if.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nsubst-if.1 (check-nsubst-if 'a #'consp '((100 1) (2 3) (4 3 2 1) (a b c))) diff --git a/cons/nsubst.lsp b/cons/nsubst.lsp index e97863d9..4788ab63 100644 --- a/cons/nsubst.lsp +++ b/cons/nsubst.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (defvar *nsubst-tree-1* '(10 (30 20 10) (20 10) (10 20 30 40))) diff --git a/cons/nth.lsp b/cons/nth.lsp index 333751e8..5aa3b517 100644 --- a/cons/nth.lsp +++ b/cons/nth.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nth.1 (nth-1-body (loop for i from 1 to 2000 collect (* 4 i))) diff --git a/cons/nthcdr.lsp b/cons/nthcdr.lsp index 36e68151..5b73e4c9 100644 --- a/cons/nthcdr.lsp +++ b/cons/nthcdr.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + ;;; Error tests diff --git a/cons/nunion.lsp b/cons/nunion.lsp index 4a9974e5..018b77fe 100644 --- a/cons/nunion.lsp +++ b/cons/nunion.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest nunion.1 (nunion nil nil) diff --git a/cons/pairlis.lsp b/cons/pairlis.lsp index d9625e57..e9d35478 100644 --- a/cons/pairlis.lsp +++ b/cons/pairlis.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + ;; Pairlis has two legal behaviors: the pairs ;; can be prepended in the same order, or in the diff --git a/cons/pop.lsp b/cons/pop.lsp index 3d225b0d..6c0f186e 100644 --- a/cons/pop.lsp +++ b/cons/pop.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest pop.1 (let ((x (copy-tree '(a b c)))) diff --git a/cons/push.lsp b/cons/push.lsp index e1d97bdd..a8d9d4da 100644 --- a/cons/push.lsp +++ b/cons/push.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + ;;; See also places.lsp diff --git a/cons/pushnew.lsp b/cons/pushnew.lsp index e3faa990..dac46e79 100644 --- a/cons/pushnew.lsp +++ b/cons/pushnew.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest pushnew.1 (let ((x nil)) diff --git a/cons/rassoc-if-not.lsp b/cons/rassoc-if-not.lsp index 87266375..365ed61f 100644 --- a/cons/rassoc-if-not.lsp +++ b/cons/rassoc-if-not.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest rassoc-if-not.1 (let* ((x (rev-assoc-list '((1 . a) (3 . b) (6 . c) (7 . d)))) diff --git a/cons/rassoc-if.lsp b/cons/rassoc-if.lsp index 9a854ee2..5f879fe2 100644 --- a/cons/rassoc-if.lsp +++ b/cons/rassoc-if.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest rassoc-if.1 (let* ((x (rev-assoc-list '((1 . a) (3 . b) (6 . c) (7 . d)))) diff --git a/cons/rassoc.lsp b/cons/rassoc.lsp index 9b066414..81ae1c00 100644 --- a/cons/rassoc.lsp +++ b/cons/rassoc.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest rassoc.1 (rassoc nil nil) diff --git a/cons/remf.lsp b/cons/remf.lsp index 5b8dc450..e7d09982 100644 --- a/cons/remf.lsp +++ b/cons/remf.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest remf.1 (let ((x nil)) diff --git a/cons/rest.lsp b/cons/rest.lsp index 6fb9f5ec..c758314e 100644 --- a/cons/rest.lsp +++ b/cons/rest.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest rest.1 (rest (list 'a 'b 'c)) diff --git a/cons/revappend.lsp b/cons/revappend.lsp index 028059fb..1c16f204 100644 --- a/cons/revappend.lsp +++ b/cons/revappend.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest revappend.1 (let* ((x (list 'a 'b 'c)) diff --git a/cons/rplaca.lsp b/cons/rplaca.lsp index 195bb6ef..eddf7647 100644 --- a/cons/rplaca.lsp +++ b/cons/rplaca.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest rplaca.1 (let ((x (cons 'a 'b))) diff --git a/cons/rplacd.lsp b/cons/rplacd.lsp index 6dd3e438..0744d717 100644 --- a/cons/rplacd.lsp +++ b/cons/rplacd.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest rplacd.1 (let ((x (cons 'a 'b))) diff --git a/cons/set-difference.lsp b/cons/set-difference.lsp index 9216417e..803242a9 100644 --- a/cons/set-difference.lsp +++ b/cons/set-difference.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest set-difference.1 (set-difference nil nil) diff --git a/cons/set-exclusive-or.lsp b/cons/set-exclusive-or.lsp index fa508d5c..f4ebc5cc 100644 --- a/cons/set-exclusive-or.lsp +++ b/cons/set-exclusive-or.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest set-exclusive-or.1 (set-exclusive-or nil nil) diff --git a/cons/sublis.lsp b/cons/sublis.lsp index 84a66623..9b231e85 100644 --- a/cons/sublis.lsp +++ b/cons/sublis.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest sublis.1 (check-sublis '((a b) g (d e 10 g h) 15 . g) diff --git a/cons/subsetp.lsp b/cons/subsetp.lsp index 196f124f..7e279317 100644 --- a/cons/subsetp.lsp +++ b/cons/subsetp.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (defvar cons-test-24-var '(78 "z" (8 9))) diff --git a/cons/subst-if-not.lsp b/cons/subst-if-not.lsp index e95b0b9a..741c18bc 100644 --- a/cons/subst-if-not.lsp +++ b/cons/subst-if-not.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest subst-if-not.1 (check-subst-if-not '(x) 'consp '(1 (1 2) (1 2 3) (1 2 3 4))) diff --git a/cons/subst-if.lsp b/cons/subst-if.lsp index 7a3493de..cc18745b 100644 --- a/cons/subst-if.lsp +++ b/cons/subst-if.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest subst-if.1 (check-subst-if 'a #'consp '((100 1) (2 3) (4 3 2 1) (a b c))) diff --git a/cons/subst.lsp b/cons/subst.lsp index 5ca4e080..54228aed 100644 --- a/cons/subst.lsp +++ b/cons/subst.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (defvar *subst-tree-1* '(10 (30 20 10) (20 10) (10 20 30 40))) diff --git a/cons/tailp.lsp b/cons/tailp.lsp index f21bc77d..56f20cab 100644 --- a/cons/tailp.lsp +++ b/cons/tailp.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest tailp.1 (let ((x (copy-tree '(a b c d e . f)))) diff --git a/cons/tree-equal.lsp b/cons/tree-equal.lsp index deddb61e..a7e4a4a8 100644 --- a/cons/tree-equal.lsp +++ b/cons/tree-equal.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest tree-equal.1 (notnot-mv (tree-equal 'a 'a)) diff --git a/cons/union.lsp b/cons/union.lsp index 400793cf..489d62b4 100644 --- a/cons/union.lsp +++ b/cons/union.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "cons-aux.lsp") + (deftest union.1 (union nil nil) diff --git a/data-and-control-flow/assoc-if.lsp b/data-and-control-flow/assoc-if.lsp deleted file mode 100644 index 2dd39d9f..00000000 --- a/data-and-control-flow/assoc-if.lsp +++ /dev/null @@ -1,181 +0,0 @@ -;-*- Mode: Lisp -*- -;;;; Author: Paul Dietz -;;;; Created: Sun Apr 20 07:27:57 2003 -;;;; Contains: Tests of ASSOC-IF - -(in-package :cl-test) - -(compile-and-load "cons-aux.lsp") - -(deftest assoc-if.1 - (let* ((x (copy-list '((1 . a) (3 . b) (6 . c) (7 . d)))) - (xcopy (make-scaffold-copy x)) - (result (assoc-if #'evenp x))) - (and - (check-scaffold-copy x xcopy) - (eqt result (third x)) - result)) - (6 . c)) - -(deftest assoc-if.2 - (let* ((x (copy-list '((1 . a) (3 . b) (6 . c) (7 . d)))) - (xcopy (make-scaffold-copy x)) - (result (assoc-if #'oddp x :key #'1+))) - (and - (check-scaffold-copy x xcopy) - (eqt result (third x)) - result)) - (6 . c)) - -(deftest assoc-if.3 - (let* ((x (copy-list '((1 . a) nil (3 . b) (6 . c) (7 . d)))) - (xcopy (make-scaffold-copy x)) - (result (assoc-if #'evenp x))) - (and - (check-scaffold-copy x xcopy) - (eqt result (fourth x)) - result)) - (6 . c)) - -(deftest assoc-if.4 - (assoc-if #'null '((a . b) nil (c . d) (nil . e) (f . g))) - (nil . e)) - -(deftest assoc-if.5 - (let () (assoc-if #'null '((a . b) nil (c . d) (nil . e) (f . g)))) - (nil . e)) - - -;;; Order of argument evaluation - -(deftest assoc-if.order.1 - (let ((i 0) x y) - (values - (assoc-if (progn (setf x (incf i)) #'null) - (progn (setf y (incf i)) - '((a . 1) (b . 2) (nil . 17) (d . 4)))) - i x y)) - (nil . 17) 2 1 2) - -(deftest assoc-if.order.2 - (let ((i 0) x y z) - (values - (assoc-if (progn (setf x (incf i)) #'null) - (progn (setf y (incf i)) - '((a . 1) (b . 2) (nil . 17) (d . 4))) - :key (progn (setf z (incf i)) #'null)) - i x y z)) - (a . 1) 3 1 2 3) - -;;; Keyword tests - -(deftest assoc-if.allow-other-keys.1 - (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :bad t :allow-other-keys t) - (nil . 2)) - -(deftest assoc-if.allow-other-keys.2 - (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) - :allow-other-keys t :also-bad t) - (nil . 2)) - -(deftest assoc-if.allow-other-keys.3 - (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) - :allow-other-keys t :also-bad t :key #'not) - (a . 1)) - -(deftest assoc-if.allow-other-keys.4 - (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :allow-other-keys t) - (nil . 2)) - -(deftest assoc-if.allow-other-keys.5 - (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :allow-other-keys nil) - (nil . 2)) - -(deftest assoc-if.keywords.6 - (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :key #'identity :key #'null) - (nil . 2)) - -(deftest assoc-if.keywords.7 - (assoc-if #'null '((a . 1) (nil . 2) (c . 3)) :key nil :key #'null) - (nil . 2)) - -;;; Macro env tests - -(deftest assoc-if.env.1 - (macrolet - ((%m (z) z)) - (let ((alist '((1 . a) (3 . b) (6 . c) (8 . d) (-1 . e)))) - (values - (assoc-if (expand-in-current-env (%m 'evenp)) alist) - (assoc-if (expand-in-current-env (%m #'evenp)) alist) - (assoc-if #'evenp (expand-in-current-env (%m alist))) - (assoc-if 'oddp alist (expand-in-current-env (%m :key)) '1+) - (assoc-if 'oddp alist :key (expand-in-current-env (%m #'1+))) - ))) - (6 . c) - (6 . c) - (6 . c) - (6 . c) - (6 . c)) - -;;; Error cases - -(deftest assoc-if.error.1 - (signals-error (assoc-if) program-error) - t) - -(deftest assoc-if.error.2 - (signals-error (assoc-if #'null) program-error) - t) - -(deftest assoc-if.error.3 - (signals-error (assoc-if #'null nil :bad t) - program-error) - t) - -(deftest assoc-if.error.4 - (signals-error (assoc-if #'null nil :key) - program-error) - t) - -(deftest assoc-if.error.5 - (signals-error (assoc-if #'null nil 1 1) - program-error) - t) - -(deftest assoc-if.error.6 - (signals-error (assoc-if #'null nil :bad t :allow-other-keys nil) - program-error) - t) - -(deftest assoc-if.error.7 - (signals-error (assoc-if #'cons '((a b)(c d))) - program-error) - t) - -(deftest assoc-if.error.8 - (signals-error (assoc-if #'identity '((a b)(c d)) :key #'cons) - program-error) - t) - -(deftest assoc-if.error.9 - (signals-type-error x 'a (assoc-if #'car '((a b)(c d)))) - t) - -(deftest assoc-if.error.10 - (signals-type-error x 'a (assoc-if #'identity '((a b)(c d)) :key #'car)) - t) - -(deftest assoc-if.error.11 - (signals-error (assoc-if #'null '((a . b) . c)) - type-error) - t) - -(deftest assoc-if.error.12 - (signals-error (assoc-if #'null '((a . b) :bad (c . d))) - type-error) - t) - -(deftest assoc-if.error.13 - (signals-type-error x 'y (assoc-if #'null x)) - t) diff --git a/data-and-control-flow/equalp.lsp b/data-and-control-flow/equalp.lsp index 4dc77596..0f69993b 100644 --- a/data-and-control-flow/equalp.lsp +++ b/data-and-control-flow/equalp.lsp @@ -5,8 +5,6 @@ (in-package :cl-test) -(compile-and-load "random-aux.lsp") - (deftest equalp.1 (loop for c across +base-chars+ always (loop for d across +base-chars+ diff --git a/data-and-control-flow/etypecase.lsp b/data-and-control-flow/etypecase.lsp index ceef833b..2a6ab1ca 100644 --- a/data-and-control-flow/etypecase.lsp +++ b/data-and-control-flow/etypecase.lsp @@ -5,8 +5,6 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") - (deftest etypecase.1 (etypecase 1 (integer 'a) (t 'b)) a) diff --git a/format/format-a.lsp b/format/format-a.lsp index b7d1b02a..5c0b44cd 100644 --- a/format/format-a.lsp +++ b/format/format-a.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Tests of printing using the ~A directive (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.a.1 "~a" (nil) "NIL") diff --git a/format/format-ampersand.lsp b/format/format-ampersand.lsp index 3063da9a..44583472 100644 --- a/format/format-ampersand.lsp +++ b/format/format-ampersand.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Tests of format with ~& directive (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.&.1 "~0&" nil "") diff --git a/format/format-b.lsp b/format/format-b.lsp index c4a64875..dafc51d5 100644 --- a/format/format-b.lsp +++ b/format/format-b.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest format.b.1 (let ((fn (formatter "~b"))) diff --git a/format/format-brace.lsp b/format/format-brace.lsp index e3304313..8f5aafb2 100644 --- a/format/format-brace.lsp +++ b/format/format-brace.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.{.1 (concatenate 'string "~{~" (string #\Newline) "~}") diff --git a/format/format-c.lsp b/format/format-c.lsp index 1a8822dc..dec2937a 100644 --- a/format/format-c.lsp +++ b/format/format-c.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; Test of the ~C directive diff --git a/format/format-circumflex.lsp b/format/format-circumflex.lsp index 52e6fbba..c028c3d8 100644 --- a/format/format-circumflex.lsp +++ b/format/format-circumflex.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Tests of the ~^ format directive (inside other format constructs) (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; Tests of ~^ inside ~{ ... ~} diff --git a/format/format-conditional.lsp b/format/format-conditional.lsp index 66b728e5..8b2c955b 100644 --- a/format/format-conditional.lsp +++ b/format/format-conditional.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.cond.1 "~[~]" (0) "") diff --git a/format/format-d.lsp b/format/format-d.lsp index cb86b700..8d065e4a 100644 --- a/format/format-d.lsp +++ b/format/format-d.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest format.d.1 (with-standard-io-syntax diff --git a/format/format-f.lsp b/format/format-f.lsp index d690008b..d35f5d47 100644 --- a/format/format-f.lsp +++ b/format/format-f.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; Equivalent to PRIN1 for 0 or (abs x) in range [10^-3,10^7). diff --git a/format/format-goto.lsp b/format/format-goto.lsp index 308b0cd3..77f0a6f3 100644 --- a/format/format-goto.lsp +++ b/format/format-goto.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; ~* diff --git a/format/format-i.lsp b/format/format-i.lsp index a58124eb..acd375f3 100644 --- a/format/format-i.lsp +++ b/format/format-i.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; pprint-indent.9 (def-pprint-test format.i.1 diff --git a/format/format-justify.lsp b/format/format-justify.lsp index 45be9d7e..cc388807 100644 --- a/format/format-justify.lsp +++ b/format/format-justify.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-pprint-test format.justify.1 (format nil "~<~>") diff --git a/format/format-logical-block.lsp b/format/format-logical-block.lsp index 5f764f4e..fc13e0ec 100644 --- a/format/format-logical-block.lsp +++ b/format/format-logical-block.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; Error cases diff --git a/format/format-newline.lsp b/format/format-newline.lsp index 1aad825d..740d02c5 100644 --- a/format/format-newline.lsp +++ b/format/format-newline.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Tests of ~<newline> (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.newline.1 (concatenate 'string "~" (string #\Newline) " X") diff --git a/format/format-o.lsp b/format/format-o.lsp index 4ded9b77..f2ec25af 100644 --- a/format/format-o.lsp +++ b/format/format-o.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest format.o.1 (let ((fn (formatter "~o"))) diff --git a/format/format-p.lsp b/format/format-p.lsp index adfa42d7..28bb2e8f 100644 --- a/format/format-p.lsp +++ b/format/format-p.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.p.1 "~p" (1) "") diff --git a/format/format-page.lsp b/format/format-page.lsp index 2320f18b..147140b7 100644 --- a/format/format-page.lsp +++ b/format/format-page.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Tests of format with ~| directive (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.page.1 "~0|" nil "") diff --git a/format/format-paren.lsp b/format/format-paren.lsp index c79a0575..d5c7dba2 100644 --- a/format/format-paren.lsp +++ b/format/format-paren.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.paren.1 "~(XXyy~AuuVV~)" ("ABc dEF ghI") "xxyyabc def ghiuuvv") diff --git a/format/format-percent.lsp b/format/format-percent.lsp index 96813b5c..99d1a438 100644 --- a/format/format-percent.lsp +++ b/format/format-percent.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Tests of format with ~% directive (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.%.1 "~%" nil #.(string #\Newline)) diff --git a/format/format-question.lsp b/format/format-question.lsp index 582e0a8f..3b86a2ba 100644 --- a/format/format-question.lsp +++ b/format/format-question.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.?.1 "~?" ("" nil) "") diff --git a/format/format-r.lsp b/format/format-r.lsp index 81b6cff6..c9c1580b 100644 --- a/format/format-r.lsp +++ b/format/format-r.lsp @@ -6,7 +6,7 @@ (in-package :cl-test) ;;; Test of various radixes -(compile-and-load "printer-aux.lsp") + (compile-and-load "roman-numerals.lsp") (deftest format.r.1 diff --git a/format/format-s.lsp b/format/format-s.lsp index 75956475..cf820bbb 100644 --- a/format/format-s.lsp +++ b/format/format-s.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Test of the ~S format directive (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest format.s.1 (let ((*print-readably* nil) diff --git a/format/format-slash.lsp b/format/format-slash.lsp index aa6e9739..b62715f6 100644 --- a/format/format-slash.lsp +++ b/format/format-slash.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-pprint-test format./.1 (format nil "~/pprint-linear/" 1) diff --git a/format/format-t.lsp b/format/format-t.lsp index 0446e17c..8b892799 100644 --- a/format/format-t.lsp +++ b/format/format-t.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-pprint-test format.t.1 (format nil "~0,0T") diff --git a/format/format-tilde.lsp b/format/format-tilde.lsp index 470c2ccf..b062f63a 100644 --- a/format/format-tilde.lsp +++ b/format/format-tilde.lsp @@ -4,7 +4,7 @@ ;;;; Contains: Tests of format directive ~~ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-format-test format.~.1 "~~" nil "~") diff --git a/format/format-underscore.lsp b/format/format-underscore.lsp index a6c6e8e6..2656b894 100644 --- a/format/format-underscore.lsp +++ b/format/format-underscore.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-ppblock-test format._.1 (progn diff --git a/format/format-x.lsp b/format/format-x.lsp index 7c73b3bd..5a45110d 100644 --- a/format/format-x.lsp +++ b/format/format-x.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest format.x.1 (let ((fn (formatter "~x"))) diff --git a/format/formatter-c.lsp b/format/formatter-c.lsp index 7de05b17..c61050da 100644 --- a/format/formatter-c.lsp +++ b/format/formatter-c.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest formatter.c.1 (let ((fn (formatter "~C"))) diff --git a/gclload1.lsp b/gclload1.lsp index a362390d..c903d643 100644 --- a/gclload1.lsp +++ b/gclload1.lsp @@ -1,8 +1,8 @@ -#+:ecl (si::package-lock (find-package "COMMON-LISP") nil) +#+ecl (si::package-lock (find-package "COMMON-LISP") nil) +#+ecl (compile nil '(lambda () nil)) +#+ecl (setq c:*suppress-compiler-warnings* t c:*suppress-compiler-notes* t) #+:armedbear (require 'pprint) - #+cmu (setq ext:*gc-verbose* nil) - #+gcl (setq compiler:*suppress-compiler-notes* t compiler:*suppress-compiler-warnings* t compiler:*compile-verbose* nil @@ -10,32 +10,31 @@ #+lispworks (setq compiler::*compiler-warnings* nil) #+lispworks (make-echo-stream *standard-input* *standard-output*) - -#+ecl (compile nil '(lambda () nil)) - -#+ecl (setq c:*suppress-compiler-warnings* t c:*suppress-compiler-notes* t) - #+clisp (setq custom::*warn-on-floating-point-contagion* nil) +;;; Configure logical pathnames +(setf (logical-pathname-translations "ansi-tests") + `(("aux;*.*" ,(merge-pathnames + "auxiliary/" + (make-pathname + :directory + (pathname-directory *load-truename*)))))) + (let (*load-verbose* *load-print* *compile-verbose* *compile-print*) (load "compile-and-load.lsp")) (let (*load-verbose* *load-print* *compile-verbose* *compile-print*) (load "rt-package.lsp") (compile-and-load "rt.lsp") - ;; (unless (probe-file "rt.o") (compile-file "rt.lsp")) - ;; (load "rt.o") (load "cl-test-package.lsp") (in-package :cl-test) - (compile-and-load "ansi-aux-macros.lsp") + (compile-and-load "ANSI-TESTS:AUX;ansi-aux-macros.lsp") (handler-bind #-sbcl () #+sbcl ((sb-ext:code-deletion-note #'muffle-warning)) (load "universe.lsp")) - (compile-and-load "random-aux.lsp") - (compile-and-load "ansi-aux.lsp") - ;; (unless (probe-file "ansi-aux.o") (compile-file "ansi-aux.lsp")) - ;; (load "ansi-aux.o") + (compile-and-load "ANSI-TESTS:AUX;random-aux.lsp") + (compile-and-load "ANSI-TESTS:AUX;ansi-aux.lsp") (load "cl-symbol-names.lsp") (load "notes.lsp")) diff --git a/load-arrays.lsp b/load-arrays.lsp index 12919e16..764add64 100644 --- a/load-arrays.lsp +++ b/load-arrays.lsp @@ -1,5 +1,7 @@ ;;; Tests on arrays -(compile-and-load "array-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;array-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;bit-aux.lsp") + (load "arrays/aref.lsp") (load "arrays/array.lsp") (load "arrays/array-t.lsp") diff --git a/load-characters.lsp b/load-characters.lsp index 6d559100..eb132f16 100644 --- a/load-characters.lsp +++ b/load-characters.lsp @@ -1,11 +1,6 @@ -;-*- Mode: Lisp -*- -;;;; Author: Paul Dietz -;;;; Created: Thu Jun 23 20:12:44 2005 -;;;; Contains: Load character tests +;;;; Character tests +(compile-and-load "ANSI-TESTS:AUX;char-aux.lsp") -(in-package :cl-test) - -(compile-and-load "char-aux.lsp") (load "characters/character.lsp") (load "characters/char-compare.lsp") (load "characters/name-char.lsp") diff --git a/load-conditions.lsp b/load-conditions.lsp index e83a8c6b..689a7aff 100644 --- a/load-conditions.lsp +++ b/load-conditions.lsp @@ -1,6 +1,7 @@ ;;; Tests of conditions -(compile-and-load "types-aux.lsp") -(compile-and-load "define-condition-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;define-condition-aux.lsp") + (load "conditions/condition.lsp") (load "conditions/cell-error-name.lsp") (load "conditions/assert.lsp") diff --git a/load-cons.lsp b/load-cons.lsp index 3a891b11..b32b1b7b 100644 --- a/load-cons.lsp +++ b/load-cons.lsp @@ -1,6 +1,5 @@ ;;; Tests of conses - -;;; (compile-and-load "cons-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;cons-aux.lsp") (load "cons/cons.lsp") (load "cons/consp.lsp") diff --git a/load-data-and-control-flow.lsp b/load-data-and-control-flow.lsp index c135aebf..a6fe6abb 100644 --- a/load-data-and-control-flow.lsp +++ b/load-data-and-control-flow.lsp @@ -1,4 +1,7 @@ ;;; Tests of data and control flow +(compile-and-load "ANSI-TESTS:AUX;cons-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp") (load "data-and-control-flow/data-and-control-flow.lsp") (load "data-and-control-flow/places.lsp") diff --git a/load-hash-tables.lsp b/load-hash-tables.lsp index 9edc9548..ba218355 100644 --- a/load-hash-tables.lsp +++ b/load-hash-tables.lsp @@ -1,4 +1,4 @@ -(compile-and-load "hash-table-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;hash-table-aux.lsp") (load "hash-tables/hash-table.lsp") (load "hash-tables/make-hash-table.lsp") diff --git a/load-iteration.lsp b/load-iteration.lsp index a1bbc3aa..b326e87b 100644 --- a/load-iteration.lsp +++ b/load-iteration.lsp @@ -1,5 +1,5 @@ ;;; Tests of iteration forms -;;(load "iteration.lsp") + (load "iteration/do.lsp") (load "iteration/dostar.lsp") (load "iteration/dolist.lsp") diff --git a/load-numbers.lsp b/load-numbers.lsp index d618f05f..6eb87fe6 100644 --- a/load-numbers.lsp +++ b/load-numbers.lsp @@ -5,8 +5,21 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "random-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;numbers-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;floor-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;ffloor-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;ceiling-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;fceiling-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;truncate-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;ftruncate-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;round-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;fround-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;times-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;division-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;exp-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;gcd-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp") (load "numbers/number-comparison.lsp") (load "numbers/max.lsp") diff --git a/load-objects.lsp b/load-objects.lsp index 533279fe..953d7698 100644 --- a/load-objects.lsp +++ b/load-objects.lsp @@ -3,7 +3,8 @@ ;;;; Created: Mon Mar 24 03:39:09 2003 ;;;; Contains: Loader for CLOS-related test files -(compile-and-load "defclass-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;defclass-aux.lsp") + (load "objects/defclass.lsp") (load "objects/defclass-01.lsp") (load "objects/defclass-02.lsp") diff --git a/load-packages.lsp b/load-packages.lsp index 9fcfb0a2..5464ddda 100644 --- a/load-packages.lsp +++ b/load-packages.lsp @@ -3,7 +3,9 @@ ;;;; Created: Sun Oct 6 00:32:56 2002 ;;;; Contains: Loader for files containing package tests -(compile-and-load "packages-00.lsp") +(compile-and-load "ANSI-TESTS:AUX;packages00-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;package-aux.lsp") + (load "packages/find-symbol.lsp") (load "packages/find-all-symbols.lsp") (load "packages/find-package.lsp") diff --git a/load-pathnames.lsp b/load-pathnames.lsp index a3fdf0ba..114fb89b 100644 --- a/load-pathnames.lsp +++ b/load-pathnames.lsp @@ -1,11 +1,5 @@ -;-*- Mode: Lisp -*- -;;;; Author: Paul Dietz -;;;; Created: Sat Nov 29 04:33:05 2003 -;;;; Contains: Load tests for pathnames and logical pathnames - -(in-package :cl-test) - -(compile-and-load "pathnames-aux.lsp") +;;;; Tests for pathnames and logical pathnames +(compile-and-load "ANSI-TESTS:AUX;pathnames-aux.lsp") (load "pathnames/pathnames.lsp") (load "pathnames/pathname.lsp") diff --git a/load-reader.lsp b/load-reader.lsp index b0fad8ca..f5975a7d 100644 --- a/load-reader.lsp +++ b/load-reader.lsp @@ -1,9 +1,5 @@ -;-*- Mode: Lisp -*- -;;;; Author: Paul Dietz -;;;; Created: Mon Feb 23 05:20:41 2004 -;;;; Contains: Load tests of the reader - -(in-package :cl-test) +;;;; Tests of the reader +(compile-and-load "ANSI-TESTS:AUX;reader-aux.lsp") (load "reader/reader-test.lsp") (load "reader/with-standard-io-syntax.lsp") diff --git a/load-sequences.lsp b/load-sequences.lsp index c8192582..2b3841bd 100644 --- a/load-sequences.lsp +++ b/load-sequences.lsp @@ -1,4 +1,8 @@ ;;; Tests of sequences +(compile-and-load "ANSI-TESTS:AUX;search-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;subseq-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;remove-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;remove-duplicates-aux.lsp") (load "sequences/copy-seq.lsp") (load "sequences/elt.lsp") diff --git a/load-strings.lsp b/load-strings.lsp index 0e5a1f44..c0b4b1ab 100644 --- a/load-strings.lsp +++ b/load-strings.lsp @@ -1,4 +1,5 @@ ;;; Tests of strings +(compile-and-load "ANSI-TESTS:AUX;string-aux.lsp") (load "strings/char-schar.lsp") (load "strings/string.lsp") @@ -18,6 +19,5 @@ (load "strings/string-right-trim.lsp") ;;; Tests of string comparison functions -(compile-and-load "string-aux.lsp") (load "strings/string-comparisons.lsp") (load "strings/make-string.lsp") diff --git a/load-symbols.lsp b/load-symbols.lsp index 57f65acd..68285523 100644 --- a/load-symbols.lsp +++ b/load-symbols.lsp @@ -1,6 +1,6 @@ ;;; Tests of symbols -(compile-and-load "cl-symbols-aux.lsp") -;; (load "cl-symbol-names.lsp") ;; moved to gclload1.lsp +(compile-and-load "ANSI-TESTS:AUX;cl-symbols-aux.lsp") + (load "symbols/cl-symbols.lsp") (load "symbols/symbolp.lsp") (load "symbols/keywordp.lsp") diff --git a/load-types-and-class.lsp b/load-types-and-class.lsp index e54b5939..35c1657f 100644 --- a/load-types-and-class.lsp +++ b/load-types-and-class.lsp @@ -1,4 +1,5 @@ ;;; Tests of types and classes +(compile-and-load "ANSI-TESTS:AUX;types-aux.lsp") (load "types-and-classes/types-and-class.lsp") (load "types-and-classes/types-and-class-2.lsp") diff --git a/makefile b/makefile index 6b56c1d8..3804e3a8 100644 --- a/makefile +++ b/makefile @@ -136,6 +136,7 @@ rt_1000_8: clean: + @rm -f auxiliary/*fas @rm -f test*.out *.cls *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl *.abcl *.fas *.lib \#*\# @rm -f *.dfsl *.d64fsl @(cd beyond-ansi; $(MAKE) clean) diff --git a/numbers/abs.lsp b/numbers/abs.lsp index ca0ddc11..f584efd9 100644 --- a/numbers/abs.lsp +++ b/numbers/abs.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest abs.error.1 (signals-error (abs) program-error) diff --git a/conditions/arithmetic-error.lsp b/numbers/arithmetic-error.lsp similarity index 100% rename from conditions/arithmetic-error.lsp rename to numbers/arithmetic-error.lsp diff --git a/numbers/boole.lsp b/numbers/boole.lsp index 74fdac38..4cfadafb 100644 --- a/numbers/boole.lsp +++ b/numbers/boole.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (defparameter *boole-val-names* '(boole-1 boole-2 boole-and boole-andc1 boole-andc2 diff --git a/numbers/ceiling.lsp b/numbers/ceiling.lsp index 827b7850..f83be0ac 100644 --- a/numbers/ceiling.lsp +++ b/numbers/ceiling.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "ceiling-aux.lsp") + + (deftest ceiling.error.1 (signals-error (ceiling) program-error) diff --git a/numbers/cis.lsp b/numbers/cis.lsp index 456edea2..9ff8d228 100644 --- a/numbers/cis.lsp +++ b/numbers/cis.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest cis.error.1 (signals-error (cis) program-error) diff --git a/numbers/decf.lsp b/numbers/decf.lsp index 8a6b7da8..32e53c3f 100644 --- a/numbers/decf.lsp +++ b/numbers/decf.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest decf.1 (let ((x 12)) diff --git a/numbers/divide.lsp b/numbers/divide.lsp index 9cb906ce..4042004a 100644 --- a/numbers/divide.lsp +++ b/numbers/divide.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "division-aux.lsp") + + (deftest /.error.1 (signals-error (/) program-error) diff --git a/numbers/epsilons.lsp b/numbers/epsilons.lsp index 143dab83..24cc2ccd 100644 --- a/numbers/epsilons.lsp +++ b/numbers/epsilons.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest epsilons.1 (loop for e in (list short-float-epsilon single-float-epsilon diff --git a/numbers/evenp.lsp b/numbers/evenp.lsp index 3b75ca38..aeeba358 100644 --- a/numbers/evenp.lsp +++ b/numbers/evenp.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest evenp.error.1 (signals-error (evenp) program-error) diff --git a/numbers/exp.lsp b/numbers/exp.lsp index d0510a34..ac7c6692 100644 --- a/numbers/exp.lsp +++ b/numbers/exp.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "exp-aux.lsp") + + ;;; Error tests diff --git a/numbers/fceiling.lsp b/numbers/fceiling.lsp index 9577e520..b4dd6295 100644 --- a/numbers/fceiling.lsp +++ b/numbers/fceiling.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "fceiling-aux.lsp") + + (deftest fceiling.error.1 (signals-error (fceiling) program-error) diff --git a/numbers/ffloor.lsp b/numbers/ffloor.lsp index ccb1a945..4b2596e8 100644 --- a/numbers/ffloor.lsp +++ b/numbers/ffloor.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "ffloor-aux.lsp") + + (deftest ffloor.error.1 (signals-error (ffloor) program-error) diff --git a/numbers/floor.lsp b/numbers/floor.lsp index 50828587..2e9a0fd6 100644 --- a/numbers/floor.lsp +++ b/numbers/floor.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "floor-aux.lsp") + + ;;; Error tests diff --git a/numbers/fround.lsp b/numbers/fround.lsp index bdf2cd63..b22548bc 100644 --- a/numbers/fround.lsp +++ b/numbers/fround.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "fround-aux.lsp") + + ;;; Error tests diff --git a/numbers/ftruncate.lsp b/numbers/ftruncate.lsp index 07430943..c4bee251 100644 --- a/numbers/ftruncate.lsp +++ b/numbers/ftruncate.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "ftruncate-aux.lsp") + + ;;; Error tests diff --git a/numbers/gcd.lsp b/numbers/gcd.lsp index 88a06a3a..d89d9951 100644 --- a/numbers/gcd.lsp +++ b/numbers/gcd.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "gcd-aux.lsp") + + ;;; Error tests diff --git a/numbers/incf.lsp b/numbers/incf.lsp index 427d4001..b4f64a91 100644 --- a/numbers/incf.lsp +++ b/numbers/incf.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest incf.1 (let ((x 12)) diff --git a/numbers/isqrt.lsp b/numbers/isqrt.lsp index eb3f6617..d25c65f1 100644 --- a/numbers/isqrt.lsp +++ b/numbers/isqrt.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/lcm.lsp b/numbers/lcm.lsp index 275abb74..7a104c5b 100644 --- a/numbers/lcm.lsp +++ b/numbers/lcm.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "gcd-aux.lsp") + + (deftest lcm.error.1 (check-type-error #'lcm #'integerp) diff --git a/numbers/logand.lsp b/numbers/logand.lsp index dc47ccc1..d38fde00 100644 --- a/numbers/logand.lsp +++ b/numbers/logand.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/logandc1.lsp b/numbers/logandc1.lsp index 295bdf15..d052d838 100644 --- a/numbers/logandc1.lsp +++ b/numbers/logandc1.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/logandc2.lsp b/numbers/logandc2.lsp index 8bef40f4..4712b221 100644 --- a/numbers/logandc2.lsp +++ b/numbers/logandc2.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/logbitp.lsp b/numbers/logbitp.lsp index c2d0d9d4..dfd4fe6b 100644 --- a/numbers/logbitp.lsp +++ b/numbers/logbitp.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/logeqv.lsp b/numbers/logeqv.lsp index b28c2160..b06a0a8d 100644 --- a/numbers/logeqv.lsp +++ b/numbers/logeqv.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/logior.lsp b/numbers/logior.lsp index 317c4406..4ebca6df 100644 --- a/numbers/logior.lsp +++ b/numbers/logior.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/lognand.lsp b/numbers/lognand.lsp index ca4dabdc..d0c81b28 100644 --- a/numbers/lognand.lsp +++ b/numbers/lognand.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/lognor.lsp b/numbers/lognor.lsp index 9c978f58..aa4dddaf 100644 --- a/numbers/lognor.lsp +++ b/numbers/lognor.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/lognot.lsp b/numbers/lognot.lsp index ef41c146..00e7ec7d 100644 --- a/numbers/lognot.lsp +++ b/numbers/lognot.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/logorc1.lsp b/numbers/logorc1.lsp index 211d3dcc..294413cd 100644 --- a/numbers/logorc1.lsp +++ b/numbers/logorc1.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/logorc2.lsp b/numbers/logorc2.lsp index 116ba4b3..d5053ec0 100644 --- a/numbers/logorc2.lsp +++ b/numbers/logorc2.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/logxor.lsp b/numbers/logxor.lsp index 271edb5e..cb7b1274 100644 --- a/numbers/logxor.lsp +++ b/numbers/logxor.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/max.lsp b/numbers/max.lsp index 924a1301..e70bc08a 100644 --- a/numbers/max.lsp +++ b/numbers/max.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/min.lsp b/numbers/min.lsp index e5a88dfc..8ad55904 100644 --- a/numbers/min.lsp +++ b/numbers/min.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest min.error.1 (signals-error (min) program-error) diff --git a/numbers/minus.lsp b/numbers/minus.lsp index 865b2625..0dd4e4bf 100644 --- a/numbers/minus.lsp +++ b/numbers/minus.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest minus.error.1 (signals-error (-) program-error) diff --git a/numbers/number-comparison.lsp b/numbers/number-comparison.lsp index 20830b56..e558b49e 100644 --- a/numbers/number-comparison.lsp +++ b/numbers/number-comparison.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Errors tests on comparison functions diff --git a/numbers/numerator-denominator.lsp b/numbers/numerator-denominator.lsp index 7f487b17..7e3b186c 100644 --- a/numbers/numerator-denominator.lsp +++ b/numbers/numerator-denominator.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest numerator.error.1 (signals-error (numerator) program-error) diff --git a/numbers/oddp.lsp b/numbers/oddp.lsp index 8fd3ec42..3b4eaf2d 100644 --- a/numbers/oddp.lsp +++ b/numbers/oddp.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/oneminus.lsp b/numbers/oneminus.lsp index afac16ee..d99c730a 100644 --- a/numbers/oneminus.lsp +++ b/numbers/oneminus.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; Error tests diff --git a/numbers/oneplus.lsp b/numbers/oneplus.lsp index 0646df8e..7b555d6f 100644 --- a/numbers/oneplus.lsp +++ b/numbers/oneplus.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest 1+.error.1 (signals-error (1+) program-error) diff --git a/numbers/plus.lsp b/numbers/plus.lsp index 869c76d1..bf11e31a 100644 --- a/numbers/plus.lsp +++ b/numbers/plus.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + ;;; (compile-and-load "plus-aux.lsp") (deftest plus.1 diff --git a/numbers/random.lsp b/numbers/random.lsp index 2f5df06e..c9b2cbe8 100644 --- a/numbers/random.lsp +++ b/numbers/random.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "random-aux.lsp") + + (deftest random.error.1 (signals-error (random) program-error) diff --git a/numbers/round.lsp b/numbers/round.lsp index 94668a25..bbef136d 100644 --- a/numbers/round.lsp +++ b/numbers/round.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "round-aux.lsp") + + (deftest round.error.1 (signals-error (round) program-error) diff --git a/numbers/sqrt.lsp b/numbers/sqrt.lsp index 2e8a0ff3..a085f603 100644 --- a/numbers/sqrt.lsp +++ b/numbers/sqrt.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") + (deftest sqrt.error.1 (signals-error (sqrt) program-error) diff --git a/numbers/times.lsp b/numbers/times.lsp index 22c10f2f..21ededbd 100644 --- a/numbers/times.lsp +++ b/numbers/times.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "times-aux.lsp") + + (deftest *.1 (*) diff --git a/numbers/truncate.lsp b/numbers/truncate.lsp index 40b2e09e..9222fec2 100644 --- a/numbers/truncate.lsp +++ b/numbers/truncate.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "numbers-aux.lsp") -(compile-and-load "truncate-aux.lsp") + + (deftest truncate.error.1 (signals-error (truncate) program-error) diff --git a/numbers/upgraded-complex-part-type.lsp b/numbers/upgraded-complex-part-type.lsp index b39fc328..addc61fd 100644 --- a/numbers/upgraded-complex-part-type.lsp +++ b/numbers/upgraded-complex-part-type.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + (defmacro def-ucpt-test (name types) `(deftest ,name diff --git a/packages/defpackage.lsp b/packages/defpackage.lsp index e46958be..6525bc2c 100644 --- a/packages/defpackage.lsp +++ b/packages/defpackage.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "package-aux.lsp") + (declaim (optimize (safety 3))) diff --git a/packages/do-external-symbols.lsp b/packages/do-external-symbols.lsp index 41f2c631..16b827aa 100644 --- a/packages/do-external-symbols.lsp +++ b/packages/do-external-symbols.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "package-aux.lsp") + (declaim (optimize (safety 3))) diff --git a/packages/do-symbols.lsp b/packages/do-symbols.lsp index 947cd496..4cdb340e 100644 --- a/packages/do-symbols.lsp +++ b/packages/do-symbols.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "package-aux.lsp") + (declaim (optimize (safety 3))) diff --git a/packages/find-symbol.lsp b/packages/find-symbol.lsp index 59544757..303f51ea 100644 --- a/packages/find-symbol.lsp +++ b/packages/find-symbol.lsp @@ -5,8 +5,6 @@ (in-package :cl-test) -(compile-and-load "packages-00.lsp") - ;;(declaim (optimize (safety 3))) ;; Test find-symbol, with the various combinations of diff --git a/packages/import.lsp b/packages/import.lsp index 43dabf51..e430dc55 100644 --- a/packages/import.lsp +++ b/packages/import.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "package-aux.lsp") + ;;; Create a package name that does not collide with an existing package ;;; name or nickname diff --git a/packages/unuse-package.lsp b/packages/unuse-package.lsp index 30fdf86c..b0b0bb1c 100644 --- a/packages/unuse-package.lsp +++ b/packages/unuse-package.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "package-aux.lsp") + (declaim (optimize (safety 3))) diff --git a/packages/use-package.lsp b/packages/use-package.lsp index 23a8f9a2..09f47da4 100644 --- a/packages/use-package.lsp +++ b/packages/use-package.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "package-aux.lsp") + (declaim (optimize (safety 3))) diff --git a/packages/with-package-iterator.lsp b/packages/with-package-iterator.lsp index 81054928..514667e1 100644 --- a/packages/with-package-iterator.lsp +++ b/packages/with-package-iterator.lsp @@ -6,7 +6,7 @@ (in-package :cl-test) (declaim (optimize (safety 3))) -(compile-and-load "package-aux.lsp") + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; with-package-iterator diff --git a/pathnames/pathname-device.lsp b/pathnames/pathname-device.lsp index cd87f9c4..621719b6 100644 --- a/pathnames/pathname-device.lsp +++ b/pathnames/pathname-device.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "pathnames-aux.lsp") + (deftest pathname-device.1 (loop for p in *pathnames* diff --git a/pathnames/pathname-directory.lsp b/pathnames/pathname-directory.lsp index 0871e892..694d7966 100644 --- a/pathnames/pathname-directory.lsp +++ b/pathnames/pathname-directory.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "pathnames-aux.lsp") + (deftest pathname-directory.1 (loop for p in *pathnames* diff --git a/pathnames/pathname-host.lsp b/pathnames/pathname-host.lsp index 2ed90306..a3473766 100644 --- a/pathnames/pathname-host.lsp +++ b/pathnames/pathname-host.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "pathnames-aux.lsp") + (deftest pathname-host.1 (loop for p in *pathnames* diff --git a/pathnames/pathname-match-p.lsp b/pathnames/pathname-match-p.lsp index 8e0ff8eb..2df133a2 100644 --- a/pathnames/pathname-match-p.lsp +++ b/pathnames/pathname-match-p.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "pathnames-aux.lsp") + ;;; Much of the behavior cannot be tested portably. diff --git a/pathnames/pathname-name.lsp b/pathnames/pathname-name.lsp index 027ffbae..2ce7d1eb 100644 --- a/pathnames/pathname-name.lsp +++ b/pathnames/pathname-name.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "pathnames-aux.lsp") + (deftest pathname-name.1 (loop for p in *pathnames* diff --git a/pathnames/pathname-type.lsp b/pathnames/pathname-type.lsp index e8c5083b..b08766aa 100644 --- a/pathnames/pathname-type.lsp +++ b/pathnames/pathname-type.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "pathnames-aux.lsp") + (deftest pathname-type.1 (loop for p in *pathnames* diff --git a/pathnames/pathname-version.lsp b/pathnames/pathname-version.lsp index 5cc77db5..3dc83b1f 100644 --- a/pathnames/pathname-version.lsp +++ b/pathnames/pathname-version.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "pathnames-aux.lsp") + (deftest pathname-version.1 (loop for p in *pathnames* diff --git a/pathnames/wild-pathname-p.lsp b/pathnames/wild-pathname-p.lsp index 3f9a3021..72a4228c 100644 --- a/pathnames/wild-pathname-p.lsp +++ b/pathnames/wild-pathname-p.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "pathnames-aux.lsp") + (deftest wild-pathname-p.1 (wild-pathname-p (make-pathname)) diff --git a/printer/pprint-newline.lsp b/printer/pprint-newline.lsp index e7295537..bc77f2be 100644 --- a/printer/pprint-newline.lsp +++ b/printer/pprint-newline.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (defmacro def-pprint-newline-test (name form expected-value &rest key-args) `(def-pprint-test ,name diff --git a/printer/pprint-tab.lsp b/printer/pprint-tab.lsp index 085e3c71..5eca2f15 100644 --- a/printer/pprint-tab.lsp +++ b/printer/pprint-tab.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; No effect in a non-pprint stream diff --git a/printer/pprint.lsp b/printer/pprint.lsp index 15edabd3..25bd1d30 100644 --- a/printer/pprint.lsp +++ b/printer/pprint.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; This function is mostly tested elsewhere diff --git a/printer/prin1-to-string.lsp b/printer/prin1-to-string.lsp index 6e950f7a..aba16db4 100644 --- a/printer/prin1-to-string.lsp +++ b/printer/prin1-to-string.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest prin1-to-string.1 (random-prin1-to-string-test 5) diff --git a/printer/prin1.lsp b/printer/prin1.lsp index 26d12c04..8dd77ab1 100644 --- a/printer/prin1.lsp +++ b/printer/prin1.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; This function is mostly tested elsewhere diff --git a/printer/princ-to-string.lsp b/printer/princ-to-string.lsp index 3a317173..5276f040 100644 --- a/printer/princ-to-string.lsp +++ b/printer/princ-to-string.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest princ-to-string.1 (random-princ-to-string-test 1000) diff --git a/printer/princ.lsp b/printer/princ.lsp index 84b1578f..fd0edb63 100644 --- a/printer/princ.lsp +++ b/printer/princ.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; This function is mostly tested elsewhere diff --git a/printer/print-array.lsp b/printer/print-array.lsp index ab93657b..2f0f2f9e 100644 --- a/printer/print-array.lsp +++ b/printer/print-array.lsp @@ -3,7 +3,7 @@ ;;;; Created: Thu Apr 22 22:38:11 2004 ;;;; Contains: Tests of printing of arrays (other than vectors) -(compile-and-load "printer-aux.lsp") + (in-package :cl-test) diff --git a/printer/print-backquote.lsp b/printer/print-backquote.lsp index 331ea940..ca282b02 100644 --- a/printer/print-backquote.lsp +++ b/printer/print-backquote.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") -(compile-and-load "backquote-aux.lsp") + + (deftest print.backquote.random.1 (let* ((x '`(a ,b ,@c (d . ,e) ,.f #(1 2 ,p ,@q ,.r s) g)) diff --git a/printer/print-bit-vector.lsp b/printer/print-bit-vector.lsp index 5e704db4..1ea931ac 100644 --- a/printer/print-bit-vector.lsp +++ b/printer/print-bit-vector.lsp @@ -3,7 +3,7 @@ ;;;; Created: Tue Apr 20 22:10:53 2004 ;;;; Contains: Tests for printing of bit vectors -(compile-and-load "printer-aux.lsp") + (in-package :cl-test) diff --git a/printer/print-characters.lsp b/printer/print-characters.lsp index c220e240..5e70be54 100644 --- a/printer/print-characters.lsp +++ b/printer/print-characters.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; See CLtS section 22.1.3.2, "Printing Characters" diff --git a/printer/print-complex.lsp b/printer/print-complex.lsp index 956fcc4d..bfab48da 100644 --- a/printer/print-complex.lsp +++ b/printer/print-complex.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest print.complex.1 (equalt diff --git a/printer/print-cons.lsp b/printer/print-cons.lsp index 7d9b77a8..8327ee10 100644 --- a/printer/print-cons.lsp +++ b/printer/print-cons.lsp @@ -3,7 +3,7 @@ ;;;; Created: Mon Apr 19 07:28:40 2004 ;;;; Contains: Tests of printing of conses -(compile-and-load "printer-aux.lsp") + (in-package :cl-test) diff --git a/printer/print-floats.lsp b/printer/print-floats.lsp index 81869ba1..dfabc830 100644 --- a/printer/print-floats.lsp +++ b/printer/print-floats.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest print.short-float.1 (with-standard-io-syntax diff --git a/printer/print-integers.lsp b/printer/print-integers.lsp index aa62498e..b6eaf898 100644 --- a/printer/print-integers.lsp +++ b/printer/print-integers.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; Tests with *print-base* diff --git a/printer/print-length.lsp b/printer/print-length.lsp index b513d40d..4b65e397 100644 --- a/printer/print-length.lsp +++ b/printer/print-length.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-print-test print-length.1 '(1) diff --git a/printer/print-level.lsp b/printer/print-level.lsp index 841af68e..4e7721f1 100644 --- a/printer/print-level.lsp +++ b/printer/print-level.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + #| (deftest print-level.1 diff --git a/printer/print-pathname.lsp b/printer/print-pathname.lsp index 6baa9825..ee3f46a4 100644 --- a/printer/print-pathname.lsp +++ b/printer/print-pathname.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest print.pathname.1 (loop for p in *universe* diff --git a/printer/print-random-state.lsp b/printer/print-random-state.lsp index 5ba76963..2ad5533d 100644 --- a/printer/print-random-state.lsp +++ b/printer/print-random-state.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest print.random-state.1 (loop repeat 100 diff --git a/printer/print-ratios.lsp b/printer/print-ratios.lsp index 4d42c6c2..b420f4f6 100644 --- a/printer/print-ratios.lsp +++ b/printer/print-ratios.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest print.ratios.random (loop for i from 1 to 1000 diff --git a/printer/print-strings.lsp b/printer/print-strings.lsp index 0c8ba3eb..f299e5df 100644 --- a/printer/print-strings.lsp +++ b/printer/print-strings.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (deftest print.string.1 (with-standard-io-syntax diff --git a/printer/print-structure.lsp b/printer/print-structure.lsp index d3b15927..82cdd2b7 100644 --- a/printer/print-structure.lsp +++ b/printer/print-structure.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (defstruct print-struct-1 foo bar) diff --git a/printer/print-symbols.lsp b/printer/print-symbols.lsp index 401e7a6b..b7351cd6 100644 --- a/printer/print-symbols.lsp +++ b/printer/print-symbols.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; Symbol printing when escaping is off diff --git a/printer/print-unreadable-object.lsp b/printer/print-unreadable-object.lsp index ab74b4e7..6b83c6a8 100644 --- a/printer/print-unreadable-object.lsp +++ b/printer/print-unreadable-object.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + (def-pprint-test print-unreadable-object.1 (loop diff --git a/printer/print-vector.lsp b/printer/print-vector.lsp index 4798fec9..4ff50ac9 100644 --- a/printer/print-vector.lsp +++ b/printer/print-vector.lsp @@ -3,7 +3,7 @@ ;;;; Created: Tue Apr 20 22:36:53 2004 ;;;; Contains: Tests of vector printing -(compile-and-load "printer-aux.lsp") + (in-package :cl-test) diff --git a/printer/print.lsp b/printer/print.lsp index 5f71bcde..dac56e76 100644 --- a/printer/print.lsp +++ b/printer/print.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; This function is mostly tested elsewhere diff --git a/printer/write-to-string.lsp b/printer/write-to-string.lsp index c324c44b..2832cb35 100644 --- a/printer/write-to-string.lsp +++ b/printer/write-to-string.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;;; This function is extensively used elsewhere diff --git a/printer/write.lsp b/printer/write.lsp index de516651..23cb1052 100644 --- a/printer/write.lsp +++ b/printer/write.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "printer-aux.lsp") + ;; (compile-and-load "write-aux.lsp") ;;; This function is also incidentally tested elsewhere. diff --git a/rctest/load.lsp b/rctest/load.lsp index 69841eb3..16867853 100644 --- a/rctest/load.lsp +++ b/rctest/load.lsp @@ -4,7 +4,7 @@ (load "../rt-package.lsp") (compile-and-load "../rt.lsp") (load "../cl-test-package.lsp") -(compile-and-load "../random-aux.lsp") +(compile-and-load "ANSI-TESTS:AUX;random-aux.lsp") (load "rctest-package.lsp") (compile-and-load "rctest-util.lsp") (compile-and-load "generator.lsp") diff --git a/reader/get-macro-character.lsp b/reader/get-macro-character.lsp index c6d04bf8..4f7d7c8f 100644 --- a/reader/get-macro-character.lsp +++ b/reader/get-macro-character.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "reader-aux.lsp") + (def-syntax-test get-macro-character.1 (loop for c across "()';\"`,#" diff --git a/reader/read-suppress.lsp b/reader/read-suppress.lsp index db1ea6ab..e00a78cf 100644 --- a/reader/read-suppress.lsp +++ b/reader/read-suppress.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "reader-aux.lsp") + (defmacro def-read-suppress-test (name string) `(def-syntax-test ,name diff --git a/reader/reader-test.lsp b/reader/reader-test.lsp index b3d63582..9537ba96 100644 --- a/reader/reader-test.lsp +++ b/reader/reader-test.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "reader-aux.lsp") + (def-syntax-test read-symbol.1 (read-from-string "a") diff --git a/reader/set-syntax-from-char.lsp b/reader/set-syntax-from-char.lsp index 90f3ecec..d1d03815 100644 --- a/reader/set-syntax-from-char.lsp +++ b/reader/set-syntax-from-char.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "reader-aux.lsp") + (defmacro def-set-syntax-from-char-test (name form &body expected-values) `(deftest ,name diff --git a/reader/syntax-tokens.lsp b/reader/syntax-tokens.lsp index debfd0e4..c41c6c6b 100644 --- a/reader/syntax-tokens.lsp +++ b/reader/syntax-tokens.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "reader-aux.lsp") + ;; Erroneous numbers diff --git a/reader/syntax.lsp b/reader/syntax.lsp index d8f6a79a..8835a447 100644 --- a/reader/syntax.lsp +++ b/reader/syntax.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "reader-aux.lsp") + (def-syntax-test syntax.whitespace.1 ;; Check that various standard or semistandard characters are whitespace[2] diff --git a/sequences/remove-duplicates.lsp b/sequences/remove-duplicates.lsp index 51b041f0..df3113fc 100644 --- a/sequences/remove-duplicates.lsp +++ b/sequences/remove-duplicates.lsp @@ -5,8 +5,8 @@ (in-package :cl-test) -(compile-and-load "remove-aux.lsp") -(compile-and-load "remove-duplicates-aux.lsp") + + (deftest random-remove-duplicates (loop for result = (random-test-remove-dups (1+ (random 20))) diff --git a/sequences/remove.lsp b/sequences/remove.lsp index bb6f9337..57ff5689 100644 --- a/sequences/remove.lsp +++ b/sequences/remove.lsp @@ -3,7 +3,7 @@ ;;;; Created: Sat Sep 14 11:46:05 2002 ;;;; Contains: Tests for REMOVE -(compile-and-load "remove-aux.lsp") + (in-package :cl-test) diff --git a/sequences/search-bitvector.lsp b/sequences/search-bitvector.lsp index 404fdbaf..cddf53a5 100644 --- a/sequences/search-bitvector.lsp +++ b/sequences/search-bitvector.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "search-aux.lsp") + (deftest search-bitvector.1 (let ((target *searched-bitvector*) diff --git a/sequences/search-list.lsp b/sequences/search-list.lsp index 2f57c063..c75d7f09 100644 --- a/sequences/search-list.lsp +++ b/sequences/search-list.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "search-aux.lsp") + (deftest search-list.1 (let ((target *searched-list*) diff --git a/sequences/search-string.lsp b/sequences/search-string.lsp index c498395b..3c88a507 100644 --- a/sequences/search-string.lsp +++ b/sequences/search-string.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "search-aux.lsp") + ;;; The next test was busted due to to a stupid cut and paste ;;; error. The loop terminates immediately, doing nothing diff --git a/sequences/search-vector.lsp b/sequences/search-vector.lsp index d441c35a..4f125882 100644 --- a/sequences/search-vector.lsp +++ b/sequences/search-vector.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "search-aux.lsp") + (deftest search-vector.1 (let ((target *searched-vector*) diff --git a/sequences/subseq.lsp b/sequences/subseq.lsp index 525d06d1..147f4e11 100644 --- a/sequences/subseq.lsp +++ b/sequences/subseq.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "subseq-aux.lsp") + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; subseq, on lists diff --git a/strings/string-comparisons.lsp b/strings/string-comparisons.lsp index e66c149c..2035803c 100644 --- a/strings/string-comparisons.lsp +++ b/strings/string-comparisons.lsp @@ -5,8 +5,6 @@ (in-package :cl-test) -(compile-and-load "string-aux.lsp") - (deftest string=.1 (not (string= "abc" (copy-seq "abc"))) nil) diff --git a/types-and-classes/deftype.lsp b/types-and-classes/deftype.lsp index acc218ba..43b555f4 100644 --- a/types-and-classes/deftype.lsp +++ b/types-and-classes/deftype.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; deftype diff --git a/types-and-classes/subtypep-array.lsp b/types-and-classes/subtypep-array.lsp index 341b0506..fcfdcec4 100644 --- a/types-and-classes/subtypep-array.lsp +++ b/types-and-classes/subtypep-array.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + ;;; *array-element-types* is defined in ansi-aux.lsp diff --git a/types-and-classes/subtypep-complex.lsp b/types-and-classes/subtypep-complex.lsp index 841dcbfd..b34dd438 100644 --- a/types-and-classes/subtypep-complex.lsp +++ b/types-and-classes/subtypep-complex.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + (deftest subtypep-complex.1 (subtypep* 'complex 'number) diff --git a/types-and-classes/subtypep-cons.lsp b/types-and-classes/subtypep-cons.lsp index 7cb110a0..991fa0e9 100644 --- a/types-and-classes/subtypep-cons.lsp +++ b/types-and-classes/subtypep-cons.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + ;;; SUBTYPEP on CONS types diff --git a/types-and-classes/subtypep-eql.lsp b/types-and-classes/subtypep-eql.lsp index 75ec441f..47079b29 100644 --- a/types-and-classes/subtypep-eql.lsp +++ b/types-and-classes/subtypep-eql.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + (deftest subtypep.eql.1 (let ((s1 (copy-seq "abc")) diff --git a/types-and-classes/subtypep-float.lsp b/types-and-classes/subtypep-float.lsp index 9f544be5..95e60b2c 100644 --- a/types-and-classes/subtypep-float.lsp +++ b/types-and-classes/subtypep-float.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + ;;;;;;; diff --git a/types-and-classes/subtypep-function.lsp b/types-and-classes/subtypep-function.lsp index ca360a0b..e4d8a34d 100644 --- a/types-and-classes/subtypep-function.lsp +++ b/types-and-classes/subtypep-function.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + (deftest subtypep-function.1 (check-all-not-subtypep t '(function (t) t)) diff --git a/types-and-classes/subtypep-integer.lsp b/types-and-classes/subtypep-integer.lsp index c6bbd6f0..effaa894 100644 --- a/types-and-classes/subtypep-integer.lsp +++ b/types-and-classes/subtypep-integer.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + (deftest subtypep.fixnum-or-bignum (check-equivalence '(or fixnum bignum) 'integer) diff --git a/types-and-classes/subtypep-member.lsp b/types-and-classes/subtypep-member.lsp index 9f17bf80..5e35bbe1 100644 --- a/types-and-classes/subtypep-member.lsp +++ b/types-and-classes/subtypep-member.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + ;;; SUBTYPEP on MEMBER types diff --git a/types-and-classes/subtypep-rational.lsp b/types-and-classes/subtypep-rational.lsp index 8afced93..a6c1e2dd 100644 --- a/types-and-classes/subtypep-rational.lsp +++ b/types-and-classes/subtypep-rational.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + ;;; SUBTYPEP on rational types diff --git a/types-and-classes/subtypep-real.lsp b/types-and-classes/subtypep-real.lsp index 6b503413..2b937e75 100644 --- a/types-and-classes/subtypep-real.lsp +++ b/types-and-classes/subtypep-real.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + ;;; SUBTYPEP on real types diff --git a/types-and-classes/subtypep.lsp b/types-and-classes/subtypep.lsp index 44774ae5..2663cebb 100644 --- a/types-and-classes/subtypep.lsp +++ b/types-and-classes/subtypep.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + ;;; More subtypep tests are in types-and-class.lsp diff --git a/types-and-classes/types-and-class-2.lsp b/types-and-classes/types-and-class-2.lsp index b11f147b..2c47f0b4 100644 --- a/types-and-classes/types-and-class-2.lsp +++ b/types-and-classes/types-and-class-2.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + ;;; Union of a type with its complement is universal diff --git a/types-and-classes/types-and-class.lsp b/types-and-classes/types-and-class.lsp index 29150a89..c2d57927 100644 --- a/types-and-classes/types-and-class.lsp +++ b/types-and-classes/types-and-class.lsp @@ -7,7 +7,7 @@ (in-package :cl-test) -(compile-and-load "types-aux.lsp") + (declaim (optimize (safety 3))) -- GitLab