- Minor refactorings.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux
index 80becb058..8c7668383 100644
--- a/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux
@@ -74,20 +74,20 @@
           "  Actual: " (|> actual nat-to-int %i)))
 
 (syntax: (arity: [name s;local-symbol] [arity s;nat])
-  (with-gensyms [g!proc g!name g!generate g!inputs]
+  (with-gensyms [g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad;seq @ (list;repeat arity (meta;gensym "input")))]
       (wrap (list (` (def: #export ((~ (code;local-symbol name)) (~ g!proc))
                        (-> (-> (;;Vector (~ (code;nat arity)) $;Inst) $;Inst)
                            (-> Text ;;Proc))
                        (function [(~ g!name)]
-                         (function [(~ g!generate) (~ g!inputs)]
+                         (function [(~ g!translate) (~ g!inputs)]
                            (case (~ g!inputs)
                              (^ (list (~@ g!input+)))
                              (do meta;Monad<Meta>
                                [(~@ (|> g!input+
                                         (list/map (function [g!input]
-                                                    (list g!input (` ((~ g!generate) (~ g!input))))))
+                                                    (list g!input (` ((~ g!translate) (~ g!input))))))
                                         list;concat))]
                                ((~' wrap) ((~ g!proc) [(~@ g!input+)])))