rb_lovely 0.3.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfc1e9d10476bf6684d49b924c2df97da27a6dc4
-  data.tar.gz: e1b73faf1ccb468e1b5df4c95dcbb30858438aa0
+  metadata.gz: fc4258b3c5efab8a5b29067b61e51c0c9660de33
+  data.tar.gz: 1065affd37a40bde5b1b188c64fd0b69a6aadd99
 SHA512:
-  metadata.gz: 157d98da65f5be762d8a57d40fe58a977d219a971751e910efe0515559b7ffe57f4b0f8df48e1b5bbc8bb403a1d15ad573df2cc4e354ad63aaa8ebddcd11fc8a
-  data.tar.gz: e8979751ca9a9e274e949e985a1b1faf1861adc6b3bfe321ae21a3ba88e18f924f878b9cd0ae77a0893bce6b612e07981d0973eb51b48ade1ad692875d7cb6cf
+  metadata.gz: f5fdd5429e26c7beeb8d37be5e614f2b553a6d21bcd7784f39e538be882c00748c90d47da312412b538ec43095d3f92e4b67da70ff54d20d16449141d080a4c8
+  data.tar.gz: 80d8f021ca4f675b336838893f9f5b5dcd2d29d74c536d83edc59908071a838399115f30c808f8784eae18220a55f5892be22d8371588c7cc22573df665753f1

data/ext/rb_lovely/ruby_util.hpp

@@ -29,6 +29,12 @@ VALUE rubyAlloc(VALUE klass) {
   return Data_Wrap_Struct(klass, 0, rubyDelete<T>, new T);
 }
 
+typedef void (*MarkFunction)(void *);
+template <class T, MarkFunction M>
+VALUE rubyAlloc(VALUE klass) {
+  return Data_Wrap_Struct(klass, M, rubyDelete<T>, new T);
+}
+
 static void initRubyUtil() {
   rbMod = rb_define_module("RbLovely");
   cmpMethSym = rb_intern("<=>");

data/ext/rb_lovely/sorted_hash.cpp

@@ -18,11 +18,6 @@ struct member {
     return NUM2INT(cmpResult) < 0;
   }
 
-  bool operator==(member const& rhs) const {
-    auto equalityVal = rb_funcall(key, hashEqualitySym, 1, rhs.key);
-    return RTEST(equalityVal);
-  }
-
   // also cache as two element array?
   member(VALUE _compareProc, VALUE _key, VALUE _val)
     : compareProc(_compareProc), key(_key), val(_val) {}
@@ -32,11 +27,18 @@ struct member {
   VALUE val;
 };
 
-std::size_t hash_value(member const& member) {
-  // TODO: something better?
-  return reinterpret_cast<std::size_t>(&member);
-  // return NUM2INT(rb_funcall(member.val, hashSym, 0));
-}
+struct CompareVALUEs {
+  bool operator()(VALUE const& lhs, VALUE const& rhs) const {
+    auto equalityVal = rb_funcall(lhs, hashEqualitySym, 1, rhs);
+    return RTEST(equalityVal);
+  }
+};
+
+struct HashVALUE {
+  std::size_t operator()(VALUE const& value) const {
+    return NUM2LL(rb_funcall(value, hashSym, 0));
+  }
+};
 
 namespace mi = boost::multi_index;
 
@@ -44,7 +46,7 @@ struct Hash {
   boost::multi_index_container<
     member,
     mi::indexed_by<
-      mi::hashed_unique< mi::member<member, VALUE, &member::key> >,
+      mi::hashed_unique< mi::member<member, VALUE, &member::key>, HashVALUE, CompareVALUEs>,
       mi::ordered_non_unique< mi::identity<member> >
     >
   > container;
@@ -224,6 +226,14 @@ VALUE hashHas(VALUE self, VALUE key) {
   return it == hash->container.end() ? Qfalse : Qtrue;
 }
 
+void markHash(void *voidSet) {
+  Hash *hash = static_cast<Hash *>(voidSet);
+  for (auto const& entry : hash->container) {
+    rb_gc_mark(entry.key);
+    rb_gc_mark(entry.val);
+  }
+}
+
 } }
 
 extern "C" {
@@ -232,7 +242,7 @@ extern "C" {
 
   void Init_rb_lovely_hybrid_set() {
     auto rbHash = rb_define_class_under(rbMod, "SortedHash", rb_cObject);
-    rb_define_alloc_func(rbHash, rubyAlloc<Hash>);
+    rb_define_alloc_func(rbHash, rubyAlloc<Hash, markHash>);
     rb_include_module(rbHash, rb_const_get(rb_cObject, rb_intern("Enumerable")));
 
     rb_define_method(rbHash, "initialize", RUBY_METHOD_FUNC(hashInitialize), -1);

data/ext/rb_lovely/sorted_set.cpp

@@ -194,6 +194,12 @@ VALUE setHas(VALUE self, VALUE val) {
   return it == set->end() ? Qfalse : Qtrue;
 }
 
+void markSet(void *voidSet) {
+  Set *set = static_cast<Set *>(voidSet);
+  for (auto& value : *set)
+    rb_gc_mark(value);
+}
+
 } } // end namespace
 
 extern "C" {
@@ -202,7 +208,7 @@ extern "C" {
 
   void Init_rb_lovely_sorted_set() {
     auto rbSet = rb_define_class_under(rbMod, "SortedSet", rb_cObject);
-    rb_define_alloc_func(rbSet, rubyAlloc<Set>);
+    rb_define_alloc_func(rbSet, rubyAlloc<Set, &markSet>);
     rb_include_module(rbSet, rb_const_get(rb_cObject, rb_intern("Enumerable")));
 
     rb_define_method(rbSet, "initialize", RUBY_METHOD_FUNC(setInitialize), -1);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb_lovely
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.5.0
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies: []
 description: A fast sorted set built using std::set and a fast sorted hash built using
   boost::multi_index_container.