bit-twiddle 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f2a0957be75960781800875823e68dccce1148
-  data.tar.gz: 1f425d6f4730abd9f318abd6fc183421604707f4
+  metadata.gz: 5c493212409e8f17cb33cdaa7b6432b0af607380
+  data.tar.gz: bb92c9458d0acc157d2ae8ba8b81b9275b805f96
 SHA512:
-  metadata.gz: cb14a13b0a2d58a0538a7f16609b9782d9a79a7aee9efc4a2a0ae670fac35ac41c2326be5d0c481abe50926dace7094a68472d16f760ce2ac06ed369bb1635ea
-  data.tar.gz: dac2a365b3b19a5acfd4fb30ba932de68b15e8daa42cd522a9db2c828a5b88f2556a408e91ce232c19b54069312596b2271605745f91819113dde3ec8083e6d6
+  metadata.gz: 9f038490f6680cf2a0dcce2c495b06750437878e7a076721629c7318da76ebffaecef28006e33ec1b62d76c459e1e45fbf06c4736d1231c9805136e00b56ac23
+  data.tar.gz: f1ce36353a33855ca3b4b424f25e5554d2df3e0550ba6837450b23b4ba0ae8b8197e4dc57cc91975260d7b371f4790b7cfa7ac6922881e1e143102be6c0417dd

data/ext/bit_twiddle/bit_twiddle.c

@@ -1,3 +1,6 @@
+/* Fast C implementation of additional bitwise operations for Ruby
+ * Hand-crafted with ♥ by Alex Dowad, using ONLY the finest 1s and 0s */
+
 #include <ruby.h>
 #include "bt_bignum.h"
 
@@ -1291,9 +1294,24 @@ bnum_bitreverse64(VALUE bnum)
   return modify_lo64_in_bignum(bnum, reverse64(load_64_from_bignum(bnum)));
 }
 
+/* Document-class: Fixnum
+ * Ruby's good old Fixnum.
+ *
+ * `require "bit-twiddle/core_ext"` before trying to use any of the below methods.
+ */
+/* Document-class: Bignum
+ * Ruby's good old Bignum.
+ *
+ * `require "bit-twiddle/core_ext"` before trying to use any of the below methods.
+ */
+/* Document-class: String
+ * Ruby's good old String.
+ *
+ * `require "bit-twiddle/core_ext"` before trying to use any of the below methods.
+ */
+
 /* Add all `bit-twiddle` methods directly to `Fixnum` and `Bignum`. */
-static VALUE
-bt_add_core_extensions(VALUE self)
+static void init_core_extensions()
 {
   rb_define_method(rb_cFixnum, "popcount", fnum_popcount, 0);
   rb_define_method(rb_cBignum, "popcount", bnum_popcount, 0);
@@ -1364,7 +1382,13 @@ bt_add_core_extensions(VALUE self)
   rb_define_method(rb_cBignum, "bitreverse32", bnum_bitreverse32, 0);
   rb_define_method(rb_cFixnum, "bitreverse64", fnum_bitreverse64, 0);
   rb_define_method(rb_cBignum, "bitreverse64", bnum_bitreverse64, 0);
+}
 
+static VALUE
+bt_add_core_extensions(VALUE self)
+{
+  /* this is so Yardoc can find method definitions */
+  init_core_extensions();
   return Qnil;
 }
 
@@ -1421,21 +1445,6 @@ def_wrapper(bitreverse16);
 def_wrapper(bitreverse32);
 def_wrapper(bitreverse64);
 
-/* Document-class: Fixnum
- * Ruby's good old Fixnum.
- *
- * `require "bit-twiddle/core_ext"` before trying to use any of the below methods.
- */
-/* Document-class: Bignum
- * Ruby's good old Bignum.
- *
- * `require "bit-twiddle/core_ext"` before trying to use any of the below methods.
- */
-/* Document-class: String
- * Ruby's good old String.
- *
- * `require "bit-twiddle/core_ext"` before trying to use any of the below methods.
- */
 void Init_bit_twiddle(void)
 {
   VALUE rb_mBitTwiddle = rb_define_module("BitTwiddle");
@@ -1848,79 +1857,4 @@ void Init_bit_twiddle(void)
    * @return [Integer]
    */
   rb_define_singleton_method(rb_mBitTwiddle, "bitreverse64", bt_bitreverse64, 1);
-
-#if 0
-  /* The following definitions are executed only on BitTwiddle.add_core_extensions
-   * This is a hack for Yardoc -- so Yardoc can find them: */
-
-   rb_define_method(rb_cFixnum, "popcount", fnum_popcount, 0);
-   rb_define_method(rb_cBignum, "popcount", bnum_popcount, 0);
-   rb_define_method(rb_cString, "popcount", str_popcount,  0);
-
-   rb_define_method(rb_cFixnum, "lo_bit",   fnum_lo_bit, 0);
-   rb_define_method(rb_cBignum, "lo_bit",   bnum_lo_bit, 0);
-   rb_define_method(rb_cFixnum, "hi_bit",   fnum_hi_bit, 0);
-   rb_define_method(rb_cBignum, "hi_bit",   bnum_hi_bit, 0);
-
-   rb_define_method(rb_cFixnum, "bswap16", fnum_bswap16, 0);
-   rb_define_method(rb_cBignum, "bswap16", bnum_bswap16, 0);
-   rb_define_method(rb_cFixnum, "bswap32", fnum_bswap32, 0);
-   rb_define_method(rb_cBignum, "bswap32", bnum_bswap32, 0);
-   rb_define_method(rb_cFixnum, "bswap64", fnum_bswap64, 0);
-   rb_define_method(rb_cBignum, "bswap64", bnum_bswap64, 0);
-
-   rb_define_method(rb_cFixnum, "rrot8",  fnum_rrot8,  1);
-   rb_define_method(rb_cBignum, "rrot8",  bnum_rrot8,  1);
-   rb_define_method(rb_cFixnum, "rrot16", fnum_rrot16, 1);
-   rb_define_method(rb_cBignum, "rrot16", bnum_rrot16, 1);
-   rb_define_method(rb_cFixnum, "rrot32", fnum_rrot32, 1);
-   rb_define_method(rb_cBignum, "rrot32", bnum_rrot32, 1);
-   rb_define_method(rb_cFixnum, "rrot64", fnum_rrot64, 1);
-   rb_define_method(rb_cBignum, "rrot64", bnum_rrot64, 1);
-
-   rb_define_method(rb_cFixnum, "lrot8",  fnum_lrot8,  1);
-   rb_define_method(rb_cBignum, "lrot8",  bnum_lrot8,  1);
-   rb_define_method(rb_cFixnum, "lrot16", fnum_lrot16, 1);
-   rb_define_method(rb_cBignum, "lrot16", bnum_lrot16, 1);
-   rb_define_method(rb_cFixnum, "lrot32", fnum_lrot32, 1);
-   rb_define_method(rb_cBignum, "lrot32", bnum_lrot32, 1);
-   rb_define_method(rb_cFixnum, "lrot64", fnum_lrot64, 1);
-   rb_define_method(rb_cBignum, "lrot64", bnum_lrot64, 1);
-
-   rb_define_method(rb_cFixnum, "lshift8",   fnum_lshift8,  1);
-   rb_define_method(rb_cBignum, "lshift8",   bnum_lshift8,  1);
-   rb_define_method(rb_cFixnum, "lshift16",  fnum_lshift16, 1);
-   rb_define_method(rb_cBignum, "lshift16",  bnum_lshift16, 1);
-   rb_define_method(rb_cFixnum, "lshift32",  fnum_lshift32, 1);
-   rb_define_method(rb_cBignum, "lshift32",  bnum_lshift32, 1);
-   rb_define_method(rb_cFixnum, "lshift64",  fnum_lshift64, 1);
-   rb_define_method(rb_cBignum, "lshift64",  bnum_lshift64, 1);
-
-   rb_define_method(rb_cFixnum, "rshift8",   fnum_rshift8,  1);
-   rb_define_method(rb_cBignum, "rshift8",   bnum_rshift8,  1);
-   rb_define_method(rb_cFixnum, "rshift16",  fnum_rshift16, 1);
-   rb_define_method(rb_cBignum, "rshift16",  bnum_rshift16, 1);
-   rb_define_method(rb_cFixnum, "rshift32",  fnum_rshift32, 1);
-   rb_define_method(rb_cBignum, "rshift32",  bnum_rshift32, 1);
-   rb_define_method(rb_cFixnum, "rshift64",  fnum_rshift64, 1);
-   rb_define_method(rb_cBignum, "rshift64",  bnum_rshift64, 1);
-
-   rb_define_method(rb_cFixnum, "arith_rshift8",  fnum_arith_rshift8,  1);
-   rb_define_method(rb_cBignum, "arith_rshift8",  bnum_arith_rshift8,  1);
-   rb_define_method(rb_cFixnum, "arith_rshift16", fnum_arith_rshift16, 1);
-   rb_define_method(rb_cBignum, "arith_rshift16", bnum_arith_rshift16, 1);
-   rb_define_method(rb_cFixnum, "arith_rshift32", fnum_arith_rshift32, 1);
-   rb_define_method(rb_cBignum, "arith_rshift32", bnum_arith_rshift32, 1);
-   rb_define_method(rb_cFixnum, "arith_rshift64", fnum_arith_rshift64, 1);
-   rb_define_method(rb_cBignum, "arith_rshift64", bnum_arith_rshift64, 1);
-
-   rb_define_method(rb_cFixnum, "bitreverse8",  fnum_bitreverse8,  0);
-   rb_define_method(rb_cBignum, "bitreverse8",  bnum_bitreverse8,  0);
-   rb_define_method(rb_cFixnum, "bitreverse16", fnum_bitreverse16, 0);
-   rb_define_method(rb_cBignum, "bitreverse16", bnum_bitreverse16, 0);
-   rb_define_method(rb_cFixnum, "bitreverse32", fnum_bitreverse32, 0);
-   rb_define_method(rb_cBignum, "bitreverse32", bnum_bitreverse32, 0);
-   rb_define_method(rb_cFixnum, "bitreverse64", fnum_bitreverse64, 0);
-   rb_define_method(rb_cBignum, "bitreverse64", bnum_bitreverse64, 0);
-#endif
 }

data/ext/bit_twiddle/extconf.rb

@@ -14,8 +14,10 @@ if RUBY_ENGINE == 'rbx'
 elsif RUBY_VERSION < '2.2.0'
   check_sizeof 'BDIGIT'
   $CFLAGS << " -I#{File.join(dir, 'ruby21')} "
-else
+elsif RUBY_VERSION < '2.3.0'
   $CFLAGS << " -I#{File.join(dir, 'ruby22')} "
+else
+  $CFLAGS << " -I#{File.join(dir, 'ruby23')} "
 end
 
 check_sizeof 'short'

data/ext/bit_twiddle/ruby23/bt_bignum.h

@@ -0,0 +1,52 @@
+
+#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+#  define BDIGIT unsigned int
+#  define SIZEOF_BDIGIT SIZEOF_INT
+#elif SIZEOF_INT*2 <= SIZEOF_LONG
+#  define BDIGIT unsigned int
+#  define SIZEOF_BDIGIT SIZEOF_INT
+#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
+#  define BDIGIT unsigned short
+#  define SIZEOF_BDIGIT SIZEOF_SHORT
+#else
+#  define BDIGIT unsigned short
+#  define SIZEOF_BDIGIT (SIZEOF_LONG/2)
+#  define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG
+#endif
+#ifndef SIZEOF_ACTUAL_BDIGIT
+# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGIT
+#endif
+
+#define BIGNUM_EMBED_LEN_NUMBITS 3
+#if (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1
+#  define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT)
+#else
+#  define BIGNUM_EMBED_LEN_MAX ((1 << BIGNUM_EMBED_LEN_NUMBITS)-1)
+#endif
+
+struct RBignum {
+    struct RBasic basic;
+    union {
+        struct {
+            size_t len;
+            BDIGIT *digits;
+        } heap;
+        BDIGIT ary[BIGNUM_EMBED_LEN_MAX];
+    } as;
+};
+
+#define BIGNUM_EMBED_FLAG FL_USER2
+#define BIGNUM_EMBED_LEN_MASK (FL_USER5|FL_USER4|FL_USER3)
+#define BIGNUM_EMBED_LEN_SHIFT (FL_USHIFT+BIGNUM_EMBED_LEN_NUMBITS)
+#define RBIGNUM_LEN(b) \
+    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
+     (long)((RBASIC(b)->flags >> BIGNUM_EMBED_LEN_SHIFT) & \
+            (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT)) : \
+     RBIGNUM(b)->as.heap.len)
+/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */
+#define RBIGNUM_DIGITS(b) \
+    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
+     RBIGNUM(b)->as.ary : \
+     RBIGNUM(b)->as.heap.digits)
+
+#define RBIGNUM(obj) (R_CAST(RBignum)(obj))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bit-twiddle
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alex Dowad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,6 +94,7 @@ files:
 - ext/bit_twiddle/extconf.rb
 - ext/bit_twiddle/ruby21/bt_bignum.h
 - ext/bit_twiddle/ruby22/bt_bignum.h
+- ext/bit_twiddle/ruby23/bt_bignum.h
 - lib/bit-twiddle.rb
 - lib/bit-twiddle/core_ext.rb
 - lib/bit_twiddle.so
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Fast bitwise operations for Ruby