rice 1.0.2 → 1.1.0

data/rice/Data_Type.ipp

@@ -2,6 +2,7 @@
 #define Rice__Data_Type__ipp_
 
 #include "Class.hpp"
+#include "String.hpp"
 #include "Data_Object.hpp"
 #include "detail/default_allocation_func.hpp"
 #include "detail/creation_funcs.hpp"
@@ -69,7 +70,10 @@ Data_Type()
   : Module_impl<Data_Type_Base, Data_Type<T> >(
       klass_ == Qnil ? rb_cObject : klass_)
 {
-  unbound_instances().insert(this);
+  if(!is_bound())
+  {
+    unbound_instances().insert(this);
+  }
 }
 
 template<typename T>
@@ -138,11 +142,23 @@ from_ruby(Object x)
 
   void * v = DATA_PTR(x.value());
   Class klass = x.class_of();
+
+  if(klass.value() == klass_)
+  {
+    // Great, not converting to a base/derived type
+    Data_Type<T> data_klass;
+    Data_Object<T> obj(x, data_klass);
+    return obj.get();
+  }
+
   Data_Type_Base::Casters::const_iterator it(
       Data_Type_Base::casters_.find(klass));
   if(it == Data_Type_Base::casters_.end())
   {
-    throw std::runtime_error("Derived type is unbound");
+    std::string s = "Derived class ";
+    s += klass.name().str();
+    s += " is not registered/bound in Rice";
+    throw std::runtime_error(s);
   }
 
   detail::Abstract_Caster * caster = it->second;

data/rice/Enum.ipp

@@ -125,10 +125,10 @@ each(Object self)
 {
   VALUE enums_v = rb_iv_get(self, "enums");
   Check_Type(enums_v, T_ARRAY);
-  RArray * enums = RARRAY(enums_v);
-  for(int j = 0; j < enums->len; ++j)
+  Array enums(enums_v);
+  for(size_t j = 0; j < enums.size(); ++j)
   {
-    rb_yield(enums->ptr[j]);
+    rb_yield(enums[j].value());
   }
   return Qnil;
 }

data/rice/Exception.hpp

@@ -1,69 +1,9 @@
 #ifndef Rice__Exception__hpp_
 #define Rice__Exception__hpp_
 
+#include "Exception_defn.hpp"
 #include "Exception_Base.hpp"
-#include "String.hpp"
 #include "Address_Registration_Guard.hpp"
 
-#include <stdexcept>
-#include "detail/ruby.hpp"
-
-namespace Rice
-{
-
-//! A placeholder for Ruby exceptions.
-/*! You can use this to safely throw a Ruby exception using C++ syntax:
- *  \code
- *    VALUE foo(VALUE self) {
- *      RUBY_TRY {
- *        throw Rice::Exception(rb_eMyException, "uh oh!");
- *      RUBY_CATCH
- *    }
- *  \endcode
- */
-class Exception
-  : public Exception_Base
-{
-public:
-  //! Construct a Exception with the exception e.
-  explicit Exception(VALUE e);
-
-  //! Copy constructor.
-  Exception(Exception const & other);
-
-  //! Construct a Exception with printf-style formatting.
-  /*! \param exc either an exception object or a class that inherits
-   *  from Exception.
-   *  \param fmt a printf-style format string
-   *  \param ... the arguments to the format string.
-   */
-  Exception(Object exc, char const * fmt, ...);
-
-  //! Destructor
-  virtual ~Exception() throw() { }
-
-  //! Get the message the exception holds
-  /*! \return the result of calling message() on the underlying
-   *  exception object.
-   */
-  String message() const;
-
-  //! Get message as a char const *.
-  /*! If message is a non-string object, then this function will attempt
-   *  to throw an exception (which it can't do because of the no-throw
-   *  specification).
-   *  \return the underlying C pointer of the underlying message object.
-   */
-  virtual char const * what() const throw();
-
-private:
-  // Keep message around in case someone calls what() and then the GC
-  // gets invoked.
-  mutable VALUE message_;
-  Address_Registration_Guard message_guard_;
-};
-
-} // namespace Rice
-
 #endif // Rice__Exception__hpp_
 

data/rice/Exception_Base.hpp

@@ -1,30 +1,8 @@
 #ifndef Rice__Exception_Base__hpp_
 #define Rice__Exception_Base__hpp_
 
-#include "Object_defn.hpp"
-
-namespace Rice
-{
-
-//! An abstract interface for Exception
-/*! This class exists to prevent a circular reference between
- *  Exception.hpp and ruby_try_catch.hpp
- */
-class Exception_Base
-  : public std::exception
-  , public Object
-{
-public:
-  Exception_Base(VALUE v);
-
-  virtual ~Exception_Base() throw() = 0;
-
-  virtual char const * what() const throw() = 0;
-};
-
-} // Rice
-
+#include "Exception_Base_defn.hpp"
 #include "Exception_Base.ipp"
-#include "Object.hpp"
 
 #endif // Rice__Exception_Base__hpp_
+

data/rice/Exception_Base.ipp

@@ -1,3 +1,5 @@
+#include "Object.hpp"
+
 inline Rice::Exception_Base::
 Exception_Base(VALUE v)
   : Object(v)

data/rice/Exception_Base_defn.hpp

@@ -0,0 +1,27 @@
+#ifndef Rice__Exception_Base_defn__hpp_
+#define Rice__Exception_Base_defn__hpp_
+
+#include "Object_defn.hpp"
+
+namespace Rice
+{
+
+//! An abstract interface for Exception
+/*! This class exists to prevent a circular reference between
+ *  Exception.hpp and ruby_try_catch.hpp
+ */
+class Exception_Base
+  : public std::exception
+  , public Object
+{
+public:
+  Exception_Base(VALUE v);
+
+  virtual ~Exception_Base() throw() = 0;
+
+  virtual char const * what() const throw() = 0;
+};
+
+} // Rice
+
+#endif // Rice__Exception_Base_defn__hpp_

data/rice/Exception_defn.hpp

@@ -0,0 +1,69 @@
+#ifndef Rice__Exception_defn__hpp_
+#define Rice__Exception_defn__hpp_
+
+#include "Exception_Base_defn.hpp"
+#include "String.hpp"
+#include "Address_Registration_Guard_defn.hpp"
+
+#include <stdexcept>
+#include "detail/ruby.hpp"
+
+namespace Rice
+{
+
+//! A placeholder for Ruby exceptions.
+/*! You can use this to safely throw a Ruby exception using C++ syntax:
+ *  \code
+ *    VALUE foo(VALUE self) {
+ *      RUBY_TRY {
+ *        throw Rice::Exception(rb_eMyException, "uh oh!");
+ *      RUBY_CATCH
+ *    }
+ *  \endcode
+ */
+class Exception
+  : public Exception_Base
+{
+public:
+  //! Construct a Exception with the exception e.
+  explicit Exception(VALUE e);
+
+  //! Copy constructor.
+  Exception(Exception const & other);
+
+  //! Construct a Exception with printf-style formatting.
+  /*! \param exc either an exception object or a class that inherits
+   *  from Exception.
+   *  \param fmt a printf-style format string
+   *  \param ... the arguments to the format string.
+   */
+  Exception(Object exc, char const * fmt, ...);
+
+  //! Destructor
+  virtual ~Exception() throw() { }
+
+  //! Get the message the exception holds
+  /*! \return the result of calling message() on the underlying
+   *  exception object.
+   */
+  String message() const;
+
+  //! Get message as a char const *.
+  /*! If message is a non-string object, then this function will attempt
+   *  to throw an exception (which it can't do because of the no-throw
+   *  specification).
+   *  \return the underlying C pointer of the underlying message object.
+   */
+  virtual char const * what() const throw();
+
+private:
+  // Keep message around in case someone calls what() and then the GC
+  // gets invoked.
+  mutable VALUE message_;
+  Address_Registration_Guard message_guard_;
+};
+
+} // namespace Rice
+
+#endif // Rice__Exception_defn__hpp_
+

data/rice/Hash.hpp

@@ -152,7 +152,7 @@ class Hash::Iterator
 {
 public:
   //! Construct a new Iterator.
-  Iterator(Hash_Ref_T hash, size_t bin, st_table_entry * ptr);
+  Iterator(Hash_Ref_T hash, st_data_t bin, st_table_entry * ptr);
 
   //! Copy construct an Iterator.
   Iterator(Iterator const & iterator);
@@ -192,7 +192,11 @@ public:
 private:
   Hash hash_;
   st_table * tbl_;
+#if RUBY_VERSION_CODE >= 190
+  st_index_t bin_;
+#else
   int bin_;
+#endif
   st_table_entry * ptr_;
 
   mutable typename detail::remove_const<Value_T>::Type tmp_;

data/rice/Hash.ipp

@@ -31,7 +31,7 @@ Hash(Object v)
 inline size_t Rice::Hash::
 size() const
 {
-  return (*this)->tbl->num_entries;
+  return RHASH_TBL(this->value())->num_entries;
 }
 
 inline Rice::Hash::Proxy::
@@ -145,9 +145,9 @@ 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, size_t bin, st_table_entry * ptr)
+Iterator(Hash_Ref_T hash, st_data_t bin, st_table_entry * ptr)
   : hash_(hash)
-  , tbl_(RHASH(hash.value())->tbl)
+  , tbl_(RHASH_TBL(hash.value()))
   , bin_(bin)
   , ptr_(ptr)
   , tmp_(hash, Qnil)
@@ -285,28 +285,28 @@ swap(Iterator& iterator)
 inline Rice::Hash::iterator Rice::Hash::
 begin()
 {
-  st_table * tbl(RHASH(value())->tbl);
+  st_table * tbl(RHASH_TBL(value()));
   return iterator(*this, 0, tbl->bins[0]);
 }
 
 inline Rice::Hash::const_iterator Rice::Hash::
 begin() const
 {
-  st_table * tbl(RHASH(value())->tbl);
+  st_table * tbl(RHASH_TBL(value()));
   return const_iterator(*this, 0, tbl->bins[0]);
 }
 
 inline Rice::Hash::iterator Rice::Hash::
 end()
 {
-  st_table * tbl(RHASH(value())->tbl);
+  st_table * tbl(RHASH_TBL(value()));
   return iterator(*this, tbl->num_bins, 0);
 }
 
 inline Rice::Hash::const_iterator Rice::Hash::
 end() const
 {
-  st_table * tbl(RHASH(value())->tbl);
+  st_table * tbl(RHASH_TBL(value()));
   return const_iterator(*this, tbl->num_bins, 0);
 }
 

data/rice/Makefile.am

@@ -14,7 +14,8 @@ VM.cpp \
 detail/check_ruby_type.cpp \
 detail/demangle.cpp \
 detail/method_data.cpp \
-detail/protect.cpp
+detail/protect.cpp \
+detail/mininode.cpp
 
 nobase_include_HEADERS = \
 Address_Registration_Guard.hpp \
@@ -34,6 +35,7 @@ Critical_Guard.hpp \
 Critical_Guard.ipp \
 Data_Object.hpp \
 Data_Object.ipp \
+Data_Object_defn.hpp \
 Data_Type.hpp \
 Data_Type.ipp \
 Data_Type_defn.hpp \
@@ -41,8 +43,10 @@ Data_Type_fwd.hpp \
 Enum.hpp \
 Enum.ipp \
 Exception.hpp \
+Exception_defn.hpp \
 Exception_Base.hpp \
 Exception_Base.ipp \
+Exception_Base_defn.hpp \
 Hash.hpp \
 Hash.ipp \
 Identifier.hpp \
@@ -73,13 +77,16 @@ ruby_try_catch.hpp \
 to_from_ruby.hpp \
 to_from_ruby.ipp \
 to_from_ruby_defn.hpp \
+ruby_mark.hpp \
 detail/Auto_Function_Wrapper.hpp \
 detail/Auto_Function_Wrapper.ipp \
 detail/Auto_Member_Function_Wrapper.hpp \
 detail/Auto_Member_Function_Wrapper.ipp \
 detail/Caster.hpp \
 detail/Exception_Handler.hpp \
-detail/Iterator_Definer.hpp \
+detail/Exception_Handler.ipp \
+detail/Exception_Handler_defn.hpp \
+detail/Iterator.hpp \
 detail/Not_Copyable.hpp \
 detail/Wrapped_Function.hpp \
 detail/check_ruby_type.hpp \
@@ -106,7 +113,8 @@ detail/to_ruby.hpp \
 detail/to_ruby.ipp \
 detail/win32.hpp \
 detail/wrap_function.hpp \
-detail/wrap_function.ipp
+detail/wrap_function.ipp \
+detail/ruby_version_code.hpp
 
 includedir = ${prefix}/include/rice
 
@@ -114,3 +122,12 @@ AM_CPPFLAGS = @RUBY_CPPFLAGS@
 
 AM_CXXFLAGS = @RUBY_CXXFLAGS@
 
+detail/method_data.cpp: detail/method_data.cpp.rpp detail/mininode.hpp
+	ruby -C detail ../rubypp.rb method_data.cpp.rpp method_data.cpp
+
+detail/mininode.cpp: detail/mininode.cpp.rpp
+	ruby -C detail ../rubypp.rb mininode.cpp.rpp mininode.cpp
+
+detail/mininode.hpp: detail/mininode.hpp.rpp
+	ruby -C detail ../rubypp.rb mininode.hpp.rpp mininode.hpp
+

data/rice/Makefile.in

@@ -61,7 +61,8 @@ am_librice_a_OBJECTS = Class.$(OBJEXT) Data_Type.$(OBJEXT) \
 	Exception.$(OBJEXT) Identifier.$(OBJEXT) Module.$(OBJEXT) \
 	Object.$(OBJEXT) String.$(OBJEXT) Struct.$(OBJEXT) \
 	Symbol.$(OBJEXT) VM.$(OBJEXT) check_ruby_type.$(OBJEXT) \
-	demangle.$(OBJEXT) method_data.$(OBJEXT) protect.$(OBJEXT)
+	demangle.$(OBJEXT) method_data.$(OBJEXT) protect.$(OBJEXT) \
+	mininode.$(OBJEXT)
 librice_a_OBJECTS = $(am_librice_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -141,6 +142,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RICE_CPPFLAGS = @RICE_CPPFLAGS@
 RICE_LDFLAGS = @RICE_LDFLAGS@
+RICE_ROOT = @RICE_ROOT@
 RICE_SAMPLES = @RICE_SAMPLES@
 RICE_USING_MINGW32 = @RICE_USING_MINGW32@
 RUBY = @RUBY@
@@ -152,6 +154,7 @@ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
 RUBY_LIBRUBYARG_STATIC = @RUBY_LIBRUBYARG_STATIC@
 RUBY_LIBS = @RUBY_LIBS@
 RUBY_SITELIBDIR = @RUBY_SITELIBDIR@
+RUBY_VERSION_CODE = @RUBY_VERSION_CODE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -220,7 +223,8 @@ VM.cpp \
 detail/check_ruby_type.cpp \
 detail/demangle.cpp \
 detail/method_data.cpp \
-detail/protect.cpp
+detail/protect.cpp \
+detail/mininode.cpp
 
 nobase_include_HEADERS = \
 Address_Registration_Guard.hpp \
@@ -240,6 +244,7 @@ Critical_Guard.hpp \
 Critical_Guard.ipp \
 Data_Object.hpp \
 Data_Object.ipp \
+Data_Object_defn.hpp \
 Data_Type.hpp \
 Data_Type.ipp \
 Data_Type_defn.hpp \
@@ -247,8 +252,10 @@ Data_Type_fwd.hpp \
 Enum.hpp \
 Enum.ipp \
 Exception.hpp \
+Exception_defn.hpp \
 Exception_Base.hpp \
 Exception_Base.ipp \
+Exception_Base_defn.hpp \
 Hash.hpp \
 Hash.ipp \
 Identifier.hpp \
@@ -279,13 +286,16 @@ ruby_try_catch.hpp \
 to_from_ruby.hpp \
 to_from_ruby.ipp \
 to_from_ruby_defn.hpp \
+ruby_mark.hpp \
 detail/Auto_Function_Wrapper.hpp \
 detail/Auto_Function_Wrapper.ipp \
 detail/Auto_Member_Function_Wrapper.hpp \
 detail/Auto_Member_Function_Wrapper.ipp \
 detail/Caster.hpp \
 detail/Exception_Handler.hpp \
-detail/Iterator_Definer.hpp \
+detail/Exception_Handler.ipp \
+detail/Exception_Handler_defn.hpp \
+detail/Iterator.hpp \
 detail/Not_Copyable.hpp \
 detail/Wrapped_Function.hpp \
 detail/check_ruby_type.hpp \
@@ -312,7 +322,8 @@ detail/to_ruby.hpp \
 detail/to_ruby.ipp \
 detail/win32.hpp \
 detail/wrap_function.hpp \
-detail/wrap_function.ipp
+detail/wrap_function.ipp \
+detail/ruby_version_code.hpp
 
 AM_CPPFLAGS = @RUBY_CPPFLAGS@
 AM_CXXFLAGS = @RUBY_CXXFLAGS@
@@ -420,6 +431,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ruby_type.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demangle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/method_data.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mininode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protect.Po@am__quote@
 
 .cpp.o:
@@ -491,6 +503,20 @@ protect.obj: detail/protect.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='detail/protect.cpp' object='protect.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o protect.obj `if test -f 'detail/protect.cpp'; then $(CYGPATH_W) 'detail/protect.cpp'; else $(CYGPATH_W) '$(srcdir)/detail/protect.cpp'; fi`
+
+mininode.o: detail/mininode.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mininode.o -MD -MP -MF $(DEPDIR)/mininode.Tpo -c -o mininode.o `test -f 'detail/mininode.cpp' || echo '$(srcdir)/'`detail/mininode.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mininode.Tpo $(DEPDIR)/mininode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='detail/mininode.cpp' object='mininode.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mininode.o `test -f 'detail/mininode.cpp' || echo '$(srcdir)/'`detail/mininode.cpp
+
+mininode.obj: detail/mininode.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mininode.obj -MD -MP -MF $(DEPDIR)/mininode.Tpo -c -o mininode.obj `if test -f 'detail/mininode.cpp'; then $(CYGPATH_W) 'detail/mininode.cpp'; else $(CYGPATH_W) '$(srcdir)/detail/mininode.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mininode.Tpo $(DEPDIR)/mininode.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='detail/mininode.cpp' object='mininode.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mininode.obj `if test -f 'detail/mininode.cpp'; then $(CYGPATH_W) 'detail/mininode.cpp'; else $(CYGPATH_W) '$(srcdir)/detail/mininode.cpp'; fi`
 install-nobase_includeHEADERS: $(nobase_include_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
@@ -689,6 +715,15 @@ uninstall-am: uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
 	uninstall-am uninstall-libLIBRARIES \
 	uninstall-nobase_includeHEADERS
 
+
+detail/method_data.cpp: detail/method_data.cpp.rpp detail/mininode.hpp
+	ruby -C detail ../rubypp.rb method_data.cpp.rpp method_data.cpp
+
+detail/mininode.cpp: detail/mininode.cpp.rpp
+	ruby -C detail ../rubypp.rb mininode.cpp.rpp mininode.cpp
+
+detail/mininode.hpp: detail/mininode.hpp.rpp
+	ruby -C detail ../rubypp.rb mininode.hpp.rpp mininode.hpp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: