Changeset 13753 in project for release/4/apropos/trunk/apropos.scm

Timestamp:

03/14/09 08:20:47 (12 years ago)

Author:

Kon Lovett

Message:

Rmvd any ref to prim inlines. (After testing to make sure it works w/ them. However, cannot really benefit since probably only used at or near the toplevel. And usually interactively at that.)

File:

• release/4/apropos/trunk/apropos.scm (modified) (3 diffs)

release/4/apropos/trunk/apropos.scm

@@ -38 +38 @@
 ;;
 
-(cond-expand
-  (unsafe
-    (include "chicken-primitive-object-inlines") )
-  (else ) )
-
 ;; Argument Checking
 
 (define-inline (%check-search-pattern loc obj argnam)
-  (cond-expand
-    (unsafe
-      (unless (or (%keyword? obj) (%symbol? obj) (%string? obj) (regexp? obj))
-        (error-invalid-search loc obj argnam) ) )
-    (else
-      (unless (or (keyword? obj) (symbol? obj) (string? obj) (regexp? obj))
-        (error-invalid-search loc obj argnam) ) ) ) )
+  (unless (or (keyword? obj) (symbol? obj) (string? obj) (regexp? obj))
+    (error-invalid-search loc obj argnam) ) )
 
 #; ;UNUSED
@@ -111 +101 @@
 
 (define (symbol=? x y)
-  (cond-expand
-    (unsafe
-      (%string=? (%symbol-string x) (%symbol-string y)) )
-    (else
-      (let ((sx (##sys#symbol->string x))
-            (sy (##sys#symbol->string y))
-            (px (##sys#qualified-symbol-prefix x))
-            (py (##sys#qualified-symbol-prefix y)))
-        (cond (px (and py (string=? px py) (string=? sx sy)))
-              (py (or (not px) (and (string=? px py) (string=? sx sy))))
-              (else (string=? sx sy) ) ) ) ) ) )
+  (let ((sx (##sys#symbol->string x))
+        (sy (##sys#symbol->string y))
+        (px (##sys#qualified-symbol-prefix x))
+        (py (##sys#qualified-symbol-prefix y)))
+    (cond (px (and py (string=? px py) (string=? sx sy)))
+          (py (or (not px) (and (string=? px py) (string=? sx sy))))
+          (else (string=? sx sy) ) ) ) )
 
 (define (symbol<? x y)
-  (cond-expand
-    (unsafe
-      (%string<? (%symbol-string x) (%symbol-string y)) )
-    (else
-      (let ((sx (##sys#symbol->string x))
-            (sy (##sys#symbol->string y))
-            (px (##sys#qualified-symbol-prefix x))
-            (py (##sys#qualified-symbol-prefix y)))
-        (cond (px (and py (string<? px py) (string<? sx sy)))
-              (py (or (not px) (and (string<? px py) (string<? sx sy))))
-              (else (string<? sx sy) ) ) ) ) ) )
+  (let ((sx (##sys#symbol->string x))
+        (sy (##sys#symbol->string y))
+        (px (##sys#qualified-symbol-prefix x))
+        (py (##sys#qualified-symbol-prefix y)))
+    (cond (px (and py (string<? px py) (string<? sx sy)))
+          (py (or (not px) (and (string<? px py) (string<? sx sy))))
+          (else (string<? sx sy) ) ) ) )
 
 (define (symbol-print-length sym)
-  (cond-expand
-    (unsafe
-      (let ((siz (%string-size (%symbol-string sym))))
-              ; assumes keyword style is not #:none
-        (cond ((%keyword? sym) siz)
-              ; compensate for the '##'
-              ((%qualified-symbol? sym) (%fx+ siz 2))
-              ; plain old string
-              (else siz) ) ) )
-    (else
-      (let ([len (string-length (##sys#symbol->qualified-string sym))])
-        (if (keyword? sym) (- len 2) ; compensate for leading '###' when only a ':' is printed
-            len ) ) ) ) )
+  (let ([len (string-length (##sys#symbol->qualified-string sym))])
+    (if (keyword? sym) (- len 2) ; compensate for leading '###' when only a ':' is printed
+        len ) ) )
 
 (define (max-symbol-print-width syms)
@@ -157 +129 @@
 
 (define (symbol-match? sym regexp)
-  (cond-expand
-    (unsafe
-      (string-search regexp (%symbol-string sym)) )
-    (else
-      (string-search regexp (symbol->string sym)) ) ) )
+  (string-search regexp (symbol->string sym)) )
 
 ;; Environment Search