X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fdefstruct.impure.lisp;h=029babdc875ef26a2c7b564616d5f14947740cd8;hb=4ac6cacd9348b4c568106f82c3a0a4294f49b44e;hp=14724d7771efccc865210f52d64700cda43ab002;hpb=d119bca6cc4e052fe6a043ce76a045713038b06f;p=sbcl.git diff --git a/tests/defstruct.impure.lisp b/tests/defstruct.impure.lisp index 14724d7..029babd 100644 --- a/tests/defstruct.impure.lisp +++ b/tests/defstruct.impure.lisp @@ -9,9 +9,8 @@ ;;;; absolutely no warranty. See the COPYING and CREDITS files for ;;;; more information. -(cl:in-package :cl-user) - (load "assertoid.lisp") +(use-package "ASSERTOID") ;;;; examples from, or close to, the Common Lisp DEFSTRUCT spec @@ -21,8 +20,48 @@ (defstruct person age (name 007 :type string)) ; not an error until 007 used (make-person :name "James") ; not an error, 007 not used (assert (raises-error? (make-person) type-error)) -;;; FIXME: broken structure slot type checking in sbcl-0.pre7.62 -#+nil (assert (raises-error? (setf (person-name (make-person "Q")) 1) type-error)) +(assert (raises-error? (setf (person-name (make-person :name "Q")) 1) + type-error)) + +;;; An &AUX variable in a boa-constructor without a default value +;;; means "do not initialize slot" and does not cause type error +(defstruct (boa-saux (:constructor make-boa-saux (&aux a (b 3) (c)))) + (a #\! :type (integer 1 2)) + (b #\? :type (integer 3 4)) + (c #\# :type (integer 5 6))) +(let ((s (make-boa-saux))) + (declare (notinline identity)) + (locally (declare (optimize (safety 3)) + (inline boa-saux-a)) + (assert (raises-error? (identity (boa-saux-a s)) type-error))) + (setf (boa-saux-a s) 1) + (setf (boa-saux-c s) 5) + (assert (eql (boa-saux-a s) 1)) + (assert (eql (boa-saux-b s) 3)) + (assert (eql (boa-saux-c s) 5))) + ; these two checks should be + ; kept separated +(let ((s (make-boa-saux))) + (declare (notinline identity)) + (locally (declare (optimize (safety 0)) + (inline boa-saux-a)) + (assert (eql (identity (boa-saux-a s)) 0))) + (setf (boa-saux-a s) 1) + (setf (boa-saux-c s) 5) + (assert (eql (boa-saux-a s) 1)) + (assert (eql (boa-saux-b s) 3)) + (assert (eql (boa-saux-c s) 5))) + +(let ((s (make-boa-saux))) + (declare (notinline identity)) + (locally (declare (optimize (safety 3)) + (notinline boa-saux-a)) + (assert (raises-error? (identity (boa-saux-a s)) type-error))) + (setf (boa-saux-a s) 1) + (setf (boa-saux-c s) 5) + (assert (eql (boa-saux-a s) 1)) + (assert (eql (boa-saux-b s) 3)) + (assert (eql (boa-saux-c s) 5))) ;;; basic inheritance (defstruct (astronaut (:include person) @@ -41,7 +80,7 @@ ;;; interaction of :TYPE and :INCLUDE and :INITIAL-OFFSET (defstruct (binop (:type list) :named (:initial-offset 2)) - (operator '? :type symbol) + (operator '? :type symbol) operand-1 operand-2) (defstruct (annotated-binop (:type list) @@ -353,6 +392,135 @@ (assert (eql (manyraw-dd copy) #c(0.33 0.33))) (assert (eql (manyraw-ee copy) #c(0.44d0 0.44d0)))) +;;;; miscellaneous old bugs + +(defstruct ya-struct) +(when (ignore-errors (or (ya-struct-p) 12)) + (error "YA-STRUCT-P of no arguments should signal an error.")) +(when (ignore-errors (or (ya-struct-p 'too 'many 'arguments) 12)) + (error "YA-STRUCT-P of three arguments should signal an error.")) + +;;; bug 210: Until sbcl-0.7.8.32 BOA constructors had SAFETY 0 +;;; declared inside on the theory that slot types were already +;;; checked, which bogusly suppressed unbound-variable and other +;;; checks within the evaluation of initforms. +(defvar *bug210*) +(defstruct (bug210a (:constructor bug210a ())) + (slot *bug210*)) +(defstruct bug210b + (slot *bug210*)) +;;; Because of bug 210, this assertion used to fail. +(assert (typep (nth-value 1 (ignore-errors (bug210a))) 'unbound-variable)) +;;; Even with bug 210, these assertions succeeded. +(assert (typep (nth-value 1 (ignore-errors *bug210*)) 'unbound-variable)) +(assert (typep (nth-value 1 (ignore-errors (make-bug210b))) 'unbound-variable)) + +;;; In sbcl-0.7.8.53, DEFSTRUCT blew up in non-toplevel contexts +;;; because it implicitly assumed that EVAL-WHEN (COMPILE) stuff +;;; setting up compiler-layout information would run before the +;;; constructor function installing the layout was compiled. Make sure +;;; that doesn't happen again. +(defun foo-0-7-8-53 () (defstruct foo-0-7-8-53 x (y :not))) +(assert (not (find-class 'foo-0-7-8-53 nil))) +(foo-0-7-8-53) +(assert (find-class 'foo-0-7-8-53 nil)) +(let ((foo-0-7-8-53 (make-foo-0-7-8-53 :x :s))) + (assert (eq (foo-0-7-8-53-x foo-0-7-8-53) :s)) + (assert (eq (foo-0-7-8-53-y foo-0-7-8-53) :not))) + +;;; tests of behaviour of colliding accessors. +(defstruct (bug127-foo (:conc-name bug127-baz-)) a) +(assert (= (bug127-baz-a (make-bug127-foo :a 1)) 1)) +(defstruct (bug127-bar (:conc-name bug127-baz-) (:include bug127-foo)) b) +(assert (= (bug127-baz-a (make-bug127-bar :a 1 :b 2)) 1)) +(assert (= (bug127-baz-b (make-bug127-bar :a 1 :b 2)) 2)) +(assert (= (bug127-baz-a (make-bug127-foo :a 1)) 1)) + +(defun bug127-flurble (x) + x) +(defstruct bug127 flurble) +(assert (= (bug127-flurble (make-bug127 :flurble 7)) 7)) + +(defstruct bug127-a b-c) +(assert (= (bug127-a-b-c (make-bug127-a :b-c 9)) 9)) +(defstruct (bug127-a-b (:include bug127-a)) c) +(assert (= (bug127-a-b-c (make-bug127-a :b-c 9)) 9)) +(assert (= (bug127-a-b-c (make-bug127-a-b :b-c 11 :c 13)) 11)) + +(defstruct (bug127-e (:conc-name bug127--)) foo) +(assert (= (bug127--foo (make-bug127-e :foo 3)) 3)) +(defstruct (bug127-f (:conc-name bug127--)) foo) +(assert (= (bug127--foo (make-bug127-f :foo 3)) 3)) +(assert (raises-error? (bug127--foo (make-bug127-e :foo 3)) type-error)) + +;;; FIXME: should probably do the same tests on DEFSTRUCT :TYPE + +;;; As noted by Paul Dietz for CMUCL, :CONC-NAME handling was a little +;;; too fragile: +(defstruct (conc-name-syntax :conc-name) a-conc-name-slot) +(assert (eq (a-conc-name-slot (make-conc-name-syntax :a-conc-name-slot 'y)) + 'y)) +;;; and further :CONC-NAME NIL was being wrongly treated: +(defpackage "DEFSTRUCT-TEST-SCRATCH") +(defstruct (conc-name-nil :conc-name) + defstruct-test-scratch::conc-name-nil-slot) +(assert (= (defstruct-test-scratch::conc-name-nil-slot + (make-conc-name-nil :conc-name-nil-slot 1)) 1)) +(assert (raises-error? (conc-name-nil-slot (make-conc-name-nil)) + undefined-function)) + +;;; The named/typed predicates were a little fragile, in that they +;;; could throw errors on innocuous input: +(defstruct (list-struct (:type list) :named) a-slot) +(assert (list-struct-p (make-list-struct))) +(assert (not (list-struct-p nil))) +(assert (not (list-struct-p 1))) +(defstruct (offset-list-struct (:type list) :named (:initial-offset 1)) a-slot) +(assert (offset-list-struct-p (make-offset-list-struct))) +(assert (not (offset-list-struct-p nil))) +(assert (not (offset-list-struct-p 1))) +(assert (not (offset-list-struct-p '(offset-list-struct)))) +(assert (not (offset-list-struct-p '(offset-list-struct . 3)))) +(defstruct (vector-struct (:type vector) :named) a-slot) +(assert (vector-struct-p (make-vector-struct))) +(assert (not (vector-struct-p nil))) +(assert (not (vector-struct-p #()))) + +;;; bug 3d: type safety with redefined type constraints on slots +(macrolet + ((test (type) + (let* ((base-name (intern (format nil "bug3d-~A" type))) + (up-name (intern (format nil "~A-up" base-name))) + (accessor (intern (format nil "~A-X" base-name))) + (up-accessor (intern (format nil "~A-X" up-name))) + (type-options (when type `((:type ,type))))) + `(progn + (defstruct (,base-name ,@type-options) + x y) + (defstruct (,up-name (:include ,base-name + (x "x" :type simple-string) + (y "y" :type simple-string)) + ,@type-options)) + (let ((ob (,(intern (format nil "MAKE-~A" up-name))))) + (setf (,accessor ob) 0) + (loop for decl in '(inline notinline) + for fun = `(lambda (s) + (declare (optimize (safety 3)) + (,decl ,',up-accessor)) + (,',up-accessor s)) + do (assert (raises-error? (funcall (compile nil fun) ob) + type-error)))))))) + (test nil) + (test list) + (test vector)) + +(let* ((name (gensym)) + (form `(defstruct ,name + (x nil :type (or null (function (integer) + (values number &optional foo))))))) + (eval (copy-tree form)) + (eval (copy-tree form))) + ;;; success (format t "~&/returning success~%") (quit :unix-status 104)