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

Issue #331 - Ensure definitions from begin's are spliced in

Browse source
This commit is contained in:
Justin Ethier 2019-08-06 22:06:43 -04:00
parent 2d398573a5
commit 80b861664a
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
scheme/eval.sld
View file

@ -614,17 +614,19 @@
rename-env
local-renamed))))))
(cond
; ;; special case
; ((eq? 'begin op)
;; special case - a begin can splice in definitions, so we can't use the
;; built-in macro that just expands them in a new lambda scope. Instead
;; we nest them below within the same lexical environment.
((eq? 'begin op)
;(newline)
;(display "/* ")
;(write (list 'begin exp))
;(write (list exp))
;(display "*/ ")
; (let ((fncs (map (lambda (expr)
; (pre-analyze-application expr a-env rename-env local-renamed))
; (cdr exp))))
; (lambda (env)
; (foldl (lambda (fnc _) (fnc env)) #f fncs))))
(let ((fncs (map (lambda (expr)
(analyze expr a-env rename-env local-renamed))
(cdr exp))))
(lambda (env)
(foldl (lambda (fnc _) (fnc env)) #f fncs))))
;; compiled macro
((Cyc-macro? var)
(expand var))
@ -806,10 +808,10 @@
(procedure? (cadr macro))))
(local-renamed (macro:get-local-renames macro local-renamed-lis))
(result #f))
; (newline)
; (display "/* ")
; (write (list 'macro:expand exp macro compiled-macro? local-renamed))
; (display "*/ ")
;(newline)
;(display "/* ")
;(write (list 'macro:expand exp macro compiled-macro? local-renamed))
;(display "*/ ")
;; Invoke ER macro
(set! result
@ -829,12 +831,12 @@
(Cyc-er-rename use-env mac-env local-renamed)
(Cyc-er-compare? use-env rename-env))
mac-env))))
; (newline)
; (display "/* ")
; (write (list 'macro:expand exp macro compiled-macro?))
; (newline)
; (write (list result))
; (display "*/ ")
;(newline)
;(display "/* ")
;(write (list 'macro:expand exp macro compiled-macro?))
;(newline)
;(write (list result))
;(display "*/ ")
(macro:add-renamed-vars! use-env rename-env)
result))