rb_lovely 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6257def0a1d18050a37cfe61c6b6a07ebcc557b4
-  data.tar.gz: 8500185c4d547bf45bd83ba3ecdc48dddae95ebb
+  metadata.gz: 2496d7e867af251fca88b09f09d803be15a9a0d5
+  data.tar.gz: 5f03cdfc07649d4f67fab1717086174b7d9499cc
 SHA512:
-  metadata.gz: 8618d167887a777da7b37f2389555678528f3b5b919b44a39dec8686b0aa66805b3e9885c92f3f7cd3af075252125fd6f620d7777d3a4dae73ebf11d9ab5384e
-  data.tar.gz: 411c88e8103e448542c8d39c8d5dbbcd9c5753529b21d2d021321bf4e8724da60276e9a9c53fa8b0be219285800d0455c111035b33960794fbe7d159083837a4
+  metadata.gz: b887607522f3a5e4afd85672cd6b085b5e6f791b741ca88f887057e381a42903d7ae06191b1130fe4449f80228ab7111b93f8d51e32c5ef06d7b094d924cbcb8
+  data.tar.gz: 73595cc2d2b79eda119ea76d2b2c9efdf44f781dee8915a1b7259885e56c19be2d5736ec0e7e489f2b2f60886da1b48ffed055e8b245444594b384475a483842

data/ext/rb_lovely/container.hpp

@@ -1,21 +1,10 @@
-#ifndef RB_LOVELY_SETS_SET_HPP
-#define RB_LOVELY_SETS_SET_HPP
+#ifndef RB_LOVELY_SETS_CONTAINER_HPP
+#define RB_LOVELY_SETS_CONTAINER_HPP
 
 #include "ruby_util.hpp"
 
 namespace rb_lovely {
 
-template <class T>
-VALUE containerLength(VALUE self) {
-  T* set = rubyCast<T>(self);
-  return INT2NUM(set->size());
-}
-
-template <class T>
-static void initSet(VALUE rbSet) {
-  rb_define_method(rbSet, "length", RUBY_METHOD_FUNC(containerLength<T>), 0);
-}
-
 auto toS = [](VALUE val) { return RSTRING_PTR(rb_funcall(val, to_sSym, 0)); };
 
 }

data/ext/rb_lovely/package.cpp

@@ -7,6 +7,8 @@ namespace rb_lovely {
   VALUE equalitySym;
   VALUE to_sSym;
   VALUE hashSym;
+  VALUE compareSym;
+  VALUE callSym;
 }
 
 extern "C" {

data/ext/rb_lovely/ruby_util.hpp

@@ -9,6 +9,8 @@ extern VALUE cmpMethSym;
 extern VALUE equalitySym;
 extern VALUE to_sSym;
 extern VALUE hashSym;
+extern VALUE callSym;
+extern VALUE compareSym;
 
 template <class T>
 void rubyDelete(T *obj) {
@@ -33,6 +35,8 @@ static void initRubyUtil() {
   equalitySym = rb_intern("==");
   to_sSym = rb_intern("to_s");
   hashSym = rb_intern("hash");
+  callSym = rb_intern("call");
+  compareSym = ID2SYM(rb_intern("compare"));
 }
 
 }

data/ext/rb_lovely/sorted_hash.cpp

@@ -12,8 +12,10 @@ namespace rb_lovely { namespace hybrid {
 
 struct member {
   bool operator<(member const& rhs) const {
-    auto cmpVal = rb_funcall(val, cmpMethSym, 1, rhs.val);
-    return NUM2INT(cmpVal) < 0;
+    auto cmpResult = compareProc != Qnil ?
+      rb_funcall(compareProc, callSym, 2, val, rhs.val) :
+      rb_funcall(val, cmpMethSym, 1, rhs.val);
+    return NUM2INT(cmpResult) < 0;
   }
 
   bool operator==(member const& rhs) const {
@@ -22,8 +24,10 @@ struct member {
   }
 
   // also cache as two element array?
-  member(VALUE _key, VALUE _val) : key(_key), val(_val) {}
+  member(VALUE _compareProc, VALUE _key, VALUE _val)
+    : compareProc(_compareProc), key(_key), val(_val) {}
 
+  VALUE compareProc;
   VALUE key;
   VALUE val;
 };
@@ -36,19 +40,42 @@ std::size_t hash_value(member const& member) {
 
 namespace mi = boost::multi_index;
 
-typedef boost::multi_index_container<
-  member,
-  mi::indexed_by<
-    mi::hashed_unique< mi::member<member, VALUE, &member::key> >,
-    mi::ordered_non_unique< mi::identity<member> >
-  >
-> Hash;
+struct Hash {
+  boost::multi_index_container<
+    member,
+    mi::indexed_by<
+      mi::hashed_unique< mi::member<member, VALUE, &member::key> >,
+      mi::ordered_non_unique< mi::identity<member> >
+    >
+  > container;
+
+  // proc used to compare values
+  VALUE compareProc = Qnil;
+};
+
+VALUE hashLength(VALUE self) {
+  Hash* hash = rubyCast<Hash>(self);
+  return INT2NUM(hash->container.size());
+}
 
 VALUE hashInitialize(int argc, VALUE *argv, VALUE self) {
+  Hash* hash = rubyCast<Hash>(self);
   if (argc == 1) {
     auto array = rb_check_array_type(argv[0]);
     if (array == Qnil) {
-      rb_raise(rb_eArgError, "Expected array");
+      auto kwArgs = rb_check_hash_type(argv[0]);
+      if (kwArgs == Qnil) {
+        rb_raise(rb_eArgError, "Expected array");
+      }
+      else {
+        auto compareProc = rb_hash_aref(kwArgs, compareSym);
+        if (compareProc == Qnil) {
+          rb_raise(rb_eArgError, "Expected compare keyword");
+        }
+        else {
+          hash->compareProc = compareProc;
+        }
+      }
     }
     else {
       auto len = RARRAY_LEN(array);
@@ -56,9 +83,8 @@ VALUE hashInitialize(int argc, VALUE *argv, VALUE self) {
         rb_raise(rb_eArgError, "Expected even number of parameters");
       }
       else {
-        Hash* hash = rubyCast<Hash>(self);
         for (auto i = 0; i < len; i += 2) {
-          hash->insert(member(rb_ary_entry(array, i), rb_ary_entry(array, i + 1)));
+          hash->container.insert(member(hash->compareProc, rb_ary_entry(array, i), rb_ary_entry(array, i + 1)));
         }
       }
     }
@@ -69,18 +95,18 @@ VALUE hashInitialize(int argc, VALUE *argv, VALUE self) {
 VALUE hashUpdate(VALUE self, VALUE key, VALUE val) {
   Hash* hash = rubyCast<Hash>(self);
   // TODO: overwrite value
-  auto it = hash->find(key);
-  if (it != hash->end())
-    hash->replace(it, member(key, val));
+  auto it = hash->container.find(key);
+  if (it != hash->container.end())
+    hash->container.replace(it, member(hash->compareProc, key, val));
   else
-    hash->insert(member(key, val));
+    hash->container.insert(member(hash->compareProc, key, val));
   return self;
 }
 
 VALUE hashGet(VALUE self, VALUE key) {
   Hash* hash = rubyCast<Hash>(self);
-  auto it = hash->find(key);
-  if (it == hash->end()) {
+  auto it = hash->container.find(key);
+  if (it == hash->container.end()) {
     return Qnil;
   }
   else {
@@ -95,7 +121,7 @@ VALUE hashEach(VALUE self) {
   }
   else {
     Hash* hash = rubyCast<Hash>(self);
-    for (auto const& member : hash->get<1>()) {
+    for (auto const& member : hash->container.get<1>()) {
       rb_yield_values(2, member.key, member.val);
     }
   }
@@ -107,8 +133,8 @@ VALUE hashToString(VALUE self) {
   std::stringstream str;
   str << "RbLovely::SortedHash {";
   Hash* hash = rubyCast<Hash>(self);
-  if (! hash->empty()) {
-    auto& idx = hash->get<1>();
+  if (! hash->container.empty()) {
+    auto& idx = hash->container.get<1>();
     auto it = idx.begin();
     str << ' ' << toS(it->key) << " => " << toS(it->val);
     for (++it; it != idx.end(); ++it) {
@@ -123,38 +149,38 @@ VALUE hashToString(VALUE self) {
 
 VALUE hashFirst(VALUE self) {
   Hash* hash = rubyCast<Hash>(self);
-  return hash->empty() ? Qnil : hash->get<1>().begin()->val;
+  return hash->container.empty() ? Qnil : hash->container.get<1>().begin()->val;
 }
 
 VALUE hashLast(VALUE self) {
   Hash* hash = rubyCast<Hash>(self);
-  if (hash->empty())
+  if (hash->container.empty())
     return Qnil;
 
-  auto last = hash->get<1>().end();
+  auto last = hash->container.get<1>().end();
   --last;
   return last->val;
 }
 
 VALUE hashMutatingDelete(VALUE self, VALUE toDelete) {
   Hash* hash = rubyCast<Hash>(self);
-  auto it = hash->find(toDelete);
-  if (it == hash->end()) {
+  auto it = hash->container.find(toDelete);
+  if (it == hash->container.end()) {
     return Qnil;
   }
   else {
     auto valBackup = it->val;
-    hash->erase(it);
+    hash->container.erase(it);
     return valBackup;
   }
 }
 
 VALUE hashShift(VALUE self) {
   Hash* hash = rubyCast<Hash>(self);
-  if (hash->empty())
+  if (hash->container.empty())
    return Qnil;
 
-  auto& idx = hash->get<1>();
+  auto& idx = hash->container.get<1>();
   auto bak = idx.begin()->val;
   idx.erase(idx.begin());
   return bak;
@@ -162,10 +188,10 @@ VALUE hashShift(VALUE self) {
 
 VALUE hashPop(VALUE self) {
   Hash* hash = rubyCast<Hash>(self);
-  if (hash->empty())
+  if (hash->container.empty())
     return Qnil;
 
-  auto& idx = hash->get<1>();
+  auto& idx = hash->container.get<1>();
   auto last = idx.end();
   --last;
   auto bak = last->val;
@@ -175,8 +201,8 @@ VALUE hashPop(VALUE self) {
 
 VALUE hashHas(VALUE self, VALUE key) {
   Hash* hash = rubyCast<Hash>(self);
-  auto it = hash->find(key);
-  return it == hash->end() ? Qfalse : Qtrue;
+  auto it = hash->container.find(key);
+  return it == hash->container.end() ? Qfalse : Qtrue;
 }
 
 } }
@@ -191,7 +217,7 @@ extern "C" {
     rb_include_module(rbHash, rb_const_get(rb_cObject, rb_intern("Enumerable")));
 
     rb_define_method(rbHash, "initialize", RUBY_METHOD_FUNC(hashInitialize), -1);
-    initSet<Hash>(rbHash);
+    rb_define_method(rbHash, "length", RUBY_METHOD_FUNC(hashLength), 0);
     rb_define_method(rbHash, "[]=", RUBY_METHOD_FUNC(hashUpdate), 2);
     rb_define_method(rbHash, "[]", RUBY_METHOD_FUNC(hashGet), 1);
     rb_define_method(rbHash, "each", RUBY_METHOD_FUNC(hashEach), 0);

data/ext/rb_lovely/sorted_set.cpp

@@ -35,6 +35,11 @@ VALUE setInitialize(int argc, VALUE *argv, VALUE self) {
   return self;
 }
 
+VALUE setLength(VALUE self) {
+  Set* set = rubyCast<Set>(self);
+  return INT2NUM(set->size());
+}
+
 VALUE setAdd(VALUE self, VALUE val) {
   Set* set = rubyCast<Set>(self);
   set->insert(val);
@@ -195,7 +200,7 @@ extern "C" {
     rb_include_module(rbSet, rb_const_get(rb_cObject, rb_intern("Enumerable")));
 
     rb_define_method(rbSet, "initialize", RUBY_METHOD_FUNC(setInitialize), -1);
-    initSet<Set>(rbSet);
+    rb_define_method(rbSet, "length", RUBY_METHOD_FUNC(setLength), 0);
     rb_define_method(rbSet, "add", RUBY_METHOD_FUNC(setAdd), 1);
     rb_define_method(rbSet, "<<", RUBY_METHOD_FUNC(setAdd), 1);
     rb_define_method(rbSet, "each", RUBY_METHOD_FUNC(setEach), 0);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_lovely
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - James Pike