mirror of
https://github.com/justinethier/cyclone.git
synced 2025-05-19 05:39:17 +02:00
Issue 395 - Cleanup, use _expand instead of macro:expand
This commit is contained in:
parent
5911336d16
commit
dd294c78ad
1 changed files with 2 additions and 4 deletions
|
@ -611,18 +611,16 @@
|
||||||
#f))
|
#f))
|
||||||
(expand
|
(expand
|
||||||
(lambda (macro-op)
|
(lambda (macro-op)
|
||||||
;(define use-env (env:extend-environment '() '() '()))
|
|
||||||
(if (Cyc-macro? macro-op)
|
(if (Cyc-macro? macro-op)
|
||||||
;; Compiled macro, call directly
|
;; Compiled macro, call directly
|
||||||
(let* ((expanded
|
(let* ((expanded (_expand exp a-env rename-env '() local-renamed))
|
||||||
(macro:expand exp (list 'macro macro-op) a-env rename-env local-renamed))
|
|
||||||
(cleaned (macro:cleanup expanded rename-env)))
|
(cleaned (macro:cleanup expanded rename-env)))
|
||||||
(analyze cleaned
|
(analyze cleaned
|
||||||
a-env
|
a-env
|
||||||
rename-env
|
rename-env
|
||||||
local-renamed))
|
local-renamed))
|
||||||
;; Interpreted macro, build expression and eval
|
;; Interpreted macro, build expression and eval
|
||||||
(let* ((expanded (macro:expand exp (list 'macro macro-op) a-env rename-env local-renamed))
|
(let* ((expanded (_expand exp a-env rename-env '() local-renamed))
|
||||||
(cleaned (macro:cleanup expanded rename-env)))
|
(cleaned (macro:cleanup expanded rename-env)))
|
||||||
(analyze
|
(analyze
|
||||||
cleaned
|
cleaned
|
||||||
|
|
Loading…
Add table
Reference in a new issue