1 files changed, 25 insertions, 69 deletions

@@ -1,9 +1,9 @@
-;;; chicanery --- subtly breaking scheme expectations
+(module chicanery ()
+  (import scheme
+          (chicken module)
+          (chicken platform))
+  (import r7rs utf8)
 
-(import (r7rs))
-
-(define-library chicanery
-  ;; All the scheme stuff in one place
   (import (scheme base))
   (import (scheme case-lambda))
   (import (scheme char))
@@ -19,69 +19,25 @@
   (import (scheme repl))
   (import (scheme time))
   (import (scheme write))
-  (import utf8)
-  (export * + - / <= < >= = > abs and #;append apply assoc assq assv begin
-          binary-port? boolean? boolean=? bytevector bytevector-append
-          bytevector-copy bytevector-copy! bytevector-length bytevector-u8-ref
-          bytevector-u8-set! bytevector? car cdr caar cadr cdar cddr
-          call-with-current-continuation call/cc call-with-port call-with-values
-          case ceiling char-ready? char->integer integer->char char=? char<?
-          char>? char<=? char>=? char? close-input-port close-output-port
-          close-port complex? cond cond-expand cons current-input-port
-          current-output-port current-error-port define define-record-type
-          define-syntax define-values denominator numerator do dynamic-wind
-          eof-object eof-object? eq? eqv? equal? error error-object-irritants
-          error-object-message error-object? even? odd? exact inexact
-          exact-integer-sqrt exact-integer? exact? inexact? exp expt features
-          file-error? floor floor/ floor-quotient floor-remainder
-          flush-output-port #;for-each gcd lcm get-output-bytevector
-          get-output-string guard if import import-for-syntax include include-ci
-          input-port-open? output-port-open? input-port? output-port? integer?
-          lambda length let let* letrec letrec* let-values let*-values let-syntax
-          letrec-syntax list list-copy list-ref list-set! list-tail list?
-          list->vector make-bytevector make-list make-parameter make-string
-          make-vector #;map max min member memq memv modulo remainder negative?
-          positive? newline not null? number->string string->number number?
-          open-input-bytevector open-output-bytevector open-input-string
-          open-output-string or pair? parameterize peek-char peek-u8 port?
-          procedure? quasiquote quote quotient remainder raise raise-continuable
-          rational? rationalize read-bytevector read-bytevector! read-char
-          read-error? read-line read-string read-u8 real? reverse round set!
-          set-car! set-cdr! square string string->list list->string string->utf8
-          utf8->string string->symbol symbol->string string->vector
-          string-append string-copy string-copy! string-fill! string-for-each
-          string-length string-map string-ref string-set! string=? string<?
-          string>? string<=? string>=? string? substring symbol=? symbol?
-          syntax-error syntax-rules textual-port? truncate truncate/
-          truncate-quotient truncate-remainder u8-ready? unless #;unquote
-          #;unquote-splicing values vector vector-append vector-copy vector-copy!
-          vector-fill! vector-for-each vector-length vector-map vector-ref
-          vector-set! vector->list vector->string vector? when
-          with-exception-handler write-bytevector write-char write-string
-          write-u8 zero?)
-  (export case-lambda)
-  (export char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=?
-          char-ci>? char-downcase char-foldcase char-lower-case? char-numeric?
-          char-upcase char-upper-case? char-whitespace? digit-value string-ci<=?
-          string-ci<? string-ci=? string-ci>=? string-ci>? string-downcase
-          string-foldcase string-upcase)
-  (export angle imag-part magnitude make-polar make-rectangular real-part)
-  (export caaaar caaadr caaar caadar caaddr caadr cadaar cadadr cadar caddar
-          cadddr caddr cdaaar cdaadr cdaar cdadar cdaddr cdadr cddaar cddadr
-          cddar cdddar cddddr cdddr)
-  (export environment eval)
-  (export call-with-input-file call-with-output-file delete-file file-exists?
-          open-binary-input-file open-binary-output-file open-input-file
-          open-output-file with-input-from-file with-output-to-file)
-  (export acos asin atan cos exp finite? infinite? log nan? sin sqrt tan)
-  (export delay delay-force force make-promise promise?)
-  (export load)
-  (export command-line emergency-exit exit get-environment-variable
-          get-environment-variables)
-  (export read)
-  (export interaction-environment)
-  (export current-jiffy current-second jiffies-per-second)
-  (export display write write-shared write-simple)
 
-  (include "chicanery.extras.scm"))
+  (reexport r7rs)
+  (reexport (scheme base))
+  (reexport (scheme case-lambda))
+  (reexport (scheme char))
+  (reexport (scheme complex))
+  (reexport (scheme cxr))
+  (reexport (scheme eval))
+  (reexport (scheme file))
+  (reexport (scheme inexact))
+  (reexport (scheme lazy))
+  (reexport (scheme load))
+  (reexport (scheme process-context))
+  (reexport (scheme read))
+  (reexport (scheme repl))
+  (reexport (scheme time))
+  (reexport (scheme write))
+  (reexport utf8)
+
+  (include "extras.scm")
 
+  (register-feature! #:chicanery))