Cleanup from previous changes, added missing args

This commit is contained in:
Justin Ethier 2018-01-15 12:53:16 -05:00
parent 910662135b
commit 12d16dfbbe

View file

@ -1103,12 +1103,18 @@
(quote? this-exp) (quote? this-exp)
(define-c? this-exp)) (define-c? this-exp))
;(log this-exp) ;(log this-exp)
(_expand-body (cons this-exp result) (cdr exp) env rename-env local-env local-renamed)) (_expand-body
(cons this-exp result)
(cdr exp)
env
rename-env
local-env
local-renamed))
((define? this-exp) ((define? this-exp)
;(log this-exp) ;(log this-exp)
(_expand-body (_expand-body
(cons (cons
(_expand this-exp env rename-env local-env) (_expand this-exp env rename-env local-env local-renamed)
result) result)
(cdr exp) (cdr exp)
env env
@ -1128,7 +1134,8 @@
(cdr exp) (cdr exp)
env env
rename-env rename-env
local-env local-renamed)) local-env
local-renamed))
;; Splice in begin contents and keep expanding body ;; Splice in begin contents and keep expanding body
((begin? this-exp) ((begin? this-exp)
(let* ((expr this-exp) (let* ((expr this-exp)
@ -1139,7 +1146,8 @@
(append begin-exprs (cdr exp)) (append begin-exprs (cdr exp))
env env
rename-env rename-env
local-env local-renamed))) local-env
local-renamed)))
((app? this-exp) ((app? this-exp)
(cond (cond
((symbol? (caar exp)) ((symbol? (caar exp))
@ -1161,30 +1169,33 @@
(cdr exp)) (cdr exp))
env env
rename-env rename-env
local-env local-renamed)) local-env
local-renamed))
;; No macro, use main expand function to process ;; No macro, use main expand function to process
(_expand-body (_expand-body
(cons (cons
(map (map
(lambda (expr) (_expand expr env rename-env local-env)) (lambda (expr) (_expand expr env rename-env local-env local-renamed))
this-exp) this-exp)
result) result)
(cdr exp) (cdr exp)
env env
rename-env rename-env
local-env local-renamed)))) local-env
local-renamed))))
(else (else
;(log 'app) ;(log 'app)
(_expand-body (_expand-body
(cons (cons
(map (map
(lambda (expr) (_expand expr env rename-env local-env)) (lambda (expr) (_expand expr env rename-env local-env local-renamed))
this-exp) this-exp)
result) result)
(cdr exp) (cdr exp)
env env
rename-env rename-env
local-env local-renamed)))) local-env
local-renamed))))
(else (else
(error "unknown exp: " this-exp)))))) (error "unknown exp: " this-exp))))))