- Function generation.

1 files changed, 19 insertions, 19 deletions

diff --git a/new-luxc/source/luxc/generator/procedure/common.jvm.lux b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
index d04a91141..9f8afdbb2 100644
--- a/new-luxc/source/luxc/generator/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
@@ -56,7 +56,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-name (list)))
+(def: $Function $;Type ($t;class &runtime;function-class (list)))
 
 (def: (install name unnamed)
   (-> Text (-> Text Proc)
@@ -135,8 +135,8 @@
 (def: (lux//try riskyI)
   Unary
   (|>. riskyI
-       ($i;CHECKCAST &runtime;function-name)
-       ($i;INVOKESTATIC &runtime;runtime-name "try" try-method false)))
+       ($i;CHECKCAST &runtime;function-class)
+       ($i;INVOKESTATIC &runtime;runtime-class "try" try-method false)))
 
 ## [[Bits]]
 (do-template [<name> <op>]
@@ -256,9 +256,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-name "div_nat" nat-method false)]
+   ($i;INVOKESTATIC &runtime;runtime-class "div_nat" nat-method false)]
   [nat//rem        ($i;unwrap #$;Long)   ($i;wrap #$;Long)
-   ($i;INVOKESTATIC &runtime;runtime-name "rem_nat" nat-method false)]
+   ($i;INVOKESTATIC &runtime;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]
@@ -269,9 +269,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-name "mul_deg" deg-method false)]
+   ($i;INVOKESTATIC &runtime;runtime-class "mul_deg" deg-method false)]
   [deg//div        ($i;unwrap #$;Long)   ($i;wrap #$;Long)
-   ($i;INVOKESTATIC &runtime;runtime-name "div_deg" deg-method false)]
+   ($i;INVOKESTATIC &runtime;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]
@@ -289,10 +289,10 @@
      [<eq>  0]
      [<lt> -1])]
 
-  [nat//eq  nat//lt  ($i;unwrap #$;Long)   ($i;INVOKESTATIC &runtime;runtime-name "compare_nat" compare-nat-method false)]
+  [nat//eq  nat//lt  ($i;unwrap #$;Long)   ($i;INVOKESTATIC &runtime;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-name "compare_nat" compare-nat-method false)]
+  [deg//eq  deg//lt  ($i;unwrap #$;Long)   ($i;INVOKESTATIC &runtime;runtime-class "compare_nat" compare-nat-method false)]
   )
 
 (do-template [<name> <prepare> <transform>]
@@ -310,15 +310,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-name "frac_to_deg"
+   (<| ($i;wrap #$;Long) ($i;INVOKESTATIC &runtime;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-name "decode_frac" ($t;method (list $String) (#;Some $Object-Array) (list)) false)]
+   ($i;INVOKESTATIC &runtime;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-name "deg_to_frac"
+   (<| ($i;wrap #$;Double) ($i;INVOKESTATIC &runtime;runtime-class "deg_to_frac"
                                             ($t;method (list $t;long) (#;Some $t;double) (list)) false))]
   )
 
@@ -358,7 +358,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-name "text_char" ($t;method (list $String $t;int) (#;Some $t;int) (list)) false)
+   ($i;INVOKESTATIC &runtime;runtime-class "text_char" ($t;method (list $String $t;int) (#;Some $t;int) (list)) false)
    lux-intI]
   )
 
@@ -371,7 +371,7 @@
           <op>))]
 
   [text//clip ($i;CHECKCAST "java.lang.String") jvm-intI jvm-intI
-   ($i;INVOKESTATIC &runtime;runtime-name "text_clip"
+   ($i;INVOKESTATIC &runtime;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)]
@@ -508,20 +508,20 @@
 ## [[Processes]]
 (def: (process//concurrency-level [])
   Nullary
-  (|>. ($i;GETSTATIC &runtime;runtime-name "concurrency_level" $t;int)
+  (|>. ($i;GETSTATIC &runtime;runtime-class "concurrency_level" $t;int)
        lux-intI))
 
 (def: (process//future procedureI)
   Unary
-  (|>. procedureI ($i;CHECKCAST &runtime;function-name)
-       ($i;INVOKESTATIC &runtime;runtime-name "future"
+  (|>. procedureI ($i;CHECKCAST &runtime;function-class)
+       ($i;INVOKESTATIC &runtime;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-name)
-       ($i;INVOKESTATIC &runtime;runtime-name "schedule"
+       procedureI ($i;CHECKCAST &runtime;function-class)
+       ($i;INVOKESTATIC &runtime;runtime-class "schedule"
                         ($t;method (list $t;long $Function) (#;Some $Object) (list)) false)))
 
 ## [Bundles]