[2nd Super Refactoring That Breaks The System: Part 6]

- Corrected more bugs in the system.

1 files changed, 13 insertions, 12 deletions

diff --git a/src/lux/analyser/case.clj b/src/lux/analyser/case.clj
index 1574218c3..93036daa6 100644
--- a/src/lux/analyser/case.clj
+++ b/src/lux/analyser/case.clj
@@ -1,7 +1,7 @@
 (ns lux.analyser.case
   (:require [clojure.core.match :as M :refer [match matchv]]
             clojure.core.match.array
-            (lux [base :as & :refer [exec return fail]]
+            (lux [base :as & :refer [exec return fail |let]]
                  [parser :as &parser]
                  [type :as &type])
             (lux.analyser [base :as &&]
@@ -22,14 +22,15 @@
     [_]
     (&/|list)))
 
-(defn analyse-branch [analyse max-registers [bindings body]]
-  ;; (prn 'analyse-branch max-registers bindings body)
-  (reduce (fn [body* name]
-            (&&/with-var
-              (fn [=var]
-                (&env/with-local name =var body*))))
-          (reduce (fn [body* _]
-                    (&env/with-local "" &type/+dont-care+ body*))
-                  (&&/analyse-1 analyse body)
-                  (range (- max-registers (count bindings))))
-          (reverse bindings)))
+(defn analyse-branch [analyse max-registers bindings+body]
+  (|let [[bindings body] bindings+body]
+    (do (prn 'analyse-branch max-registers (&/|length bindings) body)
+      (&/fold (fn [body* name]
+                (&&/with-var
+                  (fn [=var]
+                    (&env/with-local name =var body*))))
+              (&/fold (fn [body* _]
+                        (&env/with-local "" &type/+dont-care+ body*))
+                      (&&/analyse-1 analyse body)
+                      (&/|range (- max-registers (&/|length bindings))))
+              (&/|reverse bindings)))))