rice-jdguyot 1.4.0.p1 → 1.4.0

data/extconf.rb

@@ -14,9 +14,13 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
 
 require 'rbconfig'
+require 'rubygems'
 require 'ruby/lib/version.rb'
 
-prefix_dir = File.join(File.dirname(File.expand_path(__FILE__)), "ruby", "lib")
+gem_name = "rice-#{Rice::VERSION}"
+
+gem_base_dir = File.writable?(Gem.default_dir) ? Gem.default_dir : Gem.user_dir
+prefix_dir = File.join(gem_base_dir, "gems", gem_name, "ruby", "lib")
 with_ruby = File.join(Config::CONFIG["bindir"], Config::CONFIG["RUBY_INSTALL_NAME"])
 
 other_opts = ""

data/rice/Address_Registration_Guard.ipp

@@ -5,7 +5,6 @@ inline Rice::Address_Registration_Guard::
 Address_Registration_Guard(VALUE * address)
   : address_(address)
 {
-  registerExitHandler();
   rb_gc_register_address(address);
 }
 
@@ -13,15 +12,13 @@ inline Rice::Address_Registration_Guard::
 Address_Registration_Guard(Object * object)
   : address_(const_cast<VALUE *>(&object->value()))
 {
-  registerExitHandler();
   rb_gc_register_address(address_);
 }
 
 inline Rice::Address_Registration_Guard::
 ~Address_Registration_Guard()
 {
-  if (enabled)
-    rb_gc_unregister_address(address_);
+  rb_gc_unregister_address(address_);
 }
 
 inline VALUE * Rice::Address_Registration_Guard::

data/rice/Address_Registration_Guard_defn.hpp

@@ -56,17 +56,7 @@ public:
   //! Swap with another Address_Registration_Guard.
   void swap(Address_Registration_Guard & other);
 
-  /** Called during Ruby's exit process since we should not call
-   * rb_gc unregister_address there
-   */
-  static void disable();
-
 private:
-  static bool enabled;
-  static bool exit_handler_registered;
-
-  static void registerExitHandler();
-
   VALUE * address_;
 };
 

data/rice/Makefile.am

@@ -13,7 +13,6 @@ Struct.cpp \
 Symbol.cpp \
 VM.cpp \
 Arg_operators.cpp \
-Address_Registration_Guard.cpp \
 detail/check_ruby_type.cpp \
 detail/demangle.cpp \
 detail/method_data.cpp \

data/rice/Makefile.in

@@ -61,9 +61,8 @@ am_librice_a_OBJECTS = Class.$(OBJEXT) Data_Type.$(OBJEXT) \
 	Director.$(OBJEXT) Exception.$(OBJEXT) Identifier.$(OBJEXT) \
 	Module.$(OBJEXT) Object.$(OBJEXT) String.$(OBJEXT) \
 	Struct.$(OBJEXT) Symbol.$(OBJEXT) VM.$(OBJEXT) \
-	Arg_operators.$(OBJEXT) Address_Registration_Guard.$(OBJEXT) \
-	check_ruby_type.$(OBJEXT) demangle.$(OBJEXT) \
-	method_data.$(OBJEXT) protect.$(OBJEXT)
+	Arg_operators.$(OBJEXT) check_ruby_type.$(OBJEXT) \
+	demangle.$(OBJEXT) method_data.$(OBJEXT) protect.$(OBJEXT)
 librice_a_OBJECTS = $(am_librice_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -223,7 +222,6 @@ Struct.cpp \
 Symbol.cpp \
 VM.cpp \
 Arg_operators.cpp \
-Address_Registration_Guard.cpp \
 detail/check_ruby_type.cpp \
 detail/demangle.cpp \
 detail/method_data.cpp \
@@ -425,7 +423,6 @@ 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@
@@ -588,8 +585,8 @@ distdir: $(DISTFILES)
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+	  */*) eval $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|"$(distdir)"/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
@@ -597,12 +594,12 @@ distdir: $(DISTFILES)
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -pR $(srcdir)/$$file "$(distdir)"$$dir || exit 1; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -pR $$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

data/rice/String.cpp

@@ -37,7 +37,7 @@ String(char const * s)
 
 Rice::String::
 String(std::string const & s)
-  : Builtin_Object<RString, T_STRING>(protect(rb_str_new, s.data(), s.length()))
+  : Builtin_Object<RString, T_STRING>(protect(rb_str_new, s.c_str(), s.length()))
 {
 }
 
@@ -83,7 +83,7 @@ c_str() const
 std::string Rice::String::
 str() const
 {
-  return std::string(RSTRING_PTR(value()), length());
+  return RSTRING_PTR(value());
 }
 
 Rice::Identifier Rice::String::

data/rice/to_from_ruby.ipp

@@ -261,7 +261,10 @@ template<>
 inline
 char const * from_ruby<char const *>(Rice::Object x)
 {
-  return Rice::String(x).str().data();
+  // TODO: Maybe not the right way to do this conversion (what happens
+  // if the object gets GC'd?)
+  VALUE v(x.value());
+  return (char const *)Rice::protect<char const *>(rb_string_value_cstr, &v);
 }
 
 template<>
@@ -276,19 +279,19 @@ template<>
 inline
 std::string from_ruby<std::string>(Rice::Object x)
 {
-  return Rice::String(x).str();
+  return std::string(from_ruby<char const *>(x));
 }
 
 template<>
 inline
 Rice::Object to_ruby<std::string>(std::string const & x)
 {
-  return Rice::protect(rb_str_new, x.data(), x.size());
+  return to_ruby(x.c_str());
 }
 
 template<>
 inline
 std::string* from_ruby<std::string* >(Rice::Object x)
 {
-  return new std::string(Rice::String(x).str());
+  return new std::string(from_ruby<char const *>(x));
 }

data/ruby/lib/version.rb

@@ -1,3 +1,3 @@
 module Rice
-  VERSION = "1.4.0.p1"
+  VERSION = "1.4.0"
 end

data/test/test_To_From_Ruby.cpp

@@ -261,17 +261,3 @@ TESTCASE(std_string_from_ruby)
   ASSERT_EQUAL(std::string("foo"), from_ruby<std::string>(rb_str_new2("foo")));
 }
 
-TESTCASE(std_string_to_ruby_with_binary)
-{
-  Rice::String got = to_ruby(std::string("\000test", 5));
-
-  ASSERT_EQUAL(String(std::string("\000test", 5)), got);
-  ASSERT_EQUAL(5, got.length());
-}
-
-TESTCASE(std_string_from_ruby_with_binary)
-{
-  std::string got = from_ruby<std::string>(rb_str_new("\000test", 5));
-  ASSERT_EQUAL(5, got.length());
-  ASSERT_EQUAL(std::string("\000test", 5), got);
-}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rice-jdguyot
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 7
+  prerelease: false
   segments: 
   - 1
   - 4
   - 0
-  - p1
-  version: 1.4.0.p1
+  version: 1.4.0
 platform: ruby
 authors: 
 - Paul Brannan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +01:00
+date: 2010-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,6 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -81,7 +82,6 @@ files:
 - sample/Makefile.in
 - test/Makefile.am
 - test/Makefile.in
-- rice/Address_Registration_Guard.cpp
 - rice/Address_Registration_Guard.hpp
 - rice/Address_Registration_Guard.ipp
 - rice/Address_Registration_Guard_defn.hpp
@@ -99,7 +99,6 @@ files:
 - rice/Class.hpp
 - rice/Class.ipp
 - rice/Class_defn.hpp
-- rice/config.hpp
 - rice/Constructor.hpp
 - rice/Critical_Guard.hpp
 - rice/Critical_Guard.ipp
@@ -195,7 +194,6 @@ files:
 - rice/detail/protect.cpp
 - rice/detail/protect.hpp
 - rice/detail/ruby.hpp
-- rice/detail/ruby_version_code.hpp
 - rice/detail/rubysig.hpp
 - rice/detail/st.hpp
 - rice/detail/to_ruby.hpp
@@ -265,19 +263,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rice

data/rice/Address_Registration_Guard.cpp

@@ -1,22 +0,0 @@
-#include "Address_Registration_Guard.hpp"
-
-bool Rice::Address_Registration_Guard::enabled = true;
-bool Rice::Address_Registration_Guard::exit_handler_registered = false;
-
-static void disable_all_guards(VALUE)
-{
-    Rice::Address_Registration_Guard::disable();
-}
-
-void Rice::Address_Registration_Guard::registerExitHandler()
-{
-    if (exit_handler_registered) return;
-    rb_set_end_proc(&disable_all_guards, Qnil);
-    exit_handler_registered = true;
-}
-
-void Rice::Address_Registration_Guard::disable()
-{
-    enabled = false;
-}
-

data/rice/config.hpp

@@ -1,41 +0,0 @@
-/* rice/config.hpp.  Generated from config.hpp.in by configure.  */
-/* rice/config.hpp.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <env.h> header file. */
-/* #undef HAVE_ENV_H */
-
-/* Define to 1 if you have the <node.h> header file. */
-/* #undef HAVE_NODE_H */
-
-/* Define to 1 if you have the <ruby.h> header file. */
-#define HAVE_RUBY_H 1
-
-/* Define to 1 if you have the <ruby/node.h> header file. */
-/* #undef HAVE_RUBY_NODE_H */
-
-/* Define to 1 if you have the <version.h> header file. */
-/* #undef HAVE_VERSION_H */
-
-/* Name of package */
-#define PACKAGE "rice"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "rice"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "rice 1.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "rice"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1"
-
-/* Define this macro to use ruby/node.h */
-/* #undef REALLY_HAVE_RUBY_NODE_H */
-
-/* Version number of package */
-#define VERSION "1.1"

data/rice/detail/ruby_version_code.hpp

@@ -1,6 +0,0 @@
-#ifndef Rice__detail__ruby_version_code__hpp
-#define Rice__detail__ruby_version_code__hpp
-
-#define RICE__RUBY_VERSION_CODE 192
-
-#endif // Rice__detail__ruby_version_code__hpp