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/ruby/procedure/common.jvm.lux | 47 ++--------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/ruby/procedure')

diff --git a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux
index a13dae50b..e38dfff28 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux
@@ -233,9 +233,6 @@
      Nullary
      (<encode> <const>))]
 
-  [nat//min                 0                           ruby.int]
-  [nat//max                -1                           ruby.int]
-
   [frac//smallest          Double::MIN_VALUE            ruby.float]
   [frac//min               (f/* -1.0 Double::MAX_VALUE) ruby.float]
   [frac//max               Double::MAX_VALUE            ruby.float]
@@ -282,12 +279,6 @@
   [int//div        ruby./]
   [int//rem        ruby.%]
   
-  [nat//add        ruby.+]
-  [nat//sub        ruby.-]
-  [nat//mul        ruby.*]
-  [nat//div        runtimeT.nat///]
-  [nat//rem        runtimeT.nat//%]
-
   [deg//add        ruby.+]
   [deg//sub        ruby.-]
   [deg//mul        runtimeT.deg//*]
@@ -319,21 +310,10 @@
      Binary
      (<cmp> paramO subjectO))]
 
-  [nat//= ruby.=]
-  [nat//< runtimeT.nat//<]
   [int//= ruby.=]
   [int//< ruby.<]
   [deg//= ruby.=]
-  [deg//< runtimeT.nat//<])
-
-(do-template [<name>]
-  [(def: (<name> inputO)
-     Unary
-     inputO)]
-
-  [nat//to-int]
-  [int//to-nat]
-  )
+  [deg//< ruby.<])
 
 (def: frac//encode
   Unary
@@ -370,26 +350,6 @@
   [frac//to-deg runtimeT.deg//from-frac]
   )
 
-(def: nat//char
-  Unary
-  (ruby.send "chr" (list)))
-
-(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 nat//to-int))
-          (install "char" (unary nat//char)))))
-
 (def: int-procs
   Bundle
   (<| (prefix "int")
@@ -403,8 +363,8 @@
           (install "<" (binary int//<))
           (install "min" (nullary int//min))
           (install "max" (nullary int//max))
-          (install "to-nat" (unary int//to-nat))
-          (install "to-frac" (unary int//to-frac)))))
+          (install "to-frac" (unary int//to-frac))
+          (install "char" (unary (ruby.send "chr" (list)))))))
 
 (def: deg-procs
   Bundle
@@ -647,7 +607,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