From c3cdaad1d13f38ec926e7113ae95a25611a04053 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 30 Jul 2018 21:27:26 -0400
Subject: Updating new-luxc to latest Lux changes [Part 1].

---
 new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux      | 2 +-
 new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/jvm')

diff --git a/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux
index 0eb815458..4f3193bbf 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/case.jvm.lux
@@ -77,7 +77,7 @@
     (^ (synthesis.path/i64 value))
     (operation/wrap (|>> peekI
                          (_.unwrap #$.Long)
-                         (_.long value)
+                         (_.long (.int value))
                          _.LCMP
                          (_.IFNE @else)))
     
diff --git a/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
index c32e80d56..c46d4d495 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
@@ -24,9 +24,10 @@
 (do-template [<name> <type> <load> <wrap>]
   [(def: #export (<name> value)
      (-> <type> (Operation Inst))
-     (operation/wrap (|>> (<load> value) <wrap>)))]
+     (let [loadI (|> value <load>)]
+       (operation/wrap (|>> loadI <wrap>))))]
 
-  [i64  Int  _.long   (_.wrap #jvm.Long)]
-  [f64  Frac _.double (_.wrap #jvm.Double)]
-  [text Text _.string (<|)]
+  [i64  (I64 Any) (<| _.long .int) (_.wrap #jvm.Long)]
+  [f64  Frac      _.double         (_.wrap #jvm.Double)]
+  [text Text      _.string         (<|)]
   )
-- 
cgit v1.2.3