From 9a22dc032da2ab1f65d8a7f63b7f5f94e80dd40b Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 5 Oct 2017 00:39:10 -0400
Subject: - Simplified "eval".

---
 new-luxc/source/luxc/eval.lux               | 5 +++--
 new-luxc/source/luxc/generator/eval.jvm.lux | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'new-luxc/source')

diff --git a/new-luxc/source/luxc/eval.lux b/new-luxc/source/luxc/eval.lux
index 266becee6..9d6ee05e7 100644
--- a/new-luxc/source/luxc/eval.lux
+++ b/new-luxc/source/luxc/eval.lux
@@ -13,5 +13,6 @@
   (do macro;Monad<Lux>
     [exprA (../base;with-expected-type type
              (analyser;analyser eval exprC))
-     #let [exprS (synthesizer;synthesize exprA)]]
-    (eval;eval (expr;generate exprS))))
+     #let [exprS (synthesizer;synthesize exprA)]
+     exprI (expr;generate exprS)]
+    (eval;eval exprI)))
diff --git a/new-luxc/source/luxc/generator/eval.jvm.lux b/new-luxc/source/luxc/generator/eval.jvm.lux
index 818c03b66..96f7a4917 100644
--- a/new-luxc/source/luxc/generator/eval.jvm.lux
+++ b/new-luxc/source/luxc/generator/eval.jvm.lux
@@ -59,11 +59,10 @@
 (def: eval-field Text "_value")
 (def: $Object $;Type ($t;class "java.lang.Object" (list)))
 
-(def: #export (eval generator)
-  (-> (Lux $;Inst) (Lux Top))
+(def: #export (eval valueI)
+  (-> $;Inst (Lux Top))
   (do Monad<Lux>
     [class-name (:: @ map %code (macro;gensym "eval"))
-     valueI generator
      #let [writer (|> (do-to (ClassWriter.new ClassWriter.COMPUTE_MAXS)
                         (ClassWriter.visit [&common;bytecode-version
                                             (i.+ Opcodes.ACC_PUBLIC Opcodes.ACC_SUPER)
-- 
cgit v1.2.3