- Implemented bit-count in pure Lux.

4 files changed, 1 insertions, 36 deletions

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 68b0bb67d..5c4909d9b 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
@@ -176,7 +176,6 @@
   Bundle
   (<| (prefix "bit")
       (|> (dict.new text.Hash<Text>)
-          (install "count" (unary runtimeT.bit//count))
           (install "and" (binary bit//and))
           (install "or" (binary bit//or))
           (install "xor" (binary bit//xor))
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 ced898662..5f073eb17 100644
--- a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
@@ -609,24 +609,6 @@
   [bit//xor r.bit-xor]
   )
 
-(runtime: (bit//count-32 input)
-  (with-vars [count]
-    ($_ r.then
-        (r.set! count (r.int 0))
-        (let [last-input-bit (|> (@@ input) (r.bit-and (r.int 1)))
-              update-count! (r.set! count (|> (@@ count) (r.+ last-input-bit)))
-              consume-input! (r.set! input (|> (@@ input) (r.bit-ushr (r.int 1))))
-              input-remaining? (|> (@@ input) (r.= (r.int 0)))]
-          (r.while input-remaining?
-                   ($_ r.then
-                       update-count!
-                       consume-input!)))
-        (@@ count))))
-
-(runtime: (bit//count input)
-  (int//from-float (r.+ (bit//count-32 (int64-high (@@ input)))
-                        (bit//count-32 (int64-low (@@ input))))))
-
 (runtime: (bit//logical-right-shift shift input)
   ($_ r.then
       (limit-shift! shift)
@@ -656,8 +638,6 @@
       @@bit//or
       @@bit//xor
       @@bit//not
-      @@bit//count-32
-      @@bit//count
       @@bit//left-shift
       @@bit//arithmetic-right-shift-32
       @@bit//arithmetic-right-shift
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 729acd978..bcc555fe2 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
@@ -174,15 +174,10 @@
   [bit//logical-right-shift    runtimeT.bit//logical-right-shift]
   )
 
-(def: bit//count
-  Unary
-  runtimeT.bit//count)
-
 (def: bit-procs
   Bundle
   (<| (prefix "bit")
       (|> (dict.new text.Hash<Text>)
-          (install "count" (unary bit//count))
           (install "and" (binary bit//and))
           (install "or" (binary bit//or))
           (install "xor" (binary bit//xor))
diff --git a/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux
index ac8f7b11a..ef840d210 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux
@@ -157,14 +157,6 @@
           @@product//right "\n"
           @@sum//get "\n"))
 
-(runtime: (bit//count subject)
-  (ruby.block! (list (ruby.set! (list "count") (ruby.int 0))
-                     (ruby.while! (ruby.> (ruby.int 0) subject)
-                                  (ruby.block! (list (ruby.set! (list "count") (ruby.+ (ruby.% (ruby.int 2) subject)
-                                                                                       "count"))
-                                                     (ruby.set! (list subject) (ruby./ (ruby.int 2) subject)))))
-                     (ruby.return! "count"))))
-
 (runtime: (bit//logical-right-shift param subject)
   (let [mask (|> (ruby.int 1)
                  (ruby.bit-shl (ruby.- param (ruby.int 64)))
@@ -175,8 +167,7 @@
 
 (def: runtime//bit
   Runtime
-  (format @@bit//count
-          @@bit//logical-right-shift))
+  @@bit//logical-right-shift)
 
 (runtime: (text//index subject param start)
   (ruby.block! (list (ruby.set! (list "idx") (ruby.send "index" (list param start) subject))