From c4ac3e692ae96d6898d8efb42faf4dfadd43f4ae Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 14 May 2015 08:23:10 -0400
Subject: - Removed the apparently unnecessary total-locals.

---
 src/lux.clj                 |   2 -
 src/lux/compiler/base.clj   | 101 --------------------------------------------
 src/lux/compiler/lambda.clj |   9 +---
 3 files changed, 2 insertions(+), 110 deletions(-)

(limited to 'src')

diff --git a/src/lux.clj b/src/lux.clj
index 62e9d14f9..5b32955a3 100644
--- a/src/lux.clj
+++ b/src/lux.clj
@@ -9,7 +9,5 @@
   (System/exit 0))
 
 (comment
-  ;; TODO: Finish total-locals
-
   ;; cd output && jar cvf program.jar * && java -cp "program.jar" program && cd ..
   )
diff --git a/src/lux/compiler/base.clj b/src/lux/compiler/base.clj
index c0a54ba53..a7886ab48 100644
--- a/src/lux/compiler/base.clj
+++ b/src/lux/compiler/base.clj
@@ -30,104 +30,3 @@
          :let [_ (write-class name bytecode)
                _ (load-class! loader (string/replace name #"/" "."))]]
     (return nil)))
-
-(defn total-locals [expr]
-  (matchv ::M/objects [expr]
-    [[?struct ?type]]
-    (matchv ::M/objects [?struct]
-      [["case" [?variant ?base-register ?num-registers ?branches]]]
-      (+ ?num-registers (&/fold max 0 (&/|map (comp total-locals second) ?branches)))
-      
-      [["tuple" ?members]]
-      (&/fold max 0 (&/|map total-locals ?members))
-
-      [["variant" [?tag ?value]]]
-      (total-locals ?value)
-
-      [["call" [?fn ?args]]]
-      (&/fold max 0 (&/|map total-locals (&/|cons ?fn ?args)))
-      
-      [["jvm-iadd" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-isub" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-imul" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-idiv" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-irem" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-ladd" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-lsub" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-lmul" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-ldiv" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-lrem" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-fadd" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-fsub" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-fmul" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-fdiv" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-frem" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-dadd" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-dsub" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-dmul" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-ddiv" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-      
-      [["jvm-drem" [?x ?y]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?x ?y)))
-
-      [["|do" ?exprs]]
-      (&/fold max 0 (&/|map total-locals ?exprs))
-
-      [["jvm-new" [?class ?classes ?args]]]
-      (&/fold max 0 (&/|map total-locals ?args))
-
-      [["jvm-invokestatic" [?class ?method ?classes ?args]]]
-      (&/fold max 0 (&/|map total-locals ?args))
-
-      [["jvm-invokevirtual" [?class ?method ?classes ?object ?args]]]
-      (&/fold max 0 (&/|map total-locals ?args))
-
-      [["jvm-aastore" [?array ?idx ?elem]]]
-      (&/fold max 0 (&/|map total-locals (&/|list ?array ?elem)))
-
-      [["jvm-aaload" [?array ?idx]]]
-      (total-locals ?array)
-
-      ;; [["lambda" _]]
-      ;; 0
-      
-      [_]
-      0
-      )))
diff --git a/src/lux/compiler/lambda.clj b/src/lux/compiler/lambda.clj
index 625599617..42ed5459e 100644
--- a/src/lux/compiler/lambda.clj
+++ b/src/lux/compiler/lambda.clj
@@ -59,13 +59,8 @@
   (&/with-writer (doto (.visitMethod ^ClassWriter class Opcodes/ACC_PUBLIC "impl" impl-signature nil nil)
                    (.visitCode))
     (|do [^MethodVisitor *writer* &/get-writer
-          :let [num-locals (&&/total-locals impl-body)
-                $start (new Label)
-                $end (new Label)
-                _ (doto *writer*
-                    (-> (.visitLocalVariable (str &&/local-prefix idx) "Ljava/lang/Object;" nil $start $end (+ 2 idx))
-                        (->> (dotimes [idx num-locals])))
-                    (.visitLabel $start))]
+          :let [$start (new Label)
+                $end (new Label)]
           ret (compile impl-body)
           :let [_ (doto *writer*
                     (.visitLabel $end)
-- 
cgit v1.2.3