aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc/host.jvm.lux
diff options
context:
space:
mode:
authorEduardo Julian2017-10-18 12:42:46 -0400
committerEduardo Julian2017-10-18 12:42:46 -0400
commit901b09dada43ec6f3b21618800ec7400fda54a0d (patch)
treed62dde3df2ce4fd7d7cd8d0b177f6592f87817cb /new-luxc/source/luxc/host.jvm.lux
parent14e381de130f0c8d3e333cf0523c6c98b9aa84b1 (diff)
- Updated to the latest changes in stdlib.
Diffstat (limited to 'new-luxc/source/luxc/host.jvm.lux')
-rw-r--r--new-luxc/source/luxc/host.jvm.lux20
1 files changed, 10 insertions, 10 deletions
diff --git a/new-luxc/source/luxc/host.jvm.lux b/new-luxc/source/luxc/host.jvm.lux
index 55c899143..6c8eaa350 100644
--- a/new-luxc/source/luxc/host.jvm.lux
+++ b/new-luxc/source/luxc/host.jvm.lux
@@ -2,12 +2,12 @@
lux
(lux (control [monad #+ do])
(concurrency ["A" atom])
- (data ["R" result]
+ (data ["e" error]
[text]
text/format
(coll ["d" dict]
- [array #+ Array]))
- [macro #+ Monad<Lux>]
+ [array]))
+ [meta #+ Monad<Meta>]
[host #+ do-to object]
[io])
(luxc ["&" base]
@@ -40,15 +40,15 @@
(host;array-write +2 (:! (Class Object) Integer.TYPE))
(host;array-write +3 (:! (Class Object) Integer.TYPE)))]
(host;class-for java.lang.ClassLoader))
- (#R;Success method)
+ (#e;Success method)
(do-to method
(AccessibleObject.setAccessible [true]))
- (#R;Error error)
+ (#e;Error error)
(error! error)))
(def: (define-class class-name byte-code loader)
- (-> Text &&common;Bytecode ClassLoader (R;Result Object))
+ (-> Text &&common;Bytecode ClassLoader (e;Error Object))
(Method.invoke [loader
(array;from-list (list (:! Object class-name)
(:! Object byte-code)
@@ -68,10 +68,10 @@
(case (fetch-byte-code class-name store)
(#;Some bytecode)
(case (define-class class-name bytecode (:! ClassLoader _jvm_this))
- (#R;Success class)
+ (#e;Success class)
(:!! class)
- (#R;Error error)
+ (#e;Error error)
(error! (format "Class definiton error: " class-name "\n"
error)))
@@ -87,9 +87,9 @@
#&&common;function-class #;None})))
(def: #export class-loader
- (Lux ClassLoader)
+ (Meta ClassLoader)
(function [compiler]
- (#R;Success [compiler
+ (#e;Success [compiler
(|> compiler
(get@ #;host)
(:! &&common;Host)