Macro-expand interpreted code during load.

* src/lread.c (readevalloop): Call internal-macroexpand-for-load to perform
eager (load-time) macro-expansion.
* src/lisp.mk (lisp): Add macroexp.
* lisp/loadup.el: Load macroexp.  Remove hack.
* lisp/emacs-lisp/macroexp.el (macroexp--eval-if-compile): New function.
(macroexp--expand-all): Use it to get better warnings.
(macroexp--backtrace, macroexp--trim-backtrace-frame)
(internal-macroexpand-for-load): New functions.
(macroexp--pending-eager-loads): New var.
(emacs-startup-hook): New hack to replace one in loadup.el.
* lisp/emacs-lisp/cl-macs.el (cl--compiler-macro-list*)
(cl--compiler-macro-cXXr): Move to top, before they can be used.
(cl-psetf): Simplify.
(cl-defstruct): Add indent rule.

3 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1dd307b16de..b2634c4fdc4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (readevalloop): Call internal-macroexpand-for-load to perform
+        eager (load-time) macro-expansion.
+        * lisp.mk (lisp): Add macroexp.
+
 2012-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify redefinition of 'abort' (Bug#12316).
diff --git a/src/lisp.mk b/src/lisp.mk
index 162d8819917..3d60e07dea3 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -65,6 +65,7 @@ lisp = \
         $(lispsource)/format.elc \
         $(lispsource)/bindings.elc \
         $(lispsource)/files.elc \
+        $(lispsource)/emacs-lisp/macroexp.elc \
         $(lispsource)/cus-face.elc \
         $(lispsource)/faces.elc \
         $(lispsource)/button.elc \
diff --git a/src/lread.c b/src/lread.c
index c15c8da3f7b..4f3a93b16b4 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1680,6 +1680,17 @@ readevalloop (Lisp_Object readcharfun,
   int whole_buffer = 0;
   /* 1 on the first time around.  */
   int first_sexp = 1;
+  Lisp_Object macroexpand = intern ("internal-macroexpand-for-load");
+
+  if (NILP (Ffboundp (macroexpand))
+      /* Don't macroexpand in .elc files, since it should have been done
+         already.  We actually don't know whether we're in a .elc file or not,
+         so we use circumstancial evidence: .el files normally go through
+         Vload_source_file_function -> load-with-code-conversion
+         -> eval-buffer.  */
+      || EQ (readcharfun, Qget_file_char)
+      || EQ (readcharfun, Qget_emacs_mule_file_char))
+    macroexpand = Qnil;
 
   if (MARKERP (readcharfun))
     {
@@ -1809,6 +1820,8 @@ readevalloop (Lisp_Object readcharfun,
       unbind_to (count1, Qnil);
 
       /* Now eval what we just read.  */
+      if (!NILP (macroexpand))
+        val = call1 (macroexpand, val);
       val = eval_sub (val);
 
       if (printflag)