Turned all "lux int ???" extensions to "lux i64 ???".

1 files changed, 25 insertions, 31 deletions

diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.lux
index e9a72b2f1..ea67a0d4a 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.lux
@@ -79,9 +79,9 @@
           maskI (_.unwrap #_t.Long)
           <op> (_.wrap #_t.Long)))]
 
-  [bit::and _.LAND]
-  [bit::or  _.LOR]
-  [bit::xor _.LXOR]
+  [i64::and _.LAND]
+  [i64::or  _.LOR]
+  [i64::xor _.LXOR]
   )
 
 (template [<name> <op>]
@@ -92,9 +92,9 @@
           <op>
           (_.wrap #_t.Long)))]
 
-  [bit::left-shift             _.LSHL]
-  [bit::arithmetic-right-shift _.LSHR]
-  [bit::logical-right-shift    _.LUSHR]
+  [i64::left-shift             _.LSHL]
+  [i64::arithmetic-right-shift _.LSHR]
+  [i64::logical-right-shift    _.LUSHR]
   )
 
 (template [<name> <const> <type>]
@@ -117,9 +117,9 @@
 
   [i64::+  #_t.Long   _.LADD]
   [i64::-  #_t.Long   _.LSUB]
-  [int::*  #_t.Long   _.LMUL]
-  [int::/  #_t.Long   _.LDIV]
-  [int::%  #_t.Long   _.LREM]
+  [i64::*  #_t.Long   _.LMUL]
+  [i64::/  #_t.Long   _.LDIV]
+  [i64::%  #_t.Long   _.LREM]
   
   [frac::+ #_t.Double _.DADD]
   [frac::- #_t.Double _.DSUB]
@@ -141,7 +141,7 @@
      [<eq> +0]
      [<lt> -1])]
 
-  [i64::= int::< (_.unwrap #_t.Long)   _.LCMP]
+  [i64::= i64::< (_.unwrap #_t.Long)   _.LCMP]
   [frac::= frac::< (_.unwrap #_t.Double) _.DCMPG]
   )
 
@@ -150,8 +150,8 @@
      (Unary Inst)
      (|>> inputI <prepare> <transform>))]
 
-  [int::f64 (_.unwrap #_t.Long) (<| (_.wrap #_t.Double) _.L2D)]
-  [int::char (_.unwrap #_t.Long)
+  [i64::f64 (_.unwrap #_t.Long) (<| (_.wrap #_t.Double) _.L2D)]
+  [i64::char (_.unwrap #_t.Long)
    ((|>> _.L2I _.I2C (_.INVOKESTATIC "java.lang.Character" "toString" (_t.method (list _t.char) (#.Some $String) (list)) #0)))]
 
   [frac::i64 (_.unwrap #_t.Double) (<| (_.wrap #_t.Long) _.D2L)]
@@ -258,26 +258,21 @@
   Bundle
   (<| (bundle.prefix "i64")
       (|> (: Bundle bundle.empty)
-          (bundle.install "and" (binary bit::and))
-          (bundle.install "or" (binary bit::or))
-          (bundle.install "xor" (binary bit::xor))
-          (bundle.install "left-shift" (binary bit::left-shift))
-          (bundle.install "logical-right-shift" (binary bit::logical-right-shift))
-          (bundle.install "arithmetic-right-shift" (binary bit::arithmetic-right-shift))
+          (bundle.install "and" (binary i64::and))
+          (bundle.install "or" (binary i64::or))
+          (bundle.install "xor" (binary i64::xor))
+          (bundle.install "left-shift" (binary i64::left-shift))
+          (bundle.install "logical-right-shift" (binary i64::logical-right-shift))
+          (bundle.install "arithmetic-right-shift" (binary i64::arithmetic-right-shift))
+          (bundle.install "=" (binary i64::=))
+          (bundle.install "<" (binary i64::<))
           (bundle.install "+" (binary i64::+))
           (bundle.install "-" (binary i64::-))
-          (bundle.install "=" (binary i64::=)))))
-
-(def: bundle::int
-  Bundle
-  (<| (bundle.prefix "int")
-      (|> (: Bundle bundle.empty)
-          (bundle.install "*" (binary int::*))
-          (bundle.install "/" (binary int::/))
-          (bundle.install "%" (binary int::%))
-          (bundle.install "<" (binary int::<))
-          (bundle.install "f64" (unary int::f64))
-          (bundle.install "char" (unary int::char)))))
+          (bundle.install "*" (binary i64::*))
+          (bundle.install "/" (binary i64::/))
+          (bundle.install "%" (binary i64::%))
+          (bundle.install "f64" (unary i64::f64))
+          (bundle.install "char" (unary i64::char)))))
 
 (def: bundle::f64
   Bundle
@@ -323,7 +318,6 @@
   (<| (bundle.prefix "lux")
       (|> bundle::lux
           (dictionary.merge bundle::i64)
-          (dictionary.merge bundle::int)
           (dictionary.merge bundle::f64)
           (dictionary.merge bundle::text)
           (dictionary.merge bundle::io))))