rice 1.4.3 → 1.5.0

data/test/ext/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,9 +14,27 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -32,7 +50,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = test/ext
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
@@ -41,11 +59,31 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/rice/config.hpp
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -102,6 +140,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
@@ -171,6 +210,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 RUBY_EXTCONF_OPTIONS = -I@RICE_ROOT@/ruby/lib
@@ -188,14 +228,14 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/ext/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  test/ext/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/ext/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu test/ext/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -213,11 +253,12 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-tags: TAGS
-TAGS:
+$(am__aclocal_m4_deps):
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -236,13 +277,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file "$(distdir)"$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file "$(distdir)"$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f "$(distdir)"/$$file \
-	    || cp -p $$d/$$file "$(distdir)"/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -260,16 +305,22 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -284,6 +335,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -292,18 +345,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -326,15 +389,16 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic 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 \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic 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 install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
 
 
 all:
@@ -370,6 +434,7 @@ t1_distclean:
 
 t2_distclean:
 	make -C t2 distclean
+
 # 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:

data/test/test_Class.cpp

@@ -258,7 +258,7 @@ TESTCASE(define_method_int_foo)
   define_method_int_result = 0;
   Foo * foo = new Foo;
   foo->x = 1024;
-  VALUE f = Data_Wrap_Struct(rb_cObject, 0, Default_Allocation_Strategy<Foo>::free, foo);
+  VALUE f = Data_Wrap_Struct(rb_cObject, 0, Default_Free_Function<Foo>::free, foo);
   o.call("foo", 42, Object(f));
   ASSERT_EQUAL(42, define_method_int_foo_result_i);
   ASSERT_EQUAL(foo, define_method_int_foo_result_x);
@@ -332,7 +332,7 @@ TESTCASE(define_iterator)
   c.define_iterator(&Container::begin, &Container::end);
   Container * container = new Container(array, 3);
   Object wrapped_container = Data_Wrap_Struct(
-      c, 0, Default_Allocation_Strategy<Container>::free, container);
+      c, 0, Default_Free_Function<Container>::free, container);
   Array a = wrapped_container.instance_eval("a = []; each() { |x| a << x }; a");
   ASSERT_EQUAL(3u, a.size());
   ASSERT_EQUAL(to_ruby(1), Object(a[0]));

data/test/test_Data_Object.cpp

@@ -51,7 +51,7 @@ TESTCASE(construct_from_pointer_with_defaults)
       expected_mark_func,
       RDATA(wrapped_foo.value())->dmark);
   ASSERT_EQUAL(
-      RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
+      RUBY_DATA_FUNC(Default_Free_Function<Foo>::free),
       RUBY_DATA_FUNC(RDATA(wrapped_foo.value())->dfree));
   ASSERT_EQUAL(foo, DATA_PTR(wrapped_foo.value()));
 }
@@ -71,7 +71,7 @@ TESTCASE(construct_from_pointer_and_klass)
       expected_mark_func,
       RDATA(wrapped_foo.value())->dmark);
   ASSERT_EQUAL(
-      RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
+      RUBY_DATA_FUNC(Default_Free_Function<Foo>::free),
       RUBY_DATA_FUNC(RDATA(wrapped_foo.value())->dfree));
   ASSERT_EQUAL(foo, DATA_PTR(wrapped_foo.value()));
 }
@@ -91,7 +91,7 @@ TESTCASE(construct_from_pointer_and_alternate_klass)
       expected_mark_func,
       RDATA(wrapped_foo.value())->dmark);
   ASSERT_EQUAL(
-      RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
+      RUBY_DATA_FUNC(Default_Free_Function<Foo>::free),
       RUBY_DATA_FUNC(RDATA(wrapped_foo.value())->dfree));
   ASSERT_EQUAL(foo, DATA_PTR(wrapped_foo.value()));
 }
@@ -112,7 +112,7 @@ TESTCASE(construct_from_pointer_and_klass_and_mark_function)
   ASSERT_EQUAL(Data_Type<Foo>::klass(), wrapped_foo.class_of());
   ASSERT_EQUAL((void *)dummy_mark, RDATA(wrapped_foo.value())->dmark);
   ASSERT_EQUAL(
-      RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
+      RUBY_DATA_FUNC(Default_Free_Function<Foo>::free),
       RUBY_DATA_FUNC(RDATA(wrapped_foo.value())->dfree));
   ASSERT_EQUAL(foo, DATA_PTR(wrapped_foo.value()));
 }
@@ -142,14 +142,14 @@ TESTCASE(construct_from_pointer_and_klass_and_mark_and_free)
 TESTCASE(construct_from_ruby_object)
 {
   Foo * foo = new Foo;
-  VALUE wrapped_foo = Data_Wrap_Struct(Data_Type<Foo>::klass(), 0, Default_Allocation_Strategy<Foo>::free, foo);
+  VALUE wrapped_foo = Data_Wrap_Struct(Data_Type<Foo>::klass(), 0, Default_Free_Function<Foo>::free, foo);
   Data_Object<Foo> data_object_foo(wrapped_foo);
   ASSERT_EQUAL(foo, data_object_foo.get());
   ASSERT_EQUAL(Data_Type<Foo>::klass(), data_object_foo.class_of());
   ASSERT_EQUAL(RDATA(wrapped_foo), RDATA(data_object_foo.value()));
   ASSERT_EQUAL(RUBY_DATA_FUNC(0), RDATA(data_object_foo.value())->dmark);
   ASSERT_EQUAL(
-      RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
+      RUBY_DATA_FUNC(Default_Free_Function<Foo>::free),
       RUBY_DATA_FUNC(RDATA(data_object_foo.value())->dfree));
   ASSERT_EQUAL(foo, DATA_PTR(data_object_foo.value()));
 }
@@ -158,14 +158,14 @@ TESTCASE(construct_from_ruby_object_and_class)
 {
   Data_Type<Foo> rb_cFoo;
   Foo * foo = new Foo;
-  VALUE wrapped_foo = Data_Wrap_Struct(Data_Type<Foo>::klass(), 0, Default_Allocation_Strategy<Foo>::free, foo);
+  VALUE wrapped_foo = Data_Wrap_Struct(Data_Type<Foo>::klass(), 0, Default_Free_Function<Foo>::free, foo);
   Data_Object<Foo> data_object_foo(wrapped_foo, rb_cFoo);
   ASSERT_EQUAL(foo, data_object_foo.get());
   ASSERT_EQUAL(Data_Type<Foo>::klass(), data_object_foo.class_of());
   ASSERT_EQUAL(RDATA(wrapped_foo), RDATA(data_object_foo.value()));
   ASSERT_EQUAL(RUBY_DATA_FUNC(0), RDATA(data_object_foo.value())->dmark);
   ASSERT_EQUAL(
-      RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
+      RUBY_DATA_FUNC(Default_Free_Function<Foo>::free),
       RUBY_DATA_FUNC(RDATA(data_object_foo.value())->dfree));
   ASSERT_EQUAL(foo, DATA_PTR(data_object_foo.value()));
 }
@@ -174,7 +174,7 @@ TESTCASE(construct_from_ruby_object_and_wrong_class)
 {
   Foo * foo = new Foo;
   Data_Type<Foo> rb_cFoo;
-  VALUE wrapped_foo = Data_Wrap_Struct(rb_cObject, 0, Default_Allocation_Strategy<Foo>::free, foo);
+  VALUE wrapped_foo = Data_Wrap_Struct(rb_cObject, 0, Default_Free_Function<Foo>::free, foo);
   ASSERT_EXCEPTION_CHECK(
       Exception,
       Data_Object<Foo> data_object_foo(wrapped_foo, rb_cFoo),
@@ -189,7 +189,7 @@ TESTCASE(copy_construct)
 {
   Data_Type<Foo> rb_cFoo;
   Foo * foo = new Foo;
-  VALUE wrapped_foo = Data_Wrap_Struct(Data_Type<Foo>::klass(), 0, Default_Allocation_Strategy<Foo>::free, foo);
+  VALUE wrapped_foo = Data_Wrap_Struct(Data_Type<Foo>::klass(), 0, Default_Free_Function<Foo>::free, foo);
   Data_Object<Foo> orig_data_object_foo(wrapped_foo, rb_cFoo);
   Data_Object<Foo> data_object_foo(orig_data_object_foo);
   ASSERT_EQUAL(foo, data_object_foo.get());
@@ -197,7 +197,7 @@ TESTCASE(copy_construct)
   ASSERT_EQUAL(RDATA(wrapped_foo), RDATA(data_object_foo.value()));
   ASSERT_EQUAL(RUBY_DATA_FUNC(0), RDATA(data_object_foo.value())->dmark);
   ASSERT_EQUAL(
-      RUBY_DATA_FUNC(Default_Allocation_Strategy<Foo>::free),
+      RUBY_DATA_FUNC(Default_Free_Function<Foo>::free),
       RUBY_DATA_FUNC(RDATA(data_object_foo.value())->dfree));
   ASSERT_EQUAL(foo, DATA_PTR(data_object_foo.value()));
 }

data/test/test_Hash.cpp

@@ -17,7 +17,7 @@ TESTCASE(default_construct)
 {
   Hash h;
   ASSERT_EQUAL(T_HASH, rb_type(h));
-  ASSERT_EQUAL(0, RHASH_TBL(h.value())->num_entries);
+  ASSERT_EQUAL(0, RHASH_SIZE(h.value()));
 }
 
 TESTCASE(construct_from_object)
@@ -25,7 +25,7 @@ TESTCASE(construct_from_object)
   Object o(rb_hash_new());
   Hash h(o);
   ASSERT_EQUAL(T_HASH, rb_type(h));
-  ASSERT_EQUAL(0, RHASH_TBL(h.value())->num_entries);
+  ASSERT_EQUAL(0, RHASH_SIZE(h.value()));
 }
 
 TESTCASE(construct_from_value)
@@ -33,7 +33,7 @@ TESTCASE(construct_from_value)
   VALUE v(rb_hash_new());
   Hash h(v);
   ASSERT_EQUAL(T_HASH, rb_type(h));
-  ASSERT_EQUAL(0, RHASH_TBL(h.value())->num_entries);
+  ASSERT_EQUAL(0, RHASH_SIZE(h.value()));
 }
 
 TESTCASE(copy_construct)
@@ -95,6 +95,7 @@ TESTCASE(construct_vector_from_hash_iterators)
   h[6] = 9;
   h[42] = 42;
   h[6] = 1;
+
   std::vector<Hash::Entry> v(h.begin(), h.end());
   std::sort(v.begin(), v.end());
   ASSERT_EQUAL(3u, v.size());
@@ -119,13 +120,16 @@ TESTCASE(iterate)
   h[6] = 9;
   h[42] = 42;
   h[6] = 1;
+
   std::vector<Hash::Entry> v;
   Hash::iterator it = h.begin();
   Hash::iterator end = h.end();
+
   for(; it != end; ++it)
   {
     v.push_back(*it);
   }
+
   std::sort(v.begin(), v.end());
   ASSERT_EQUAL(3u, v.size());
   ASSERT_EQUAL(v[0].key, to_ruby(1));
@@ -192,4 +196,3 @@ TESTCASE(iterate_and_change)
   ASSERT_EQUAL(to_ruby(m[6]), h[6]);
   ASSERT_EQUAL(to_ruby(m[42]), h[42]);
 }
-

data/test/test_Module.cpp

@@ -94,6 +94,22 @@ TESTCASE(define_module_function_simple)
   ASSERT(define_method_simple_ok);
 }
 
+TESTCASE(define_module_does_not_leak_method_to_Object)
+{
+  Module m = define_module("TestModule");
+  m.define_module_function("test_module_function", &define_method_simple_helper);
+
+  Module runner(anonymous_module());
+  ASSERT_EXCEPTION_CHECK(
+    Exception,
+    runner.instance_eval("Object.test_module_function"),
+    ASSERT_EQUAL(
+      Object(rb_eNoMethodError),
+      Object(CLASS_OF(ex.value()))
+    )
+  );
+}
+
 namespace
 {
 
@@ -184,7 +200,7 @@ TESTCASE(define_singleton_method_int_foo)
   define_method_int_result = 0;
   Foo * foo = new Foo;
   foo->x = 1024;
-  VALUE f = Data_Wrap_Struct(rb_cObject, 0, Default_Allocation_Strategy<Foo>::free, foo);
+  VALUE f = Data_Wrap_Struct(rb_cObject, 0, Default_Free_Function<Foo>::free, foo);
   m.call("int_and_foo", 42, Object(f));
   ASSERT_EQUAL(42, define_method_int_foo_result_i);
   ASSERT_EQUAL(foo, define_method_int_foo_result_x);