~ chicken-core (chicken-5) 1a0a597e9822bcc91bcfb2317fdf9832e0e5cbff


commit 1a0a597e9822bcc91bcfb2317fdf9832e0e5cbff
Author:     LemonBoy <thatlemon@gmail.com>
AuthorDate: Mon May 15 19:58:17 2017 +0200
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Sun May 21 12:40:35 2017 +1200

    Small code cleanup in the expander
    
    Merge ##sys#undefine-macro! with ##sys#unregister-macro since the latter
    was just a wrapper around the former.
    
    Signed-off-by: Evan Hanson <evhan@foldling.org>

diff --git a/expand.scm b/expand.scm
index 0395be4a..3c04a4f7 100644
--- a/expand.scm
+++ b/expand.scm
@@ -206,18 +206,14 @@
       (and-let* ((l (lookup sym (##sys#macro-environment))))
 	(pair? l))))
 
-(define (##sys#unregister-macro name)
+(define (##sys#undefine-macro! name)
   (##sys#macro-environment
     ;; this builds up stack, but isn't used often anyway...
-    (let loop ((me (##sys#macro-environment)) (me2 '()))
+    (let loop ((me (##sys#macro-environment)))
       (cond ((null? me) '())
 	    ((eq? name (caar me)) (cdr me))
 	    (else (cons (car me) (loop (cdr me))))))))
 
-(define (##sys#undefine-macro! name)
-  (##sys#unregister-macro name) )
-
-
 ;; The basic macro-expander
 
 (define (##sys#expand-0 exp dse cs?)
Trap