diff --git a/ansi-tests/cons-test-07.lsp b/ansi-tests/cons-test-07.lsp index d3c5d1cc23859917ca39c3c7404ba9821a2b13d8..5034441a3660891152567d654b2239b2e71e3fb8 100644 --- a/ansi-tests/cons-test-07.lsp +++ b/ansi-tests/cons-test-07.lsp @@ -18,9 +18,9 @@ (nconc (copy-tree '(a b c d e f))) (a b c d e f)) -(deftest nconc.3 - (nconc 1) - 1) +;;; (deftest nconc.3 +;;; (nconc 1) +;;; 1) (deftest nconc.4 (let ((x (list 'a 'b 'c)) @@ -72,9 +72,9 @@ (deftest nconc.order.2 (let ((i 0)) (values - (nconc (incf i)) + (nconc (list 'a) (incf i)) i)) - 1 1) + (a . 1) 1) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; append diff --git a/ansi-tests/make-array.lsp b/ansi-tests/make-array.lsp index 761b860c50796eea7d4d850778e4410707b63434..c8e6ae36fe001a73d2a6fd69e09ee8eee3e5f0c0 100644 --- a/ansi-tests/make-array.lsp +++ b/ansi-tests/make-array.lsp @@ -192,9 +192,9 @@ (read-from-string (format nil "#~Aa()" len)))) t) -(deftest make-array.24 - (make-array-with-checks '(5) :initial-element 'a :displaced-to nil) - #(a a a a a)) +;;; (deftest make-array.24 +;;; (make-array-with-checks '(5) :initial-element 'a :displaced-to nil) +;;; #(a a a a a)) (deftest make-array.25 (make-array '(4) :initial-element 'x :nonsense-argument t @@ -646,25 +646,28 @@ ;;; Order of evaluation tests (deftest make-array.order.1 - (let ((i 0) a b c d e) + (let ((i 0) a b c e) (values (make-array (progn (setf a (incf i)) 5) :initial-element (progn (setf b (incf i)) 'a) :fill-pointer (progn (setf c (incf i)) nil) - :displaced-to (progn (setf d (incf i)) nil) + ;; :displaced-to (progn (setf d (incf i)) nil) :element-type (progn (setf e (incf i)) t) ) - i a b c d e)) - #(a a a a a) 5 1 2 3 4 5) + i a b c e)) + #(a a a a a) 4 1 2 3 4) (deftest make-array.order.2 - (let ((i 0) a b c d e) + (let ((i 0) a b d e) (values (make-array (progn (setf a (incf i)) 5) :element-type (progn (setf b (incf i)) t) - :displaced-to (progn (setf c (incf i)) nil) + ;; :displaced-to (progn (setf c (incf i)) nil) :fill-pointer (progn (setf d (incf i)) nil) :initial-element (progn (setf e (incf i)) 'a) ) - i a b c d e)) - #(a a a a a) 5 1 2 3 4 5) + i a b d e)) + #(a a a a a) 4 1 2 3 4) + +;; Must add back order tests for :displaced-to and :displaced-index-offset +