From a40f40f230e6312ae432f06e7f73aa5945d8fa49 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 18 Jul 2021 23:10:18 -0400
Subject: New JVM compiler can now compile JVM interfaces.

---
 .../luxc/lang/translation/jvm/extension/common.lux | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux')

diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
index d79362d79..70175b636 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
@@ -216,20 +216,20 @@
 
   [i64::f64 (_.unwrap type.long) (<| (_.wrap type.double) _.L2D)]
   [i64::char (_.unwrap type.long)
-   ((|>> _.L2I _.I2C (_.INVOKESTATIC (type.class "java.lang.Character" (list)) "toString" (type.method [(list type.char) $String (list)]))))]
+   ((|>> _.L2I _.I2C (_.INVOKESTATIC (type.class "java.lang.Character" (list)) "toString" (type.method [(list) (list type.char) $String (list)]))))]
 
   [f64::i64 (_.unwrap type.double) (<| (_.wrap type.long) _.D2L)]
   [f64::encode (_.unwrap type.double)
-   (_.INVOKESTATIC (type.class "java.lang.Double" (list)) "toString" (type.method [(list type.double) $String (list)]))]
+   (_.INVOKESTATIC (type.class "java.lang.Double" (list)) "toString" (type.method [(list) (list type.double) $String (list)]))]
   [f64::decode ..check_stringI
-   (_.INVOKESTATIC ///.$Runtime "decode_frac" (type.method [(list $String) ///.$Variant (list)]))]
+   (_.INVOKESTATIC ///.$Runtime "decode_frac" (type.method [(list) (list $String) ///.$Variant (list)]))]
   )
 
 (def: (text::size inputI)
   (Unary Inst)
   (|>> inputI
        ..check_stringI
-       (_.INVOKEVIRTUAL $String "length" (type.method [(list) type.int (list)]))
+       (_.INVOKEVIRTUAL $String "length" (type.method [(list) (list) type.int (list)]))
        lux_intI))
 
 (template [<name> <pre_subject> <pre_param> <op> <post>]
@@ -240,13 +240,13 @@
           <op> <post>))]
 
   [text::= (<|) (<|)
-   (_.INVOKEVIRTUAL $Object "equals" (type.method [(list $Object) type.boolean (list)]))
+   (_.INVOKEVIRTUAL $Object "equals" (type.method [(list) (list $Object) type.boolean (list)]))
    (_.wrap type.boolean)]
   [text::< ..check_stringI ..check_stringI
-   (_.INVOKEVIRTUAL $String "compareTo" (type.method [(list $String) type.int (list)]))
+   (_.INVOKEVIRTUAL $String "compareTo" (type.method [(list) (list $String) type.int (list)]))
    (predicateI _.IFLT)]
   [text::char ..check_stringI jvm_intI
-   (_.INVOKEVIRTUAL $String "charAt" (type.method [(list type.int) type.char (list)]))
+   (_.INVOKEVIRTUAL $String "charAt" (type.method [(list) (list type.int) type.char (list)]))
    lux_intI]
   )
 
@@ -254,7 +254,7 @@
   (Binary Inst)
   (|>> leftI ..check_stringI
        rightI ..check_stringI
-       (_.INVOKEVIRTUAL $String "concat" (type.method [(list $String) $String (list)]))))
+       (_.INVOKEVIRTUAL $String "concat" (type.method [(list) (list $String) $String (list)]))))
 
 (def: (text::clip [offsetI lengthI subjectI])
   (Trinary Inst)
@@ -263,9 +263,9 @@
        _.DUP
        lengthI jvm_intI
        _.IADD
-       (_.INVOKEVIRTUAL $String "substring" (type.method [(list type.int type.int) $String (list)]))))
+       (_.INVOKEVIRTUAL $String "substring" (type.method [(list) (list type.int type.int) $String (list)]))))
 
-(def: index_method (type.method [(list $String type.int) type.int (list)]))
+(def: index_method (type.method [(list) (list $String type.int) type.int (list)]))
 (def: (text::index [startI partI textI])
   (Trinary Inst)
   (<| _.with_label (function (_ @not_found))
@@ -285,7 +285,7 @@
            runtime.noneI
            (_.label @end))))
 
-(def: string_method (type.method [(list $String) type.void (list)]))
+(def: string_method (type.method [(list) (list $String) type.void (list)]))
 (def: (io::log messageI)
   (Unary Inst)
   (let [$PrintStream (type.class "java.io.PrintStream" (list))]
-- 
cgit v1.2.3