- Minor refactorings.

- Fixed some bugs.
- Enabled macro-expansion for statements.

1 files changed, 7 insertions, 7 deletions

diff --git a/new-luxc/source/luxc/lang/translation/function.jvm.lux b/new-luxc/source/luxc/lang/translation/function.jvm.lux
index 35c88e4ed..ebdb28853 100644
--- a/new-luxc/source/luxc/lang/translation/function.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/function.jvm.lux
@@ -266,13 +266,13 @@
                     $i;ARETURN
                     ))))
 
-(def: #export (with-function generate class env arity body)
+(def: #export (with-function translate class env arity body)
   (-> (-> ls;Synthesis (Meta $;Inst))
       Text (List Variable) ls;Arity ls;Synthesis
       (Meta [$;Def $;Inst]))
   (do meta;Monad<Meta>
     [@begin $i;make-label
-     bodyI (commonT;with-function class (generate body))
+     bodyI (commonT;with-function class (translate body))
      #let [env-size (list;size env)
            applyD (: $;Def
                      (if (poly-arg? arity)
@@ -295,13 +295,13 @@
            instanceI (instance class arity env)]]
     (wrap [functionD instanceI])))
 
-(def: #export (generate-function generate env arity body)
+(def: #export (translate-function translate env arity body)
   (-> (-> ls;Synthesis (Meta $;Inst))
       (List Variable) ls;Arity ls;Synthesis
       (Meta $;Inst))
   (do meta;Monad<Meta>
     [function-class (:: @ map %code (meta;gensym "function"))
-     [functionD instanceI] (with-function generate function-class env arity body)
+     [functionD instanceI] (with-function translate function-class env arity body)
      _ (commonT;store-class function-class
                             ($d;class #$;V1.6 #$;Public $;finalC
                                       function-class (list)
@@ -316,13 +316,13 @@
       (list pre)
       (list& pre (segment size post)))))
 
-(def: #export (generate-call generate functionS argsS)
+(def: #export (translate-call translate functionS argsS)
   (-> (-> ls;Synthesis (Meta $;Inst))
       ls;Synthesis (List ls;Synthesis)
       (Meta $;Inst))
   (do meta;Monad<Meta>
-    [functionI (generate functionS)
-     argsI (monad;map @ generate argsS)
+    [functionI (translate functionS)
+     argsI (monad;map @ translate argsS)
      #let [applyI (|> (segment runtimeT;num-apply-variants argsI)
                       (list/map (function [chunkI+]
                                   (|>. ($i;CHECKCAST hostL;function-class)