diff --git a/src/ikarus.boot b/src/ikarus.boot index 2da2471..2f1dd92 100644 Binary files a/src/ikarus.boot and b/src/ikarus.boot differ diff --git a/src/libsyntax.ss b/src/libsyntax.ss index a952e2f..ed1df0b 100644 --- a/src/libsyntax.ss +++ b/src/libsyntax.ss @@ -318,8 +318,7 @@ [b (label->binding label r)] [type (binding-type b)]) (case type - [(define define-syntax core-macro begin macro - module set!) + [(define define-syntax core-macro begin macro module set!) (values type (binding-value b) id)] [else (values 'call #f #f)])) diff --git a/src/libtoplevel.ss b/src/libtoplevel.ss index 2185144..b969ee6 100644 --- a/src/libtoplevel.ss +++ b/src/libtoplevel.ss @@ -16,11 +16,8 @@ ;;; Finally, we're ready to evaluate the files and enter the cafe. (library (ikarus interaction) - (export bar) + (export) (import (scheme) (ikarus greeting)) - - (define bar 'i-am-an-exported-primitive-named-foo) - (let-values ([(files script args) (let f ([args (command-line-arguments)]) (cond diff --git a/src/makefile.ss b/src/makefile.ss index 15d3e46..82faf86 100755 --- a/src/makefile.ss +++ b/src/makefile.ss @@ -88,7 +88,7 @@ (define-record library (code export-subst export-env)) - (define must-export-primitives '(bar)) + (define export-as-primitive '()) (define (expand-file filename) (map (lambda (x) @@ -114,9 +114,10 @@ (lambda (v) (let ([name (car v)]) (cond - [(memq name must-export-primitives) + [(memq name export-as-primitive) (cons (cons label (cons 'core-prim name)) r)] - [else r])))] + [else + (cons (cons label (cons 'global val)) r)])))] [else (error #f "cannot find binding for ~s" x)])] [else (error #f "cannot handle export for ~s" x)])))) (let f ([r r])