comments removed from code

Author: vlad-km

src/conditions.lisp

@@ -231,17 +231,7 @@
 				                 :format-control "Assert failed: ~s."
 				                 :format-arguments (list form)))))
 
-#+nil
-(defmacro %%assert (test &optional ignore datum &rest args)
-  (let ((value (gensym "ASSERT-VALUE"))
-        (name (gensym "ASSERT-BLOCK")))
-    `(block
-         ,name
-       (let ((,value ,test))
-         (when (not ,value)
-           (%%assert-error ',test ,datum ,@args))))))
-
-
+;;; @vlad-km macro %%assert moved to boot.lisp
 
 #+jscl
 (progn
@@ -258,9 +248,6 @@
   (defmacro ignore-errors (&rest forms)
     `(%%ignore-errors ,@forms))
 
-  ;;(defmacro assert (test &optional ignore datum &rest args)
-  ;;  `(%%assert ,test ,ignore ,datum ,@args))
-
   (fset 'make-condition #'%%make-condition)
   (fset 'signal #'%%signal)
   (fset 'warn #'%%warn)

src/stream.lisp

@@ -148,68 +148,5 @@
      ,@body
      (get-output-stream-string ,var)))
 
-#|
-;;; replace sequences - http://clhs.lisp.se/Body/f_replac.htm
-;;;   string <- string
-;;;   vector <- vector
-;;;   otherwise =>error
-
-(defun %replace-seq-eql (x y)
-  (typecase x
-    (number (and (numberp y) (= x y)))
-    (character (and (characterp y) (char-equal x y)))
-    (string
-     (and (stringp y)
-          (equal x y) ))
-    (vector
-     (and (vectorp y)
-          (let ((lex (length x)))
-            (= lex (length y))
-            (dotimes (i lex t)
-              (when (not (%replace-seq-eql (aref x i) (aref y i)))
-                (return nil))))))
-    (t (equal x y))))
-
-(defun %replace-seq (seq-1 seq-2 start1 end1 start2 end2)
-  (let* ((trimed-end (min (- end1 start1) (- end2 start2)))
-         (back nil))
-    (setq end1 (+ start1 trimed-end)
-          end2 (+ start2 trimed-end))
-    ;; set copy bacward flag
-    (when (and (%replace-seq-eql seq-1 seq-2)
-               (<= start2 start1)
-               (or (and (<= start1 start2) (< start2 end1))
-                   (and (< start1 end2) (<= end2 end1))
-                   (and (<= start2 start1) (< start1 end2))
-                   (and (< start2 end1) (<= end1 end2))))
-      (when (eq start1 start2)
-        ;; nothing to copy
-        (return-from %replace-seq seq-1))
-      (setq back t))
-    (cond (back
-           (dotimes (i trimed-end seq-1)
-             (setf (aref seq-1 (- (+ start1 trimed-end) i 1))
-                   (aref seq-2 (- (+ start2 trimed-end) i 1)))))
-          (t
-           (dotimes (i trimed-end seq-1)
-             (setf (aref seq-1 (+ start1 i))
-                   (aref seq-2 (+ start2 i))))))
-    ))
-
-(defun replace (sequence-1
-                sequence-2
-                &key (start1 0)
-                (end1 (length sequence-1))
-                (start2 0) (end2 (length sequence-2)))
-  (let ((compatible-types-replace (eql (array-element-type sequence-1)
-                                       (array-element-type sequence-2)))
-        (region-nondecreasing-order-seq-1 (<= 0 start1 end1 (length sequence-1)))
-        (region-nondecreasing-order-seq-2 (<= 0 start2 end2 (length sequence-2))))
-    (assert compatible-types-replace)
-    ;; check region monotonically nondecreasing order
-    (assert region-nondecreasing-order-seq-1)
-    (assert region-nondecreasing-order-seq-2))
-  (%replace-seq sequence-1 sequence-2 start1 end1 start2 end2))
-|#
 
 ;;; EOF