Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-13 07:47:39 +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)) (append begin-exprs (cdr exp))
env))) env)))
((app? this-exp) ((app? this-exp)
(let ((macro #f)) (cond
(when (and (app? this-exp) ((symbol? (caar exp))
(symbol? (caar exp))) (let ((val (env:lookup (caar exp) env #f)))
(set! macro (env:lookup (caar exp) env #f))) (if (tagged-list? 'macro val)
(if (tagged-list? 'macro macro)
;; Expand macro here so we can catch begins in the expanded code, ;; Expand macro here so we can catch begins in the expanded code,
;; including nested begins ;; including nested begins
(let ((expanded (macro:expand this-exp macro env))) (expand-body
;; Call with expanded macro in case we need to expand again result
(expand-body (cons
result (macro:expand this-exp val env)
(cons expanded (cdr exp)) (cdr exp))
env)) env)
;; No macro, use main expand function to process ;; No macro, use main expand function to process
(expand-body (expand-body
(cons (cons
@ -925,6 +924,15 @@
result) result)
(cdr exp) (cdr exp)
env)))) env))))
(else
(expand-body
(cons
(map
(lambda (expr) (expand expr env))
this-exp)
result)
(cdr exp)
env))))
(else (else
(error "unknown exp: " this-exp)))))) (error "unknown exp: " this-exp))))))