mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-23 21:13:18 -08:00
Code Issues Projects Releases Packages Wiki Activity

Look up a lexical macro before a compiler macro.

Browse source 
Fixes #83. Fixes #237.
This commit is contained in:
Daniel Kochmanski 2018-02-12 16:02:00 +01:00
parent 857ea3d928
commit d9da8648cd
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cmp/cmpeval.lsp
View file

@ -68,6 +68,9 @@
(unoptimized-long-call `#',fname args)))
((setq fd (local-function-ref fname))
(c1call-local fname fd args))
((and macros-allowed ; macrolet
(setq fd (cmp-env-search-macro fname)))
(cmp-expand-macro fd (list* fname args)))
((and (setq can-inline (inline-possible fname))
(setq fd (compiler-macro-function fname))
(progn
@ -81,8 +84,8 @@
(clos-compiler-macro-expand fname args))
success))
fd)
((and macros-allowed
(setq fd (cmp-macro-function fname)))
((and macros-allowed ; global macro
(setq fd (macro-function fname)))
(cmp-expand-macro fd (list* fname args)))
((and (setq can-inline (declared-inline-p fname))
(consp can-inline)