cwebber pushed a commit to branch wip-elisp-rebased
in repository guile.
commit 8dcb633909b5b5c36819bb297af216f18b3de769
Author: Robin Templeton <[email protected]>
AuthorDate: Mon Aug 4 23:11:29 2014 -0400
compiler macros
(Best-ability ChangeLog annotation added by Christine Lemmer-Webber.)
* module/language/elisp/boot.el (%define-compiler-macro): New macro.
* module/language/elisp/compile-tree-il.scm: New function.
(compile-pair): Update to handle %compiler-macro condition.
---
module/language/elisp/boot.el | 12 ++++++++++++
module/language/elisp/compile-tree-il.scm | 12 ++++++++++++
2 files changed, 24 insertions(+)
diff --git a/module/language/elisp/boot.el b/module/language/elisp/boot.el
index bef4c1d..fe9af29 100644
--- a/module/language/elisp/boot.el
+++ b/module/language/elisp/boot.el
@@ -41,6 +41,18 @@
(eval-when-compile ,@body)
(progn ,@body)))
+(defmacro %define-compiler-macro (name args &rest body)
+ `(eval-and-compile
+ (%funcall
+ (@ (language elisp runtime) set-symbol-plist!)
+ ',name
+ (%funcall
+ (@ (guile) cons*)
+ '%compiler-macro
+ #'(lambda ,args ,@body)
+ (%funcall (@ (language elisp runtime) symbol-plist) ',name)))
+ ',name))
+
(eval-and-compile
(defun eval (form)
(%funcall (@ (language elisp runtime) eval-elisp) form)))
diff --git a/module/language/elisp/compile-tree-il.scm
b/module/language/elisp/compile-tree-il.scm
index 4304fba..24d6cc4 100644
--- a/module/language/elisp/compile-tree-il.scm
+++ b/module/language/elisp/compile-tree-il.scm
@@ -788,6 +788,11 @@
(make-void loc))
(else (report-error loc "bad %set-lexical-binding-mode" args))))
+(define (eget s p)
+ (if (symbol-fbound? 'get)
+ ((symbol-function 'get) s p)
+ #nil))
+
;;; Compile a compound expression to Tree-IL.
(define (compile-pair loc expr)
@@ -800,6 +805,13 @@
((find-operator operator 'macro)
=> (lambda (macro-function)
(compile-expr (apply macro-function arguments))))
+ ((and (symbol? operator)
+ (eget operator '%compiler-macro))
+ => (lambda (compiler-macro-function)
+ (let ((new (compiler-macro-function expr)))
+ (if (eq? new expr)
+ (compile-expr `(%funcall (%function ,operator) ,@arguments))
+ (compile-expr new)))))
(else
(compile-expr `(%funcall (%function ,operator) ,@arguments))))))
