From 4f939136769d9a3f64088115e3b48f0e491c7c37 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 10 Oct 2019 18:00:28 -0400
Subject: Small improvements + fixes

---
 luxc/src/lux/analyser/lux.clj |  2 +-
 luxc/src/lux/base.clj         |  4 ++--
 luxc/src/lux/compiler.clj     |  2 +-
 luxc/src/lux/compiler/jvm.clj | 14 +++++++-------
 luxc/src/lux/lib/loader.clj   |  1 -
 luxc/src/lux/type.clj         | 14 +++++++-------
 6 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'luxc')

diff --git a/luxc/src/lux/analyser/lux.clj b/luxc/src/lux/analyser/lux.clj
index 8a2f4b70c..eb412bf0c 100644
--- a/luxc/src/lux/analyser/lux.clj
+++ b/luxc/src/lux/analyser/lux.clj
@@ -395,7 +395,7 @@
               ;;           (->> macro-expansion
               ;;                (&/|map (fn [ast] (str (&/show-ast ast) "\n")))
               ;;                (&/fold str "")
-              ;;                (&/|log! (str 'macro-expansion " " (&/ident->text real-name) " @ " module-name "\n"))))]
+              ;;                (&/|log! (str 'macro-expansion " " (&/ident->text real-name) " @ " module-name))))]
               ]
           (&/flat-map% (partial analyse exo-type) macro-expansion))
         (do-analyse-apply analyse exo-type =fn ?args)))
diff --git a/luxc/src/lux/base.clj b/luxc/src/lux/base.clj
index f91bc4f2a..9a0bc1b5a 100644
--- a/luxc/src/lux/base.clj
+++ b/luxc/src/lux/base.clj
@@ -965,7 +965,7 @@
 (let [!out! *out*]
   (defn |log! [& parts]
     (binding [*out* !out!]
-      (do (print (apply str parts))
+      (do (print (str (apply str parts) "\n"))
         (flush)))))
 
 (defn |last [xs]
@@ -1480,7 +1480,7 @@
         ($Right state* output)
         (let [post (System/currentTimeMillis)
               duration (- post pre)
-              _ (|log! (str what " [" when "]: +" duration "ms" "\n"))]
+              _ (|log! (str what " [" when "]: +" duration "ms"))]
           ($Right (T [state* output])))
 
         ($Left ^String msg)
diff --git a/luxc/src/lux/compiler.clj b/luxc/src/lux/compiler.clj
index 2f46d2506..a3e60e463 100644
--- a/luxc/src/lux/compiler.clj
+++ b/luxc/src/lux/compiler.clj
@@ -26,4 +26,4 @@
 
 (defn compile-program [mode program-module dependencies source-dirs target-dir]
   (init! dependencies target-dir)
-  (&&jvm/compile-program mode program-module dependencies source-dirs))
+  (&&jvm/compile-program mode program-module source-dirs))
diff --git a/luxc/src/lux/compiler/jvm.clj b/luxc/src/lux/compiler/jvm.clj
index bcde7a8ea..5ed579116 100644
--- a/luxc/src/lux/compiler/jvm.clj
+++ b/luxc/src/lux/compiler/jvm.clj
@@ -174,7 +174,7 @@
 
 (let [+field-flags+ (+ Opcodes/ACC_PUBLIC Opcodes/ACC_FINAL Opcodes/ACC_STATIC)
       +datum-sig+ "Ljava/lang/Object;"]
-  (defn compile-module [compile-module source-dirs name]
+  (defn compile-module [source-dirs name]
     (|do [[file-name file-content] (&&io/read-file source-dirs name)
           :let [file-hash (hash file-content)
                 compile-module!! (&&parallel/parallel-compilation (partial compile-module source-dirs))]]
@@ -217,9 +217,9 @@
     (proxy [java.lang.ClassLoader]
       []
       (findClass [^String class-name]
-        (if-let [^bytes bytecode (get @store class-name)]
-          (.invoke define-class this (to-array [class-name bytecode (int 0) (int (alength bytecode))]))
-          (throw (IllegalStateException. (str "[Class Loader] Unknown class: " class-name))))))))
+                 (if-let [^bytes bytecode (get @store class-name)]
+                   (.invoke define-class this (to-array [class-name bytecode (int 0) (int (alength bytecode))]))
+                   (throw (IllegalStateException. (str "[Class Loader] Unknown class: " class-name))))))))
 
 (defn jvm-host []
   (let [store (atom {})]
@@ -236,13 +236,13 @@
                   ]))))
 
 (let [!err! *err*]
-  (defn compile-program [mode program-module dependencies source-dirs]
+  (defn compile-program [mode program-module source-dirs]
     (let [m-action (|do [_ (&&cache/pre-load-cache! source-dirs
                                                     &&jvm-cache/load-def-value
                                                     &&jvm-cache/install-all-defs-in-module
                                                     &&jvm-cache/uninstall-all-defs-in-module)
-                         _ (compile-module dependencies source-dirs "lux")]
-                     (compile-module dependencies source-dirs program-module))]
+                         _ (compile-module source-dirs "lux")]
+                     (compile-module source-dirs program-module))]
       (|case (m-action (&/init-state "{old}" mode (jvm-host)))
         (&/$Right ?state _)
         (do (println "Compilation complete!")
diff --git a/luxc/src/lux/lib/loader.clj b/luxc/src/lux/lib/loader.clj
index 5afae6ae2..97e6ee684 100644
--- a/luxc/src/lux/lib/loader.clj
+++ b/luxc/src/lux/lib/loader.clj
@@ -36,7 +36,6 @@
 
 ;; [Exports]
 (defn load [dependencies]
-  (prn `load (&/->seq dependencies))
   (->> dependencies
        &/->seq
        (map #(->> ^String % (new File) unpackage))
diff --git a/luxc/src/lux/type.clj b/luxc/src/lux/type.clj
index fc1736a1c..ae80d1142 100644
--- a/luxc/src/lux/type.clj
+++ b/luxc/src/lux/type.clj
@@ -746,13 +746,13 @@
         [(&/$Apply A F) _]
         (let [fp-pair (&/T [expected actual])
               _ (when (> (&/|length fixpoints) max-stack-size)
-                  (&/|log! (println-str 'FIXPOINTS (->> (&/|keys fixpoints)
-                                                        (&/|map (fn [pair]
-                                                                  (|let [[e a] pair]
-                                                                    (str (show-type e) ":+:"
-                                                                         (show-type a)))))
-                                                        (&/|interpose "\n\n")
-                                                        (&/fold str ""))))
+                  (&/|log! (print-str 'FIXPOINTS (->> (&/|keys fixpoints)
+                                                      (&/|map (fn [pair]
+                                                                (|let [[e a] pair]
+                                                                  (str (show-type e) ":+:"
+                                                                       (show-type a)))))
+                                                      (&/|interpose "\n\n")
+                                                      (&/fold str ""))))
                   (assert false (prn-str 'check* '[(&/$Apply A F) _] (&/|length fixpoints) (show-type expected) (show-type actual))))]
           (|case (fp-get fp-pair fixpoints)
             (&/$Some ?)
-- 
cgit v1.2.3