- Fixed some bugs.

- Some refactoring.
- Added some alternative snippets of code that new-luxc can handle better.

2 files changed, 123 insertions, 112 deletions

diff --git a/new-luxc/source/luxc/lang/translation.lux b/new-luxc/source/luxc/lang/translation.lux
index fbecf2da5..80484b7e8 100644
--- a/new-luxc/source/luxc/lang/translation.lux
+++ b/new-luxc/source/luxc/lang/translation.lux
@@ -128,8 +128,9 @@
                                        (analyse valueC))))
                valueT (&;with-type-env
                         (tc;clean valueT))
-               ## #let [_ (if (or (text/= "list/size" def-name))
+               ## #let [_ (if (or (text/= "string~" def-name))
                ##           (log! (format "{" def-name "}\n"
+               ##                         "     TYPE: " (%type valueT) "\n"
                ##                         " ANALYSIS: " (%code valueA) "\n"
                ##                         "SYNTHESIS: " (%code (expressionS;synthesize valueA))))
                ##           [])]
diff --git a/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux
index 6c1b18932..01f2a33c7 100644
--- a/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/procedure/common.jvm.lux
@@ -224,7 +224,7 @@
 ## [[Arrays]]
 (def: (array//new lengthI)
   Unary
-  (|>. lengthI jvm-intI ($i;ANEWARRAY ($t;descriptor $Object))))
+  (|>. lengthI jvm-intI ($i;ANEWARRAY ($t;binary-name "java.lang.Object"))))
 
 (def: (array//get [arrayI idxI])
   Binary
@@ -348,9 +348,8 @@
      (|>. inputI <prepare> <transform>))]
 
   [nat//to-int id id]
-  [nat//to-char ($i;unwrap #$;Long)
-   (<| ($i;INVOKESTATIC "java.lang.Character" "toString" ($t;method (list $t;char) (#;Some $String) (list)) false)
-       $i;I2C $i;L2I)]
+  [nat//char ($i;unwrap #$;Long)
+   ((|>. $i;L2I $i;I2C ($i;INVOKESTATIC "java.lang.Character" "toString" ($t;method (list $t;char) (#;Some $String) (list)) false)))]
   
   [int//to-nat id id]
   [int//to-frac ($i;unwrap #$;Long) (<| ($i;wrap #$;Double) $i;L2D)]
@@ -397,7 +396,7 @@
    ($i;wrap #$;Boolean)]
   [text//lt ($i;CHECKCAST "java.lang.String") ($i;CHECKCAST "java.lang.String")
    ($i;INVOKEVIRTUAL "java.lang.String" "compareTo" ($t;method (list $String) (#;Some $t;int) (list)) false)
-   (predicateI $i;IF_ICMPEQ)]
+   (<| (predicateI $i;IF_ICMPEQ) ($i;int -1))]
   [text//concat ($i;CHECKCAST "java.lang.String") ($i;CHECKCAST "java.lang.String")
    ($i;INVOKEVIRTUAL "java.lang.String" "concat" ($t;method (list $String) (#;Some $String) (list)) false)
    id]
@@ -563,7 +562,8 @@
 ## [[Processes]]
 (def: (process//concurrency-level [])
   Nullary
-  (|>. ($i;GETSTATIC hostL;runtime-class "concurrency_level" $t;int)
+  (|>. ($i;INVOKESTATIC "java.lang.Runtime" "getRuntime" ($t;method (list) (#;Some ($t;class "java.lang.Runtime" (list))) (list)) false)
+       ($i;INVOKEVIRTUAL "java.lang.Runtime" "availableProcessors" ($t;method (list) (#;Some $t;int) (list)) false)
        lux-intI))
 
 (def: (process//future procedureI)
@@ -593,82 +593,87 @@
 
 (def: bit-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "bit count" (unary bit//count))
-      (install "bit and" (binary bit//and))
-      (install "bit or" (binary bit//or))
-      (install "bit xor" (binary bit//xor))
-      (install "bit shift-left" (binary bit//shift-left))
-      (install "bit unsigned-shift-right" (binary bit//unsigned-shift-right))
-      (install "bit shift-right" (binary bit//shift-right))
-      ))
+  (<| (prefix "bit")
+      (|> (dict;new text;Hash<Text>)
+          (install "count" (unary bit//count))
+          (install "and" (binary bit//and))
+          (install "or" (binary bit//or))
+          (install "xor" (binary bit//xor))
+          (install "shift-left" (binary bit//shift-left))
+          (install "unsigned-shift-right" (binary bit//unsigned-shift-right))
+          (install "shift-right" (binary bit//shift-right))
+          )))
 
 (def: nat-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "nat +" (binary nat//add))
-      (install "nat -" (binary nat//sub))
-      (install "nat *" (binary nat//mul))
-      (install "nat /" (binary nat//div))
-      (install "nat %" (binary nat//rem))
-      (install "nat =" (binary nat//eq))
-      (install "nat <" (binary nat//lt))
-      (install "nat min" (nullary nat//min))
-      (install "nat max" (nullary nat//max))
-      (install "nat to-int" (unary nat//to-int))
-      (install "nat to-char" (unary nat//to-char))))
+  (<| (prefix "nat")
+      (|> (dict;new text;Hash<Text>)
+          (install "+" (binary nat//add))
+          (install "-" (binary nat//sub))
+          (install "*" (binary nat//mul))
+          (install "/" (binary nat//div))
+          (install "%" (binary nat//rem))
+          (install "=" (binary nat//eq))
+          (install "<" (binary nat//lt))
+          (install "min" (nullary nat//min))
+          (install "max" (nullary nat//max))
+          (install "to-int" (unary nat//to-int))
+          (install "char" (unary nat//char)))))
 
 (def: int-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "int +" (binary int//add))
-      (install "int -" (binary int//sub))
-      (install "int *" (binary int//mul))
-      (install "int /" (binary int//div))
-      (install "int %" (binary int//rem))
-      (install "int =" (binary int//eq))
-      (install "int <" (binary int//lt))
-      (install "int min" (nullary int//min))
-      (install "int max" (nullary int//max))
-      (install "int to-nat" (unary int//to-nat))
-      (install "int to-frac" (unary int//to-frac))))
+  (<| (prefix "int")
+      (|> (dict;new text;Hash<Text>)
+          (install "+" (binary int//add))
+          (install "-" (binary int//sub))
+          (install "*" (binary int//mul))
+          (install "/" (binary int//div))
+          (install "%" (binary int//rem))
+          (install "=" (binary int//eq))
+          (install "<" (binary int//lt))
+          (install "min" (nullary int//min))
+          (install "max" (nullary int//max))
+          (install "to-nat" (unary int//to-nat))
+          (install "to-frac" (unary int//to-frac)))))
 
 (def: deg-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "deg +" (binary deg//add))
-      (install "deg -" (binary deg//sub))
-      (install "deg *" (binary deg//mul))
-      (install "deg /" (binary deg//div))
-      (install "deg %" (binary deg//rem))
-      (install "deg =" (binary deg//eq))
-      (install "deg <" (binary deg//lt))
-      (install "deg scale" (binary deg//scale))
-      (install "deg reciprocal" (binary deg//reciprocal))
-      (install "deg min" (nullary deg//min))
-      (install "deg max" (nullary deg//max))
-      (install "deg to-frac" (unary deg//to-frac))))
+  (<| (prefix "deg")
+      (|> (dict;new text;Hash<Text>)
+          (install "+" (binary deg//add))
+          (install "-" (binary deg//sub))
+          (install "*" (binary deg//mul))
+          (install "/" (binary deg//div))
+          (install "%" (binary deg//rem))
+          (install "=" (binary deg//eq))
+          (install "<" (binary deg//lt))
+          (install "scale" (binary deg//scale))
+          (install "reciprocal" (binary deg//reciprocal))
+          (install "min" (nullary deg//min))
+          (install "max" (nullary deg//max))
+          (install "to-frac" (unary deg//to-frac)))))
 
 (def: frac-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "frac +" (binary frac//add))
-      (install "frac -" (binary frac//sub))
-      (install "frac *" (binary frac//mul))
-      (install "frac /" (binary frac//div))
-      (install "frac %" (binary frac//rem))
-      (install "frac =" (binary frac//eq))
-      (install "frac <" (binary frac//lt))
-      (install "frac smallest" (nullary frac//smallest))
-      (install "frac min" (nullary frac//min))
-      (install "frac max" (nullary frac//max))
-      (install "frac not-a-number" (nullary frac//not-a-number))
-      (install "frac positive-infinity" (nullary frac//positive-infinity))
-      (install "frac negative-infinity" (nullary frac//negative-infinity))
-      (install "frac to-deg" (unary frac//to-deg))
-      (install "frac to-int" (unary frac//to-int))
-      (install "frac encode" (unary frac//encode))
-      (install "frac decode" (unary frac//decode))))
+  (<| (prefix "frac")
+      (|> (dict;new text;Hash<Text>)
+          (install "+" (binary frac//add))
+          (install "-" (binary frac//sub))
+          (install "*" (binary frac//mul))
+          (install "/" (binary frac//div))
+          (install "%" (binary frac//rem))
+          (install "=" (binary frac//eq))
+          (install "<" (binary frac//lt))
+          (install "smallest" (nullary frac//smallest))
+          (install "min" (nullary frac//min))
+          (install "max" (nullary frac//max))
+          (install "not-a-number" (nullary frac//not-a-number))
+          (install "positive-infinity" (nullary frac//positive-infinity))
+          (install "negative-infinity" (nullary frac//negative-infinity))
+          (install "to-deg" (unary frac//to-deg))
+          (install "to-int" (unary frac//to-int))
+          (install "encode" (unary frac//encode))
+          (install "decode" (unary frac//decode)))))
 
 (def: text-procs
   Bundle
@@ -690,59 +695,64 @@
 
 (def: array-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "array new" (unary array//new))
-      (install "array get" (binary array//get))
-      (install "array put" (trinary array//put))
-      (install "array remove" (binary array//remove))
-      (install "array size" (unary array//size))
-      ))
+  (<| (prefix "array")
+      (|> (dict;new text;Hash<Text>)
+          (install "new" (unary array//new))
+          (install "get" (binary array//get))
+          (install "put" (trinary array//put))
+          (install "remove" (binary array//remove))
+          (install "size" (unary array//size))
+          )))
 
 (def: math-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "math cos" (unary math//cos))
-      (install "math sin" (unary math//sin))
-      (install "math tan" (unary math//tan))
-      (install "math acos" (unary math//acos))
-      (install "math asin" (unary math//asin))
-      (install "math atan" (unary math//atan))
-      (install "math cosh" (unary math//cosh))
-      (install "math sinh" (unary math//sinh))
-      (install "math tanh" (unary math//tanh))
-      (install "math exp" (unary math//exp))
-      (install "math log" (unary math//log))
-      (install "math root2" (unary math//root2))
-      (install "math root3" (unary math//root3))
-      (install "math ceil" (unary math//ceil))
-      (install "math floor" (unary math//floor))
-      (install "math round" (unary math//round))
-      (install "math atan2" (binary math//atan2))
-      (install "math pow" (binary math//pow))
-      ))
+  (<| (prefix "math")
+      (|> (dict;new text;Hash<Text>)
+          (install "cos" (unary math//cos))
+          (install "sin" (unary math//sin))
+          (install "tan" (unary math//tan))
+          (install "acos" (unary math//acos))
+          (install "asin" (unary math//asin))
+          (install "atan" (unary math//atan))
+          (install "cosh" (unary math//cosh))
+          (install "sinh" (unary math//sinh))
+          (install "tanh" (unary math//tanh))
+          (install "exp" (unary math//exp))
+          (install "log" (unary math//log))
+          (install "root2" (unary math//root2))
+          (install "root3" (unary math//root3))
+          (install "ceil" (unary math//ceil))
+          (install "floor" (unary math//floor))
+          (install "round" (unary math//round))
+          (install "atan2" (binary math//atan2))
+          (install "pow" (binary math//pow))
+          )))
 
 (def: io-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "io log" (unary io//log))
-      (install "io error" (unary io//error))
-      (install "io exit" (unary io//exit))
-      (install "io current-time" (nullary io//current-time))))
+  (<| (prefix "io")
+      (|> (dict;new text;Hash<Text>)
+          (install "log" (unary io//log))
+          (install "error" (unary io//error))
+          (install "exit" (unary io//exit))
+          (install "current-time" (nullary io//current-time)))))
 
 (def: atom-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "atom new" (unary atom//new))
-      (install "atom read" (unary atom//read))
-      (install "atom compare-and-swap" (trinary atom//compare-and-swap))))
+  (<| (prefix "atom")
+      (|> (dict;new text;Hash<Text>)
+          (install "new" (unary atom//new))
+          (install "read" (unary atom//read))
+          (install "compare-and-swap" (trinary atom//compare-and-swap)))))
 
 (def: process-procs
   Bundle
-  (|> (dict;new text;Hash<Text>)
-      (install "process concurrency-level" (nullary process//concurrency-level))
-      (install "process future" (unary process//future))
-      (install "process schedule" (binary process//schedule))
-      ))
+  (<| (prefix "process")
+      (|> (dict;new text;Hash<Text>)
+          (install "concurrency-level" (nullary process//concurrency-level))
+          (install "future" (unary process//future))
+          (install "schedule" (binary process//schedule))
+          )))
 
 (def: #export procedures
   Bundle