diff --git a/lib/chibi/binary-record.sld b/lib/chibi/binary-record.sld index ce36653a..d15f4ebe 100644 --- a/lib/chibi/binary-record.sld +++ b/lib/chibi/binary-record.sld @@ -5,7 +5,7 @@ (chibi io) (chibi string) (only (chibi) identifier? er-macro-transformer)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (export define-binary-record-type) (include "binary-record.scm")) diff --git a/lib/chibi/bytevector.sld b/lib/chibi/bytevector.sld index 4ce9c8d2..23ad337a 100644 --- a/lib/chibi/bytevector.sld +++ b/lib/chibi/bytevector.sld @@ -11,6 +11,6 @@ bytevector->hex-string hex-string->bytevector) (import (scheme base)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (include "bytevector.scm")) diff --git a/lib/chibi/crypto/md5.sld b/lib/chibi/crypto/md5.sld index 69caeb6e..b053ae70 100644 --- a/lib/chibi/crypto/md5.sld +++ b/lib/chibi/crypto/md5.sld @@ -5,7 +5,7 @@ (define-library (chibi crypto md5) (import (scheme base) (chibi bytevector)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (export md5) (include "md5.scm")) diff --git a/lib/chibi/crypto/rsa.sld b/lib/chibi/crypto/rsa.sld index 37a10663..74c3d722 100644 --- a/lib/chibi/crypto/rsa.sld +++ b/lib/chibi/crypto/rsa.sld @@ -5,8 +5,8 @@ (import (scheme base) (srfi 27) (chibi bytevector) (chibi math prime)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (export make-rsa-key rsa-key-gen rsa-key-gen-from-primes rsa-pub-key rsa-encrypt rsa-decrypt rsa-sign rsa-verify rsa-verify? rsa-key? rsa-key-bits rsa-key-n rsa-key-e rsa-key-d diff --git a/lib/chibi/crypto/sha2.sld b/lib/chibi/crypto/sha2.sld index 5282a1b2..37e67208 100644 --- a/lib/chibi/crypto/sha2.sld +++ b/lib/chibi/crypto/sha2.sld @@ -11,8 +11,8 @@ (include-shared "crypto")) (else (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (import (chibi bytevector)) (include "sha2.scm")))) diff --git a/lib/chibi/iset/base.sld b/lib/chibi/iset/base.sld index 2ef9bc9d..90850dd7 100644 --- a/lib/chibi/iset/base.sld +++ b/lib/chibi/iset/base.sld @@ -4,8 +4,8 @@ (chibi (import (chibi) (srfi 9))) (else (import (scheme base)))) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (include "base.scm") (export %make-iset make-iset iset? iset-contains? Integer-Set diff --git a/lib/chibi/iset/constructors.sld b/lib/chibi/iset/constructors.sld index 48b5682a..9351fe9f 100644 --- a/lib/chibi/iset/constructors.sld +++ b/lib/chibi/iset/constructors.sld @@ -5,8 +5,8 @@ (else (import (scheme base)))) (import (chibi iset base) (chibi iset iterators)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (include "constructors.scm") (export iset iset-copy list->iset list->iset! iset-map diff --git a/lib/chibi/iset/iterators.sld b/lib/chibi/iset/iterators.sld index 3deb9e2f..d63611b2 100644 --- a/lib/chibi/iset/iterators.sld +++ b/lib/chibi/iset/iterators.sld @@ -5,8 +5,8 @@ (else (import (scheme base)))) (import (chibi iset base)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (include "iterators.scm") (export iset-empty? iset-fold iset-fold-node iset-for-each iset-for-each-node diff --git a/lib/chibi/iset/optimize.sld b/lib/chibi/iset/optimize.sld index 4d923a51..66fb53a3 100644 --- a/lib/chibi/iset/optimize.sld +++ b/lib/chibi/iset/optimize.sld @@ -7,9 +7,9 @@ (chibi iset iterators) (chibi iset constructors)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) + ((library (srfi 33)) (import (srfi 33))) (else - (import (srfi 33)) + (import (srfi 60)) (begin (define (%mask size) (bitwise-not (arithmetic-shift -1 size))) (define (extract-bit-field size position n) diff --git a/lib/chibi/math/prime.sld b/lib/chibi/math/prime.sld index 08b40250..82651004 100644 --- a/lib/chibi/math/prime.sld +++ b/lib/chibi/math/prime.sld @@ -2,8 +2,8 @@ (define-library (chibi math prime) (import (scheme base) (scheme inexact) (srfi 27)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (export prime? nth-prime prime-above prime-below factor perfect? totient aliquot provable-prime? probable-prime? diff --git a/lib/chibi/regexp.sld b/lib/chibi/regexp.sld index 3641e3fa..9243d801 100644 --- a/lib/chibi/regexp.sld +++ b/lib/chibi/regexp.sld @@ -13,8 +13,8 @@ regexp-match->list regexp-match->sexp) (import (srfi 69)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) ;; Chibi's char-set library is more factored than SRFI-14. (cond-expand (chibi diff --git a/lib/chibi/regexp/pcre.sld b/lib/chibi/regexp/pcre.sld index 7deaee3f..d08c1d99 100644 --- a/lib/chibi/regexp/pcre.sld +++ b/lib/chibi/regexp/pcre.sld @@ -5,6 +5,6 @@ (srfi 1) (chibi string) (chibi regexp)) (cond-expand - ((library (srfi 60)) (import (srfi 60))) - (else (import (srfi 33)))) + ((library (srfi 33)) (import (srfi 33))) + (else (import (srfi 60)))) (include "pcre.scm"))