Changeset 911

Timestamp:

Feb 16, 2005, 11:11:15 AM (20 years ago)

Author:

bryan

Message:

"" is a substring to all strings, update %apropos-substring-p to
explicitly check for that and return t before doing any more work.

File:

• trunk/ccl/lib/apropos.lisp (modified) (1 diff)

trunk/ccl/lib/apropos.lisp

@@ -138 +138 @@
         (blen (length b)))
     (declare (fixnum alen blen) (optimize (speed 3)(safety 0)))
-    (if *apropos-case-sensitive-p*
-      (dotimes (i (the fixnum (%imin blen (%i+ 1 (%i- blen alen)))))
-        (declare (fixnum i))
-        (when (eq (%schar b i) chara0)
-          (when
-            (do ((j 1 (1+ j)))
-                ((>= j alen) t)
-              (declare (fixnum j))
-              (when (neq (%schar a j)(%schar b (%i+ j i)))
-                (return nil)))
-            (return  (%i- blen i alen)))))
-     (dotimes (i (the fixnum (%imin blen (%i+ 1 (%i- blen alen)))))
-        (declare (fixnum i))
-        (when (eq (char-upcase (%schar b i)) (char-upcase chara0))
-          (when
-            (do ((j 1 (1+ j)))
-                ((>= j alen) t)
-              (declare (fixnum j))
-              (unless (eq (char-upcase (%schar a j)) (char-upcase (%schar b (%i+ j i))))
-                (return nil)))
-            (return  (%i- blen i alen))))))))
+    (if (= alen 0)  ; "" is substring of every string
+        t
+        (if *apropos-case-sensitive-p*
+            (dotimes (i (the fixnum (%imin blen (%i+ 1 (%i- blen alen)))))
+              (declare (fixnum i))
+              (when (eq (%schar b i) chara0)
+                (when
+                    (do ((j 1 (1+ j)))
+                        ((>= j alen) t)
+                      (declare (fixnum j))
+                      (when (neq (%schar a j)(%schar b (%i+ j i)))
+                        (return nil)))
+                  (return  (%i- blen i alen)))))
+            (dotimes (i (the fixnum (%imin blen (%i+ 1 (%i- blen alen)))))
+              (declare (fixnum i))
+              (when (eq (char-upcase (%schar b i)) (char-upcase chara0))
+                (when
+                    (do ((j 1 (1+ j)))
+                        ((>= j alen) t)
+                      (declare (fixnum j))
+                      (unless (eq (char-upcase (%schar a j)) (char-upcase (%schar b (%i+ j i))))
+                        (return nil)))
+                  (return  (%i- blen i alen)))))))))