replacing import-immutable with import (which is now immutable by default)

lib/chibi/ast.module

@@ -32,7 +32,7 @@
    type-name type-cpl type-parent type-slots
    object-size integer->immediate gc
    string-contains)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "ast")
   (include "ast.scm"))
 

lib/chibi/base64.module

@@ -3,5 +3,5 @@
   (export base64-encode base64-encode-string
           base64-decode base64-decode-string
           base64-encode-header)
-  (import-immutable (scheme) (srfi 33) (chibi io))
+  (import (scheme) (srfi 33) (chibi io))
   (include "base64.scm"))

lib/chibi/disasm.module

@@ -6,5 +6,5 @@
 
 (module (chibi disasm)
   (export disasm)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "disasm"))

lib/chibi/equiv.module

@@ -1,6 +1,6 @@
 
 (module (chibi equiv)
   (export equiv?)
-  (import-immutable (scheme))
+  (import (scheme))
   (import (srfi 69))
   (include "equiv.scm"))

lib/chibi/filesystem.module

@@ -27,7 +27,7 @@
           open/create      open/exclusive         open/truncate
           open/append      open/non-block
           is-a-tty?)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "filesystem")
   (include "filesystem.scm"))
 

lib/chibi/generic.module

@@ -3,5 +3,5 @@
 
 (module (chibi generic)
   (export define-generic define-method make-generic generic-add!)
-  (import-immutable (scheme))
+  (import (scheme))
   (include "generic.scm"))

lib/chibi/heap-stats.module

@@ -20,6 +20,5 @@
 
 (module (chibi heap-stats)
   (export heap-stats heap-dump)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "heap-stats"))
-

lib/chibi/highlight.module

@@ -2,6 +2,5 @@
 (module (chibi highlight)
   (export highlight highlight-detect-language highlighter-for highlight-style
           highlight-scheme highlight-c highlight-assembly)
-  (import-immutable (scheme))
+  (import (scheme) (srfi 1) (chibi io))
-  (import (srfi 1) (chibi io))
   (include "highlight.scm"))

lib/chibi/io.module

@@ -8,6 +8,6 @@
           make-null-output-port make-broadcast-port make-concatenated-port
           make-generated-input-port make-filtered-output-port
           make-filtered-input-port)
-  (import-immutable (scheme) (chibi ast))
+  (import (scheme) (chibi ast))
   (include-shared "io/io")
   (include "io/io.scm"))

lib/chibi/loop.module

@@ -4,6 +4,6 @@
           listing listing-reverse appending appending-reverse
           summing multiplying in-string in-string-reverse
           in-vector in-vector-reverse)
-  (import-immutable (scheme))
+  (import (scheme))
   (include "loop/loop.scm"))
 

lib/chibi/match.module

@@ -1,6 +1,6 @@
 
 (module (chibi match)
   (export match match-lambda match-lambda* match-let match-letrec match-let*)
-  (import-immutable (scheme))
+  (import (scheme))
   (include "match/match.scm"))
 

lib/chibi/mime.module

@@ -3,5 +3,5 @@
   (export mime-ref assoc-ref mime-header-fold mime-headers->list
           mime-parse-content-type mime-decode-header
           mime-message-fold mime-message->sxml)
-  (import-immutable (scheme) (chibi base64) (chibi quoted-printable) (chibi io))
+  (import (scheme) (chibi base64) (chibi quoted-printable) (chibi io))
   (include "mime.scm"))

lib/chibi/modules.module

@@ -4,6 +4,6 @@
           module-ast module-ast-set! module-ref module-contains?
           analyze-module containing-module load-module module-exports
           module-name->file procedure-analysis)
-  (import-immutable (scheme) (config))
+  (import (scheme) (config))
   (import (chibi ast))
   (include "modules.scm"))

lib/chibi/net.module

@@ -5,7 +5,7 @@
           with-net-io open-net-io
           address-info-family address-info-socket-type address-info-protocol
           address-info-address address-info-address-length address-info-next)
-  (import-immutable (scheme))
+  (import (scheme))
   (import (chibi filesystem))
   (include-shared "net")
   (include "net.scm"))

lib/chibi/pathname.module

@@ -3,5 +3,5 @@
   (export path-strip-directory path-directory ;; path-extension-pos
           path-extension path-strip-extension path-replace-extension
           path-absolute? path-relative? path-normalize make-path)
-  (import-immutable (scheme))
+  (import (scheme))
   (include "pathname.scm"))

lib/chibi/process.module

@@ -13,7 +13,7 @@
           signal/user2      signal/child       signal/continue
           signal/stop       signal/tty-stop    signal/tty-input
           signal/tty-output wait/no-hang)
-  (import-immutable (scheme))
+  (import (scheme))
   (cond-expand (threads (import (srfi 18))) (else #f))
   (include-shared "process")
   (body

lib/chibi/quoted-printable.module

@@ -3,5 +3,5 @@
   (export quoted-printable-encode quoted-printable-encode-string
           quoted-printable-encode-header
           quoted-printable-decode quoted-printable-decode-string)
-  (import-immutable (scheme) (srfi 33) (chibi io))
+  (import (scheme) (srfi 33) (chibi io))
   (include "quoted-printable.scm"))

lib/chibi/repl.module

@@ -1,7 +1,7 @@
 
 (module (chibi repl)
   (export repl)
-  (import-immutable (scheme))
+  (import (scheme))
   (import (chibi ast)
           (chibi io)
           (chibi process)

lib/chibi/scribble.module

@@ -1,5 +1,5 @@
 
 (module (chibi scribble)
   (export scribble-parse scribble-read)
-  (import-immutable (scheme))
+  (import (scheme))
   (include "scribble.scm"))

lib/chibi/stty.module

@@ -3,9 +3,7 @@
   (export stty with-stty with-raw-io
           get-terminal-width get-terminal-dimensions
           TCSANOW TCSADRAIN TCSAFLUSH)
-  (import-immutable (scheme)
+  (import (scheme) (srfi 33) (srfi 69))
-                    (srfi 33)
-                    (srfi 69))
   (include-shared "stty")
   (include "stty.scm"))
 

lib/chibi/system.module

@@ -8,7 +8,7 @@
           set-current-group-id! set-current-effective-group-id!
           current-session-id create-session
           set-root-directory!)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "system")
   (body
    (define (user-information user)

lib/chibi/test.module

@@ -8,6 +8,5 @@
    current-test-verbosity current-test-epsilon current-test-comparator
    current-test-applier current-test-handler current-test-skipper
    current-test-group-reporter test-failure-count)
-  (import-immutable (scheme))
+  (import (scheme) (srfi 39) (srfi 98) (chibi time) (chibi ast))
-  (import (srfi 39) (srfi 98) (chibi time) (chibi ast))
   (include "test.scm"))

lib/chibi/time.module

@@ -7,6 +7,6 @@
           time-second time-minute time-hour time-day time-month time-year
           time-day-of-week time-day-of-year time-dst?
           tm? timeval? timezone?)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "time"))
 

lib/chibi/type-inference.module

@@ -1,7 +1,6 @@
 
 (define-module (chibi type-inference)
   (export type-analyze-module type-analyze procedure-signature)
-  (import-immutable (scheme))
+  (import (scheme) (srfi 1) (srfi 69) (chibi modules) (chibi ast) (chibi match))
-  (import (srfi 1) (srfi 69) (chibi modules) (chibi ast) (chibi match))
   (include "type-inference.scm"))
 

lib/chibi/uri.module

@@ -5,6 +5,5 @@
           uri-with-scheme uri-with-user uri-with-host uri-with-path
           uri-with-query uri-with-fragment
           uri-encode uri-decode uri-query->alist uri-alist->query)
-  (import-immutable (scheme)
+  (import (scheme) (srfi 9))
-                    (srfi 9))
   (include "uri.scm"))

lib/srfi/11.module

@@ -1,7 +1,7 @@
 
 (module (srfi 11)
   (export let-values let*-values)
-  (import-immutable (scheme))
+  (import (scheme))
   (begin
    (define-syntax let*-values
      (syntax-rules ()
@@ -25,4 +25,3 @@
        ((let-values ((params expr) . rest) . body)
         (let-values ("step") () () expr () params rest . body))
        ))))
-

lib/srfi/16.module

@@ -1,7 +1,7 @@
 
 (module (srfi 16)
   (export case-lambda)
-  (import-immutable (scheme))
+  (import (scheme))
   (begin
    (define-syntax %case
      (syntax-rules ()
@@ -21,4 +21,3 @@
      (syntax-rules ()
        ((case-lambda . clauses)
         (lambda args (let ((len (length args))) (%case args len 0 () . clauses))))))))
-

lib/srfi/18.module

@@ -15,11 +15,7 @@
    join-timeout-exception? abandoned-mutex-exception?
    terminated-thread-exception? uncaught-exception?
    uncaught-exception-reason)
-  (import-immutable (scheme)
+  (import (scheme) (srfi 9) (chibi ast) (chibi time))
-                    (srfi 9)
-                    (chibi ast)
-                    (chibi time))
   (include "18/types.scm")
   (include-shared "18/threads")
   (include "18/interface.scm"))
-

lib/srfi/2.module

@@ -1,7 +1,7 @@
 
 (module (srfi 2)
   (export and-let*)
-  (import-immutable (scheme))
+  (import (scheme))
   (begin
    (define-syntax and-let*
      (syntax-rules ()
@@ -13,4 +13,3 @@
        ((and-let* ((expr) . rest) . body)
         (let ((tmp expr))
           (and tmp (and-let* rest . body))))))))
-

lib/srfi/26.module

@@ -1,7 +1,7 @@
 
 (module (srfi 26)
   (export cut cute)
-  (import-immutable (scheme))
+  (import (scheme))
   (begin
    (define-syntax %cut
      (syntax-rules (<> <...>)
@@ -21,4 +21,3 @@
      (syntax-rules () ((cut args ...) (%cut #f () () args ...))))
    (define-syntax cute
      (syntax-rules () ((cute args ...) (%cut #t () () args ...))))))
-

lib/srfi/27.module

@@ -5,7 +5,6 @@
           random-source-state-ref random-source-state-set!
           random-source-randomize! random-source-pseudo-randomize!
           random-source-make-integers random-source-make-reals)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "27/rand")
   (include "27/constructors.scm"))
-

lib/srfi/33.module

@@ -12,6 +12,6 @@
           first-set-bit
           extract-bit-field test-bit-field? clear-bit-field 
           replace-bit-field  copy-bit-field)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "33/bit")
   (include "33/bitwise.scm"))

lib/srfi/38.module

@@ -1,6 +1,6 @@
 
 (module (srfi 38)
-  (import-immutable (scheme))
+  (import (scheme))
   (export write-with-shared-structure write/ss
           read-with-shared-structure read/ss)
   (include "38.scm"))

lib/srfi/39.module

@@ -1,6 +1,6 @@
 
 (module (srfi 39)
   (export make-parameter parameterize)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "39/param")
   (include "39/syntax.scm"))

lib/srfi/55.module

@@ -1,7 +1,7 @@
 
 (module (srfi 55)
   (export require-extension)
-  (import-immutable (scheme))
+  (import (scheme))
   (begin
    (define-syntax require-extension
      (syntax-rules ()

lib/srfi/6.module

@@ -1,5 +1,4 @@
 
 (module (srfi 6)
   (export open-input-string open-output-string get-output-string)
-  (import-immutable (scheme)))
+  (import (scheme)))
-

lib/srfi/69.module

@@ -10,8 +10,6 @@
    hash-table-walk hash-table-fold hash-table->alist
    hash-table-copy hash-table-merge!
    hash string-hash string-ci-hash hash-by-identity)
-  (import-immutable (scheme)
+  (import (scheme) (srfi 9))
-                    (srfi 9))
   (include-shared "69/hash")
   (include "69/type.scm" "69/interface.scm"))
-

lib/srfi/8.module

@@ -1,10 +1,9 @@
 
 (module (srfi 8)
   (export receive)
-  (import-immutable (scheme))
+  (import (scheme))
   (body
    (define-syntax receive
      (syntax-rules ()
        ((receive params expr . body)
         (call-with-values (lambda () expr) (lambda params . body)))))))
-

lib/srfi/9.module

@@ -1,6 +1,5 @@
 
 (module (srfi 9)
   (export define-record-type)
-  (import-immutable (scheme))
+  (import (scheme))
   (include "9.scm"))
-

lib/srfi/95.module

@@ -1,7 +1,6 @@
 
 (module (srfi 95)
   (export sorted? merge merge! sort sort! object-cmp)
-  (import-immutable (scheme))
+  (import (scheme))
   (include-shared "95/qsort")
   (include "95/sort.scm"))
-

lib/srfi/98.module

@@ -2,4 +2,3 @@
 (module (srfi 98)
   (export get-environment-variable get-environment-variables)
   (include-shared "98/env"))
-

lib/srfi/99/records.module

@@ -1,5 +1,5 @@
 
-(define-module (srfi 99 records)
+(module (srfi 99 records)
   (import (srfi 99 records procedural)
           (srfi 99 records inspection)
           (srfi 99 records syntactic))

lib/srfi/99/records/inspection.module

@@ -1,7 +1,6 @@
 
-(define-module (srfi 99 records inspection)
+(module (srfi 99 records inspection)
   (export record? record-rtd rtd-name rtd-parent
           rtd-field-names rtd-all-field-names rtd-field-mutable?)
-  (import-immutable (scheme))
+  (import (scheme) (chibi ast))
-  (import (chibi ast))
   (include "inspection.scm"))

lib/srfi/99/records/procedural.module

@@ -1,6 +1,5 @@
 
-(define-module (srfi 99 records procedural)
+(module (srfi 99 records procedural)
   (export make-rtd rtd? rtd-constructor rtd-predicate rtd-accessor rtd-mutator)
-  (import-immutable (scheme))
+  (import (scheme) (chibi ast) (srfi 99 records inspection))
-  (import (chibi ast) (srfi 99 records inspection))
   (include "procedural.scm"))

lib/srfi/99/records/syntactic.module

@@ -1,6 +1,5 @@
 
-(define-module (srfi 99 records syntactic)
+(module (srfi 99 records syntactic)
   (export define-record-type)
-  (import-immutable (scheme))
+  (import (scheme) (srfi 99 records inspection))
-  (import (srfi 99 records inspection))
   (include "syntactic.scm"))