renamed:

src/libfasl.ss => src/ikarus.fasl.ss

src/ikarus.compiler.ss

@@ -4,10 +4,11 @@
           current-primitive-locations eval-core)
   (import 
     (only (scheme) $record-ref $record/rtd? $code->closure)
-    (except (ikarus)
+    (except (ikarus) ;fasl-write
         compile-core-expr-to-port assembler-output
         current-primitive-locations eval-core)
-    (ikarus intel-assembler))
+    (ikarus intel-assembler)
+    (ikarus fasl write))
 
 
 

src/ikarus.fasl.ss

@@ -31,8 +31,10 @@
 
 
 (library (ikarus fasl write)
-  (export)
-  (import (scheme))
+  (export fasl-write)
+  (import
+    (only (scheme) $closure-code $base-rtd)
+    (except (ikarus) fasl-write))
 
   (define write-fixnum 
     (lambda (x p)
@@ -223,7 +225,7 @@
          (write-char #\1 port)
          (fasl-write-object x port h 1)
          (void))))
-  (primitive-set! 'fasl-write
+  (define fasl-write
      (case-lambda 
        [(x) (fasl-write-to-port x (current-output-port))]
        [(x port)

src/makefile.ss

@@ -54,7 +54,7 @@
       "ikarus.code-objects.ss"
 
       "ikarus.intel-assembler.ss"
-      "libfasl.ss"
+      "ikarus.fasl.ss"
       "libtrace.ss"
       "ikarus.compiler.ss"
       "libsyntax.ss"
@@ -438,7 +438,7 @@
       [eval-core                        s i]
       [load                             s i]
       [assembler-output                 s i]
-      [fasl-write                       s i]
+      ;[fasl-write                       s i]
       [new-cafe                         s i]
       [command-line-arguments           s i]
       [list*->code*                     s i]
@@ -897,7 +897,7 @@
       [eval-core  eval-core-label  (core-prim . eval-core)]
       [load       load-label       (core-prim . load)]
       [assembler-output       assembler-output-label       (core-prim . assembler-output)]
-      [fasl-write       fasl-write-label       (core-prim . fasl-write)]
+      ;[fasl-write       fasl-write-label       (core-prim . fasl-write)]
       [new-cafe   new-cafe-label   (core-prim . new-cafe)]
       [command-line-arguments command-line-arguments-label (core-prim .  command-line-arguments)]
       [list*->code*       list*->code*-label       (core-prim . list*->code*)]