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

Basic way to preserve local env within macro

Browse source
This commit is contained in:
Justin Ethier 2018-01-18 13:26:48 -05:00
parent e0220ea62d
commit bf9591c451
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scheme/eval.sld
View file

@ -746,10 +746,16 @@
;; Macro section
(define (macro:macro? exp defined-macros) (assoc (car exp) defined-macros))
(define (macro:expand exp macro mac-env rename-env local-renamed)
(define (macro:get-local-renames macro current-rename-lis)
(if (eq? 3 (length macro))
(caddr macro)
current-rename-lis))
(define (macro:expand exp macro mac-env rename-env local-renamed-lis)
(let* ((use-env (env:extend-environment '() '() '()))
(compiled-macro? (or (Cyc-macro? (Cyc-get-cvar (cadr macro)))
(procedure? (cadr macro))))
(local-renamed (macro:get-local-renames macro local-renamed-lis))
(result #f))
;(newline)
;(display "/* ")
@ -1004,7 +1010,10 @@
(if (macro:syntax-rules? (env:lookup (car binding) env #f))
;; TODO: is this ok?
(cadr (_expand binding env rename-env local-env local-renamed))
binding-body)))))
binding-body)
;; Preserve local renames at macro definition time
local-renamed
))))
bindings))
(new-local-macro-env (append bindings-as-macros local-env))
)