rice 2.2.0 → 3.0.0

data/rice/to_from_ruby.ipp

@@ -101,7 +101,7 @@ template<>
 inline
 long from_ruby<long>(Rice::Object x)
 {
-  return Rice::protect(Rice::detail::num2long, x);
+  return (long)Rice::protect(Rice::detail::num2long, x);
 }
 
 template<>
@@ -225,7 +225,7 @@ template<>
 inline
 unsigned long from_ruby<unsigned long>(Rice::Object x)
 {
-  return Rice::protect(Rice::detail::num2ulong, x);
+  return (unsigned long)Rice::protect(Rice::detail::num2ulong, x);
 }
 
 template<>
@@ -407,7 +407,7 @@ template<>
 inline
 Rice::Object to_ruby<std::string>(std::string const & x)
 {
-  return Rice::protect(rb_str_new, x.data(), x.size());
+  return Rice::protect(rb_str_new, x.data(), (long)x.size());
 }
 
 template<>

data/ruby/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,
@@ -89,7 +89,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = ruby
 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) \
@@ -223,7 +223,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@

data/ruby/lib/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,
@@ -90,7 +90,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = ruby/lib
 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) \
@@ -193,7 +193,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@

data/ruby/lib/version.rb

@@ -1,3 +1,3 @@
 module Rice
-  VERSION = "2.2.0"
+  VERSION = "3.0.0"
 end

data/sample/Makefile.am

@@ -10,7 +10,10 @@ EXTRA_DIST = \
 	map/test.rb \
 	inheritance/extconf.rb \
 	inheritance/animals.cpp \
-	inheritance/test.rb
+	inheritance/test.rb \
+	callbacks/extconf.rb \
+	callbacks/sample_callbacks.cpp \
+	callbacks/test.rb
 
 enum/Makefile: enum/extconf.rb ../config.status ../ruby/lib/mkmf-rice.rb
 	@RUBY@ $(RUBY_EXTCONF_OPTIONS) -C enum extconf.rb $(EXTCONF_OPTIONS)
@@ -21,7 +24,10 @@ map/Makefile: map/extconf.rb ../config.status ../ruby/lib/mkmf-rice.rb
 inheritance/Makefile: inheritance/extconf.rb ../config.status ../ruby/lib/mkmf-rice.rb
 	@RUBY@ $(RUBY_EXTCONF_OPTIONS) -C inheritance extconf.rb $(EXTCONF_OPTIONS)
 
-all: enum/Makefile map/Makefile inheritance/Makefile all_extensions
+callbacks/Makefile: callbacks/extconf.rb ../config.status ../ruby/lib/mkmf-rice.rb
+	@RUBY@ $(RUBY_EXTCONF_OPTIONS) -C callbacks extconf.rb $(EXTCONF_OPTIONS)
+
+all: enum/Makefile map/Makefile inheritance/Makefile callbacks/Makefile all_extensions
 
 all_extensions: $(addsuffix /Makefile,$(RICE_SAMPLES))
 	@for sample in $(RICE_SAMPLES); \
@@ -29,7 +35,7 @@ all_extensions: $(addsuffix /Makefile,$(RICE_SAMPLES))
 	  ${MAKE} -C $${sample} all; \
 	done
 
-clean: enum/Makefile map/Makefile inheritance/Makefile clean_extensions
+clean: enum/Makefile map/Makefile inheritance/Makefile callbacks/Makefile clean_extensions
 
 clean_extensions:
 	@for sample in $(RICE_SAMPLES); \
@@ -37,7 +43,7 @@ clean_extensions:
 	  ${MAKE} -C $${sample} clean; \
 	done
 
-distclean: enum/Makefile map/Makefile inheritance/Makefile distclean_extensions
+distclean: enum/Makefile map/Makefile inheritance/Makefile callbacks/Makefile distclean_extensions
 
 distclean_extensions:
 	@for sample in $(RICE_SAMPLES);

data/sample/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,
@@ -89,7 +89,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = sample
 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) \
@@ -163,7 +163,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@
@@ -265,7 +265,10 @@ EXTRA_DIST = \
 	map/test.rb \
 	inheritance/extconf.rb \
 	inheritance/animals.cpp \
-	inheritance/test.rb
+	inheritance/test.rb \
+	callbacks/extconf.rb \
+	callbacks/sample_callbacks.cpp \
+	callbacks/test.rb
 
 all: all-am
 
@@ -460,7 +463,10 @@ map/Makefile: map/extconf.rb ../config.status ../ruby/lib/mkmf-rice.rb
 inheritance/Makefile: inheritance/extconf.rb ../config.status ../ruby/lib/mkmf-rice.rb
 	@RUBY@ $(RUBY_EXTCONF_OPTIONS) -C inheritance extconf.rb $(EXTCONF_OPTIONS)
 
-all: enum/Makefile map/Makefile inheritance/Makefile all_extensions
+callbacks/Makefile: callbacks/extconf.rb ../config.status ../ruby/lib/mkmf-rice.rb
+	@RUBY@ $(RUBY_EXTCONF_OPTIONS) -C callbacks extconf.rb $(EXTCONF_OPTIONS)
+
+all: enum/Makefile map/Makefile inheritance/Makefile callbacks/Makefile all_extensions
 
 all_extensions: $(addsuffix /Makefile,$(RICE_SAMPLES))
 	@for sample in $(RICE_SAMPLES); \
@@ -468,7 +474,7 @@ all_extensions: $(addsuffix /Makefile,$(RICE_SAMPLES))
 	  ${MAKE} -C $${sample} all; \
 	done
 
-clean: enum/Makefile map/Makefile inheritance/Makefile clean_extensions
+clean: enum/Makefile map/Makefile inheritance/Makefile callbacks/Makefile clean_extensions
 
 clean_extensions:
 	@for sample in $(RICE_SAMPLES); \
@@ -476,7 +482,7 @@ clean_extensions:
 	  ${MAKE} -C $${sample} clean; \
 	done
 
-distclean: enum/Makefile map/Makefile inheritance/Makefile distclean_extensions
+distclean: enum/Makefile map/Makefile inheritance/Makefile callbacks/Makefile distclean_extensions
 
 distclean_extensions:
 	@for sample in $(RICE_SAMPLES);

data/sample/callbacks/extconf.rb

@@ -0,0 +1,3 @@
+require 'mkmf-rice'
+create_makefile('sample_callbacks')
+

data/sample/callbacks/sample_callbacks.cpp

@@ -0,0 +1,38 @@
+#include "rice/Data_Type.hpp"
+#include "rice/Constructor.hpp"
+#include "rice/String.hpp"
+
+using namespace Rice;
+
+namespace
+{
+
+  class CallbackHolder {
+    public:
+
+    void registerCallback(Rice::Object cb) {
+      callback = cb;
+    }
+
+    Rice::Object fireCallback(Rice::String param) {
+      return callback.call("call", param);
+    }
+
+    Rice::Object callback;
+  };
+
+} // namespace
+
+extern "C"
+void Init_sample_callbacks()
+{
+  RUBY_TRY
+  {
+    define_class<CallbackHolder>("CallbackHolder")
+      .define_constructor(Constructor<CallbackHolder>())
+      .define_method("register_callback", &CallbackHolder::registerCallback)
+      .define_method("fire_callback", &CallbackHolder::fireCallback);
+  }
+  RUBY_CATCH
+}
+

data/sample/callbacks/test.rb

@@ -0,0 +1,28 @@
+require 'sample_callbacks'
+
+def hello(message)
+  "Hello #{message}"
+end
+
+cb1 = CallbackHolder.new
+cb2 = CallbackHolder.new
+cb3 = CallbackHolder.new
+
+cb1.register_callback(lambda do |param|
+  "Callback 1 got param #{param}"
+end)
+
+cb2.register_callback(lambda do |param|
+  "Callback 2 got param #{param}"
+end)
+
+cb3.register_callback method(:hello)
+
+puts "Calling Callback 1"
+puts cb1.fire_callback("Hello")
+
+puts "Calling Callback 2"
+puts cb2.fire_callback("World")
+
+puts "Calling Callback 3"
+puts cb3.fire_callback("Ruby")

data/test/Makefile.am

@@ -30,6 +30,7 @@ run_multiple_extensions_same_class_test:
 
 
 unittest_SOURCES = \
+	embed_ruby.cpp \
 	unittest.cpp \
 	test_Address_Registration_Guard.cpp \
 	test_Array.cpp \

data/test/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,
@@ -92,7 +92,7 @@ noinst_PROGRAMS = unittest$(EXEEXT)
 TESTS = unittest$(EXEEXT)
 subdir = test
 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) \
@@ -103,7 +103,7 @@ CONFIG_HEADER = $(top_builddir)/rice/config.hpp
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_unittest_OBJECTS = unittest.$(OBJEXT) \
+am_unittest_OBJECTS = embed_ruby.$(OBJEXT) unittest.$(OBJEXT) \
 	test_Address_Registration_Guard.$(OBJEXT) test_Array.$(OBJEXT) \
 	test_Builtin_Object.$(OBJEXT) test_Class.$(OBJEXT) \
 	test_Constructor.$(OBJEXT) test_Data_Object.$(OBJEXT) \
@@ -132,7 +132,8 @@ am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/rice
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/test_Address_Registration_Guard.Po \
+am__depfiles_remade = ./$(DEPDIR)/embed_ruby.Po \
+	./$(DEPDIR)/test_Address_Registration_Guard.Po \
 	./$(DEPDIR)/test_Array.Po ./$(DEPDIR)/test_Builtin_Object.Po \
 	./$(DEPDIR)/test_Class.Po ./$(DEPDIR)/test_Constructor.Po \
 	./$(DEPDIR)/test_Data_Object.Po ./$(DEPDIR)/test_Data_Type.Po \
@@ -382,6 +383,7 @@ am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
 TEST_SUITE_LOG = test-suite.log
 TEST_EXTENSIONS = @EXEEXT@ .test
@@ -474,7 +476,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@
@@ -571,6 +573,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = ext
 unittest_SOURCES = \
+	embed_ruby.cpp \
 	unittest.cpp \
 	test_Address_Registration_Guard.cpp \
 	test_Array.cpp \
@@ -652,6 +655,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/embed_ruby.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Address_Registration_Guard.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Array.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Builtin_Object.Po@am__quote@ # am--include-marker
@@ -903,7 +907,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
@@ -1061,7 +1065,8 @@ clean: clean-recursive
 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
-		-rm -f ./$(DEPDIR)/test_Address_Registration_Guard.Po
+		-rm -f ./$(DEPDIR)/embed_ruby.Po
+	-rm -f ./$(DEPDIR)/test_Address_Registration_Guard.Po
 	-rm -f ./$(DEPDIR)/test_Array.Po
 	-rm -f ./$(DEPDIR)/test_Builtin_Object.Po
 	-rm -f ./$(DEPDIR)/test_Class.Po
@@ -1128,7 +1133,8 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-		-rm -f ./$(DEPDIR)/test_Address_Registration_Guard.Po
+		-rm -f ./$(DEPDIR)/embed_ruby.Po
+	-rm -f ./$(DEPDIR)/test_Address_Registration_Guard.Po
 	-rm -f ./$(DEPDIR)/test_Array.Po
 	-rm -f ./$(DEPDIR)/test_Builtin_Object.Po
 	-rm -f ./$(DEPDIR)/test_Class.Po

data/test/embed_ruby.cpp

@@ -0,0 +1,21 @@
+#include <ruby.h>
+
+void embed_ruby()
+{
+  static bool initialized__ = false;
+
+  if (!initialized__)
+  {
+    int argc = 0;
+    char* argv = (char*)malloc(1);
+    argv[0] = 0;
+    char** pArgv = &argv;
+
+    ruby_sysinit(&argc, &pArgv);
+    RUBY_INIT_STACK;
+    ruby_init();
+    ruby_init_loadpath();
+
+    initialized__ = true;
+  }
+}

data/test/embed_ruby.hpp

@@ -0,0 +1,4 @@
+#ifndef Rice_embed_ruby
+#define Rice_embed_ruby
+void embed_ruby();
+#endif

data/test/ext/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,
@@ -89,7 +89,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = test/ext
 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) \
@@ -163,7 +163,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@

data/test/test_Address_Registration_Guard.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Address_Registration_Guard.hpp"
 
 using namespace Rice;
@@ -7,7 +8,7 @@ TESTSUITE(Address_Registration_Guard);
 
 SETUP(Address_Registration_Guard)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(register_address)

data/test/test_Array.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Array.hpp"
 #include "rice/String.hpp"
 #include "rice/global_function.hpp"
@@ -9,7 +10,7 @@ TESTSUITE(Array);
 
 SETUP(Array)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(default_construct)