Move features to a function in the base library.

scheme/base.sld

@@ -78,8 +78,12 @@
     newline
     write-char
     flush-output-port
+    features
   )
   (begin
+    ;; Features implemented by this Scheme
+    (define (features) '(cyclone))
+
     ;; TODO: The whitespace characters are space, tab, line feed, form feed (not in parser yet), and carriage return.
     (define call-with-current-continuation call/cc)
     ;; TODO: this is from r7rs, but is not really good enough by itself

scheme/cyclone/common.scm

@@ -29,7 +29,3 @@
  **
  **/
 "))
-
-;; Features implemented by this Scheme
-(define *features* '(cyclone))
-

scheme/cyclone/common.sld

@@ -3,8 +3,7 @@
     *Cyc-version-banner*
     *version*
     *version-banner*
-    *c-file-header-comment* 
+    *c-file-header-comment*)
-    *features*)
   (include "common.scm")
   (begin
     (define *Cyc-version-banner* *version-banner*)))

scheme/cyclone/transforms.scm

@@ -141,7 +141,7 @@
                 ((not) (not (check (cadr x))))
                 ;((library) (eval `(find-module ',(cadr x)) (%meta-env)))
                 (else (error "cond-expand: bad feature" x)))
-              (memq x *features*)))
+              (memq x (features))))
         (let expand ((ls (cdr expr)))
           (cond ((null? ls))  ; (error "cond-expand: no expansions" expr)
                 ((not (pair? (car ls))) (error "cond-expand: bad clause" (car ls)))