From f76922dfef6e88db854a27dc17987ccdc9736d6a Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 11 Jul 2018 21:45:38 -0400
Subject: - Removed stale machinery for "lux int min" and  "lux int max".

---
 .../source/luxc/lang/translation/r/procedure/common.jvm.lux   | 11 -----------
 new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux       |  6 +++---
 2 files changed, 3 insertions(+), 14 deletions(-)

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

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 ea85aef1e..2e6ea90e2 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
@@ -218,15 +218,6 @@
   [frac//max      Double::MAX_VALUE            r.float]
   )
 
-(do-template [<name> <expression>]
-  [(def: (<name> _)
-     Nullary
-     <expression>)]
-
-  [int//min runtimeT.int//min]
-  [int//max runtimeT.int//max]
-  )
-
 (do-template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
@@ -283,8 +274,6 @@
           (install "%" (binary int//rem))
           (install "=" (binary int//=))
           (install "<" (binary int//<))
-          (install "min" (nullary int//min))
-          (install "max" (nullary int//max))
           (install "to-frac" (unary runtimeT.int//to-float))
           (install "char" (unary int//char)))))
 
diff --git a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
index 7267494d5..09bc9e7b0 100644
--- a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
@@ -3,7 +3,7 @@
   (lux (control ["p" parser "p/" Monad<Parser>]
                 [monad #+ do])
        (data [bit]
-             [number #+ hex]
+             [number (#+ hex) ("int/" Interval<Int>)]
              text/format
              (coll [list "list/" Monad<List>]))
        [macro]
@@ -169,8 +169,8 @@
 
   [int//zero 0]
   [int//one 1]
-  [int//min ("lux int min")]
-  [int//max ("lux int max")]
+  [int//min int/bottom]
+  [int//max int/top]
   )
 
 (def: #export int64-high (r.nth (r.string //.int-high-field)))
-- 
cgit v1.2.3