From 6ec3bf97fa903e0cc963451d285da834b09c9bcc Mon Sep 17 00:00:00 2001 From: pfdietz <pfdietz@localhost> Date: Wed, 19 Feb 2003 13:24:01 +0000 Subject: [PATCH] Moved ansi-test/rt/ files to ansi-tests/, since ECL was having trouble with compiling in the subdirectory. Fixed missing end-of-file newline problem that caused ECL to barf. Added new tests for subtypep on cons with rational, real intervals. Added tests for an SBCL problem in subtypep on negated rational, integer types. --- ansi-tests/compiler-macros.lsp | 2 +- ansi-tests/defconstant.lsp | 2 +- ansi-tests/gclload1.lsp | 8 ++++---- ansi-tests/{rt => }/rt-acl.system | 0 ansi-tests/{rt => }/rt-doc.txt | 0 ansi-tests/{rt => }/rt-package.lsp | 0 ansi-tests/{rt => }/rt-test.lsp | 0 ansi-tests/{rt => }/rt.lsp | 0 ansi-tests/{rt => }/rt.system | 0 ansi-tests/subtypep-cons.lsp | 22 ++++++++++++++++++++++ ansi-tests/subtypep-rational.lsp | 11 ++++++++++- ansi-tests/subtypep-real.lsp | 6 ++++++ 12 files changed, 44 insertions(+), 7 deletions(-) rename ansi-tests/{rt => }/rt-acl.system (100%) rename ansi-tests/{rt => }/rt-doc.txt (100%) rename ansi-tests/{rt => }/rt-package.lsp (100%) rename ansi-tests/{rt => }/rt-test.lsp (100%) rename ansi-tests/{rt => }/rt.lsp (100%) rename ansi-tests/{rt => }/rt.system (100%) diff --git a/ansi-tests/compiler-macros.lsp b/ansi-tests/compiler-macros.lsp index 3b9d2184..116b2aa4 100644 --- a/ansi-tests/compiler-macros.lsp +++ b/ansi-tests/compiler-macros.lsp @@ -5,4 +5,4 @@ (in-package :cl-test) -;;; Compiler macro tests will go here \ No newline at end of file +;;; Compiler macro tests will go here diff --git a/ansi-tests/defconstant.lsp b/ansi-tests/defconstant.lsp index 6c4ffe2a..f0b132c2 100644 --- a/ansi-tests/defconstant.lsp +++ b/ansi-tests/defconstant.lsp @@ -42,4 +42,4 @@ ;;; (classify-error (defconstant +ignorable-constant-name2+ nil ;;; "This is a docstring" ;;; "This is an unnecessary extra argument.")) -;;; program-error) \ No newline at end of file +;;; program-error) diff --git a/ansi-tests/gclload1.lsp b/ansi-tests/gclload1.lsp index 86d54849..a8127425 100644 --- a/ansi-tests/gclload1.lsp +++ b/ansi-tests/gclload1.lsp @@ -1,8 +1,8 @@ (load "compile-and-load.lsp") -(load "rt/rt-package.lsp") -(compile-and-load "rt/rt.lsp") -;;; (unless (probe-file "rt/rt.o") (compile-file "rt/rt.lsp")) -;;; (load "rt/rt.o") +(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) (load "universe.lsp") diff --git a/ansi-tests/rt/rt-acl.system b/ansi-tests/rt-acl.system similarity index 100% rename from ansi-tests/rt/rt-acl.system rename to ansi-tests/rt-acl.system diff --git a/ansi-tests/rt/rt-doc.txt b/ansi-tests/rt-doc.txt similarity index 100% rename from ansi-tests/rt/rt-doc.txt rename to ansi-tests/rt-doc.txt diff --git a/ansi-tests/rt/rt-package.lsp b/ansi-tests/rt-package.lsp similarity index 100% rename from ansi-tests/rt/rt-package.lsp rename to ansi-tests/rt-package.lsp diff --git a/ansi-tests/rt/rt-test.lsp b/ansi-tests/rt-test.lsp similarity index 100% rename from ansi-tests/rt/rt-test.lsp rename to ansi-tests/rt-test.lsp diff --git a/ansi-tests/rt/rt.lsp b/ansi-tests/rt.lsp similarity index 100% rename from ansi-tests/rt/rt.lsp rename to ansi-tests/rt.lsp diff --git a/ansi-tests/rt/rt.system b/ansi-tests/rt.system similarity index 100% rename from ansi-tests/rt/rt.system rename to ansi-tests/rt.system diff --git a/ansi-tests/subtypep-cons.lsp b/ansi-tests/subtypep-cons.lsp index e7d3aeaa..a37be83c 100644 --- a/ansi-tests/subtypep-cons.lsp +++ b/ansi-tests/subtypep-cons.lsp @@ -88,3 +88,25 @@ (cons (integer 3 (6)) (integer 3 (6)))) '(cons (integer 0 (9)) (integer 0 (9)))) nil) + +(deftest subtypep.cons.10 + (check-equivalence + '(or + (cons (rational 0 (3)) (rational 0 (6))) + (cons (rational 3 (9)) (rational 0 (3))) + (cons (rational 0 (6)) (rational 6 (9))) + (cons (rational 6 (9)) (rational 3 (9))) + (cons (rational 3 (6)) (rational 3 (6)))) + '(cons (rational 0 (9)) (rational 0 (9)))) + nil) + +(deftest subtypep.cons.11 + (check-equivalence + '(or + (cons (real 0 (3)) (real 0 (6))) + (cons (real 3 (9)) (real 0 (3))) + (cons (real 0 (6)) (real 6 (9))) + (cons (real 6 (9)) (real 3 (9))) + (cons (real 3 (6)) (real 3 (6)))) + '(cons (real 0 (9)) (real 0 (9)))) + nil) diff --git a/ansi-tests/subtypep-rational.lsp b/ansi-tests/subtypep-rational.lsp index 05aa35a5..8f70fa1e 100644 --- a/ansi-tests/subtypep-rational.lsp +++ b/ansi-tests/subtypep-rational.lsp @@ -161,4 +161,13 @@ (deftest subtypep.rational.16 (check-equivalence '(and integer (rational (-1/2) (1/2))) '(integer 0 0)) - nil) \ No newline at end of file + nil) + +(deftest subtypep.rational.17 + (subtypep*-or-fail '(not (rational -1/2 1/2)) '(not (integer 0 0))) + t) + +(deftest subtypep.rational.18 + (subtypep*-or-fail '(not (rational -1/2 1/2)) '(not (eql 0))) + t) + diff --git a/ansi-tests/subtypep-real.lsp b/ansi-tests/subtypep-real.lsp index 16b7ab84..abb0494f 100644 --- a/ansi-tests/subtypep-real.lsp +++ b/ansi-tests/subtypep-real.lsp @@ -185,7 +185,13 @@ '(rational (1/11) (8/37))) nil) +(deftest subtypep.rational.23 + (subtypep*-or-fail '(not (real -1/2 1/2)) '(not (integer 0 0))) + t) +(deftest subtypep.rational.24 + (subtypep*-or-fail '(not (real -1/2 1/2)) '(not (eql 0))) + t) -- GitLab