diff --git a/src/ikarus.boot b/src/ikarus.boot index c652cb0..897d965 100644 Binary files a/src/ikarus.boot and b/src/ikarus.boot differ diff --git a/src/ikarus.core.ss b/src/ikarus.core.ss index b4fbf94..51fcd25 100644 --- a/src/ikarus.core.ss +++ b/src/ikarus.core.ss @@ -11,9 +11,6 @@ (primitive-set! 'void (lambda () (void))) -(primitive-set! 'eof-object? - (lambda (x) (eof-object? x))) - (primitive-set! 'fxadd1 (lambda (n) diff --git a/src/ikarus.predicates.ss b/src/ikarus.predicates.ss index 969e81f..f6686f5 100644 --- a/src/ikarus.predicates.ss +++ b/src/ikarus.predicates.ss @@ -1,14 +1,16 @@ (library (ikarus predicates) (export fixnum? flonum? bignum? number? complex? real? rational? - integer? exact?) + integer? exact? eof-object?) (import (except (ikarus) fixnum? flonum? bignum? number? complex? real? - rational? integer? exact?) - (rename (only (ikarus) fixnum? flonum? bignum?) + rational? integer? exact? eof-object?) + (rename (only (ikarus) fixnum? flonum? bignum? eof-object?) (fixnum? sys:fixnum?) (flonum? sys:flonum?) - (bignum? sys:bignum?))) + (bignum? sys:bignum?) + (eof-object? sys:eof-object?) + )) (define fixnum? (lambda (x) (sys:fixnum? x))) @@ -54,4 +56,10 @@ [(sys:bignum? x) #t] [(sys:flonum? x) #f] [else - (error 'exact? "~s is not a number" x)])))) + (error 'exact? "~s is not a number" x)]))) + + (define eof-object? + (lambda (x) + (sys:eof-object? x))) + + )