X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fseq.lisp;h=ed14624f1a9e53a99eb22ba42844cc13836fab28;hb=672ac5849b408281b5ca0dfc3fd58d418de2b272;hp=19f2aa1f72da209e16cbfa0572920203b2a7abaa;hpb=19198944c81507369ae46522c13b30df628cb442;p=sbcl.git

diff --git a/src/code/seq.lisp b/src/code/seq.lisp
index 19f2aa1..ed14624 100644
--- a/src/code/seq.lisp
+++ b/src/code/seq.lisp
@@ -81,7 +81,7 @@
 		  :datum type
 		  :expected-type '(or vector cons)
 		  :format-control
-		  "NIL output type invalid for this sequence function."
+		  "A NIL output type is invalid for this sequence function."
 		  :format-arguments ())))
       ((dolist (seq-type '(list string simple-vector bit-vector))
 	 (when (csubtypep type (specifier-type seq-type))
@@ -155,15 +155,15 @@
      (setf (aref sequence index) newval))))
 
 (defun length (sequence)
-  #!+sb-doc "Returns an integer that is the length of SEQUENCE."
+  #!+sb-doc "Return an integer that is the length of SEQUENCE."
   (etypecase sequence
     (vector (length (truly-the vector sequence)))
     (list (length (truly-the list sequence)))))
 
 (defun make-sequence (type length &key (initial-element NIL iep))
   #!+sb-doc
-  "Returns a sequence of the given Type and Length, with elements initialized
-  to :Initial-Element."
+  "Return a sequence of the given TYPE and LENGTH, with elements initialized
+  to :INITIAL-ELEMENT."
   (declare (fixnum length))
   (let ((type (specifier-type type)))
     (cond ((csubtypep type (specifier-type 'list))
@@ -186,11 +186,12 @@
 		     (vlen (car (array-type-dimensions type))))
 		 (if (and (numberp vlen) (/= vlen length))
 		   (error 'simple-type-error
-			  ;; these two are under-specified by ANSI
+			  ;; These two are under-specified by ANSI.
 			  :datum (type-specifier type)
 			  :expected-type (type-specifier type)
 			  :format-control
-			  "The length of ~S does not match the specified length  of ~S."
+			  "The length of ~S does not match the specified ~
+                           length=~S."
 			  :format-arguments
 			  (list (type-specifier type) length)))
 		 (if iep
@@ -441,9 +442,9 @@
   (when (null source-end) (setq source-end (length source-sequence)))
   (mumble-replace-from-mumble))
 
-;;; REPLACE cannot default end arguments to the length of sequence since it
-;;; is not an error to supply nil for their values. We must test for ends
-;;; being nil in the body of the function.
+;;; REPLACE cannot default END arguments to the length of SEQUENCE since it
+;;; is not an error to supply NIL for their values. We must test for ENDs
+;;; being NIL in the body of the function.
 (defun replace (target-sequence source-sequence &key
 		((:start1 target-start) 0)
 		((:end1 target-end))
@@ -606,8 +607,7 @@
 		    bit-vector simple-bit-vector base-string
 		    simple-base-string) ; FIXME: unifying principle here?
      (let ((result (apply #'concat-to-simple* output-type-spec sequences)))
-       #!+high-security
-       (check-type-var result output-type-spec)
+       #!+high-security (aver (typep result output-type-spec))
        result))
     (list (apply #'concat-to-list* sequences))
     (t
@@ -1882,7 +1882,7 @@
   `(vector-locater-macro ,sequence
 			 (locater-test-not ,item ,sequence :vector ,return-type)
 			 ,return-type))
-
+
 (sb!xc:defmacro locater-if-test (test sequence seq-type return-type sense)
   (let ((seq-ref (case return-type
 		   (:position
@@ -1909,7 +1909,7 @@
 
 (sb!xc:defmacro vector-locater-if-not (test sequence return-type)
   `(vector-locater-if-macro ,test ,sequence ,return-type nil))
-
+
 (sb!xc:defmacro list-locater-macro (sequence body-form return-type)
   `(if from-end
        (do ((sequence (nthcdr (- (the fixnum (length sequence))
@@ -1952,7 +1952,7 @@
 
 ) ; EVAL-WHEN
 
-;;; POSITION
+;;;; POSITION
 
 (eval-when (:compile-toplevel :execute)
 
@@ -1965,7 +1965,7 @@
 ) ; EVAL-WHEN
 
 ;;; POSITION cannot default end to the length of sequence since it is not
-;;; an error to supply nil for its value. We must test for end being nil
+;;; an error to supply nil for its value. We must test for END being NIL
 ;;; in the body of the function, and this is actually done in the support
 ;;; routines for other reasons (see below).
 (defun position (item sequence &key from-end (test #'eql) test-not (start 0)
@@ -2298,14 +2298,14 @@
 (defun mismatch (sequence1 sequence2 &key from-end (test #'eql) test-not
 			   (start1 0) end1 (start2 0) end2 key)
   #!+sb-doc
-  "The specified subsequences of Sequence1 and Sequence2 are compared
+  "The specified subsequences of SEQUENCE1 and SEQUENCE2 are compared
    element-wise. If they are of equal length and match in every element, the
    result is Nil. Otherwise, the result is a non-negative integer, the index
-   within Sequence1 of the leftmost position at which they fail to match; or,
+   within SEQUENCE1 of the leftmost position at which they fail to match; or,
    if one is shorter than and a matching prefix of the other, the index within
-   Sequence1 beyond the last position tested is returned. If a non-Nil
-   :From-End keyword argument is given, then one plus the index of the
-   rightmost position in which the sequences differ is returned."
+   SEQUENCE1 beyond the last position tested is returned. If a non-NIL
+   :FROM-END argument is given, then one plus the index of the rightmost
+   position in which the sequences differ is returned."
   (declare (fixnum start1 start2))
   (let* ((length1 (length sequence1))
 	 (end1 (or end1 length1))