rice 1.4.3 → 1.5.0

data/rice/Builtin_Object_defn.hpp

@@ -2,7 +2,6 @@
 #define Rice__Builtin_Object_defn__hpp_
 
 #include "Object_defn.hpp"
-#include "Allocation_Strategies.hpp"
 #include "detail/ruby.hpp"
 
 namespace Rice

data/rice/Constructor.hpp

@@ -41,7 +41,7 @@ namespace Rice
     }
   };
 
-  
+
     template<typename T, typename Arg0_T>
     class Constructor<T, Arg0_T, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
     {
@@ -52,7 +52,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T>
     class Constructor<T, Arg0_T, Arg1_T, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
     {
@@ -63,7 +63,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, void, void, void, void, void, void, void, void, void, void, void, void, void>
     {
@@ -74,7 +74,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, void, void, void, void, void, void, void, void, void, void, void, void>
     {
@@ -85,7 +85,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, void, void, void, void, void, void, void, void, void, void, void>
     {
@@ -96,7 +96,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, void, void, void, void, void, void, void, void, void, void>
     {
@@ -107,7 +107,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, void, void, void, void, void, void, void, void, void>
     {
@@ -118,7 +118,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, void, void, void, void, void, void, void, void>
     {
@@ -129,7 +129,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, void, void, void, void, void, void, void>
     {
@@ -140,7 +140,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, void, void, void, void, void, void>
     {
@@ -151,7 +151,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, void, void, void, void, void>
     {
@@ -162,7 +162,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, void, void, void, void>
     {
@@ -173,7 +173,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, void, void, void>
     {
@@ -184,7 +184,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T, typename Arg13_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, Arg13_T, void, void>
     {
@@ -195,7 +195,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T, typename Arg13_T, typename Arg14_T>
     class Constructor<T, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, Arg13_T, Arg14_T, void>
     {
@@ -206,7 +206,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T>
     class Constructor<T, Object, Arg0_T, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
     {
@@ -217,7 +217,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, void, void, void, void, void, void, void, void, void, void, void, void, void>
     {
@@ -228,7 +228,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, void, void, void, void, void, void, void, void, void, void, void, void>
     {
@@ -239,7 +239,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, void, void, void, void, void, void, void, void, void, void, void>
     {
@@ -250,7 +250,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, void, void, void, void, void, void, void, void, void, void>
     {
@@ -261,7 +261,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, void, void, void, void, void, void, void, void, void>
     {
@@ -272,7 +272,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, void, void, void, void, void, void, void, void>
     {
@@ -283,7 +283,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, void, void, void, void, void, void, void>
     {
@@ -294,7 +294,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, void, void, void, void, void, void>
     {
@@ -305,7 +305,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, void, void, void, void, void>
     {
@@ -316,7 +316,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, void, void, void, void>
     {
@@ -327,7 +327,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, void, void, void>
     {
@@ -338,7 +338,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, void, void>
     {
@@ -349,7 +349,7 @@ namespace Rice
         }
     };
 
-    
+
     template<typename T, typename Arg0_T, typename Arg1_T, typename Arg2_T, typename Arg3_T, typename Arg4_T, typename Arg5_T, typename Arg6_T, typename Arg7_T, typename Arg8_T, typename Arg9_T, typename Arg10_T, typename Arg11_T, typename Arg12_T, typename Arg13_T>
     class Constructor<T, Object, Arg0_T, Arg1_T, Arg2_T, Arg3_T, Arg4_T, Arg5_T, Arg6_T, Arg7_T, Arg8_T, Arg9_T, Arg10_T, Arg11_T, Arg12_T, Arg13_T, void>
     {
@@ -360,7 +360,8 @@ namespace Rice
         }
     };
 
-    } // namespace Rice
+
+} // namespace Rice
 
 
 #endif // Rice__Constructor__hpp_

data/rice/Data_Object_defn.hpp

@@ -3,7 +3,6 @@
 
 #include "Object_defn.hpp"
 #include "Data_Type_fwd.hpp"
-#include "Allocation_Strategies.hpp"
 #include "ruby_mark.hpp"
 #include "detail/to_ruby.hpp"
 #include "detail/ruby.hpp"
@@ -23,6 +22,13 @@ struct Default_Mark_Function
   static const Ruby_Data_Func mark;
 };
 
+template<typename T>
+struct Default_Free_Function
+{
+  static void free(T * obj) { delete obj; }
+};
+
+
 //! A smartpointer-like wrapper for Ruby data objects.
 /*! A data object is a ruby object of type T_DATA, which is usually
  *  created by using the Data_Wrap_Struct or Data_Make_Struct macro.
@@ -73,7 +79,7 @@ public:
       T * obj,
       VALUE klass = Data_Type<T>::klass(),
       Ruby_Data_Func mark_func = Default_Mark_Function<T>::mark,
-      Ruby_Data_Func free_func = Default_Allocation_Strategy<T>::free);
+      Ruby_Data_Func free_func = Default_Free_Function<T>::free);
 
   //! Unwrap a Ruby object.
   /*! This constructor is analgous to calling Data_Get_Struct.  Uses

data/rice/Hash.hpp

@@ -2,9 +2,9 @@
 #define Rice__Hash__hpp_
 
 #include "Builtin_Object_defn.hpp"
+#include "Array.hpp"
 #include "to_from_ruby_defn.hpp"
 #include "detail/ruby.hpp"
-#include "detail/st.hpp"
 #include "detail/traits.hpp"
 #include <iterator>
 
@@ -152,7 +152,10 @@ class Hash::Iterator
 {
 public:
   //! Construct a new Iterator.
-  Iterator(Hash_Ref_T hash, st_data_t bin, st_table_entry * ptr);
+  Iterator(Hash_Ref_T hash);
+
+  //! Construct a new Iterator with a given start-at index point
+  Iterator(Hash_Ref_T hash, int start_at);
 
   //! Copy construct an Iterator.
   Iterator(Iterator const & iterator);
@@ -189,21 +192,35 @@ public:
   //! Swap with another iterator of the same type.
   void swap(Iterator & iterator);
 
+protected:
+  Object current_key();
+
+  Array hash_keys();
+
 private:
   Hash hash_;
-  st_table * tbl_;
-#if RICE__RUBY_VERSION_CODE >= 190
-  st_index_t bin_;
-#else
-  int bin_;
-#endif
-  st_table_entry * ptr_;
+  int current_index_;
+  VALUE keys_;
 
   mutable typename detail::remove_const<Value_T>::Type tmp_;
 };
 
 } // namespace Rice
 
+template<>
+inline
+Rice::Hash from_ruby<Rice::Hash>(Rice::Object x)
+{
+  return Rice::Hash(x);
+}
+
+template<>
+inline
+Rice::Object to_ruby<Rice::Hash>(Rice::Hash const & x)
+{
+  return x;
+}
+
 #include "Hash.ipp"
 
 #endif // Rice__Hash__hpp_

data/rice/Hash.ipp

@@ -6,16 +6,9 @@
 #include "Builtin_Object.hpp"
 #include "Exception.hpp"
 #include "Builtin_Object.hpp"
+#include "detail/st.hpp"
 #include <algorithm>
 
-// TODO: Evil hack
-struct st_table_entry {
-  unsigned int hash;
-  st_data_t key;
-  st_data_t record;
-  st_table_entry *next;
-};
-
 inline Rice::Hash::
 Hash()
   : Builtin_Object<RHash, T_HASH>(protect(rb_hash_new))
@@ -31,7 +24,7 @@ Hash(Object v)
 inline size_t Rice::Hash::
 size() const
 {
-  return RHASH_TBL(this->value())->num_entries;
+  return RHASH_SIZE(this->value());
 }
 
 inline Rice::Hash::Proxy::
@@ -145,28 +138,30 @@ swap(Rice::Hash::Entry & entry)
 
 template<typename Hash_Ref_T, typename Value_T>
 inline Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
-Iterator(Hash_Ref_T hash, st_data_t bin, st_table_entry * ptr)
+Iterator(Hash_Ref_T hash)
   : hash_(hash)
-  , tbl_(RHASH_TBL(hash.value()))
-  , bin_(bin)
-  , ptr_(ptr)
+  , current_index_(0)
+  , keys_(Qnil)
+  , tmp_(hash, Qnil)
+{
+}
+
+template<typename Hash_Ref_T, typename Value_T>
+inline Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
+Iterator(Hash_Ref_T hash, int start_at)
+  : hash_(hash)
+  , current_index_(start_at)
+  , keys_(Qnil)
   , tmp_(hash, Qnil)
 {
-  // If we aren't already at the end, then use the increment operator to
-  // point to the first element
-  if(!ptr_ && bin_ < tbl_->num_bins)
-  {
-    operator++();
-  }
 }
 
 template<typename Hash_Ref_T, typename Value_T>
 inline Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
 Iterator(Iterator const & iterator)
   : hash_(iterator.hash_.value())
-  , tbl_(iterator.tbl_)
-  , bin_(iterator.bin_)
-  , ptr_(iterator.ptr_)
+  , current_index_(iterator.current_index_)
+  , keys_(Qnil)
   , tmp_(iterator.hash_, Qnil)
 {
 }
@@ -176,9 +171,8 @@ template<typename Iterator_T>
 inline Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
 Iterator(Iterator_T const & iterator)
   : hash_(iterator.hash_.value())
-  , tbl_(iterator.tbl_)
-  , bin_(iterator.bin_)
-  , ptr_(iterator.ptr_)
+  , current_index_(iterator.current_index_)
+  , keys_(Qnil)
   , tmp_(iterator.hash_, Qnil)
 {
 }
@@ -200,25 +194,9 @@ inline Rice::Hash::Iterator<Hash_Ref_T, Value_T> &
 Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
 operator++()
 {
-  // Go to the next element in the bin; this will be a no-op if we were
-  // called from the constructor, because ptr_ will be 0 (and if its
-  // not, this function won't get called).
-  if(ptr_)
-  {
-    ptr_ = ptr_->next;
-  }
-
-  // If we've reached the end of the bin, then try the next bin until
-  // we have run out of bins
-  while(ptr_ == 0)
-  {
-    ++bin_;
-    if(bin_ == tbl_->num_bins)
-    {
-      // At the end..
-      return *this;
-    }
-    ptr_ = tbl_->bins[bin_];
+  // Ensure we're within the range
+  if(current_index_ < hash_keys().size()) {
+    current_index_++;
   }
 
   return *this;
@@ -239,7 +217,7 @@ inline Value_T
 Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
 operator*()
 {
-  return Value_T(hash_, ptr_->key);
+  return Value_T(hash_, current_key());
 }
 
 template<typename Hash_Ref_T, typename Value_T>
@@ -247,7 +225,7 @@ inline Value_T *
 Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
 operator->()
 {
-  Entry tmp(hash_, ptr_->key);
+  Entry tmp(hash_, current_key());
   this->tmp_.swap(tmp);
   return &tmp_;
 }
@@ -257,9 +235,7 @@ inline bool Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
 operator==(Iterator const & rhs) const
 {
   return hash_.value() == rhs.hash_.value()
-    && tbl_ == rhs.tbl_
-    && bin_ == rhs.bin_
-    && ptr_ == rhs.ptr_;
+    && current_index_ == rhs.current_index_;
 }
 
 template<typename Hash_Ref_T, typename Value_T>
@@ -277,37 +253,53 @@ swap(Iterator& iterator)
   using namespace std;
 
   hash_.swap(iterator.hash_);
-  swap(tbl_, iterator.tbl_);
-  swap(bin_, iterator.bin_);
-  swap(ptr_, iterator.ptr_);
+  swap(keys_, iterator.keys_);
+  swap(current_index_, iterator.current_index_);
+}
+
+template<typename Hash_Ref_T, typename Value_T>
+inline Rice::Object
+Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
+current_key()
+{
+  return hash_keys()[current_index_];
+}
+
+
+template<typename Hash_Ref_T, typename Value_T>
+inline Rice::Array
+Rice::Hash::Iterator<Hash_Ref_T, Value_T>::
+hash_keys()
+{
+  if(NIL_P(keys_)) {
+    keys_ = rb_funcall(hash_, rb_intern("keys"), 0, 0);
+  }
+
+  return Rice::Array(keys_);
 }
 
 inline Rice::Hash::iterator Rice::Hash::
 begin()
 {
-  st_table * tbl(RHASH_TBL(value()));
-  return iterator(*this, 0, tbl->bins[0]);
+  return iterator(*this);
 }
 
 inline Rice::Hash::const_iterator Rice::Hash::
 begin() const
 {
-  st_table * tbl(RHASH_TBL(value()));
-  return const_iterator(*this, 0, tbl->bins[0]);
+  return const_iterator(*this);
 }
 
 inline Rice::Hash::iterator Rice::Hash::
 end()
 {
-  st_table * tbl(RHASH_TBL(value()));
-  return iterator(*this, tbl->num_bins, 0);
+  return iterator(*this, size());
 }
 
 inline Rice::Hash::const_iterator Rice::Hash::
 end() const
 {
-  st_table * tbl(RHASH_TBL(value()));
-  return const_iterator(*this, tbl->num_bins, 0);
+  return const_iterator(*this, size());
 }
 
 inline bool Rice::