9 files changed, 22 insertions, 16 deletions
diff --git a/new-luxc/source/luxc/lang/host/common-lisp.lux b/new-luxc/source/luxc/lang/host/common-lisp.lux
index 77b8cfc22..fb6a933df 100644
--- a/new-luxc/source/luxc/lang/host/common-lisp.lux
+++ b/new-luxc/source/luxc/lang/host/common-lisp.lux
@@ -53,7 +53,7 @@
     (:abstraction "()"))
 
   (def: #export bool
-    (-> Bool Expression)
+    (-> Bit Expression)
     (|>> (case> true (:abstraction "t")
                 false ..nil)))
 
diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux
index d30df3fd3..3c5fa3150 100644
--- a/new-luxc/source/luxc/lang/host/jvm.lux
+++ b/new-luxc/source/luxc/lang/host/jvm.lux
@@ -97,7 +97,7 @@
                              options)]
     (wrap (list& (` (type: (~' #export) (~ g!type)
                       (~ (code.record (list/map (function (_ tag)
-                                                  [tag (` .Bool)])
+                                                  [tag (` .Bit)])
                                                 g!tags+)))))
 
                  (` (def: (~' #export) (~ g!none)
diff --git a/new-luxc/source/luxc/lang/host/jvm/def.lux b/new-luxc/source/luxc/lang/host/jvm/def.lux
index c973f79c3..4c19f38f6 100644
--- a/new-luxc/source/luxc/lang/host/jvm/def.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/def.lux
@@ -265,7 +265,7 @@
                       (FieldVisitor::visitEnd []))]
          writer)))]
 
-  [boolean-field Bool $t.boolean id]
+  [boolean-field Bit  $t.boolean id]
   [byte-field    Int  $t.byte    host.long-to-byte]
   [short-field   Int  $t.short   host.long-to-short]
   [int-field     Int  $t.int     host.long-to-int]
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index c3088ec7d..3f0f68def 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -127,7 +127,7 @@
        (do-to visitor
          (MethodVisitor::visitLdcInsn [(<prepare> value)]))))]
 
-  [boolean Bool id]
+  [boolean Bit id]
   [int     Int  host.long-to-int]
   [long    Int  id]
   [double  Frac id]
@@ -259,7 +259,7 @@
 
 (do-template [<name> <inst>]
   [(def: #export (<name> class method-name method-signature interface?)
-     (-> Text Text //.Method Bool //.Inst)
+     (-> Text Text //.Method Bit //.Inst)
      (function (_ visitor)
        (do-to visitor
          (MethodVisitor::visitMethodInsn [<inst> (//type.binary-name class) method-name (//type.method-descriptor method-signature) interface?]))))]
diff --git a/new-luxc/source/luxc/lang/host/lua.lux b/new-luxc/source/luxc/lang/host/lua.lux
index 8f057bc29..ec2fa8928 100644
--- a/new-luxc/source/luxc/lang/host/lua.lux
+++ b/new-luxc/source/luxc/lang/host/lua.lux
@@ -15,7 +15,7 @@
   "nil")
 
 (def: #export bool
-  (-> Bool Expression)
+  (-> Bit Expression)
   %b)
 
 (def: #export int
diff --git a/new-luxc/source/luxc/lang/host/php.lux b/new-luxc/source/luxc/lang/host/php.lux
index 50d618f85..34c7c0535 100644
--- a/new-luxc/source/luxc/lang/host/php.lux
+++ b/new-luxc/source/luxc/lang/host/php.lux
@@ -23,7 +23,7 @@
   (type: #export Global (Code' (Expression' Global')))
   (type: #export Var (Code' (Expression' Var')))
   (type: #export Argument
-    {#reference? Bool
+    {#reference? Bit
      #var Var})
   (type: #export Computation (Code' (Expression' Computation')))
   (type: #export Statement (Code' Statement'))
@@ -82,8 +82,10 @@
     (:abstraction "NULL"))
 
   (def: #export bool
-    (-> Bool Computation)
-    (|>> %b :abstraction))
+    (-> Bit Computation)
+    (|>> (case> true "true"
+                false "false")
+         :abstraction))
 
   (def: #export int
     (-> Int Computation)
diff --git a/new-luxc/source/luxc/lang/host/python.lux b/new-luxc/source/luxc/lang/host/python.lux
index c9835aa5d..e39ce5571 100644
--- a/new-luxc/source/luxc/lang/host/python.lux
+++ b/new-luxc/source/luxc/lang/host/python.lux
@@ -48,7 +48,7 @@
     (:abstraction "None"))
 
   (def: #export bool
-    (-> Bool Expression)
+    (-> Bit Expression)
     (|>> (case> true "True"
                 false "False")
          :abstraction))
diff --git a/new-luxc/source/luxc/lang/host/r.lux b/new-luxc/source/luxc/lang/host/r.lux
index 6667d531f..4655c1343 100644
--- a/new-luxc/source/luxc/lang/host/r.lux
+++ b/new-luxc/source/luxc/lang/host/r.lux
@@ -66,7 +66,7 @@
   (def: #export no-answer Expression n/a)
 
   (def: #export bool
-    (-> Bool Expression)
+    (-> Bit Expression)
     (|>> (case> true "TRUE"
                 false "FALSE")
          self-contained))
diff --git a/new-luxc/source/luxc/lang/host/ruby.lux b/new-luxc/source/luxc/lang/host/ruby.lux
index c2bc6e95f..51b0d7ea7 100644
--- a/new-luxc/source/luxc/lang/host/ruby.lux
+++ b/new-luxc/source/luxc/lang/host/ruby.lux
@@ -1,8 +1,11 @@
 (.module:
   [lux #- not or and]
-  (lux (data [text]
-             text/format
-             (coll [list "list/" Functor<List> Fold<List>]))))
+  (lux
+   (control
+    pipe)
+   (data [text]
+         text/format
+         (coll [list "list/" Functor<List> Fold<List>]))))
 
 (type: #export Ruby Text)
 
@@ -15,8 +18,9 @@
   "nil")
 
 (def: #export bool
-  (-> Bool Expression)
-  %b)
+  (-> Bit Expression)
+  (|>> (case> true "true"
+              false "false")))
 
 (def: #export int
   (-> Int Expression)