1 files changed, 4 insertions, 39 deletions
diff --git a/new-luxc/source/luxc/synthesizer/function.lux b/new-luxc/source/luxc/synthesizer/function.lux
index 4d9970a3f..52aee9a49 100644
--- a/new-luxc/source/luxc/synthesizer/function.lux
+++ b/new-luxc/source/luxc/synthesizer/function.lux
@@ -1,31 +1,8 @@
 (;module:
   lux
-  (lux (data (coll [list "list/" Functor<List>])))
   (luxc (lang ["la" analysis]
-              ["ls" synthesis])))
-
-(def: #export (environment scope)
-  (-> Scope (List ls;Variable))
-  (|> scope
-      (get@ [#;captured #;mappings])
-      (list/map (function [[_ _ ref]]
-                  (case ref
-                    (#;Local idx)
-                    (nat-to-int idx)
-                    
-                    (#;Captured idx)
-                    (|> idx n.inc nat-to-int (i.* -1))
-                    )))))
-
-(do-template [<name> <comp>]
-  [(def: #export (<name> var)
-     (-> ls;Variable Bool)
-     (<comp> 0 var))]
-
-  [self?     i.=]
-  [local?    i.>]
-  [captured? i.<]
-  )
+              ["ls" synthesis]
+              [";L" variable #+ Variable])))
 
 (do-template [<name> <comp> <ref>]
   [(def: #export (<name> arity)
@@ -37,27 +14,15 @@
   )
 
 (def: #export (adjust-var outer var)
-  (-> ls;Arity ls;Variable ls;Variable)
+  (-> ls;Arity Variable Variable)
   (|> outer n.dec nat-to-int (i.+ var)))
 
-(def: #export (to-captured idx)
-  (-> Nat Int)
-  (|> idx n.inc nat-to-int (i.* -1)))
-
-(def: #export (captured-idx idx)
-  (-> Int Nat)
-  (|> idx (i.* -1) int-to-nat n.dec))
-
-(def: #export (to-local idx)
-  (-> Nat Int)
-  (nat-to-int idx))
-
 (def: #export (unfold-apply apply)
   (-> la;Analysis [la;Analysis (List la;Analysis)])
   (loop [apply apply
          args (list)]
     (case apply
-      (#la;Apply arg func)
+      (^code ("lux apply" (~ arg) (~ func)))
       (recur func (#;Cons arg args))
 
       _