diff --git a/lib/chibi/ast.module b/lib/chibi/ast.module index 816a1348..b7b7bd95 100644 --- a/lib/chibi/ast.module +++ b/lib/chibi/ast.module @@ -1,5 +1,5 @@ -(define-module (chibi ast) +(module (chibi ast) (export analyze optimize env-cell ast->sexp macroexpand type-of diff --git a/lib/chibi/base64.module b/lib/chibi/base64.module index 12324e1d..bad54930 100644 --- a/lib/chibi/base64.module +++ b/lib/chibi/base64.module @@ -1,5 +1,5 @@ -(define-module (chibi base64) +(module (chibi base64) (export base64-encode base64-encode-string base64-decode base64-decode-string base64-encode-header) diff --git a/lib/chibi/disasm.module b/lib/chibi/disasm.module index 9017a4bc..84444591 100644 --- a/lib/chibi/disasm.module +++ b/lib/chibi/disasm.module @@ -1,5 +1,5 @@ -(define-module (chibi disasm) +(module (chibi disasm) (export disasm) (import-immutable (scheme)) (include-shared "disasm")) diff --git a/lib/chibi/equiv.module b/lib/chibi/equiv.module index 3ca1f2dd..23b2e1ed 100644 --- a/lib/chibi/equiv.module +++ b/lib/chibi/equiv.module @@ -1,5 +1,5 @@ -(define-module (chibi equiv) +(module (chibi equiv) (export equiv?) (import-immutable (scheme)) (import (srfi 69)) diff --git a/lib/chibi/filesystem.module b/lib/chibi/filesystem.module index 63e7e3cd..57d487ba 100644 --- a/lib/chibi/filesystem.module +++ b/lib/chibi/filesystem.module @@ -1,5 +1,5 @@ -(define-module (chibi filesystem) +(module (chibi filesystem) (export open-input-file-descriptor open-output-file-descriptor duplicate-file-descriptor duplicate-file-descriptor-to close-file-descriptor renumber-file-descriptor diff --git a/lib/chibi/generic.module b/lib/chibi/generic.module index 15bd78d0..9dfcc2ba 100644 --- a/lib/chibi/generic.module +++ b/lib/chibi/generic.module @@ -1,5 +1,5 @@ -(define-module (chibi generic) +(module (chibi generic) (export define-generic define-method make-generic generic-add!) (import-immutable (scheme)) (include "generic.scm")) diff --git a/lib/chibi/heap-stats.module b/lib/chibi/heap-stats.module index c1599c35..408f3755 100644 --- a/lib/chibi/heap-stats.module +++ b/lib/chibi/heap-stats.module @@ -1,5 +1,5 @@ -(define-module (chibi heap-stats) +(module (chibi heap-stats) (export heap-stats heap-dump) (import-immutable (scheme)) (include-shared "heap-stats")) diff --git a/lib/chibi/io.module b/lib/chibi/io.module index ec765c04..c7b95743 100644 --- a/lib/chibi/io.module +++ b/lib/chibi/io.module @@ -1,5 +1,5 @@ -(define-module (chibi io) +(module (chibi io) (export read-string read-string! write-string read-line write-line port-fold port-fold-right port-map port->list port->string-list port->sexp-list port->string diff --git a/lib/chibi/loop.module b/lib/chibi/loop.module index 5b76daf8..c380353d 100644 --- a/lib/chibi/loop.module +++ b/lib/chibi/loop.module @@ -1,5 +1,5 @@ -(define-module (chibi loop) +(module (chibi loop) (export loop in-list in-lists in-port in-file up-from down-from listing listing-reverse appending appending-reverse summing multiplying in-string in-string-reverse diff --git a/lib/chibi/match.module b/lib/chibi/match.module index 1366176a..2a5c661f 100644 --- a/lib/chibi/match.module +++ b/lib/chibi/match.module @@ -1,5 +1,5 @@ -(define-module (chibi match) +(module (chibi match) (export match match-lambda match-lambda* match-let match-letrec match-let*) (import-immutable (scheme)) (include "match/match.scm")) diff --git a/lib/chibi/modules.module b/lib/chibi/modules.module index 0d20861e..275a69b2 100644 --- a/lib/chibi/modules.module +++ b/lib/chibi/modules.module @@ -1,5 +1,5 @@ -(define-module (chibi modules) +(module (chibi modules) (export analyze-module module-ast module-ast-set! module-ref module-contains? containing-module procedure-analysis) diff --git a/lib/chibi/net.module b/lib/chibi/net.module index 39335033..4c6ad3b9 100644 --- a/lib/chibi/net.module +++ b/lib/chibi/net.module @@ -1,5 +1,5 @@ -(define-module (chibi net) +(module (chibi net) (export sockaddr? address-info? get-address-info socket connect bind accept listen with-net-io open-net-io diff --git a/lib/chibi/pathname.module b/lib/chibi/pathname.module index 765ee189..1f4ffbf2 100644 --- a/lib/chibi/pathname.module +++ b/lib/chibi/pathname.module @@ -1,5 +1,5 @@ -(define-module (chibi pathname) +(module (chibi pathname) (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) diff --git a/lib/chibi/process.module b/lib/chibi/process.module index 32e0de5b..851333ff 100644 --- a/lib/chibi/process.module +++ b/lib/chibi/process.module @@ -1,5 +1,5 @@ -(define-module (chibi process) +(module (chibi process) (export exit sleep alarm fork kill execute waitpid system process-command-line process-running? set-signal-action! make-signal-set signal-set-contains? diff --git a/lib/chibi/quoted-printable.module b/lib/chibi/quoted-printable.module index 9cbec430..d47cc5c3 100644 --- a/lib/chibi/quoted-printable.module +++ b/lib/chibi/quoted-printable.module @@ -1,5 +1,5 @@ -(define-module (chibi quoted-printable) +(module (chibi quoted-printable) (export quoted-printable-encode quoted-printable-encode-string quoted-printable-encode-header quoted-printable-decode quoted-printable-decode-string) diff --git a/lib/chibi/repl.module b/lib/chibi/repl.module index 2bb224e5..445983bf 100644 --- a/lib/chibi/repl.module +++ b/lib/chibi/repl.module @@ -1,5 +1,5 @@ -(define-module (chibi repl) +(module (chibi repl) (export repl) (import-immutable (scheme)) (import (chibi ast) diff --git a/lib/chibi/scribble.module b/lib/chibi/scribble.module index b479eb64..392ff302 100644 --- a/lib/chibi/scribble.module +++ b/lib/chibi/scribble.module @@ -1,5 +1,5 @@ -(define-module (chibi scribble) +(module (chibi scribble) (export scribble-parse scribble-read) (import-immutable (scheme)) (include "scribble.scm")) diff --git a/lib/chibi/stty.module b/lib/chibi/stty.module index 4540cb18..6a095a0a 100644 --- a/lib/chibi/stty.module +++ b/lib/chibi/stty.module @@ -1,5 +1,5 @@ -(define-module (chibi stty) +(module (chibi stty) (export stty with-stty with-raw-io get-terminal-width get-terminal-dimensions TCSANOW TCSADRAIN TCSAFLUSH) diff --git a/lib/chibi/system.module b/lib/chibi/system.module index dee60b47..9792f8aa 100644 --- a/lib/chibi/system.module +++ b/lib/chibi/system.module @@ -1,5 +1,5 @@ -(define-module (chibi system) +(module (chibi system) (export user-information user? user-name user-password user-id user-group-id user-gecos user-home user-shell current-user-id current-group-id diff --git a/lib/chibi/term/edit-line.module b/lib/chibi/term/edit-line.module index 139aff06..f9c2e6f7 100644 --- a/lib/chibi/term/edit-line.module +++ b/lib/chibi/term/edit-line.module @@ -1,5 +1,5 @@ -(define-module (chibi term edit-line) +(module (chibi term edit-line) (export edit-line edit-line-repl make-history history-insert! history-commit! buffer->string) (import-immutable (scheme) (chibi stty) (srfi 9)) diff --git a/lib/chibi/test.module b/lib/chibi/test.module index 66e97d54..8babebfa 100644 --- a/lib/chibi/test.module +++ b/lib/chibi/test.module @@ -1,5 +1,5 @@ -(define-module (chibi test) +(module (chibi test) (export test test-error test-assert test-not test-values test-group current-test-group diff --git a/lib/chibi/time.module b/lib/chibi/time.module index 8d591100..295fc528 100644 --- a/lib/chibi/time.module +++ b/lib/chibi/time.module @@ -1,5 +1,5 @@ -(define-module (chibi time) +(module (chibi time) (export current-seconds get-time-of-day set-time-of-day! seconds->time seconds->string time->seconds time->string timeval-seconds timeval-microseconds diff --git a/lib/chibi/uri.module b/lib/chibi/uri.module index 46f9e6a6..028d91b2 100644 --- a/lib/chibi/uri.module +++ b/lib/chibi/uri.module @@ -1,5 +1,5 @@ -(define-module (chibi uri) +(module (chibi uri) (export uri? uri->string make-uri string->uri uri-scheme uri-user uri-host uri-port uri-path uri-query uri-fragment uri-with-scheme uri-with-user uri-with-host uri-with-path diff --git a/lib/chibi/weak.module b/lib/chibi/weak.module index e739bf89..4471790f 100644 --- a/lib/chibi/weak.module +++ b/lib/chibi/weak.module @@ -1,5 +1,5 @@ -(define-module (chibi weak) +(module (chibi weak) (export make-ephemeron ephemeron? ephemeron-broken? ephemeron-key ephemeron-value make-weak-vector weak-vector? weak-vector-length diff --git a/lib/srfi/1.module b/lib/srfi/1.module index 3d3da044..db35ca27 100644 --- a/lib/srfi/1.module +++ b/lib/srfi/1.module @@ -1,5 +1,5 @@ -(define-module (srfi 1) +(module (srfi 1) (export xcons cons* make-list list-tabulate list-copy circular-list iota proper-list? circular-list? dotted-list? not-pair? null-list? list= diff --git a/lib/srfi/11.module b/lib/srfi/11.module index f3c91df8..f18cde7f 100644 --- a/lib/srfi/11.module +++ b/lib/srfi/11.module @@ -1,8 +1,8 @@ -(define-module (srfi 11) +(module (srfi 11) (export let-values let*-values) (import-immutable (scheme)) - (body + (begin (define-syntax let*-values (syntax-rules () ((let*-values () . body) diff --git a/lib/srfi/16.module b/lib/srfi/16.module index f931a376..3b735334 100644 --- a/lib/srfi/16.module +++ b/lib/srfi/16.module @@ -1,8 +1,8 @@ -(define-module (srfi 16) +(module (srfi 16) (export case-lambda) (import-immutable (scheme)) - (body + (begin (define-syntax %case (syntax-rules () ((%case args len n p ((params ...) . body) . rest) diff --git a/lib/srfi/18.module b/lib/srfi/18.module index dd0fa8a3..6e511e59 100644 --- a/lib/srfi/18.module +++ b/lib/srfi/18.module @@ -1,5 +1,5 @@ -(define-module (srfi 18) +(module (srfi 18) (export current-thread thread? make-thread thread-name thread-specific thread-specific-set! thread-start! diff --git a/lib/srfi/2.module b/lib/srfi/2.module index 4ceb8b6b..50d4619c 100644 --- a/lib/srfi/2.module +++ b/lib/srfi/2.module @@ -1,8 +1,8 @@ -(define-module (srfi 2) +(module (srfi 2) (export and-let*) (import-immutable (scheme)) - (body + (begin (define-syntax and-let* (syntax-rules () ((and-let* () . body) diff --git a/lib/srfi/26.module b/lib/srfi/26.module index f97ab783..535f1d1c 100644 --- a/lib/srfi/26.module +++ b/lib/srfi/26.module @@ -1,8 +1,8 @@ -(define-module (srfi 26) +(module (srfi 26) (export cut cute) (import-immutable (scheme)) - (body + (begin (define-syntax %cut (syntax-rules (<> <...>) ((%cut e? params args) diff --git a/lib/srfi/27.module b/lib/srfi/27.module index 5c451629..5104b2a5 100644 --- a/lib/srfi/27.module +++ b/lib/srfi/27.module @@ -1,5 +1,5 @@ -(define-module (srfi 27) +(module (srfi 27) (export random-integer random-real default-random-source make-random-source random-source? random-source-state-ref random-source-state-set! diff --git a/lib/srfi/33.module b/lib/srfi/33.module index 7eb86c1e..5d599c8e 100644 --- a/lib/srfi/33.module +++ b/lib/srfi/33.module @@ -1,5 +1,5 @@ -(define-module (srfi 33) +(module (srfi 33) (export bitwise-not bitwise-and bitwise-ior bitwise-xor bitwise-eqv diff --git a/lib/srfi/38.module b/lib/srfi/38.module index 45769029..bf537a80 100644 --- a/lib/srfi/38.module +++ b/lib/srfi/38.module @@ -1,5 +1,5 @@ -(define-module (srfi 38) +(module (srfi 38) (import-immutable (scheme)) (export write-with-shared-structure write/ss read-with-shared-structure read/ss) diff --git a/lib/srfi/39.module b/lib/srfi/39.module index 52b550f7..7970119c 100644 --- a/lib/srfi/39.module +++ b/lib/srfi/39.module @@ -1,5 +1,5 @@ -(define-module (srfi 39) +(module (srfi 39) (export make-parameter parameterize) (import-immutable (scheme)) (include-shared "39/param") diff --git a/lib/srfi/55.module b/lib/srfi/55.module index 3f513b0d..040d1d10 100644 --- a/lib/srfi/55.module +++ b/lib/srfi/55.module @@ -1,8 +1,8 @@ -(define-module (srfi 55) +(module (srfi 55) (export require-extension) (import-immutable (scheme)) - (body + (begin (define-syntax require-extension (syntax-rules () ((require-extension (prefix mod ...)) diff --git a/lib/srfi/6.module b/lib/srfi/6.module index e589b6ff..32cf2df6 100644 --- a/lib/srfi/6.module +++ b/lib/srfi/6.module @@ -1,5 +1,5 @@ -(define-module (srfi 6) +(module (srfi 6) (export open-input-string open-output-string get-output-string) (import-immutable (scheme))) diff --git a/lib/srfi/69.module b/lib/srfi/69.module index 037b6393..0044cdae 100644 --- a/lib/srfi/69.module +++ b/lib/srfi/69.module @@ -1,5 +1,5 @@ -(define-module (srfi 69) +(module (srfi 69) (export make-hash-table hash-table? alist->hash-table hash-table-equivalence-function hash-table-hash-function diff --git a/lib/srfi/8.module b/lib/srfi/8.module index 64a3e6e2..024e7d1e 100644 --- a/lib/srfi/8.module +++ b/lib/srfi/8.module @@ -1,5 +1,5 @@ -(define-module (srfi 8) +(module (srfi 8) (export receive) (import-immutable (scheme)) (body diff --git a/lib/srfi/9.module b/lib/srfi/9.module index 7513b7f3..0e00fa06 100644 --- a/lib/srfi/9.module +++ b/lib/srfi/9.module @@ -1,5 +1,5 @@ -(define-module (srfi 9) +(module (srfi 9) (export define-record-type) (import-immutable (scheme)) (include "9.scm")) diff --git a/lib/srfi/95.module b/lib/srfi/95.module index 43bab9dd..7cf04db7 100644 --- a/lib/srfi/95.module +++ b/lib/srfi/95.module @@ -1,5 +1,5 @@ -(define-module (srfi 95) +(module (srfi 95) (export sorted? merge merge! sort sort! object-cmp) (import-immutable (scheme)) (include-shared "95/qsort") diff --git a/lib/srfi/98.module b/lib/srfi/98.module index 9d124d66..5a49b48a 100644 --- a/lib/srfi/98.module +++ b/lib/srfi/98.module @@ -1,5 +1,5 @@ -(define-module (srfi 98) +(module (srfi 98) (export get-environment-variable get-environment-variables) (include-shared "98/env")) diff --git a/lib/srfi/99.module b/lib/srfi/99.module index 66bec55d..a36d0754 100644 --- a/lib/srfi/99.module +++ b/lib/srfi/99.module @@ -1,5 +1,5 @@ -(define-module (srfi 99) +(module (srfi 99) (import (srfi 99 records)) (export make-rtd rtd? rtd-constructor rtd-predicate rtd-accessor rtd-mutator record? record-rtd rtd-name rtd-parent