Use `re-export' instead of `export' for re-exported core bindings. Do

not re-export `numerator', `denominator' and `rationalize' since Guile
does not have them.  Continue to use `export' for `null-environment'.

diff --git a/ice-9/safe-r5rs.scm b/ice-9/safe-r5rs.scm
index 1ebec99..0221bd1 100644 (file)
--- a/ice-9/safe-r5rs.scm
+++ b/ice-9/safe-r5rs.scm
@@ -48,113 +48,114 @@
 
 (module-use! %module-public-interface null-interface)
 
-(export eqv? eq? equal?
-       number? complex? real? rational? integer?
-       exact? inexact?
-       = < > <= >=
-       zero? positive? negative? odd? even?
-       max min
-       + * - /
-       abs
-       quotient remainder modulo
-       gcd lcm
-       numerator denominator
-       floor ceiling truncate round
-       rationalize
-       exp log sin cos tan asin acos atan
-       sqrt
-       expt
-       make-rectangular make-polar real-part imag-part magnitude angle
-       exact->inexact inexact->exact
-
-       number->string string->number
-
-       boolean?
-       not
-
-       pair?
-       cons car cdr
-       set-car! set-cdr!
-       caar cadr cdar cddr
-       caaar caadr cadar caddr cdaar cdadr cddar cdddr
-       caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr
-       cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr
-       null?
-       list?
-       list
-       length
-       append
-       reverse
-       list-tail list-ref
-       memq memv member
-       assq assv assoc
-       
-       symbol?
-       symbol->string string->symbol
-
-       char?
-       char=? char<? char>? char<=? char>=?
-       char-ci=? char-ci<? char-ci>? char-ci<=? char-ci>=?
-       char-alphabetic? char-numeric? char-whitespace?
-       char-upper-case? char-lower-case?
-       char->integer integer->char
-       char-upcase
-       char-downcase
-
-       string?
-       make-string
-       string
-       string-length
-       string-ref string-set!
-       string=? string-ci=?
-       string<? string>? string<=? string>=?
-       string-ci<? string-ci>? string-ci<=? string-ci>=?
-       substring
-       string-length
-       string-append
-       string->list list->string
-       string-copy string-fill!
-
-       vector?
-       make-vector
-       vector
-       vector-length
-       vector-ref vector-set!
-       vector->list list->vector
-       vector-fill!
-
-       procedure?
-       apply
-       map
-       for-each
-       force
-       
-       call-with-current-continuation
-
-       values
-       call-with-values
-       dynamic-wind
-
-       eval
-       null-environment
-
-       input-port? output-port?
-       current-input-port current-output-port
-
-       read
-       read-char
-       peek-char
-       eof-object?
-       char-ready?
-
-       write
-       display
-       newline
-       write-char
-
-       ;;transcript-on
-       ;;transcript-off
-       )
+(re-export eqv? eq? equal?
+          number?      complex? real? rational? integer?
+          exact? inexact?
+          = < > <= >=
+          zero? positive?      negative? odd? even?
+          max min
+          + * - /
+          abs
+          quotient remainder modulo
+          gcd lcm
+          ;;numerator denominator XXX
+          ;;rationalize           XXX
+          floor ceiling truncate round
+          exp log sin cos tan asin acos atan
+          sqrt
+          expt
+          make-rectangular make-polar real-part imag-part magnitude angle
+          exact->inexact inexact->exact
+          
+          number->string string->number
+          
+          boolean?
+          not
+          
+          pair?
+          cons car cdr
+          set-car! set-cdr!
+          caar cadr cdar cddr
+          caaar caadr cadar caddr cdaar cdadr cddar cdddr
+          caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr
+          cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr
+          null?
+          list?
+          list
+          length
+          append
+          reverse
+          list-tail list-ref
+          memq memv member
+          assq assv assoc
+          
+          symbol?
+          symbol->string string->symbol
+          
+          char?
+          char=? char<? char>? char<=? char>=?
+          char-ci=? char-ci<? char-ci>? char-ci<=? char-ci>=?
+          char-alphabetic? char-numeric? char-whitespace?
+          char-upper-case? char-lower-case?
+          char->integer integer->char
+          char-upcase
+          char-downcase
+          
+          string?
+          make-string
+          string
+          string-length
+          string-ref string-set!
+          string=? string-ci=?
+          string<? string>? string<=? string>=?
+          string-ci<? string-ci>? string-ci<=? string-ci>=?
+          substring
+          string-length
+          string-append
+          string->list list->string
+          string-copy string-fill!
+          
+          vector?
+          make-vector
+          vector
+          vector-length
+          vector-ref vector-set!
+          vector->list list->vector
+          vector-fill!
+          
+          procedure?
+          apply
+          map
+          for-each
+          force
+          
+          call-with-current-continuation
+          
+          values
+          call-with-values
+          dynamic-wind
+          
+          eval
+
+          input-port? output-port?
+          current-input-port current-output-port
+          
+          read
+          read-char
+          peek-char
+          eof-object?
+          char-ready?
+          
+          write
+          display
+          newline
+          write-char
+
+          ;;transcript-on
+          ;;transcript-off
+          )
+
+(export null-environment)
 
 (define (null-environment n)
   (if (not (= n 5))