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

WIP, staging changes to fix match macro

Browse source
This commit is contained in:
Justin Ethier 2018-02-06 13:34:45 -05:00
parent b22d1d906d
commit 85df40fa1c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scheme/eval.sld
View file

@ -545,6 +545,8 @@
(error "Empty sequence -- ANALYZE")) (error "Empty sequence -- ANALYZE"))
(loop (car procs) (cdr procs)))) (loop (car procs) (cdr procs))))
TODO: instead of defining use-env inline, need to define it as part of eval and pass it around.
that way subsequent calls to analyze can pick it up so symbols can be renamed properly
(define (pre-analyze-application exp a-env) (define (pre-analyze-application exp a-env)
;; Notes: ;; Notes:
;; look up symbol in env, and expand if it is a macro ;; look up symbol in env, and expand if it is a macro
@ -564,7 +566,7 @@
(analyze (apply macro-op (analyze (apply macro-op
(list (cons (car exp) (operands exp)) (list (cons (car exp) (operands exp))
(Cyc-er-rename use-env a-env '()) (Cyc-er-rename use-env a-env '())
(Cyc-er-compare? use-env use-env))) (Cyc-er-compare? use-env a-env)))
a-env) a-env)
;; Interpreted macro, build expression and eval ;; Interpreted macro, build expression and eval
(let ((expr (cons macro-op (let ((expr (cons macro-op
@ -572,7 +574,7 @@
(list (cons (car exp) (list (cons (car exp)
(operands exp)))) (operands exp))))
(Cyc-er-rename use-env a-env '()) (Cyc-er-rename use-env a-env '())
(Cyc-er-compare? use-env use-env))))) (Cyc-er-compare? use-env a-env)))))
(analyze (analyze
(eval expr a-env) ;; Expand macro (eval expr a-env) ;; Expand macro
a-env)))))) a-env))))))