From 69fefab57c40f323d759dc444dbcebad15071585 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 13 Jul 2018 22:01:32 -0400
Subject: Re-named "Bool" type to "Bit".

---
 new-luxc/source/luxc/lang/translation/lua/case.jvm.lux       | 4 ++--
 new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux | 4 ++--
 new-luxc/source/luxc/lang/translation/lua/primitive.jvm.lux  | 8 ++++----
 new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux    | 4 ++--
 new-luxc/source/luxc/lang/translation/lua/structure.jvm.lux  | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/new-luxc/source/luxc/lang/translation/lua/case.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/case.jvm.lux
index 70d2330f4..af4e61b7c 100644
--- a/new-luxc/source/luxc/lang/translation/lua/case.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/case.jvm.lux
@@ -30,7 +30,7 @@
                              (lua.return! bodyO)))))))
 
 (def: #export (translate-record-get translate valueS path)
-  (-> (-> ls.Synthesis (Meta Expression)) ls.Synthesis (List [Nat Bool])
+  (-> (-> ls.Synthesis (Meta Expression)) ls.Synthesis (List [Nat Bit])
       (Meta Expression))
   (do macro.Monad<Meta>
     [valueO (translate valueS)]
@@ -105,7 +105,7 @@
     ([#.Nat  (<| lua.int (:coerce Int))]
      [#.Int  lua.int]
      [#.Rev  (<| lua.int (:coerce Int))]
-     [#.Bool lua.bool]
+     [#.Bit lua.bool]
      [#.Frac lua.float]
      [#.Text lua.string])
 
diff --git a/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux
index 9632d5708..0fefcc8ba 100644
--- a/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux
@@ -42,14 +42,14 @@
     (^template [<tag> <generator>]
       [_ (<tag> value)]
       (<generator> value))
-    ([#.Bool primitiveT.translate-bool]
+    ([#.Bit primitiveT.translate-bit]
      [#.Nat  primitiveT.translate-nat]
      [#.Int  primitiveT.translate-int]
      [#.Rev  primitiveT.translate-rev]
      [#.Frac primitiveT.translate-frac]
      [#.Text primitiveT.translate-text])
 
-    (^code ((~ [_ (#.Nat tag)]) (~ [_ (#.Bool last?)]) (~ valueS)))
+    (^code ((~ [_ (#.Nat tag)]) (~ [_ (#.Bit last?)]) (~ valueS)))
     (structureT.translate-variant translate tag last? valueS)
 
     (^code [(~+ members)])
diff --git a/new-luxc/source/luxc/lang/translation/lua/primitive.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/primitive.jvm.lux
index 4a6c78b04..230498fcb 100644
--- a/new-luxc/source/luxc/lang/translation/lua/primitive.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/primitive.jvm.lux
@@ -6,13 +6,13 @@
        [macro "meta/" Monad<Meta>])
   (luxc (lang (host [lua #+ Lua Expression Statement]))))
 
-(def: #export translate-bool
-  (-> Bool (Meta Expression))
-  (|>> %b meta/wrap))
+(def: #export translate-bit
+  (-> Bit (Meta Expression))
+  (|>> lua.bool meta/wrap))
 
 (def: #export translate-int
   (-> Int (Meta Expression))
-  (|>> %i meta/wrap))
+  (|>> lua.int meta/wrap))
 
 (def: #export translate-frac
   (-> Frac (Meta Expression))
diff --git a/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux
index 2c0dfec17..6be20a0e6 100644
--- a/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux
@@ -17,7 +17,7 @@
 (def: #export unit Expression (%t //.unit))
 
 (def: (flag value)
-  (-> Bool Lua)
+  (-> Bit Lua)
   (if value
     (lua.string "")
     lua.nil))
@@ -29,7 +29,7 @@
                    [//.variant-value-field value])))
 
 (def: #export (variant tag last? value)
-  (-> Nat Bool Expression Expression)
+  (-> Nat Bit Expression Expression)
   (variant' (%i (.int tag)) (flag last?) value))
 
 (def: none
diff --git a/new-luxc/source/luxc/lang/translation/lua/structure.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/structure.jvm.lux
index c629b0cae..b6eeaa013 100644
--- a/new-luxc/source/luxc/lang/translation/lua/structure.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/structure.jvm.lux
@@ -25,7 +25,7 @@
       (wrap (format "{" (text.join-with "," elemsT+) "}")))))
 
 (def: #export (translate-variant translate tag tail? valueS)
-  (-> (-> Synthesis (Meta Expression)) Nat Bool Synthesis (Meta Expression))
+  (-> (-> Synthesis (Meta Expression)) Nat Bit Synthesis (Meta Expression))
   (do macro.Monad<Meta>
     [valueT (translate valueS)]
     (wrap (runtimeT.variant tag tail? valueT))))
-- 
cgit v1.2.3