- Renamed "this" to "_jvm_this".

- Movied lux/data/io to lux/codata/io.

5 files changed, 10 insertions, 9 deletions

diff --git a/source/lux/data/io.lux b/source/lux/codata/io.lux
index 973d37e38..195aef616 100644
--- a/source/lux/data/io.lux
+++ b/source/lux/codata/io.lux
@@ -5,8 +5,8 @@
 
 (;import lux
          (lux (control (functor #as F)
-                       (monad #as M)))
-         (.. list))
+                       (monad #as M))
+              (data list)))
 
 ## [Types]
 (deftype #export (IO a)
diff --git a/source/lux/host/io.lux b/source/lux/host/io.lux
index 99e15722d..220f089a2 100644
--- a/source/lux/host/io.lux
+++ b/source/lux/host/io.lux
@@ -4,8 +4,8 @@
 ##  You can obtain one at http://mozilla.org/MPL/2.0/.
 
 (;import lux
-         (lux (data io
-                    (list #refer #all #open ("" List/Fold)))
+         (lux (data (list #refer #all #open ("" List/Fold)))
+              (codata io)
               (meta ast
                     syntax
                     lux)
diff --git a/src/lux/analyser/base.clj b/src/lux/analyser/base.clj
index 8df7f23b2..b12425ac7 100644
--- a/src/lux/analyser/base.clj
+++ b/src/lux/analyser/base.clj
@@ -155,6 +155,8 @@
   (|let [[_ type] syntax+]
     type))
 
+(def jvm-this "_jvm_this")
+
 (defn cap-1 [action]
   (|do [result action]
     (|case result
diff --git a/src/lux/analyser/host.clj b/src/lux/analyser/host.clj
index f6963d8bf..681f22168 100644
--- a/src/lux/analyser/host.clj
+++ b/src/lux/analyser/host.clj
@@ -411,7 +411,7 @@
                                (if (= "void" method-output)
                                  (&&/analyse-1+ analyse method-body)
                                  (&&/analyse-1 analyse (&type/Data$ (as-otype method-output) &/Nil$) method-body))
-                               (&/|reverse (&/Cons$ (&/T "this" owner-class)
+                               (&/|reverse (&/Cons$ (&/T &&/jvm-this owner-class)
                                                     =method-inputs)))]
       (return {:name method-name
                :modifiers =method-modifiers
diff --git a/src/lux/analyser/lux.clj b/src/lux/analyser/lux.clj
index 3de4db89f..6546990e6 100644
--- a/src/lux/analyser/lux.clj
+++ b/src/lux/analyser/lux.clj
@@ -275,10 +275,9 @@
                                              endo-type))))
                      state)
 
-                    [_]
-                    (do ;; (prn 'analyse-symbol/_2.1.2 ?module name name)
-                        (fail* "[Analyser Error] Can't have anything other than a global def in the global environment."))))
-              (fail* "_{_ analyse-symbol _}_")))
+                    _
+                    (fail* "[Analyser Error] Can't have anything other than a global def in the global environment.")))
+              (fail* "")))
         
         (&/$Cons top-outer _)
         (do ;; (prn 'analyse-symbol/_3 ?module name)