From 27d0955180c137813af1dcc36fe4db0ab25d21a8 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 5 Aug 2018 01:57:38 -0400
Subject: Some small improvements and fixes.

---
 luxc/src/lux/analyser/proc/jvm.clj | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'luxc')

diff --git a/luxc/src/lux/analyser/proc/jvm.clj b/luxc/src/lux/analyser/proc/jvm.clj
index 98c2435e9..9bcb9f616 100644
--- a/luxc/src/lux/analyser/proc/jvm.clj
+++ b/luxc/src/lux/analyser/proc/jvm.clj
@@ -729,7 +729,8 @@
                      super-params*))))
 
 (defn ^:private check-method! [only-interface? class method]
-  (|do [!class! (&/de-alias-class class)
+  (|do [!class!* (&/de-alias-class class)
+        :let [!class! (string/replace !class!* "/" ".")]
         class-loader &/loader
         _ (try (assert! (let [=class (Class/forName !class! true class-loader)]
                           (= only-interface? (.isInterface =class)))
@@ -737,7 +738,7 @@
                           (str "[Analyser Error] Can only invoke method \"" method "\"" " on interface.")
                           (str "[Analyser Error] Can only invoke method \"" method "\"" " on class.")))
             (catch Exception e
-              (&/fail-with-loc (str "[Analyser Error] Unknown class: " class))))]
+              (&/fail-with-loc (str "[Analyser Error] Unknown class: " !class!))))]
     (return (&/T [!class! class-loader]))))
 
 (let [dummy-type-param (&/$Primitive "java.lang.Object" &/$Nil)]
@@ -883,6 +884,7 @@
             :let [name (->> scope &/|reverse &/|tail &host/location)
                   class-decl (&/T [name &/$Nil])
                   anon-class (str (string/replace module "/" ".") "." name)
+                  class-type-decl (&/T [anon-class &/$Nil])
                   anon-class-type (&/$Primitive anon-class &/$Nil)]
             =ctor-args (&/map% (fn [ctor-arg]
                                  (|let [[arg-type arg-term] ctor-arg]
@@ -893,7 +895,7 @@
                    (&/$Cons default-<init>)
                    (&host/use-dummy-class class-decl super-class interfaces (&/$Some =ctor-args) &/$Nil))
             [=methods =captured] (let [all-supers (&/$Cons super-class interfaces)]
-                                   (analyse-methods analyse class-decl all-supers methods))
+                                   (analyse-methods analyse class-type-decl all-supers methods))
             _ (let [=fields (&/|map (fn [^objects idx+capt]
                                       (|let [[idx _] idx+capt]
                                         (&/$VariableFieldAnalysis (str &c!base/closure-prefix idx)
-- 
cgit v1.2.3