Made JVM "import:" syntax consistent with the other "import:"s.

1 files changed, 4 insertions, 12 deletions

diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux
index 43a327049..caff78c66 100644
--- a/stdlib/source/library/lux/ffi.old.lux
+++ b/stdlib/source/library/lux/ffi.old.lux
@@ -968,13 +968,6 @@
                                             #import_field_type    gtype]})))
       ))
 
-(def: bundle
-  (-> (List Type_Parameter) (Parser [Text (List Import_Member_Declaration)]))
-  (|>> ..import_member_decl^
-       <>.some
-       (<>.and <code>.text)
-       <code>.tuple))
-
 ... Generators
 (def: with_parens
   (-> JVM_Code JVM_Code)
@@ -1618,13 +1611,12 @@
                             error)))))
 
 (syntax: .public (import: [class_decl ..class_decl^
-                           bundles (<>.some (..bundle (product.right class_decl)))])
+                           import_format <code>.text
+                           members (<>.some (..import_member_decl^ (product.right class_decl)))])
   (do [! meta.monad]
     [kind (class_kind class_decl)
-     =members (|> bundles
-                  (list#each (function (_ [import_format members])
-                               (list#each (|>> [import_format]) members)))
-                  list.together
+     =members (|> members
+                  (list#each (|>> [import_format]))
                   (monad.each ! (member_import$ (product.right class_decl) kind class_decl)))]
     (in (list& (class_import$ class_decl) (list#conjoint =members)))))