rice 2.1.0 → 3.0.0

data/rice/Data_Object_defn.hpp

@@ -62,7 +62,7 @@ public:
   typedef void (*Ruby_Data_Func)(T * obj);
 
   //! Wrap a C++ object.
-  /*! This constructor is analgous to calling Data_Wrap_Struct.  Be
+  /*! This constructor is analogous to calling Data_Wrap_Struct.  Be
    *  careful not to call this function more than once for the same
    *  pointer (in general, it should only be called for newly
    *  constructed objects that need to be managed by Ruby's garbage
@@ -82,7 +82,7 @@ public:
       Ruby_Data_Func free_func = Default_Free_Function<T>::free);
 
   //! Unwrap a Ruby object.
-  /*! This constructor is analgous to calling Data_Get_Struct.  Uses
+  /*! This constructor is analogous to calling Data_Get_Struct.  Uses
    *  Data_Type<T>::klass as the class of the object.
    *  \param value the Ruby object to unwrap.
    */
@@ -90,7 +90,7 @@ public:
       Object value);
 
   //! Unwrap a Ruby object.
-  /*! This constructor is analgous to calling Data_Get_Struct.  Will
+  /*! This constructor is analogous to calling Data_Get_Struct.  Will
    *  throw an exception if the class of the object differs from the
    *  specified class.
    *  \param value the Ruby object to unwrap.

data/rice/Director.hpp

@@ -10,10 +10,10 @@ namespace Rice {
    * You use this class to help build proxy classes so that polymorphism
    * works from C++ into Ruby. See the main README for how this class works.
    */
-  class Director 
+  class Director
   {
     public:
-      //! Construct new Director. Needs the Ruby object so that the 
+      //! Construct new Director. Needs the Ruby object so that the
       //  proxy class can call methods on that object.
       Director(Object self);
 
@@ -21,7 +21,7 @@ namespace Rice {
 
       //! Raise a ruby exception when a call comes through for a pure virtual method
       /*! If a Ruby script calls 'super' on a method that's otherwise a pure virtual
-       *  method, use this method to throw an exception in this case. 
+       *  method, use this method to throw an exception in this case.
        */
       void raisePureVirtual() const;
 

data/rice/Enum.ipp

@@ -75,7 +75,7 @@ initialize(
     .define_method("to_i", to_i)
     .define_method("inspect", inspect)
     .define_method("<=>", compare)
-    //.define_method("hash", hash)
+    .define_method("hash", hash)
     .define_method("eql?", eql)
     .define_method("==", eql)
     .define_method("===", eql)

data/rice/Exception.cpp

@@ -3,13 +3,8 @@
 #include "to_from_ruby.hpp"
 #include "detail/ruby.hpp"
 
-#ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
 #define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
 
 Rice::Exception::
 Exception(VALUE e)
@@ -35,7 +30,7 @@ Exception(Object exc, char const * fmt, ...)
 {
   va_list args;
   char buf[BUFSIZ];
-  
+
   va_init_list(args, fmt);
   vsnprintf(buf, BUFSIZ, fmt, args);
   buf[BUFSIZ - 1] = '\0';
@@ -54,6 +49,6 @@ char const * Rice::Exception::
 what() const throw()
 {
   message_ = message();
-  return from_ruby<std::string>(message_).c_str();
+  return from_ruby<char const *>(message_);
 }
 

data/rice/Hash.hpp

@@ -5,8 +5,8 @@
 #include "Array.hpp"
 #include "to_from_ruby_defn.hpp"
 #include "detail/ruby.hpp"
-#include "detail/traits.hpp"
 #include <iterator>
+#include <type_traits>
 
 namespace Rice
 {
@@ -146,11 +146,14 @@ bool operator<(Hash::Entry const & lhs, Hash::Entry const & rhs);
 //! A helper class for implementing iterators for a Hash.
 template<typename Hash_Ref_T, typename Value_T>
 class Hash::Iterator
-  : public std::iterator<
-      std::input_iterator_tag,
-      Value_T>
 {
 public:
+  using iterator_category = std::input_iterator_tag;
+  using value_type = Value_T;
+  using difference_type = long;
+  using pointer = Object*;
+  using reference = Value_T&;
+
   //! Construct a new Iterator.
   Iterator(Hash_Ref_T hash);
 
@@ -202,7 +205,7 @@ private:
   size_t current_index_;
   VALUE keys_;
 
-  mutable typename detail::remove_const<Value_T>::Type tmp_;
+  mutable typename std::remove_const<Value_T>::type tmp_;
 };
 
 } // namespace Rice

data/rice/Hash.ipp

@@ -292,13 +292,13 @@ begin() const
 inline Rice::Hash::iterator Rice::Hash::
 end()
 {
-  return iterator(*this, size());
+  return iterator(*this, (int)size());
 }
 
 inline Rice::Hash::const_iterator Rice::Hash::
 end() const
 {
-  return const_iterator(*this, size());
+  return const_iterator(*this, (int)size());
 }
 
 inline bool Rice::

data/rice/Makefile.am

@@ -78,6 +78,7 @@ to_from_ruby.hpp \
 to_from_ruby.ipp \
 to_from_ruby_defn.hpp \
 ruby_mark.hpp \
+config.hpp \
 detail/Auto_Function_Wrapper.hpp \
 detail/Auto_Function_Wrapper.ipp \
 detail/Auto_Member_Function_Wrapper.hpp \
@@ -103,17 +104,13 @@ detail/from_ruby.hpp \
 detail/from_ruby.ipp \
 detail/method_data.hpp \
 detail/node.hpp \
-detail/object_call.hpp \
-detail/object_call.ipp \
 detail/protect.hpp \
 detail/ruby.hpp \
 detail/st.hpp \
-detail/traits.hpp \
 detail/to_ruby.hpp \
 detail/to_ruby.ipp \
 detail/win32.hpp \
 detail/wrap_function.hpp \
-detail/wrap_function.ipp \
 detail/ruby_version_code.hpp
 
 includedir = ${prefix}/include/rice

data/rice/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -91,7 +91,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = rice
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/check_stdcxx_11.ac \
+am__aclocal_m4_deps = $(top_srcdir)/ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -162,7 +162,16 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/Address_Registration_Guard.Po \
+	./$(DEPDIR)/Arg_operators.Po ./$(DEPDIR)/Class.Po \
+	./$(DEPDIR)/Data_Type.Po ./$(DEPDIR)/Director.Po \
+	./$(DEPDIR)/Exception.Po ./$(DEPDIR)/Identifier.Po \
+	./$(DEPDIR)/Module.Po ./$(DEPDIR)/Object.Po \
+	./$(DEPDIR)/String.Po ./$(DEPDIR)/Struct.Po \
+	./$(DEPDIR)/Symbol.Po detail/$(DEPDIR)/check_ruby_type.Po \
+	detail/$(DEPDIR)/demangle.Po detail/$(DEPDIR)/method_data.Po \
+	detail/$(DEPDIR)/protect.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -185,8 +194,8 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 HEADERS = $(nobase_include_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.hpp.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+	config.hpp.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -250,7 +259,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
-HAVE_CXX11 = @HAVE_CXX11@
+HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -420,6 +429,7 @@ to_from_ruby.hpp \
 to_from_ruby.ipp \
 to_from_ruby_defn.hpp \
 ruby_mark.hpp \
+config.hpp \
 detail/Auto_Function_Wrapper.hpp \
 detail/Auto_Function_Wrapper.ipp \
 detail/Auto_Member_Function_Wrapper.hpp \
@@ -445,17 +455,13 @@ detail/from_ruby.hpp \
 detail/from_ruby.ipp \
 detail/method_data.hpp \
 detail/node.hpp \
-detail/object_call.hpp \
-detail/object_call.ipp \
 detail/protect.hpp \
 detail/ruby.hpp \
 detail/st.hpp \
-detail/traits.hpp \
 detail/to_ruby.hpp \
 detail/to_ruby.ipp \
 detail/win32.hpp \
 detail/wrap_function.hpp \
-detail/wrap_function.ipp \
 detail/ruby_version_code.hpp
 
 AM_CPPFLAGS = @RUBY_CPPFLAGS@
@@ -482,8 +488,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -567,22 +573,28 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Address_Registration_Guard.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Arg_operators.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Class.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Data_Type.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Director.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exception.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Identifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Module.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Object.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/String.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Struct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Symbol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/check_ruby_type.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/demangle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/method_data.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/protect.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Address_Registration_Guard.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Arg_operators.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Class.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Data_Type.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Director.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exception.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Identifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Module.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Object.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/String.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Struct.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Symbol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/check_ruby_type.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/demangle.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/method_data.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/protect.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -676,7 +688,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -750,7 +765,22 @@ clean: clean-am
 clean-am: clean-generic clean-libLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR) detail/$(DEPDIR)
+		-rm -f ./$(DEPDIR)/Address_Registration_Guard.Po
+	-rm -f ./$(DEPDIR)/Arg_operators.Po
+	-rm -f ./$(DEPDIR)/Class.Po
+	-rm -f ./$(DEPDIR)/Data_Type.Po
+	-rm -f ./$(DEPDIR)/Director.Po
+	-rm -f ./$(DEPDIR)/Exception.Po
+	-rm -f ./$(DEPDIR)/Identifier.Po
+	-rm -f ./$(DEPDIR)/Module.Po
+	-rm -f ./$(DEPDIR)/Object.Po
+	-rm -f ./$(DEPDIR)/String.Po
+	-rm -f ./$(DEPDIR)/Struct.Po
+	-rm -f ./$(DEPDIR)/Symbol.Po
+	-rm -f detail/$(DEPDIR)/check_ruby_type.Po
+	-rm -f detail/$(DEPDIR)/demangle.Po
+	-rm -f detail/$(DEPDIR)/method_data.Po
+	-rm -f detail/$(DEPDIR)/protect.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -796,7 +826,22 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR) detail/$(DEPDIR)
+		-rm -f ./$(DEPDIR)/Address_Registration_Guard.Po
+	-rm -f ./$(DEPDIR)/Arg_operators.Po
+	-rm -f ./$(DEPDIR)/Class.Po
+	-rm -f ./$(DEPDIR)/Data_Type.Po
+	-rm -f ./$(DEPDIR)/Director.Po
+	-rm -f ./$(DEPDIR)/Exception.Po
+	-rm -f ./$(DEPDIR)/Identifier.Po
+	-rm -f ./$(DEPDIR)/Module.Po
+	-rm -f ./$(DEPDIR)/Object.Po
+	-rm -f ./$(DEPDIR)/String.Po
+	-rm -f ./$(DEPDIR)/Struct.Po
+	-rm -f ./$(DEPDIR)/Symbol.Po
+	-rm -f detail/$(DEPDIR)/check_ruby_type.Po
+	-rm -f detail/$(DEPDIR)/demangle.Po
+	-rm -f detail/$(DEPDIR)/method_data.Po
+	-rm -f detail/$(DEPDIR)/protect.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -816,9 +861,9 @@ uninstall-am: uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
 
 .MAKE: all install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-hdr \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libLIBRARIES cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \

data/rice/Module_impl.ipp

@@ -285,7 +285,7 @@ bool
 Rice::Module_impl<Base_T, Derived_T>::
 const_defined(Identifier name) const
 {
-  int result = protect(rb_const_defined, *this, name);
+  size_t result = protect(rb_const_defined, *this, name);
   return bool(result);
 }
 

data/rice/Object.cpp

@@ -117,7 +117,7 @@ vcall(
     a[i] = it->value();
   }
 
-  return protect(rb_funcall3, *this, id, args.size(), &a[0]);
+  return protect(rb_funcall3, *this, id, (int)args.size(), a.data());
 }
 
 void Rice::Object::

data/rice/Object.ipp

@@ -3,8 +3,22 @@
 
 #include "protect.hpp"
 #include "detail/ruby.hpp"
+#include "to_from_ruby.hpp"
 
-#include "detail/object_call.ipp"
+#include <vector>
+
+template<typename ...ArgT>
+inline Rice::Object Rice::Object::
+call(Identifier id, ArgT... args) const
+{
+  auto asList = this->convert_args<ArgT...>(args...);
+  return protect(rb_funcall2, value(), id, (int)asList.size(), asList.data());
+}
+
+template<typename ...ArgT>
+std::vector<VALUE> Rice::Object::convert_args(ArgT&... args) const {
+  return std::vector<VALUE>{ to_ruby(args)... };
+}
 
 template<typename T>
 void Rice::Object::

data/rice/Object_defn.hpp

@@ -8,6 +8,7 @@
 #include "detail/ruby.hpp"
 
 #include <iosfwd>
+#include <vector>
 
 namespace Rice
 {
@@ -151,7 +152,25 @@ public:
   Object attr_get(
       Identifier name) const;
 
-#include "detail/object_call.hpp"
+  //! Call the Ruby method specified by 'id' on object 'obj'.
+  /*! Pass in arguments (arg1, arg2, ...).  The arguments will be converted to
+  *  Ruby objects with to_ruby<>.
+  *
+  *  E.g.:
+  *  \code
+  *    Rice::Object obj = x.call("foo", "one", 2);
+  *  \endcode
+  *
+  *  If a return type is specified, the return value will automatically be
+  *  converted to that type as long as 'from_ruby' exists for that type.
+  *
+  *  E.g.:
+  *  \code
+  *    float ret = x.call<float>("foo", z, 42);
+  *  \endcode
+  */
+  template<typename ...ArgT>
+  Object call(Identifier id, ArgT... args) const;
 
   //! Vectorized call.
   /*! Calls the method identified by id with the list of arguments
@@ -169,6 +188,10 @@ protected:
   //! Set the encapsulated value.
   void set_value(VALUE v);
 
+  //! Unpack the provided arguments and convert them all to Ruby types.
+  template<typename ...ArgT>
+  std::vector<VALUE> convert_args(ArgT&... args) const;
+
 private:
   volatile VALUE value_;
 };