* removed some junk from ikarus.syntax

This commit is contained in:
Abdulaziz Ghuloum 2007-05-06 23:11:30 -04:00
parent 085a0c14ed
commit 2eb451febe
4 changed files with 278 additions and 293 deletions

Binary file not shown.

View File

@ -15,17 +15,10 @@
(library (ikarus library-manager) (library (ikarus library-manager)
(export imported-label->binding library-subst/env (export imported-label->binding library-subst/env
current-library-collection current-library-collection installed-libraries
installed-libraries
find-library-by-name imported-loc->library install-library find-library-by-name imported-loc->library install-library
library-spec invoke-library) library-spec invoke-library)
(import (except (ikarus) imported-label->binding library-subst/env (import (except (ikarus) current-library-collection))
current-library-collection
installed-libraries
find-library-by-name imported-loc->library install-library
library-spec invoke-library))
(define (make-collection) (define (make-collection)
(let ([set '()]) (let ([set '()])

View File

@ -7,14 +7,6 @@
(ikarus library-manager) (ikarus library-manager)
(only (ikarus compiler) eval-core) (only (ikarus compiler) eval-core)
(rename (except (ikarus) boot-library-expand syntax-error (rename (except (ikarus) boot-library-expand syntax-error
library-subst/env
find-library-by-name
imported-label->binding
imported-loc->library
library-spec
current-library-collection
invoke-library
installed-libraries
eval-top-level) eval-top-level)
(free-identifier=? sys:free-identifier=?) (free-identifier=? sys:free-identifier=?)
(identifier? sys:identifier?) (identifier? sys:identifier?)

View File

@ -150,266 +150,266 @@
[or i r])) [or i r]))
(define ikarus-procedures-map (define ikarus-procedures-map
'([void i] '([void i]
[not i] [not i]
[boolean? i] [boolean? i]
[null? i] [null? i]
[procedure? i] [procedure? i]
[eof-object? i] [eof-object? i]
[eof-object i] [eof-object i]
[eq? i] [eq? i]
[eqv? i] [eqv? i]
[equal? i] [equal? i]
[cons i] [cons i]
[pair? i] [pair? i]
[car i] [car i]
[cdr i] [cdr i]
[set-car! i] [set-car! i]
[set-cdr! i] [set-cdr! i]
[caar i] [caar i]
[cdar i] [cdar i]
[cadr i] [cadr i]
[cddr i] [cddr i]
[caaar i] [caaar i]
[cdaar i] [cdaar i]
[cadar i] [cadar i]
[cddar i] [cddar i]
[caadr i] [caadr i]
[cdadr i] [cdadr i]
[caddr i] [caddr i]
[cdddr i] [cdddr i]
[caaaar i] [caaaar i]
[cdaaar i] [cdaaar i]
[cadaar i] [cadaar i]
[cddaar i] [cddaar i]
[caadar i] [caadar i]
[cdadar i] [cdadar i]
[caddar i] [caddar i]
[cdddar i] [cdddar i]
[caaadr i] [caaadr i]
[cdaadr i] [cdaadr i]
[cadadr i] [cadadr i]
[cddadr i] [cddadr i]
[caaddr i] [caaddr i]
[cdaddr i] [cdaddr i]
[cadddr i] [cadddr i]
[cddddr i] [cddddr i]
[list i] [list i]
[list-ref i] [list-ref i]
[make-list i] [make-list i]
[list* i] [list* i]
[list? i] [list? i]
[append i] [append i]
[last-pair i] [last-pair i]
[reverse i] [reverse i]
[length i] [length i]
[assq i] [assq i]
[assv i] [assv i]
[assoc i] [assoc i]
[memq i] [memq i]
[memv i] [memv i]
[member i] [member i]
[bwp-object? i] [bwp-object? i]
[weak-cons i] [weak-cons i]
[weak-pair? i] [weak-pair? i]
[char? i] [char? i]
[char=? i] [char=? i]
[char<? i] [char<? i]
[char>? i] [char>? i]
[char<=? i] [char<=? i]
[char>=? i] [char>=? i]
[integer->char i] [integer->char i]
[char->integer i] [char->integer i]
[char-whitespace? i] [char-whitespace? i]
[string? i] [string? i]
[string i] [string i]
[make-string i] [make-string i]
[string-ref i] [string-ref i]
[string-set! i] [string-set! i]
[string-length i] [string-length i]
[string=? i] [string=? i]
[substring i] [substring i]
[string-append i] [string-append i]
[string->list i] [string->list i]
[list->string i] [list->string i]
[uuid i] [uuid i]
[date-string i] [date-string i]
[vector i] [vector i]
[make-vector i] [make-vector i]
[vector-ref i] [vector-ref i]
[vector-set! i] [vector-set! i]
[vector? i] [vector? i]
[vector-length i] [vector-length i]
[list->vector i] [list->vector i]
[vector->list i] [vector->list i]
[for-each i] [for-each i]
[map i] [map i]
[andmap i] [andmap i]
[ormap i] [ormap i]
[fixnum? i] [fixnum? i]
[fx< i] [fx< i]
[fx<= i] [fx<= i]
[fx> i] [fx> i]
[fx>= i] [fx>= i]
[fx= i] [fx= i]
[fx- i] [fx- i]
[fx+ i] [fx+ i]
[fx* i] [fx* i]
[fxzero? i] [fxzero? i]
[fxadd1 i] [fxadd1 i]
[fxsub1 i] [fxsub1 i]
[fxquotient i] [fxquotient i]
[fxremainder i] [fxremainder i]
[fxmodulo i] [fxmodulo i]
[fxsll i] [fxsll i]
[fxsra i] [fxsra i]
[fxlogand i] [fxlogand i]
[fxlogxor i] [fxlogxor i]
[fxlogor i] [fxlogor i]
[fxlognot i] [fxlognot i]
[fixnum->string i] [fixnum->string i]
[string->flonum i] [string->flonum i]
[- i] [- i]
[= i] [= i]
[< i] [< i]
[> i] [> i]
[<= i] [<= i]
[>= i] [>= i]
[* i] [* i]
[+ i] [+ i]
[add1 i] [add1 i]
[sub1 i] [sub1 i]
[number? i] [number? i]
[bignum? i] [bignum? i]
[integer? i] [integer? i]
[flonum? i] [flonum? i]
[quotient i] [quotient i]
[remainder i] [remainder i]
[quotient+remainder i] [quotient+remainder i]
[number->string i] [number->string i]
[string->number i] [string->number i]
[flonum->string i] [flonum->string i]
[symbol? i] [symbol? i]
[gensym? i] [gensym? i]
[gensym i] [gensym i]
[getprop i] [getprop i]
[putprop i] [putprop i]
[remprop i] [remprop i]
[property-list i] [property-list i]
[string->symbol i] [string->symbol i]
[symbol->string i] [symbol->string i]
[gensym->unique-string i] [gensym->unique-string i]
[symbol-bound? i] [symbol-bound? i]
[symbol-value i] [symbol-value i]
[set-symbol-value! i] [set-symbol-value! i]
[make-guardian i] [make-guardian i]
[make-input-port i] [make-input-port i]
[make-output-port i] [make-output-port i]
[make-input/output-port i] [make-input/output-port i]
[port-output-index i] [port-output-index i]
[port-output-size i] [port-output-size i]
[port-output-buffer i] [port-output-buffer i]
[set-port-output-index! i] [set-port-output-index! i]
[set-port-output-size! i] [set-port-output-size! i]
[port-input-buffer i] [port-input-buffer i]
[port-input-index i] [port-input-index i]
[port-input-size i] [port-input-size i]
[set-port-input-index! i] [set-port-input-index! i]
[set-port-input-size! i] [set-port-input-size! i]
[output-port? i] [output-port? i]
[input-port? i] [input-port? i]
[port? i] [port? i]
[port-name i] [port-name i]
[input-port-name i] [input-port-name i]
[output-port-name i] [output-port-name i]
[open-input-file i] [open-input-file i]
[with-input-from-file i] [with-input-from-file i]
[with-output-to-file i] [with-output-to-file i]
[open-output-file i] [open-output-file i]
[open-output-string i] [open-output-string i]
[get-output-string i] [get-output-string i]
[close-input-port i] [close-input-port i]
[close-output-port i] [close-output-port i]
[console-input-port i] [console-input-port i]
[console-output-port i] [console-output-port i]
[current-input-port i] [current-input-port i]
[current-output-port i] [current-output-port i]
[standard-input-port i] [standard-input-port i]
[standard-output-port i] [standard-output-port i]
[standard-error-port i] [standard-error-port i]
[flush-output-port i] [flush-output-port i]
[reset-input-port! i] [reset-input-port! i]
[display i] [display i]
[write i] [write i]
[write-char i] [write-char i]
[read i] [read i]
[read-char i] [read-char i]
[read-token i] [read-token i]
[peek-char i] [peek-char i]
[unread-char i] [unread-char i]
[newline i] [newline i]
[printf i] [printf i]
[format i] [format i]
[pretty-print i] [pretty-print i]
[comment-handler i] [comment-handler i]
[print-gensym i] [print-gensym i]
[gensym-count i] [gensym-count i]
[gensym-prefix i] [gensym-prefix i]
[make-hash-table i] [make-hash-table i]
[hash-table? i] [hash-table? i]
[get-hash-table i] [get-hash-table i]
[put-hash-table! i] [put-hash-table! i]
[make-parameter i] [make-parameter i]
[apply i] [apply i]
[values i] [values i]
[call-with-values i] [call-with-values i]
[call/cc i] [call/cc i]
[call/cf i] [call/cf i]
[dynamic-wind i] [dynamic-wind i]
[error i] [error i]
[print-error i] [print-error i]
[error-handler i] [error-handler i]
[interrupt-handler i] [interrupt-handler i]
[exit i] [exit i]
[load i] [load i]
[assembler-output i] [assembler-output i]
[new-cafe i] [new-cafe i]
[command-line-arguments i] [command-line-arguments i]
[record? i] [record? i]
[make-record-type i] [make-record-type i]
[record-type-descriptor i] [record-type-descriptor i]
[record-type-field-names i] [record-type-field-names i]
[record-type-symbol i] [record-type-symbol i]
[record-type-name i] [record-type-name i]
[record-name i] [record-name i]
[record-constructor i] [record-constructor i]
[record-predicate i] [record-predicate i]
[record-length i] [record-length i]
[record-printer i] [record-printer i]
[record-ref i] [record-ref i]
[record-field-accessor i] [record-field-accessor i]
[record-field-mutator i] [record-field-mutator i]
[identifier? i] [identifier? i]
[syntax-error i] [syntax-error i]
[generate-temporaries i] [generate-temporaries i]
[free-identifier=? i] [free-identifier=? i]
[code? i] [code? i]
[immediate? i] [immediate? i]
[pointer-value i] [pointer-value i]
[current-library-collection $boot]
[compile-core-expr-to-port $boot]
[current-primitive-locations $boot]
[boot-library-expand $boot]
[current-library-collection $boot]
[compile-core-expr-to-port $boot]
[current-primitive-locations $boot]
[boot-library-expand $boot]
; (ikarus system $pairs)
[$car $pairs] [$car $pairs]
[$cdr $pairs] [$cdr $pairs]
[$set-car! $pairs] [$set-car! $pairs]
[$set-cdr! $pairs] [$set-cdr! $pairs]
; (ikarus system $lists)
[$memq $lists] [$memq $lists]
[$memv $lists] [$memv $lists]
; (ikarus system $chars)
[$char? $chars] [$char? $chars]
[$char= $chars] [$char= $chars]
[$char< $chars] [$char< $chars]
@ -418,17 +418,17 @@
[$char>= $chars] [$char>= $chars]
[$char->fixnum $chars] [$char->fixnum $chars]
[$fixnum->char $chars] [$fixnum->char $chars]
; (ikarus system $strings)
[$make-string $strings] [$make-string $strings]
[$string-ref $strings] [$string-ref $strings]
[$string-set! $strings] [$string-set! $strings]
[$string-length $strings] [$string-length $strings]
; (ikarus system $vectors)
[$make-vector $vectors] [$make-vector $vectors]
[$vector-length $vectors] [$vector-length $vectors]
[$vector-ref $vectors] [$vector-ref $vectors]
[$vector-set! $vectors] [$vector-set! $vectors]
; (ikarus system $fx)
[$fxzero? $fx] [$fxzero? $fx]
[$fxadd1 $fx] [$fxadd1 $fx]
[$fxsub1 $fx] [$fxsub1 $fx]
@ -448,7 +448,7 @@
[$fx+ $fx] [$fx+ $fx]
[$fx* $fx] [$fx* $fx]
[$fx- $fx] [$fx- $fx]
; (ikarus system $symbols)
[$make-symbol $symbols] [$make-symbol $symbols]
[$symbol-unique-string $symbols] [$symbol-unique-string $symbols]
[$symbol-value $symbols] [$symbol-value $symbols]
@ -459,7 +459,7 @@
[$set-symbol-unique-string! $symbols] [$set-symbol-unique-string! $symbols]
[$set-symbol-plist! $symbols] [$set-symbol-plist! $symbols]
[$unbound-object? $symbols] [$unbound-object? $symbols]
; (ikarus system $records)
[base-rtd $records] [base-rtd $records]
[$record-set! $records] [$record-set! $records]
[$record-ref $records] [$record-ref $records]
@ -468,7 +468,7 @@
[$make-record $records] [$make-record $records]
[$record? $records] [$record? $records]
[$record/rtd? $records] [$record/rtd? $records]
; (ikarus system $ports)
[$make-port/input $ports] [$make-port/input $ports]
[$make-port/output $ports] [$make-port/output $ports]
[$make-port/both $ports] [$make-port/both $ports]
@ -483,7 +483,7 @@
[$set-port-input-size! $ports] [$set-port-input-size! $ports]
[$set-port-output-index! $ports] [$set-port-output-index! $ports]
[$set-port-output-size! $ports] [$set-port-output-size! $ports]
; (ikarus system $codes)
[$closure-code $codes] [$closure-code $codes]
[$code->closure $codes] [$code->closure $codes]
[$code-reloc-vector $codes] [$code-reloc-vector $codes]
@ -491,7 +491,7 @@
[$code-size $codes] [$code-size $codes]
[$code-ref $codes] [$code-ref $codes]
[$code-set! $codes] [$code-set! $codes]
; (ikarus system $tcbuckets)
[$make-tcbucket $tcbuckets] [$make-tcbucket $tcbuckets]
[$tcbucket-key $tcbuckets] [$tcbucket-key $tcbuckets]
[$tcbucket-val $tcbuckets] [$tcbucket-val $tcbuckets]
@ -499,7 +499,7 @@
[$set-tcbucket-val! $tcbuckets] [$set-tcbucket-val! $tcbuckets]
[$set-tcbucket-next! $tcbuckets] [$set-tcbucket-next! $tcbuckets]
[$set-tcbucket-tconc! $tcbuckets] [$set-tcbucket-tconc! $tcbuckets]
; (ikarus system $io)
[$flush-output-port $io] [$flush-output-port $io]
[$reset-input-port! $io] [$reset-input-port! $io]
[$close-input-port $io] [$close-input-port $io]
@ -508,9 +508,9 @@
[$read-char $io] [$read-char $io]
[$peek-char $io] [$peek-char $io]
[$unread-char $io] [$unread-char $io]
; (ikarus system $arg-list)
[$arg-list $arg-list] [$arg-list $arg-list]
; (ikarus system $stack)
[$$apply $stack] [$$apply $stack]
[$fp-at-base $stack] [$fp-at-base $stack]
[$primitive-call/cc $stack] [$primitive-call/cc $stack]
@ -519,7 +519,7 @@
[$seal-frame-and-call $stack] [$seal-frame-and-call $stack]
[$make-call-with-values-procedure $stack] [$make-call-with-values-procedure $stack]
[$make-values-procedure $stack] [$make-values-procedure $stack]
; (ikarus system $interrupts)
[$interrupted? $interrupts] [$interrupted? $interrupts]
[$unset-interrupted! $interrupts] [$unset-interrupted! $interrupts]
;;; the following must be defined but they don't have ;;; the following must be defined but they don't have
@ -549,15 +549,15 @@
[syntax-dispatch ] [syntax-dispatch ]
)) ))
(define (verify-procedures-map) (define (verify-map)
(for-each (define (f x)
(lambda (x) (for-each
(for-each (lambda (x)
(lambda (x) (unless (assq x library-legend)
(unless (assq x library-legend) (error 'verify "~s is not in the libraries list" x)))
(error 'verify "~s is not in the libraries list" x))) (cdr x)))
(cdr x))) (for-each f ikarus-procedures-map)
ikarus-procedures-map)) (for-each f ikarus-macros-map))
(define (make-collection) (define (make-collection)
(let ([set '()]) (let ([set '()])
@ -667,7 +667,7 @@
[env '()]) [env '()])
(for-each (for-each
(lambda (file) (lambda (file)
(printf "expanding ~s\n" file) ;(printf "expanding ~s\n" file)
(load file (load file
(lambda (x) (lambda (x)
(let-values ([(code export-subst export-env) (let-values ([(code export-subst export-env)
@ -684,7 +684,7 @@
(reverse (list* (car code*) code (cdr code*))) (reverse (list* (car code*) code (cdr code*)))
export-locs))))) export-locs)))))
(verify-procedures-map) (verify-map)
(printf "expanding ...\n") (printf "expanding ...\n")