From df6cf0d3c980e3d7240eec6cb38d86af61037725 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 8 Nov 2021 02:02:27 -0400
Subject: Sharing the same Function class between bootsrapper and JVM compiler.

---
 lux-jvm/commands.md                                  | 2 +-
 lux-jvm/project.clj                                  | 4 +++-
 lux-jvm/source/luxc/lang/translation/jvm.lux         | 3 ++-
 lux-jvm/source/luxc/lang/translation/jvm/runtime.lux | 6 ++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'lux-jvm')

diff --git a/lux-jvm/commands.md b/lux-jvm/commands.md
index 1d3c9dec1..81a36643a 100644
--- a/lux-jvm/commands.md
+++ b/lux-jvm/commands.md
@@ -40,7 +40,7 @@ cd ~/lux/stdlib/ \
 
 ```
 cd ~/lux/lux-jvm/ \
-&& mvn install:install-file -Dfile=target/program.jar -DgroupId=com.github.luxlang -DartifactId=lux-jvm -Dversion=0.6.3 -Dpackaging=jar
+&& mvn install:install-file -Dfile=target/program.jar -DgroupId=com.github.luxlang -DartifactId=lux-jvm -Dversion=0.6.5-SNAPSHOT -Dpackaging=jar
 
 cd ~/lux/lux-jvm/ && mvn deploy:deploy-file \
 -Durl=https://<username>:<password>@oss.sonatype.org/content/repositories/snapshots/ \
diff --git a/lux-jvm/project.clj b/lux-jvm/project.clj
index 803c29b0f..5d9ae53d2 100644
--- a/lux-jvm/project.clj
+++ b/lux-jvm/project.clj
@@ -1,4 +1,4 @@
-(def version "0.6.4")
+(def version "0.6.5-SNAPSHOT")
 (def repo "https://github.com/LuxLang/lux")
 (def sonatype "https://oss.sonatype.org")
 (def sonatype-releases (str sonatype "/service/local/staging/deploy/maven2/"))
@@ -20,6 +20,8 @@
         :url ~(str repo ".git")}
 
   :dependencies [[com.github.luxlang/lux-bootstrapper ~version]
+                 [com.github.luxlang/lux-jvm-function ~version]
+                 
                  ;; [com.github.luxlang/stdlib ~version]
                  ;; JVM Bytecode (TODO: Remove ASAP)
                  [org.ow2.asm/asm "7.3.1"]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index 7642a6952..0d4f493bb 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -200,4 +200,5 @@
   (type.class (..class_name [0 0]) (list)))
 
 (def: .public $Function
-  (type.class (..class_name [0 1]) (list)))
+  (type.class "library.lux.Function" ... (..class_name [0 1])
+              (list)))
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
index 6058ba138..dc2cb5053 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
@@ -408,11 +408,13 @@
   (Operation [Registry Output])
   (do phase.monad
     [runtime_payload ..translate_runtime
-     function_payload ..translate_function]
+     ... function_payload ..translate_function
+     ]
     (in [(|> artifact.empty
              artifact.resource
              product.right
              artifact.resource
              product.right)
          (sequence.sequence runtime_payload
-                            function_payload)])))
+                            ... function_payload
+                            )])))
-- 
cgit v1.2.3