[Guile-commits] 27/36: only evaluate top-level macro definitions

[Christopher Allan Webber]

cwebber pushed a commit to branch wip-elisp
in repository guile.

commit 93b8b53c65995a205abe2b97956a472e4c6fd2e0
Author: Robin Templeton <address@hidden>
Date:   Mon Aug 11 06:04:28 2014 -0400

    only evaluate top-level macro definitions
    
    (Best-ability ChangeLog annotation added by Christopher Allan Webber.)
    
    * module/language/elisp/compile-tree-il.scm (defmacro): Check to see
      whether toplevel? is true before compiling a macro.
---
 module/language/elisp/compile-tree-il.scm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/module/language/elisp/compile-tree-il.scm 
b/module/language/elisp/compile-tree-il.scm
index 702272e..daa0623 100644
--- a/module/language/elisp/compile-tree-il.scm
+++ b/module/language/elisp/compile-tree-il.scm
@@ -782,7 +782,8 @@
                                           args
                                           body))))
                   (make-const loc name))))
-           (compile tree-il #:from 'tree-il #:to 'value)
+           (when (fluid-ref toplevel?)
+             (compile tree-il #:from 'tree-il #:to 'value))
            tree-il)))
     (else (report-error loc "bad defmacro" args))))