From e53c1a090eb9cfac3cb23d10d981648d02518ed1 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Fri, 13 Aug 2021 04:18:57 -0400 Subject: Made program: specify its bindings the same way as syntax:. --- lux-jvm/source/luxc/lang/directive/jvm.lux | 2 +- .../source/luxc/lang/translation/jvm/extension/host.lux | 16 ++++++++-------- lux-jvm/source/program.lux | 2 +- lux-jvm/test/test/luxc/lang/translation/jvm.lux | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'lux-jvm') diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux index bc038bc92..7f1df4db3 100644 --- a/lux-jvm/source/luxc/lang/directive/jvm.lux +++ b/lux-jvm/source/luxc/lang/directive/jvm.lux @@ -420,7 +420,7 @@ (def: (relabel [mapping label]) (Re_labeler Identity) - (case (dictionary.get label mapping) + (case (dictionary.value label mapping) (#.Some label) [mapping label] diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux index 6fc52a0ab..b25d37fd7 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux @@ -120,7 +120,7 @@ (template [ ] [(def: ( inputI) (Unary Inst) - (if (is? _.NOP ) + (if (same? _.NOP ) inputI (|>> inputI )))] @@ -628,7 +628,7 @@ (function (_ extension_name generate archive [class field unboxed]) (do phase.monad [] - (case (dictionary.get unboxed ..primitives) + (case (dictionary.value unboxed ..primitives) (#.Some primitive) (in (_.GETSTATIC (type.class class (list)) field primitive)) @@ -643,7 +643,7 @@ (do phase.monad [valueI (generate archive valueS) .let [$class (type.class class (list))]] - (case (dictionary.get unboxed ..primitives) + (case (dictionary.value unboxed ..primitives) (#.Some primitive) (in (|>> valueI (_.PUTSTATIC $class field primitive) @@ -663,7 +663,7 @@ (do phase.monad [objectI (generate archive objectS) .let [$class (type.class class (list)) - getI (case (dictionary.get unboxed ..primitives) + getI (case (dictionary.value unboxed ..primitives) (#.Some primitive) (_.GETFIELD $class field primitive) @@ -682,7 +682,7 @@ [valueI (generate archive valueS) objectI (generate archive objectS) .let [$class (type.class class (list)) - putI (case (dictionary.get unboxed ..primitives) + putI (case (dictionary.value unboxed ..primitives) (#.Some primitive) (_.PUTFIELD $class field primitive) @@ -917,7 +917,7 @@ (^ (synthesis.variable var)) (|> mapping - (dictionary.get body) + (dictionary.value body) (maybe.else var) synthesis.variable) @@ -944,7 +944,7 @@ (case captured (^ (synthesis.variable var)) (|> mapping - (dictionary.get captured) + (dictionary.value captured) (maybe.else var) synthesis.variable) @@ -1114,7 +1114,7 @@ (list\map (function (_ [foreign_id capture]) [(synthesis.variable/foreign foreign_id) (|> global_mapping - (dictionary.get capture) + (dictionary.value capture) maybe.assume)])) (dictionary.of_list synthesis.hash))] [ownerT name diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux index e14cfbb27..72a245f9d 100644 --- a/lux-jvm/source/program.lux +++ b/lux-jvm/source/program.lux @@ -276,7 +276,7 @@ (-> Any (Async Any)) (async.future (\ world/program.default exit +0))) -(program: [{service /cli.service}] +(program: [service /cli.service] (let [static {#/static.host @.jvm #/static.host_module_extension ".jvm" #/static.target (/cli.target service) diff --git a/lux-jvm/test/test/luxc/lang/translation/jvm.lux b/lux-jvm/test/test/luxc/lang/translation/jvm.lux index 233178409..b4781b637 100644 --- a/lux-jvm/test/test/luxc/lang/translation/jvm.lux +++ b/lux-jvm/test/test/luxc/lang/translation/jvm.lux @@ -544,7 +544,7 @@ (lang.with-current-module "") (macro.result (io.run! init-jvm)) (case> (#e.Success outputT) - (is? hostL.unit (:coerce Text outputT)) + (same? hostL.unit (:coerce Text outputT)) (#e.Error error) #0))) -- cgit v1.2.3