From c404a6b5887adc514a8a615638fd8501117bb54b Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Fri, 15 Dec 2017 18:10:28 -0500
Subject: [PATCH] Working letrec-syntax

Need to understand a bit more why this works, though...
---
 scheme/eval.sld | 50 ++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/scheme/eval.sld b/scheme/eval.sld
index ef17f2e5..21b48bee 100644
--- a/scheme/eval.sld
+++ b/scheme/eval.sld
@@ -471,24 +471,24 @@
 (define (analyze-letrec-syntax exp a-env)
   (let* ((rename-env (env:extend-environment '() '() '()))
 
-; (vars (foldl (lambda (lis acc) (append acc (car lis))) '() a-env))
-; (vals (foldl (lambda (lis acc) (append acc (cdr lis))) '() a-env))
-; (zipped (apply map list vars (list vals)))
-; (defined-macros
-;   (filter
-;     (lambda (v)
-;       (Cyc-macro? (Cyc-get-cvar (cadr v))))
-;     zipped))
-; (macro-env 
-;   (env:extend-environment
-;     (map car defined-macros)
-;     (map (lambda (v)
-;            (list 'macro (cadr v)))
-;          defined-macros)
-;     '())) ;; base-env
+ (vars (foldl (lambda (lis acc) (append acc (car lis))) '() a-env))
+ (vals (foldl (lambda (lis acc) (append acc (cdr lis))) '() a-env))
+ (zipped (apply map list vars (list vals)))
+ (defined-macros
+   (filter
+     (lambda (v)
+       (Cyc-macro? (Cyc-get-cvar (cadr v))))
+     zipped))
+ (macro-env 
+   (env:extend-environment
+     (map car defined-macros)
+     (map (lambda (v)
+            (list 'macro (cadr v)))
+          defined-macros)
+     (create-environment '() '())))
 
-         ;(expanded (expand exp macro-env rename-env))
-         (expanded (expand exp a-env rename-env))
+         (expanded (expand exp macro-env rename-env))
+         ;(expanded (expand exp a-env rename-env))
          (cleaned (macro:cleanup expanded rename-env))
         )
     (analyze cleaned a-env)))
@@ -876,10 +876,10 @@
       (current-error-port))
     (newline (current-error-port)))
   ;(log exp)
-(display "/* ")
-(write `(expand ,exp))
-(display "*/ ")
-(newline)
+;;(display "/* ")
+;;(write `(expand ,exp))
+;;(display "*/ ")
+;;(newline)
   (cond
     ((const? exp)      exp)
     ((prim? exp)       exp)
@@ -1006,10 +1006,10 @@
                            #;(if v
                                v
                                (env:lookup (car exp) rename-env #f)))))))
-(display "/* ")
-(write `(app DEBUG ,(car exp) ,val ,env ,local-env ,rename-env ,(env:lookup (car exp) env #f)))
-(display "*/ ")
-(newline)
+;;(display "/* ")
+;;(write `(app DEBUG ,(car exp) ,val ,env ,local-env ,rename-env ,(env:lookup (car exp) env #f)))
+;;(display "*/ ")
+;;(newline)
           (cond
            ((tagged-list? 'macro val)
             (_expand ; Could expand into another macro