From 12d16dfbbe41f7b0ebacb5ad713e55787907b377 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Mon, 15 Jan 2018 12:53:16 -0500
Subject: [PATCH] Cleanup from previous changes, added missing args

---
 scheme/eval.sld | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/scheme/eval.sld b/scheme/eval.sld
index ca57f27f..382960f5 100644
--- a/scheme/eval.sld
+++ b/scheme/eval.sld
@@ -1103,12 +1103,18 @@
             (quote? this-exp)
             (define-c? 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)
 ;(log this-exp)
         (_expand-body 
           (cons
-            (_expand this-exp env rename-env local-env)
+            (_expand this-exp env rename-env local-env local-renamed)
             result)
           (cdr exp)
           env
@@ -1128,7 +1134,8 @@
           (cdr exp)
           env
           rename-env 
-          local-env local-renamed))
+          local-env 
+          local-renamed))
        ;; Splice in begin contents and keep expanding body
        ((begin? this-exp)
         (let* ((expr this-exp)
@@ -1139,7 +1146,8 @@
          (append begin-exprs (cdr exp))
          env
          rename-env
-         local-env local-renamed)))
+         local-env 
+         local-renamed)))
        ((app? this-exp)
         (cond
           ((symbol? (caar exp))
@@ -1161,30 +1169,33 @@
                     (cdr exp))
                   env
                   rename-env
-                  local-env local-renamed))
+                  local-env 
+                  local-renamed))
               ;; No macro, use main expand function to process
               (_expand-body
                (cons 
                  (map
-                  (lambda (expr) (_expand expr env rename-env local-env))
+                  (lambda (expr) (_expand expr env rename-env local-env local-renamed))
                   this-exp)
                  result)
                (cdr exp)
                env
                rename-env
-               local-env local-renamed))))
+               local-env 
+               local-renamed))))
           (else
 ;(log 'app)
            (_expand-body
              (cons 
                (map
-                (lambda (expr) (_expand expr env rename-env local-env))
+                (lambda (expr) (_expand expr env rename-env local-env local-renamed))
                 this-exp)
                result)
              (cdr exp)
              env
              rename-env
-             local-env local-renamed))))
+             local-env 
+             local-renamed))))
        (else
         (error "unknown exp: " this-exp))))))