From 8cd61c00de00728759d0362a60dbca8d23e4d8dc Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 28 May 2019 22:14:53 -0400
Subject: Both the old JVM interop and the new JVM interop use the same syntax
 for array types.

---
 new-luxc/source/luxc/lang/host/jvm/def.lux  | 10 +++++-----
 new-luxc/source/luxc/lang/host/jvm/inst.lux |  4 ++--
 new-luxc/source/luxc/lang/translation/r.lux |  2 +-
 new-luxc/source/program.lux                 |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'new-luxc')

diff --git a/new-luxc/source/luxc/lang/host/jvm/def.lux b/new-luxc/source/luxc/lang/host/jvm/def.lux
index ce236c905..bf4abc8ed 100644
--- a/new-luxc/source/luxc/lang/host/jvm/def.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/def.lux
@@ -57,11 +57,11 @@
   (#static COMPUTE_MAXS int)
   (#static COMPUTE_FRAMES int)
   (new [int])
-  (visit [int int String String String (Array String)] void)
+  (visit [int int String String String [String]] void)
   (visitEnd [] void)
   (visitField [int String String String Object] FieldVisitor)
-  (visitMethod [int String String String (Array String)] MethodVisitor)
-  (toByteArray [] (Array byte)))
+  (visitMethod [int String String String [String]] MethodVisitor)
+  (toByteArray [] [byte]))
 
 (def: (string-array values)
   (-> (List Text) (Array Text))
@@ -161,7 +161,7 @@
   [(def: #export (<name> version visibility config name parameters super interfaces
                          definitions)
      (-> //.Version //.Visibility //.Class-Config Text (List Parameter) Class (List Class) //.Def
-         (host.type (Array byte)))
+         (host.type [byte]))
      (let [writer (|> (do-to (ClassWriter::new class-computes)
                         (ClassWriter::visit (version-flag version)
                                             ($_ i/+
@@ -188,7 +188,7 @@
 (def: #export (interface version visibility config name parameters interfaces
                          definitions)
   (-> //.Version //.Visibility //.Class-Config Text (List Parameter) (List Class) //.Def
-      (host.type (Array byte)))
+      (host.type [byte]))
   (let [writer (|> (do-to (ClassWriter::new class-computes)
                      (ClassWriter::visit (version-flag version)
                                          ($_ i/+
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index 040f6f04a..aeb9621ef 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -122,8 +122,8 @@
   (visitLabel [org/objectweb/asm/Label] void)
   (visitJumpInsn [int org/objectweb/asm/Label] void)
   (visitTryCatchBlock [org/objectweb/asm/Label org/objectweb/asm/Label org/objectweb/asm/Label java/lang/String] void)
-  (visitLookupSwitchInsn [org/objectweb/asm/Label (Array int) (Array org/objectweb/asm/Label)] void)
-  (visitTableSwitchInsn [int int org/objectweb/asm/Label (Array org/objectweb/asm/Label)] void)
+  (visitLookupSwitchInsn [org/objectweb/asm/Label [int] [org/objectweb/asm/Label]] void)
+  (visitTableSwitchInsn [int int org/objectweb/asm/Label [org/objectweb/asm/Label]] void)
   )
 
 ## [Insts]
diff --git a/new-luxc/source/luxc/lang/translation/r.lux b/new-luxc/source/luxc/lang/translation/r.lux
index d5a9f35fa..a4a3db1f5 100644
--- a/new-luxc/source/luxc/lang/translation/r.lux
+++ b/new-luxc/source/luxc/lang/translation/r.lux
@@ -31,7 +31,7 @@
 (host.import: java/lang/Object)
 
 (host.import: java/lang/String
-  (getBytes [String] #try (Array byte)))
+  (getBytes [String] #try [byte]))
 
 (host.import: java/lang/CharSequence)
 
diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux
index 46462ab34..8a00858b1 100644
--- a/new-luxc/source/program.lux
+++ b/new-luxc/source/program.lux
@@ -41,10 +41,10 @@
        ["." host]]]]]])
 
 (import: #long java/lang/reflect/Method
-  (invoke [java/lang/Object (Array java/lang/Object)] #try java/lang/Object))
+  (invoke [java/lang/Object [java/lang/Object]] #try java/lang/Object))
 
 (import: #long (java/lang/Class c)
-  (getMethod [java/lang/String (Array (java/lang/Class java/lang/Object))] #try java/lang/reflect/Method))
+  (getMethod [java/lang/String [(java/lang/Class java/lang/Object)]] #try java/lang/reflect/Method))
 
 (import: #long java/lang/Object
   (getClass [] (java/lang/Class java/lang/Object)))
-- 
cgit v1.2.3