From 84d7f9ccef221e9797929813af1094b335ba26e9 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Thu, 9 Aug 2018 23:39:17 -0400 Subject: - Fixes for eval. - Macro-expansion during analysis. --- new-luxc/source/luxc/lang/translation/jvm.lux | 2 +- new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'new-luxc/source/luxc/lang/translation') diff --git a/new-luxc/source/luxc/lang/translation/jvm.lux b/new-luxc/source/luxc/lang/translation/jvm.lux index 14f8cf0a0..2aa46e050 100644 --- a/new-luxc/source/luxc/lang/translation/jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm.lux @@ -117,7 +117,7 @@ (def: (store! name bytecode store) (-> Text ByteCode Store (Error Any)) - (if (dictionary.contains? name (|> store atom.read io.run)) + (if (|> store atom.read io.run (dictionary.contains? name)) (ex.throw class-already-stored name) (exec (io.run (atom.update (dictionary.put name bytecode) store)) (#error.Success [])))) diff --git a/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux index 4b3259efd..3c687f822 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/runtime.jvm.lux @@ -381,7 +381,7 @@ pm-methods io-methods))] (do phase.Monad - [_ (translation.execute! [//.runtime-class bytecode])] + [_ (translation.execute! //.runtime-class [//.runtime-class bytecode])] (wrap bytecode)))) (def: translate-function @@ -411,7 +411,7 @@ _.RETURN)) applyI))] (do phase.Monad - [_ (translation.execute! [//.function-class bytecode])] + [_ (translation.execute! //.function-class [//.function-class bytecode])] (wrap bytecode)))) (def: #export translate -- cgit v1.2.3