From 901b09dada43ec6f3b21618800ec7400fda54a0d Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 18 Oct 2017 12:42:46 -0400
Subject: - Updated to the latest changes in stdlib.

---
 new-luxc/source/luxc/generator/host/jvm/def.lux  |  4 ++--
 new-luxc/source/luxc/generator/host/jvm/inst.lux | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'new-luxc/source/luxc/generator/host/jvm')

diff --git a/new-luxc/source/luxc/generator/host/jvm/def.lux b/new-luxc/source/luxc/generator/host/jvm/def.lux
index 7dd78ceb3..1d50ba9f6 100644
--- a/new-luxc/source/luxc/generator/host/jvm/def.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/def.lux
@@ -60,7 +60,7 @@
 
 ## [Defs]
 (def: (string-array values)
-  (-> (List Text) (a;Array Text))
+  (-> (List Text) (Array Text))
   (let [output (host;array String (list;size values))]
     (exec (list/map (function [[idx value]]
                    (host;array-write idx value output))
@@ -68,7 +68,7 @@
       output)))
 
 (def: exceptions-array
-  (-> $;Method (a;Array Text))
+  (-> $;Method (Array Text))
   (|>. (get@ #$;exceptions)
        (list/map (|>. #$;Generic $t;descriptor))
        string-array))
diff --git a/new-luxc/source/luxc/generator/host/jvm/inst.lux b/new-luxc/source/luxc/generator/host/jvm/inst.lux
index d5df6a9f7..1951076c3 100644
--- a/new-luxc/source/luxc/generator/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/inst.lux
@@ -3,12 +3,12 @@
   (lux (control monad
                 ["p" parser])
        (data [maybe]
-             ["R" result]
+             ["e" error]
              text/format
              (coll [list "L/" Functor<List>]))
        [host #+ do-to]
-       [macro]
-       (macro [code]
+       [meta]
+       (meta [code]
               ["s" syntax #+ syntax:]))
   ["$" ..]
   (.. ["$t" type]))
@@ -115,9 +115,9 @@
 
 ## [Insts]
 (def: #export make-label
-  (Lux Label)
+  (Meta Label)
   (function [compiler]
-    (#R;Success [compiler (Label.new [])])))
+    (#e;Success [compiler (Label.new [])])))
 
 (def: #export (with-label action)
   (-> (-> Label $;Inst) $;Inst)
-- 
cgit v1.2.3