- Changed the name of lux/host/java to lux/host/jvm

- Completed lux/host/jvm
- Modified (slightly) the syntax used in several host (JVM) special forms.
- The "defsyntax" macro now binds all of the arguments it receives inside a variable named "tokens".

1 files changed, 14 insertions, 13 deletions

diff --git a/source/lux.lux b/source/lux.lux
index 8f7e4fa04..c51929635 100644
--- a/source/lux.lux
+++ b/source/lux.lux
@@ -8,7 +8,7 @@
 
 ## First things first, must define functions
 (_jvm_interface "Function" []
-  (apply ["java.lang.Object"] "java.lang.Object" ["public" "abstract"]))
+  ("apply" ["java.lang.Object"] "java.lang.Object" ["public" "abstract"]))
 
 ## Basic types
 (_lux_def Bool (#DataT "java.lang.Boolean"))
@@ -860,8 +860,9 @@
     [true (#Meta [_ (#FormS (#Cons [(#Meta [_ (#SymbolS ["" "~"])]) (#Cons [unquoted #Nil])]))])]
     unquoted
 
-    [_ (#Meta [_ (#FormS elems)])]
-    (splice replace? (untemplate replace? subst) (tag$ ["lux" "FormS"]) elems)
+    [_ (#Meta [meta (#FormS elems)])]
+    (let [(#Meta [_ form']) (splice replace? (untemplate replace? subst) (tag$ ["lux" "FormS"]) elems)]
+      (#Meta [meta form']))
 
     [_ (#Meta [_ (#RecordS fields)])]
     (wrap-meta (form$ (list (tag$ ["lux" "RecordS"])
@@ -1071,7 +1072,7 @@
 
 (def'' (text:= x y)
   (-> Text Text Bool)
-  (_jvm_invokevirtual java.lang.Object equals [java.lang.Object]
+  (_jvm_invokevirtual "java.lang.Object" "equals" ["java.lang.Object"]
                       x [y]))
 
 (def'' (get-rep key env)
@@ -1146,9 +1147,9 @@
      (-> <type> <type> Bool)
      (<cmp> x y))]
 
-  [i=  _jvm_leq Int]
-  [i>  _jvm_lgt Int]
-  [i<  _jvm_llt Int]
+  [i= _jvm_leq Int]
+  [i> _jvm_lgt Int]
+  [i< _jvm_llt Int]
   [r= _jvm_deq Real]
   [r> _jvm_dgt Real]
   [r< _jvm_dlt Real]
@@ -1198,7 +1199,7 @@
 
 (def'' (text:++ x y)
   (-> Text Text Text)
-  (_jvm_invokevirtual java.lang.String concat [java.lang.String]
+  (_jvm_invokevirtual "java.lang.String" "concat" ["java.lang.String"]
                       x [y]))
 
 (def'' (ident->text ident)
@@ -1396,7 +1397,7 @@
 
 (def'' #export (->text x)
   (-> (^ java.lang.Object) Text)
-  (_jvm_invokevirtual java.lang.Object toString [] x []))
+  (_jvm_invokevirtual "java.lang.Object" "toString" [] x []))
 
 (def'' (interpose sep xs)
   (All [a]
@@ -2039,22 +2040,22 @@
 
 (def (last-index-of part text)
   (-> Text Text Int)
-  (_jvm_i2l (_jvm_invokevirtual java.lang.String lastIndexOf [java.lang.String]
+  (_jvm_i2l (_jvm_invokevirtual "java.lang.String" "lastIndexOf" ["java.lang.String"]
                                 text [part])))
 
 (def (index-of part text)
   (-> Text Text Int)
-  (_jvm_i2l (_jvm_invokevirtual java.lang.String indexOf [java.lang.String]
+  (_jvm_i2l (_jvm_invokevirtual "java.lang.String" "indexOf" ["java.lang.String"]
                                 text [part])))
 
 (def (substring1 idx text)
   (-> Int Text Text)
-  (_jvm_invokevirtual java.lang.String substring [int]
+  (_jvm_invokevirtual "java.lang.String" "substring" ["int"]
                       text [(_jvm_l2i idx)]))
 
 (def (substring2 idx1 idx2 text)
   (-> Int Int Text Text)
-  (_jvm_invokevirtual java.lang.String substring [int int]
+  (_jvm_invokevirtual "java.lang.String" "substring" ["int" "int"]
                       text [(_jvm_l2i idx1) (_jvm_l2i idx2)]))
 
 (def (split-module-contexts module)