From 2a3946e713821880ecc47580e754315349f2fe73 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 13 Nov 2017 20:02:18 -0400
Subject: - Type-vars no longer get deleted. - Fixed some bugs.

---
 new-luxc/source/luxc/lang/translation.lux | 35 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation.lux')

diff --git a/new-luxc/source/luxc/lang/translation.lux b/new-luxc/source/luxc/lang/translation.lux
index 779cb92fd..c4ebf3642 100644
--- a/new-luxc/source/luxc/lang/translation.lux
+++ b/new-luxc/source/luxc/lang/translation.lux
@@ -39,24 +39,25 @@
   (case code
     (^code ("lux def" (~ [_ (#;Symbol ["" def-name])]) (~ valueC) (~ metaC)))
     (hostL;with-context def-name
-      (do meta;Monad<Meta>
-        [[_ metaA] (&;with-scope
-                     (&;with-expected-type Code
-                       (analyse metaC)))
-         metaI (expressionT;translate (expressionS;synthesize metaA))
-         metaV (evalT;eval metaI)
-         [_ valueT valueA] (&;with-scope
-                             (if (meta;type? (:! Code metaV))
-                               (&;with-expected-type Type
+      (&;with-fresh-type-env
+        (do meta;Monad<Meta>
+          [[_ metaA] (&;with-scope
+                       (&;with-expected-type Code
+                         (analyse metaC)))
+           metaI (expressionT;translate (expressionS;synthesize metaA))
+           metaV (evalT;eval metaI)
+           [_ valueT valueA] (&;with-scope
+                               (if (meta;type? (:! Code metaV))
                                  (do @
-                                   [valueA (analyse valueC)]
-                                   (wrap [Type valueA])))
-                               (commonA;with-unknown-type
-                                 (analyse valueC))))
-         valueI (expressionT;translate (expressionS;synthesize valueA))
-         _ (&;with-scope
-             (statementT;translate-def def-name valueT valueI metaI (:! Code metaV)))]
-        (wrap [])))
+                                   [valueA (&;with-expected-type Type
+                                             (analyse valueC))]
+                                   (wrap [Type valueA]))
+                                 (commonA;with-unknown-type
+                                   (analyse valueC))))
+           valueI (expressionT;translate (expressionS;synthesize valueA))
+           _ (&;with-scope
+               (statementT;translate-def def-name valueT valueI metaI (:! Code metaV)))]
+          (wrap []))))
 
     (^code ("lux program" (~ [_ (#;Symbol ["" program-args])]) (~ programC)))
     (do meta;Monad<Meta>
-- 
cgit v1.2.3