shithub: sl

Info  •  Files  •  Log  •  Branches

expand -> macroexpand

binary files a/boot/flisp.boot.builtin b/boot/flisp.boot.builtin differ

--- a/src/system.lsp

+++ b/src/system.lsp

@@ -796,7 +796,7 @@

         (if f (apply f (cdr e))

             e))))

-(def (expand e)

+(def (macroexpand e)

   ; symbol resolves to toplevel; i.e. has no shadowing definition

   (def (top? s env) (not (or (bound? s) (assq s env))))

@@ -934,7 +934,7 @@

                 (else                   (default))))))

   (expand-in e ()))

-(def (eval x) ((compile-thunk (expand x))))

+(def (eval x) ((compile-thunk (macroexpand x))))

 (def (load-process x) (eval x))

--- a/test/perf.lsp

+++ b/test/perf.lsp

@@ -12,8 +12,8 @@

 (set! r (map-int (λ (x) (mod (+ (* x 9421) 12345) 1024)) 1000))

 (time (simple-sort r))

-(princ "expand: ")

-(time (dotimes (n 5000) (expand '(dotimes (i 100) body1 body2))))

+(princ "macroexpand: ")

+(time (dotimes (n 5000) (macroexpand '(dotimes (i 100) body1 body2))))

 (def (my-append . lsts)

   (cond ((not lsts) nil)

--- a/tools/mkboot0.lsp

+++ b/tools/mkboot0.lsp

@@ -3,7 +3,7 @@

 (def update-compiler

    (let ((C ()))

      (with-bindings

-       ((eval (λ (x) (set! C (cons (compile-thunk (expand x)) C)))))

+       ((eval (λ (x) (set! C (cons (compile-thunk (macroexpand x)) C)))))

        (begin

          (load "instructions.lsp")

          (load "compiler.lsp")))

@@ -16,7 +16,7 @@

     (let next ((E (read in)))

       (if (not (io-eof? in))

           (begin

-             (print (compile-thunk (expand E)))

+             (print (compile-thunk (macroexpand E)))

                  (newline)

                  (next (read in)))))

     (io-close in)))