From 59ededb795732e04ac8e1eaceb2b1509a1c1cc23 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 20 Aug 2019 22:00:59 -0400 Subject: WIP: Make new-luxc instructions rely on the Descriptor type. --- new-luxc/source/program.lux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'new-luxc/source/program.lux') diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux index 2ec090903..1311392a9 100644 --- a/new-luxc/source/program.lux +++ b/new-luxc/source/program.lux @@ -6,10 +6,10 @@ [monad (#+ do)]] [control ["." io (#+ IO)] + ["." try (#+ Try)] [parser [cli (#+ program:)]]] [data - ["." error (#+ Error)] [collection [array (#+ Array)] ["." dictionary]]] @@ -67,12 +67,12 @@ (def: #export (expander macro inputs lux) Expander - (do error.monad + (do try.monad [apply-method (|> macro (:coerce java/lang/Object) (java/lang/Object::getClass) (java/lang/Class::getMethod "apply" _apply-args))] - (:coerce (Error (Error [Lux (List Code)])) + (:coerce (Try (Try [Lux (List Code)])) (java/lang/reflect/Method::invoke (:coerce java/lang/Object macro) (|> (host.array java/lang/Object 2) -- cgit v1.2.3