diff options
author | Eduardo Julian | 2017-10-05 00:39:10 -0400 |
---|---|---|
committer | Eduardo Julian | 2017-10-05 00:39:10 -0400 |
commit | 9a22dc032da2ab1f65d8a7f63b7f5f94e80dd40b (patch) | |
tree | 1e7a4aad73af3bc4daa18ddd4158080ace67a84d /new-luxc/source/luxc | |
parent | 54815ade282ff4feb81d7d557188bde8111db376 (diff) |
- Simplified "eval".
Diffstat (limited to 'new-luxc/source/luxc')
-rw-r--r-- | new-luxc/source/luxc/eval.lux | 5 | ||||
-rw-r--r-- | new-luxc/source/luxc/generator/eval.jvm.lux | 5 |
2 files changed, 5 insertions, 5 deletions
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) |