Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-12 15:27:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring

Browse source
This commit is contained in:
Justin Ethier 2016-04-30 02:50:48 -04:00
parent 6ed5d735f6
commit ce801e092a
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scheme/cyclone/transforms.sld
View file

@ -903,19 +903,18 @@
(append begin-exprs (cdr exp))
env)))
((app? this-exp)
(let ((macro #f))
(when (and (app? this-exp)
(symbol? (caar exp)))
(set! macro (env:lookup (caar exp) env #f)))
(if (tagged-list? 'macro macro)
(cond
((symbol? (caar exp))
(let ((val (env:lookup (caar exp) env #f)))
(if (tagged-list? 'macro val)
;; Expand macro here so we can catch begins in the expanded code,
;; including nested begins
(let ((expanded (macro:expand this-exp macro env)))
;; Call with expanded macro in case we need to expand again
(expand-body
result
(cons expanded (cdr exp))
env))
(expand-body
result
(cons
(macro:expand this-exp val env)
(cdr exp))
env)
;; No macro, use main expand function to process
(expand-body
(cons
@ -925,6 +924,15 @@
result)
(cdr exp)
env))))
(else
(expand-body
(cons
(map
(lambda (expr) (expand expr env))
this-exp)
result)
(cdr exp)
env))))
(else
(error "unknown exp: " this-exp))))))