From fb72b937aba7886ce204379e97aa06c327a4029f Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 6 May 2018 23:27:12 -0400
Subject: - Implemented Nat functionality in pure Lux.

---
 .../lang/translation/r/procedure/common.jvm.lux    | 37 +++-------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux')

diff --git a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux
index a9e661130..9554abc86 100644
--- a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux
@@ -229,9 +229,6 @@
      Nullary
      <expression>)]
 
-  [nat//min runtimeT.int//zero]
-  [nat//max runtimeT.int//-one]
-
   [int//min runtimeT.int//min]
   [int//max runtimeT.int//max]
 
@@ -260,12 +257,6 @@
   [int//div        runtimeT.int///]
   [int//rem        runtimeT.int//%]
 
-  [nat//add        runtimeT.int//+]
-  [nat//sub        runtimeT.int//-]
-  [nat//mul        runtimeT.int//*]
-  [nat//div        runtimeT.nat///]
-  [nat//rem        runtimeT.nat//%]
-
   [deg//add        runtimeT.int//+]
   [deg//sub        runtimeT.int//-]
   [deg//rem        runtimeT.int//-]
@@ -297,14 +288,11 @@
      Binary
      (<cmp> paramO subjectO))]
 
-  [nat//= runtimeT.int//=]
-  [nat//< runtimeT.nat//<]
-
   [int//= runtimeT.int//=]
   [int//< runtimeT.int//<]
 
   [deg//= runtimeT.int//=]
-  [deg//< runtimeT.nat//<]
+  [deg//< runtimeT.int//<]
   )
 
 (def: (apply1 func)
@@ -312,23 +300,7 @@
   (function (_ value)
     (r.apply (list value) func)))
 
-(def: nat//char (|>> runtimeT.int64-low (apply1 (r.global "intToUtf8"))))
-
-(def: nat-procs
-  Bundle
-  (<| (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//=))
-          (install "<" (binary nat//<))
-          (install "min" (nullary nat//min))
-          (install "max" (nullary nat//max))
-          (install "to-int" (unary id))
-          (install "char" (unary nat//char)))))
+(def: int//char (|>> runtimeT.int64-low (apply1 (r.global "intToUtf8"))))
 
 (def: int-procs
   Bundle
@@ -343,8 +315,8 @@
           (install "<" (binary int//<))
           (install "min" (nullary int//min))
           (install "max" (nullary int//max))
-          (install "to-nat" (unary id))
-          (install "to-frac" (unary runtimeT.int//to-float)))))
+          (install "to-frac" (unary runtimeT.int//to-float))
+          (install "char" (unary int//char)))))
 
 (def: deg-procs
   Bundle
@@ -544,7 +516,6 @@
   (<| (prefix "lux")
       (|> lux-procs
           (dict.merge bit-procs)
-          (dict.merge nat-procs)
           (dict.merge int-procs)
           (dict.merge deg-procs)
           (dict.merge frac-procs)
-- 
cgit v1.2.3