diff --git a/src/ikarus.boot b/src/ikarus.boot index 2860ece..0ac9146 100644 Binary files a/src/ikarus.boot and b/src/ikarus.boot differ diff --git a/src/ikarus.syntax.ss b/src/ikarus.syntax.ss index 0580eee..cb331c0 100644 --- a/src/ikarus.syntax.ss +++ b/src/ikarus.syntax.ss @@ -10,10 +10,14 @@ generate-temporaries free-identifier=? syntax-error eval-r6rs-top-level boot-library-expand eval-top-level) (import - (ikarus library-manager) + (except (ikarus library-manager) installed-libraries) (only (ikarus compiler) eval-core) - (rename (except (ikarus) boot-library-expand - eval-top-level installed-libraries) + (only (ikarus) error) + (chez modules) + (only (ikarus) ormap andmap gensym fxadd1 fx= fxsub1 sub1 list* + add1 format make-record-type symbol-value parameterize + void make-parameter set-symbol-value!) + (rename (r6rs) (free-identifier=? sys:free-identifier=?) (identifier? sys:identifier?) (syntax-error sys:syntax-error) diff --git a/src/makefile.ss b/src/makefile.ss index b31d008..16f68a0 100755 --- a/src/makefile.ss +++ b/src/makefile.ss @@ -96,6 +96,7 @@ (define library-legend '([i (ikarus) #t] [r (r6rs) #t] + [cm (chez modules) #t] [$all (ikarus system $all) #f] [$pairs (ikarus system $pairs) #f] [$lists (ikarus system $lists) #f] @@ -118,7 +119,7 @@ (define ikarus-macros-map '([define i r] [define-syntax i r] - [module i ] + [module i cm] [begin i r] [set! i r] [foreign-call i r] @@ -149,99 +150,99 @@ (define ikarus-procedures-map '([void i] - [not i] - [boolean? i] - [null? i] - [procedure? i] - [eof-object? i] + [not i r] + [boolean? i r] + [null? i r] + [procedure? i r] + [eof-object? i r] [eof-object i] - [eq? i] - [eqv? i] - [equal? i] - [cons i] - [pair? i] - [car i] - [cdr i] + [eq? i r] + [eqv? i r] + [equal? i r] + [cons i r] + [pair? i r] + [car i r] + [cdr i r] [set-car! i] [set-cdr! i] - [caar i] - [cdar i] - [cadr i] - [cddr i] - [caaar i] - [cdaar i] - [cadar i] - [cddar i] - [caadr i] - [cdadr i] - [caddr i] - [cdddr i] - [caaaar i] - [cdaaar i] - [cadaar i] - [cddaar i] - [caadar i] - [cdadar i] - [caddar i] - [cdddar i] - [caaadr i] - [cdaadr i] - [cadadr i] - [cddadr i] - [caaddr i] - [cdaddr i] - [cadddr i] - [cddddr i] - [list i] - [list-ref i] - [make-list i] + [caar i r] + [cdar i r] + [cadr i r] + [cddr i r] + [caaar i r] + [cdaar i r] + [cadar i r] + [cddar i r] + [caadr i r] + [cdadr i r] + [caddr i r] + [cdddr i r] + [caaaar i r] + [cdaaar i r] + [cadaar i r] + [cddaar i r] + [caadar i r] + [cdadar i r] + [caddar i r] + [cdddar i r] + [caaadr i r] + [cdaadr i r] + [cadadr i r] + [cddadr i r] + [caaddr i r] + [cdaddr i r] + [cadddr i r] + [cddddr i r] + [list i r] + [list-ref i r] + [make-list i r] [list* i] - [list? i] - [append i] - [last-pair i] - [reverse i] - [length i] - [assq i] - [assv i] - [assoc i] - [memq i] - [memv i] - [member i] + [list? i r] + [append i r] + [last-pair i r] + [reverse i r] + [length i r] + [assq i r] + [assv i r] + [assoc i r] + [memq i r] + [memv i r] + [member i r] [bwp-object? i] [weak-cons i] [weak-pair? i] - [char? i] - [char=? i] - [char? i] - [char<=? i] - [char>=? i] - [integer->char i] - [char->integer i] - [char-whitespace? i] - [string? i] - [string i] - [make-string i] - [string-ref i] - [string-set! i] - [string-length i] - [string=? i] - [substring i] - [string-append i] - [string->list i] - [list->string i] + [char? i r] + [char=? i r] + [char? i r] + [char<=? i r] + [char>=? i r] + [integer->char i r] + [char->integer i r] + [char-whitespace? i r] + [string? i r] + [string i r] + [make-string i r] + [string-ref i r] + [string-set! i r] + [string-length i r] + [string=? i r] + [substring i r] + [string-append i r] + [string->list i r] + [list->string i r] [uuid i] [date-string i] - [vector i] - [make-vector i] - [vector-ref i] - [vector-set! i] - [vector? i] - [vector-length i] - [list->vector i] - [vector->list i] - [for-each i] - [map i] + [vector i r] + [make-vector i r] + [vector-ref i r] + [vector-set! i r] + [vector? i r] + [vector-length i r] + [list->vector i r] + [vector->list i r] + [for-each i r] + [map i r] [andmap i] [ormap i] [fixnum? i] @@ -267,35 +268,35 @@ [fxlognot i] [fixnum->string i] [string->flonum i] - [- i] - [= i] - [< i] - [> i] - [<= i] - [>= i] - [* i] - [+ i] + [- i r] + [= i r] + [< i r] + [> i r] + [<= i r] + [>= i r] + [* i r] + [+ i r] [add1 i] [sub1 i] - [number? i] + [number? i r] [bignum? i] [integer? i] [flonum? i] - [quotient i] - [remainder i] - [quotient+remainder i] - [number->string i] - [string->number i] + [quotient i r] + [remainder i r] + [quotient+remainder i r] + [number->string i r] + [string->number i r] [flonum->string i] - [symbol? i] + [symbol? i r] [gensym? i] [gensym i] [getprop i] [putprop i] [remprop i] [property-list i] - [string->symbol i] - [symbol->string i] + [string->symbol i r] + [symbol->string i r] [gensym->unique-string i] [symbol-bound? i] [symbol-value i] @@ -314,20 +315,20 @@ [port-input-size i] [set-port-input-index! i] [set-port-input-size! i] - [output-port? i] - [input-port? i] - [port? i] + [output-port? i r] + [input-port? i r] + [port? i r] [port-name i] [input-port-name i] [output-port-name i] - [open-input-file i] - [with-input-from-file i] - [with-output-to-file i] - [open-output-file i] + [open-input-file i r] + [with-input-from-file i r] + [with-output-to-file i r] + [open-output-file i r] [open-output-string i] [get-output-string i] - [close-input-port i] - [close-output-port i] + [close-input-port i r] + [close-output-port i r] [console-input-port i] [console-output-port i] [current-input-port i] @@ -337,15 +338,15 @@ [standard-error-port i] [flush-output-port i] [reset-input-port! i] - [display i] - [write i] + [display i r] + [write i r] [write-char i] - [read i] - [read-char i] + [read i r] + [read-char i r] [read-token i] [peek-char i] [unread-char i] - [newline i] + [newline i r] [printf i] [format i] [pretty-print i] @@ -358,12 +359,12 @@ [get-hash-table i] [put-hash-table! i] [make-parameter i] - [apply i] - [values i] - [call-with-values i] - [call/cc i] + [apply i r] + [values i r] + [call-with-values i r] + [call/cc i r] [call/cf i] - [dynamic-wind i] + [dynamic-wind i r] [error i] [print-error i] [error-handler i] @@ -389,10 +390,10 @@ [record-ref i] [record-field-accessor i] [record-field-mutator i] - [identifier? i] - [syntax-error i] - [generate-temporaries i] - [free-identifier=? i] + [identifier? i r] + [syntax-error i r] + [generate-temporaries i r] + [free-identifier=? i r] [code? i] [immediate? i] [pointer-value i]