- Fixed some bugs.

- Improved error reporting.
- Implemented macro-expansion (for JVM).
- Implemented "let" compilation.

2 files changed, 25 insertions, 23 deletions

diff --git a/new-luxc/source/luxc/generator/procedure/common.jvm.lux b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
index 48a820663..fd76082a6 100644
--- a/new-luxc/source/luxc/generator/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
@@ -10,6 +10,7 @@
              ["s" syntax #+ syntax:])
        [host])
   (luxc ["&" base]
+        [";L" host]
         (lang ["la" analysis]
               ["ls" synthesis])
         ["&;" analyser]
@@ -56,7 +57,7 @@
 (def: $Object-Array $;Type ($t;array +1 $Object))
 (def: $String $;Type ($t;class "java.lang.String" (list)))
 (def: $CharSequence $;Type ($t;class "java.lang.CharSequence" (list)))
-(def: $Function $;Type ($t;class &runtime;function-class (list)))
+(def: $Function $;Type ($t;class hostL;function-class (list)))
 
 (def: #export (install name unnamed)
   (-> Text (-> Text Proc)
@@ -142,8 +143,8 @@
 (def: (lux//try riskyI)
   Unary
   (|>. riskyI
-       ($i;CHECKCAST &runtime;function-class)
-       ($i;INVOKESTATIC &runtime;runtime-class "try" try-method false)))
+       ($i;CHECKCAST hostL;function-class)
+       ($i;INVOKESTATIC hostL;runtime-class "try" try-method false)))
 
 ## [[Bits]]
 (do-template [<name> <op>]
@@ -263,9 +264,9 @@
   [nat//sub        ($i;unwrap #$;Long)   ($i;wrap #$;Long)   $i;LSUB]
   [nat//mul        ($i;unwrap #$;Long)   ($i;wrap #$;Long)   $i;LMUL]
   [nat//div        ($i;unwrap #$;Long)   ($i;wrap #$;Long)
-   ($i;INVOKESTATIC &runtime;runtime-class "div_nat" nat-method false)]
+   ($i;INVOKESTATIC hostL;runtime-class "div_nat" nat-method false)]
   [nat//rem        ($i;unwrap #$;Long)   ($i;wrap #$;Long)
-   ($i;INVOKESTATIC &runtime;runtime-class "rem_nat" nat-method false)]
+   ($i;INVOKESTATIC hostL;runtime-class "rem_nat" nat-method false)]
 
   [frac//add       ($i;unwrap #$;Double) ($i;wrap #$;Double) $i;DADD]
   [frac//sub       ($i;unwrap #$;Double) ($i;wrap #$;Double) $i;DSUB]
@@ -276,9 +277,9 @@
   [deg//add        ($i;unwrap #$;Long)   ($i;wrap #$;Long)   $i;LADD]
   [deg//sub        ($i;unwrap #$;Long)   ($i;wrap #$;Long)   $i;LSUB]
   [deg//mul        ($i;unwrap #$;Long)   ($i;wrap #$;Long)
-   ($i;INVOKESTATIC &runtime;runtime-class "mul_deg" deg-method false)]
+   ($i;INVOKESTATIC hostL;runtime-class "mul_deg" deg-method false)]
   [deg//div        ($i;unwrap #$;Long)   ($i;wrap #$;Long)
-   ($i;INVOKESTATIC &runtime;runtime-class "div_deg" deg-method false)]
+   ($i;INVOKESTATIC hostL;runtime-class "div_deg" deg-method false)]
   [deg//rem        ($i;unwrap #$;Long)   ($i;wrap #$;Long)   $i;LSUB]
   [deg//scale      ($i;unwrap #$;Long)   ($i;wrap #$;Long)   $i;LMUL]
   [deg//reciprocal ($i;unwrap #$;Long)   ($i;wrap #$;Long)   $i;LDIV]
@@ -296,10 +297,10 @@
      [<eq>  0]
      [<lt> -1])]
 
-  [nat//eq  nat//lt  ($i;unwrap #$;Long)   ($i;INVOKESTATIC &runtime;runtime-class "compare_nat" compare-nat-method false)]
+  [nat//eq  nat//lt  ($i;unwrap #$;Long)   ($i;INVOKESTATIC hostL;runtime-class "compare_nat" compare-nat-method false)]
   [int//eq  int//lt  ($i;unwrap #$;Long)   $i;LCMP]
   [frac//eq frac//lt ($i;unwrap #$;Double) $i;DCMPG]
-  [deg//eq  deg//lt  ($i;unwrap #$;Long)   ($i;INVOKESTATIC &runtime;runtime-class "compare_nat" compare-nat-method false)]
+  [deg//eq  deg//lt  ($i;unwrap #$;Long)   ($i;INVOKESTATIC hostL;runtime-class "compare_nat" compare-nat-method false)]
   )
 
 (do-template [<name> <prepare> <transform>]
@@ -317,15 +318,15 @@
 
   [frac//to-int ($i;unwrap #$;Double) (<| ($i;wrap #$;Long) $i;D2L)]
   [frac//to-deg ($i;unwrap #$;Double)
-   (<| ($i;wrap #$;Long) ($i;INVOKESTATIC &runtime;runtime-class "frac_to_deg"
+   (<| ($i;wrap #$;Long) ($i;INVOKESTATIC hostL;runtime-class "frac_to_deg"
                                           ($t;method (list $t;double) (#;Some $t;long) (list)) false))]
   [frac//encode ($i;unwrap #$;Double)
    ($i;INVOKESTATIC "java.lang.Double" "toString" ($t;method (list $t;double) (#;Some $String) (list)) false)]
   [frac//decode ($i;CHECKCAST "java.lang.String")
-   ($i;INVOKESTATIC &runtime;runtime-class "decode_frac" ($t;method (list $String) (#;Some $Object-Array) (list)) false)]
+   ($i;INVOKESTATIC hostL;runtime-class "decode_frac" ($t;method (list $String) (#;Some $Object-Array) (list)) false)]
 
   [deg//to-frac ($i;unwrap #$;Long)
-   (<| ($i;wrap #$;Double) ($i;INVOKESTATIC &runtime;runtime-class "deg_to_frac"
+   (<| ($i;wrap #$;Double) ($i;INVOKESTATIC hostL;runtime-class "deg_to_frac"
                                             ($t;method (list $t;long) (#;Some $t;double) (list)) false))]
   )
 
@@ -365,7 +366,7 @@
    ($i;INVOKEVIRTUAL "java.lang.String" "contains" ($t;method (list $CharSequence) (#;Some $t;boolean) (list)) false)
    ($i;wrap #$;Boolean)]
   [text//char ($i;CHECKCAST "java.lang.String") jvm-intI
-   ($i;INVOKESTATIC &runtime;runtime-class "text_char" ($t;method (list $String $t;int) (#;Some $t;int) (list)) false)
+   ($i;INVOKESTATIC hostL;runtime-class "text_char" ($t;method (list $String $t;int) (#;Some $t;int) (list)) false)
    lux-intI]
   )
 
@@ -378,7 +379,7 @@
           <op>))]
 
   [text//clip ($i;CHECKCAST "java.lang.String") jvm-intI jvm-intI
-   ($i;INVOKESTATIC &runtime;runtime-class "text_clip"
+   ($i;INVOKESTATIC hostL;runtime-class "text_clip"
                     ($t;method (list $String $t;int $t;int) (#;Some $Object-Array) (list)) false)]
   [text//replace ($i;CHECKCAST "java.lang.String") ($i;CHECKCAST "java.lang.String") ($i;CHECKCAST "java.lang.String")
    ($i;INVOKEVIRTUAL "java.lang.String" "replace" ($t;method (list $CharSequence $CharSequence) (#;Some $String) (list)) false)]
@@ -466,7 +467,7 @@
        messageI
        ($i;CHECKCAST "java.lang.String")
        ($i;INVOKEVIRTUAL "java.io.PrintStream" "println" string-method false)
-       ($i;string &runtime;unit)))
+       ($i;string hostL;unit)))
 
 (def: (io//error messageI)
   Unary
@@ -515,20 +516,20 @@
 ## [[Processes]]
 (def: (process//concurrency-level [])
   Nullary
-  (|>. ($i;GETSTATIC &runtime;runtime-class "concurrency_level" $t;int)
+  (|>. ($i;GETSTATIC hostL;runtime-class "concurrency_level" $t;int)
        lux-intI))
 
 (def: (process//future procedureI)
   Unary
-  (|>. procedureI ($i;CHECKCAST &runtime;function-class)
-       ($i;INVOKESTATIC &runtime;runtime-class "future"
+  (|>. procedureI ($i;CHECKCAST hostL;function-class)
+       ($i;INVOKESTATIC hostL;runtime-class "future"
                         ($t;method (list $Function) (#;Some $Object) (list)) false)))
 
 (def: (process//schedule [millisecondsI procedureI])
   Binary
   (|>. millisecondsI ($i;unwrap #$;Long)
-       procedureI ($i;CHECKCAST &runtime;function-class)
-       ($i;INVOKESTATIC &runtime;runtime-class "schedule"
+       procedureI ($i;CHECKCAST hostL;function-class)
+       ($i;INVOKESTATIC hostL;runtime-class "schedule"
                         ($t;method (list $t;long $Function) (#;Some $Object) (list)) false)))
 
 ## [Bundles]
diff --git a/new-luxc/source/luxc/generator/procedure/host.jvm.lux b/new-luxc/source/luxc/generator/procedure/host.jvm.lux
index f908c6c6e..fc6bdd01b 100644
--- a/new-luxc/source/luxc/generator/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/host.jvm.lux
@@ -15,6 +15,7 @@
              ["s" syntax #+ syntax:])
        [host])
   (luxc ["&" base]
+        [";L" host]
         (lang ["la" analysis]
               ["ls" synthesis])
         ["&;" analyser]
@@ -494,13 +495,13 @@
           (wrap (|>. valueI
                      ($i;unwrap primitive)
                      ($i;PUTSTATIC class field (#$;Primitive primitive))
-                     ($i;string &runtime;unit))))
+                     ($i;string hostL;unit))))
         
         #;None
         (wrap (|>. valueI
                    ($i;CHECKCAST class)
                    ($i;PUTSTATIC class field ($t;class class (list)))
-                   ($i;string &runtime;unit)))))
+                   ($i;string hostL;unit)))))
 
     _
     (&;fail (format "Wrong syntax for '" proc "'."))))
@@ -655,7 +656,7 @@
   (case returnT
     #;None
     (|>. returnI
-         ($i;string &runtime;unit))
+         ($i;string hostL;unit))
 
     (#;Some type)
     (case type