Prefer SRFI 33 over SRFI 60, preventing import cycles when a user has

a SRFI 60 installed which imports (scheme base).  This can still break
in theory if a user installs a third-party SRFI 33 in the search path
in front of the Chibi SRFI 33, but we can't always be safe against
such behavior.
Fixes issue #267.

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)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (import (srfi 33))))
+   (else (import (srfi 60))))
   (export define-binary-record-type)
   (include "binary-record.scm"))

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)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (import (srfi 33))))
+   (else (import (srfi 60))))
   (include "bytevector.scm"))

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)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (import (srfi 33))))
+   (else (import (srfi 60))))
   (export md5)
   (include "md5.scm"))

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)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (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

lib/chibi/crypto/sha2.sld

@@ -11,8 +11,8 @@
     (include-shared "crypto"))
    (else
     (cond-expand
-     ((library (srfi 60)) (import (srfi 60)))
+     ((library (srfi 33)) (import (srfi 33)))
-     (else (import (srfi 33))))
+     (else (import (srfi 60))))
     (import (chibi bytevector))
     (include "sha2.scm"))))
 

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)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (import (srfi 33))))
+   (else (import (srfi 60))))
   (include "base.scm")
   (export
    %make-iset make-iset iset? iset-contains? Integer-Set

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)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (import (srfi 33))))
+   (else (import (srfi 60))))
   (include "constructors.scm")
   (export
    iset iset-copy list->iset list->iset! iset-map

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)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (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

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)

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)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (import (srfi 33))))
+   (else (import (srfi 60))))
   (export prime? nth-prime prime-above prime-below factor perfect?
           totient aliquot
           provable-prime? probable-prime?

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)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (import (srfi 33))))
+   (else (import (srfi 60))))
   ;; Chibi's char-set library is more factored than SRFI-14.
   (cond-expand
    (chibi

lib/chibi/regexp/pcre.sld

@@ -5,6 +5,6 @@
           (srfi 1)
           (chibi string) (chibi regexp))
   (cond-expand
-   ((library (srfi 60)) (import (srfi 60)))
+   ((library (srfi 33)) (import (srfi 33)))
-   (else (import (srfi 33))))
+   (else (import (srfi 60))))
   (include "pcre.scm"))